Changeset 285


Ignore:
Timestamp:
Jul 26, 2007, 5:43:54 PM (17 years ago)
Author:
イグトランス (egtra)
Message:

wtypes.abを追加

Location:
Include
Files:
1 added
13 edited

Legend:

Unmodified
Added
Removed

  • Include/Classes/ActiveBasic/Math/Math.ab

    r276 r285  
    1313Function CopySign(x As Single, y As Single) As Single
    1414    SetDWord(VarPtr(CopySign), (GetDWord(VarPtr(x)) And &h7fffffff) Or (GetDWord(VarPtr(y)) And &h80000000))
     15End Function
     16
     17Function Hypot(x As Double, y As Double) As Double
     18    If x = 0 Then
     19        Hypot = Abs(y)
     20    Else If y = 0 Then
     21        Hypot = Abs(x)
     22    Else
     23        Dim ax = Abs(x)
     24        Dim ay = Abs(y)
     25        If ay > ax Then
     26            Dim t = x / y
     27            Hypot = ay * Sqr(1 + t * t)
     28        Else
     29            Dim t = y / x
     30            Hypot = ax * Sqr(1 + t * t)
     31        End If
     32    End If
    1533End Function
    1634
    … …  
    3957
    4058Function IsInf(x As Double) As Boolean
    41     Dim p As *DWord, nan As Double
    42     p = VarPtr(x) As *DWord
     59    Dim p = VarPtr(x) As *DWord
    4360    p[1] And= &h7fffffff
    44     nan = ActiveBasic.Math.Detail.GetInf(False)
    45     IsInf = (memcmp(p As *Byte, VarPtr(nan), SizeOf (Double)) = 0)
     61    Dim inf = ActiveBasic.Math.Detail.GetInf(False)
     62    IsInf = (memcmp(p As *Byte, VarPtr(inf), SizeOf (Double)) = 0)
    4663End Function
    4764
    4865Function IsFinite(x As Double) As Boolean
    49     Dim p As *DWord, nan As Double
    50     p = VarPtr(x) As *DWord
    51 '   p[1] And= &h7ffe0000
     66    Dim p = VarPtr(x) As *DWord
    5267    p[1] And= &H7FF00000
    53     p[0] = 0
    54     nan = ActiveBasic.Math.Detail.GetInf(/*x,*/ False)
    55     IsFinite = (memcmp(p As BytePtr, VarPtr(nan), SizeOf (Double)) = 0)
     68    IsFinite = p[1] And &H7FF00000 = &H7FF00000
    5669End Function
    5770
    … …  
    8295
    8396Function GetNaN() As Double
    84     Dim p As *DWord
    85     p = VarPtr(GetNaN) As *DWord
     97    Dim p = VarPtr(GetNaN) As *DWord
    8698    p[0] = 0
    8799    p[1] = &H7FF80000
    … …  
    104116    While i >= 1
    105117        Dim t = (i * x) As Double
    106         s = t / (2 + t / (2 * i + 1 + s))
     118        s = t * (2 * i + 1 + s) / (2 + t)
    107119        i--
    108120    Wend
    … …  
    111123
    112124Function _Support_tan(x As Double, ByRef k As Long) As Double
    113     Dim i As Long
    114     Dim t As Double, x2 As Double
    115 
    116125    If x>=0 Then
    117126        k=Fix(x/(_System_PI/2)+0.5)
    … …  
    122131    x=(x-(CDbl(3217)/CDbl(2048))*k)+4.4544551033807686783083602485579e-6*k
    123132
    124     x2=x*x
    125     t=0
     133    Dim x2 = x * x
     134    Dim t = 0 As Double
    126135
     136    Dim i As Long
    127137    For i=19 To 3 Step -2
    128138        t=x2/(i-t)

  • Include/Classes/System/IO/DirectoryInfo.ab

    r271 r285  
    4545
    4646            ' 終端の '\' を除去
    47             If dirPath[dirPath.Length-1] = Asc("\\") Then
    48                 dirPath = dirPath.SubString(0, dirPath.Length-1)
     47            If dirPath[dirPath.Length-1] = Asc("\") Then
     48                dirPath = dirPath.Substring(0, dirPath.Length-1)
    4949            End If
    5050
    … …  
    5555            op.hwnd = NULL
    5656            op.wFunc = FO_DELETE
    57             op.pFrom = dirPath.Chars
     57            op.pFrom = ToTCStr(dirPath)
    5858            op.pTo = NULL
    5959            op.fFlags = FOF_NOCONFIRMATION or FOF_NOERRORUI or FOF_SILENT

  • Include/Classes/System/IO/DriveInfo.ab

    r271 r285  
    4040    Function DriveFormat() As String
    4141        Dim systemName[15] As TCHAR
    42         If GetVolumeInformation(m_DriveName, NULL, NULL, NULL, NULL, NULL, systemName, Len (systemName)) Then
     42        If GetVolumeInformation(m_DriveName, NULL, 0, NULL, NULL, NULL, systemName, Len (systemName)) Then
    4343            Return systemName
    4444        Else
    … …  
    5252
    5353    Function IsReady() As Boolean
    54         If GetVolumeInformation(m_DriveName, NULL, NULL, NULL, NULL, NULL, NULL, NULL) Then
     54        If GetVolumeInformation(m_DriveName, NULL, 0, NULL, NULL, NULL, NULL, 0) Then
    5555            Return True
    5656        Else

  • Include/Classes/System/IO/Path.ab

    r281 r285  
    7272
    7373        Dim tempFileName[ELM(MAX_PATH)] As TCHAR
    74         __GetTempFileName(tempPath, "ABT", 0, tempFileName)
    75         free(tempPath)
    76         Return tempFileName
     74        Dim len = __GetTempFileName(tempPath, "ABT", 0, tempFileName)
     75        _System_free(tempPath)
     76        Return New String(tempFileName, len As Long)
    7777    End Function
    7878

  • Include/Classes/System/Math.ab

    r268 r285  
    172172            End If
    173173        End If
    174         Dim i As Long, k As Long
    175         Dim x2 As Double, w As Double
    176 
     174        Dim k As Long
    177175        If x >= 0 Then
    178176            k = Fix(x / _System_LOG2 + 0.5)
    … …  
    183181        x -= k * _System_LOG2
    184182
    185         x2 = x * x
    186         w = x2 / 22
    187 
    188         i = 18
     183        Dim x2 = x * x
     184        Dim w = x2 / 22
     185
     186        Dim i = 18
    189187        While i >= 6
    190188            w = x2 / (w + i)

  • Include/Classes/System/String.ab

    r272 r285  
    506506            Clone = This
    507507        End Function
     508
    508509        Static Function Copy(s As String) As String
    509510            Copy = New String(s.Chars, s.m_Length)
    … …  
    520521            Dim size = m_Length
    521522#endif
    522             Return _System_GetHashFromWordArray(Chars As *Word, size)
     523            Return _System_GetHashFromWordArray(Chars As *Word, size) Xor size
    523524        End Function
    524525
    … …  
    541542
    542543        Function PadRight(total As Long) As String
    543             PadLeft(total, &h30 As StrChar)
     544            PadRight(total, &h30 As StrChar)
    544545        End Function
    545546

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

    r282 r285  
    309309        ' EndInvokeがDeleteする
    310310        Dim asyncResult = New System.Windows.Forms.Detail.AsyncResultForInvoke(CreateEvent(0, FALSE, FALSE, 0))
    311         ' OnControlBeginInvokeがDeleteする
    312311        Dim asyncInvokeData = New System.Windows.Forms.Detail.AsyncInvokeData
    313312        With asyncInvokeData

  • Include/OAIdl.ab

    r268 r285  
    1616#define __IOleAutomationTypes_INTERFACE_DEFINED__
    1717
    18 TypeDef VARTYPE = Word ' WTypes.ab
    19 TypeDef VARIANT_BOOL = Integer ' WTypes.ab
    20 Const VARIANT_TRUE = (-1 As VARIANT_BOOL) ' WTypes.ab
    21 Const VARIANT_FALSE = (0 As VARIANT_BOOL) ' WTypes.ab
    2218TypeDef SCODE = Long
    23 TypeDef CY = Int64
    24 'Type /*Class*/ CY ' WTypes.ab
    25 'Public
    26 '   int64 As Int64
    27 /*
    28     Function Lo() As DWord
    29         Return GetDWord(VarPtr(int64))
    30     End Function
    31 
    32     Sub Lo(lo As DWord)
    33         SetDWord(VarPtr(int64), lo)
    34     End Sub
    35 
    36     Function Hi() As Long
    37         Return GetDWord(VarPtr(int64) + SizeOf (DWord)) As Long
    38     End Function
    39 
    40     Sub Lo(lo As Long)
    41         SetDWord(VarPtr(int64) + SizeOf (DWord, lo As DWord))
    42     End Sub
    43 */
    44 'End Type'Class
    45 
    46 Const DECIMAL_NEG = (&h80 As Byte) 'WTypes.ab
    47 
    48 Type /*Class*/ DECIMAL 'WTypes.ab
    49 'Public
    50     wReserved As Word
    51     signscale As Word
    52     Hi32 As DWord
    53     Lo64 As QWord
    54 /*
    55     Function scale() As Byte
    56         Return GetByte(VarPtr(signscale))
    57     End Function
    58 
    59     Sub scale(s As Byte)
    60         SetByte(VarPtr(signscale), s)
    61     End Sub
    62 
    63     Function sign() As Byte
    64         Return GetByte(VarPtr(signscale) + SizeOf (Byte))
    65     End Function
    66 
    67     Sub sign(s As Byte)
    68         SetByte(VarPtr(signscale) + SizeOf (Byte), s)
    69     End Sub
    70 
    71     Function Lo32() As DWord
    72         Return GetDWord(VarPtr(Lo64) As *DWord)
    73     End Function
    74 
    75     Sub Lo32(l As DWord)
    76         SetDWord(VarPtr(Lo64) As *DWord, l)
    77     End Sub
    78 
    79     Function Mid32() As DWord
    80         Return GetDWord(VarPtr(Lo64) As *DWord)
    81     End Function
    82 
    83     Sub Mid32(m As DWord)
    84         SetDWord(VarPtr(Lo64) As *DWord + SizeOf (DWord), m)
    85     End Sub
    86 */
    87 End Type ' Class
    88 
    89 TypeDef DATE = Double ' WTypes.ab
    9019
    9120/* interface IOleAutomationTypes */
    … …  
    15786Const FADF_VARIANT = &h800
    15887Const FADF_RESERVED = &hf008
    159 
    160 Const Enum VARENUM 'WTypes.idl
    161     VT_EMPTY    = 0
    162     VT_NULL = 1
    163     VT_I2   = 2
    164     VT_I4   = 3
    165     VT_R4   = 4
    166     VT_R8   = 5
    167     VT_CY   = 6
    168     VT_DATE = 7
    169     VT_BSTR = 8
    170     VT_DISPATCH = 9
    171     VT_ERROR    = 10
    172     VT_BOOL = 11
    173     VT_VARIANT  = 12
    174     VT_UNKNOWN  = 13
    175     VT_DECIMAL  = 14
    176     VT_I1   = 16
    177     VT_UI1  = 17
    178     VT_UI2  = 18
    179     VT_UI4  = 19
    180     VT_I8   = 20
    181     VT_UI8  = 21
    182     VT_INT  = 22
    183     VT_UINT = 23
    184     VT_VOID = 24
    185     VT_HRESULT  = 25
    186     VT_PTR  = 26
    187     VT_SAFEARRAY    = 27
    188     VT_CARRAY   = 28
    189     VT_USERDEFINED  = 29
    190     VT_LPSTR    = 30
    191     VT_LPWSTR   = 31
    192     VT_RECORD   = 36
    193     VT_INT_PTR  = 37
    194     VT_UINT_PTR = 38
    195     VT_FILETIME = 64
    196     VT_BLOB = 65
    197     VT_STREAM   = 66
    198     VT_STORAGE  = 67
    199     VT_STREAMED_OBJECT  = 68
    200     VT_STORED_OBJECT    = 69
    201     VT_BLOB_OBJECT  = 70
    202     VT_CF   = 71
    203     VT_CLSID    = 72
    204     VT_VERSIONED_STREAM = 73
    205     VT_BSTR_BLOB    = &hfff
    206     VT_VECTOR   = &h1000
    207     VT_ARRAY    = &h2000
    208     VT_BYREF    = &h4000
    209     VT_RESERVED = &h8000
    210     VT_ILLEGAL  = &hffff
    211     VT_ILLEGALMASKED    = &hfff
    212     VT_TYPEMASK = &hfff
    213 End Enum
    21488
    21589Type /*Class*/ VARIANT

  • Include/objbase.sbp

    r175 r285  
    11' objbase.sbp
    2 
    32
    43#ifndef _INC_OBJBASE
    54#define _INC_OBJBASE
    6 
    7 Type CSPLATFORM 'wtypes.sbp
    8     dwPlatformId As DWord
    9     dwVersionHi As DWord
    10     dwVersionLo As DWord
    11     dwProcessorArch As DWord
    12 End Type
    13 
    14 Type QUERYCONTEXT 'wtypes.sbp
    15     dwContext As DWord
    16     latform As CSPLATFORM
    17     Locale As LCID
    18     dwVersionHi As DWord
    19     dwVersionLo As DWord
    20 End Type
    215
    226TypeDef RPC_AUTH_IDENTITY_HANDLE = VoidPtr 'Declared in Rpcdce.sbp; include Rpc.sbp.
    … …  
    9579'typedef interface    IRpcChannelBuffer  IRpcChannelBuffer;
    9680
    97 #include <unknwn.sbp>
    98 #include <objidl.sbp>
     81#require <wtypes.ab>
     82#require <unknwn.sbp>
     83#require <objidl.sbp>
    9984
    10085'-------------------
    … …  
    10287'-------------------
    10388
    104 Const CLSCTX_INPROC_SERVER     = &H01
    105 Const CLSCTX_INPROC_HANDLER    = &H02
    106 Const CLSCTX_LOCAL_SERVER      = &H4
    107 Const CLSCTX_INPROC_SERVER16   = &H8
    108 Const CLSCTX_REMOTE_SERVER     = &H10
    109 Const CLSCTX_INPROC_HANDLER16  = &H20
    110 Const CLSCTX_INPROC_SERVERX86  = &H40
    111 Const CLSCTX_INPROC_HANDLERX86 = &H80
    112 Const CLSCTX_ESERVER_HANDLER   = &H100
    113 
    11489Const CLSCTX_INPROC = CLSCTX_INPROC_SERVER or CLSCTX_INPROC_HANDLER
     90'#if (_WIN32_WINNT >= &h0400) Or defined(_WIN32_DCOM)
     91#ifdef _WIN32_DCOM
    11592Const CLSCTX_ALL    = CLSCTX_INPROC_SERVER or CLSCTX_INPROC_HANDLER or CLSCTX_LOCAL_SERVER or CLSCTX_REMOTE_SERVER
    11693Const CLSCTX_SERVER = CLSCTX_INPROC_SERVER or CLSCTX_LOCAL_SERVER or CLSCTX_REMOTE_SERVER
     94#else
     95Const CLSCTX_ALL    = CLSCTX_INPROC_SERVER or CLSCTX_INPROC_HANDLER or CLSCTX_LOCAL_SERVER
     96Const CLSCTX_SERVER = CLSCTX_INPROC_SERVER or CLSCTX_LOCAL_SERVER
     97#endif
    11798
    11899Const Enum REGCLS
    … …  
    124105End Enum
    125106
    126 Type COAUTHIDENTITY
    127     User As *Word
    128     UserLength As DWord
    129     Domain As *Word
    130     DomainLength As DWord
    131     Password As *Word
    132     PasswordLength As DWord
    133     Flags As DWord
    134 End Type
    135 Type COAUTHINFO
    136     dwAuthnSvc As DWord
    137     dwAuthzSvc As DWord
    138     pwszServerPrincName As LPWSTR
    139     dwAuthnLevel As DWord
    140     dwImpersonationLevel As DWord
    141     pAuthIdentityData As *COAUTHIDENTITY
    142     dwCapabilities As DWord
    143 End Type
    144 Type COSERVERINFO
    145     dwReserved1 As DWord
    146     pwszName As LPWSTR
    147     pAuthInfo As *COAUTHINFO
    148     dwReserved2 As DWord
    149 End Type
    150107Declare Function CoInitialize Lib "ole32" (pvReserved As VoidPtr) As HRESULT
    151108Declare Sub CoUninitialize Lib "ole32" ()
    152 'Declare Sub CoGetMalloc Lib "ole32" (dwMemContext As DWord, ByRef pMalloc As *IMalloc) As HRESULT
     109'Declare Sub CoGetMalloc Lib "ole32" (dwMemContext As DWord, ByRef pMalloc As IMalloc) As HRESULT
    153110Declare Function CoGetCurrentProcess Lib "ole32" () As DWord
    154111'Declare Function CoRegisterMallocSpy Lib "ole32" (pMallocSpy As *IMallocSpy) As HRESULT
    … …  
    584541    Inherits IUnknown
    585542End Interface
    586 '#include <urlmon.sbp>
    587 '#include <propidl.sbp>
     543'#require <urlmon.sbp>
     544'#require <propidl.sbp>
    588545
    589546' Standard Progress Indicator impolementation

  • Include/objidl.sbp

    r223 r285  
    44TypeDef SNB = **OLECHAR
    55
    6 ' IMarshal
     6Type COSERVERINFO
     7    dwReserved1 As DWord
     8    pwszName As LPWSTR
     9    pAuthInfo As *COAUTHINFO
     10    dwReserved2 As DWord
     11End Type
     12
     13/* interface IMarshal */
     14/* [uuid][object][local] */
     15
     16TypeDef LPMARSHAL = /* [unique] */ *IMarshal
     17
     18Dim IID_IMarshal = [&h00000003, 0, 0, [&hC0, 0, 0, 0, 0, 0, 0, &h46]] As IID
     19Interface IMarshal
     20    Inherits IUnknown
     21
     22    Function GetUnmarshalClass(
     23        /* [in] */ ByRef iid As IID,
     24        /* [unique][in] */ pv As VoidPtr,
     25        /* [in] */ dwDestContext As DWord,
     26        /* [unique][in] */ pvDestContext As VoidPtr,
     27        /* [in] */ mshlflags As DWord,
     28        /* [out] */ ByRef Cid As CLSID) As HRESULT
     29    Function GetMarshalSizeMax(
     30        /* [in] */ ByRef iid As IID,
     31        /* [unique][in] */ pv As VoidPtr,
     32        /* [in] */ dwDestContext As DWord,
     33        /* [unique][in] */ pvDestContext As VoidPtr,
     34        /* [in] */ mshlflags As DWord,
     35        /* [out] */ ByRef Size As DWord) As HRESULT
     36    Function MarshalInterface(
     37        /* [unique][in] */ pStm As IStream,
     38        /* [in] */ ByRef iid As IID,
     39        /* [unique][in] */ pv As VoidPtr,
     40        /* [in] */ dwDestContext As DWord,
     41        /* [unique][in] */ pvDestContext As VoidPtr,
     42        /* [in] */ mshlflags As DWord) As HRESULT
     43    Function UnmarshalInterface(
     44        /* [unique][in] */ pStm As IStream,
     45        /* [in] */ ByRef iid As IID,
     46        /* [out] */ ByRef ppv As VoidPtr) As HRESULT
     47    Function ReleaseMarshalData(
     48        /* [unique][in] */ pStm As *IStream) As HRESULT
     49    Function DisconnectObject(
     50        /* [in] */ dwReserved As DWord) As HRESULT
     51End Interface
    752
    853' IMarshal2
    954
     55Dim IID_IMalloc = [&h00000002, 0, 0, [&hC0, 0, 0, 0, 0, 0, 0, &h46]] As IID
    1056Interface IMalloc
    1157    Inherits IUnknown
    1258
    13     Function Alloc(cb As SIZE_T) As VoidPtr
    14     Function Realloc(pv As VoidPtr, cb As SIZE_T) As VoidPtr
    15     Sub Free(pv As VoidPtr)
     59    Function Alloc(
     60        /* [in] */ cb As SIZE_T) As VoidPtr
     61    Function Realloc(
     62        /* [in] */ pv As VoidPtr,
     63        /* [in] */ cb As SIZE_T) As VoidPtr
     64    Sub Free(
     65        /* [in] */ pv As VoidPtr)
    1666    Function GetSize(pv As VoidPtr) As SIZE_T
    1767    Function DidAlloc(pv As VoidPtr) As Long
    … …  
    67117End Type
    68118
     119Type BIND_OPTS3
     120'   Inherits BIND_OPTS
     121    cbStruct As DWord
     122    grfFlags As DWord
     123    grfMode As DWord
     124    dwTickCountDeadline As DWord
     125
     126    dwTrackFlags As DWord
     127    dwClassContext As DWord
     128    locale As LCID
     129    pServerInfo As *COSERVERINFO
     130
     131    hwnd As HWND
     132End Type
     133
     134Const Enum BIND_FLAGS
     135    BIND_MAYBOTHERUSER
     136    BIND_JUSTTESTEXISTENCE
     137End Enum
     138
     139Dim IID_IBindCtx = [&h0000000E, 0, 0, [&hC0, 0, 0, 0, 0, 0, 0, &h46]] As IID
    69140Interface IBindCtx
    70141    Inherits IUnknown
     142
     143    Function RegisterObjectBound(
     144        /* [unique][in] */ punk As IUnknown) As HRESULT
     145    Function RevokeObjectBound(
     146        /* [unique][in] */ punk As IUnknown) As HRESULT
     147    Function ReleaseBoundObjects() As HRESULT
     148    /* [local] */ Function SetBindOptions(
     149        /* [in] */ ByRef bindopts As BIND_OPTS) As HRESULT
     150    /* [local] */ Function GetBindOptions(
     151        /* [out][in] */ ByRef bindopts As BIND_OPTS) As HRESULT
     152    Function GetRunningObjectTable(
     153        /* [out] */ ByRef rot As IRunningObjectTable) As HRESULT
     154    Function RegisterObjectParam(
     155        /* [in] */ pszKey As LPOLESTR,
     156        /* [unique][in] */ unk As IUnknown) As HRESULT
     157    Function GetObjectParam(
     158        /* [in] */ pszKey As LPOLESTR,
     159        /* [out] */ ByRef unk As IUnknown) As HRESULT
     160    Function EnumObjectParam(
     161        /* [out] */ ByRef enumstr As IEnumString) As HRESULT
     162    Function RevokeObjectParam(
     163        /* [in] */ pszKey As LPOLESTR) As HRESULT
    71164End Interface
    72165
    … …  
    92185
    93186    Function Load(
    94         /* [unique][in] */ pStm As *IStream) As HRESULT
     187        /* [unique][in] */ Stm As IStream) As HRESULT
    95188
    96189    Function Save(
    97         /* [unique][in] */ pStm As *IStream,
     190        /* [unique][in] */ Stm As IStream,
    98191        /* [in] */ fClearDirty As BOOL) As HRESULT
    99192
    … …  
    106199End Interface
    107200
    108 ' IEnumString
     201Dim IID_IEnumString = [&h00000101, 0, 0, [&hC0, 0, 0, 0, 0, 0, 0, &h46]] As IID
     202Interface IEnumString
     203    Inherits IUnknown
     204
     205    /* [local] */ Function Next_(
     206        /* [in] */ celt As DWord,
     207        /* [length_is][size_is][out] */ ByRef rgelt As LPOLESTR,
     208        /* [out] */ ByRef celtFetched As DWord) As HRESULT
     209    Function Skip(
     210        /* [in] */ celt As DWord) As HRESULT
     211    Function Reset() As HRESULT
     212    Function Clone(
     213        /* [out] */ ByRef enumstr As IEnumString) As HRESULT
     214End Interface
    109215
    110216Dim IID_ISequentialStream = [&h0c733a30, &h2a1c, &h11ce, [&had, &he5, &h00, &haa, &h00, &h44, &h77, &h3d]] As IID
    … …  
    112218    Inherits IUnknown
    113219
    114     Function Read(pv As VoidPtr, cb As DWord, pcbRead As *DWord) As HRESULT
    115     Function Write(pv As VoidPtr, cb As DWord, pcbWritten As *DWord) As HRESULT
     220    Function Read(pv As VoidPtr, cb As DWord, ByRef cbRead As DWord) As HRESULT
     221    Function Write(pv As VoidPtr, cb As DWord, ByRef cbWritten As DWord) As HRESULT
    116222End Interface
    117223
    … …  
    161267    Function UnlockRegion(libOffset As ULARGE_INTEGER, cb As ULARGE_INTEGER, dwLockType As DWord) As HRESULT
    162268    Function Stat(pstatstg As *STATSTG, grfStatFlag As DWord) As HRESULT
    163     Function Clone(ByRef ppstm As *IStream) As HRESULT
     269    Function Clone(ByRef stm As IStream) As HRESULT
    164270End Interface
    165271TypeDef LPSTREAM = *IStream
    … …  
    173279
    174280/* interface IStorage */
    175 /* [unique][uuid][object] */ 
     281/* [unique][uuid][object] */
    176282
    177283TypeDef LPSTORAGE = /* [unique] */ *IStorage
    … …  
    197303        /* [in] */ reserved1 As DWord,
    198304        /* [in] */ reserved2 As DWord,
    199         /* [out] */ ByRef pstm As *IStream) As HRESULT
     305        /* [out] */ ByRef stm As IStream) As HRESULT
    200306    /* [local] */ Function OpenStream(
    201307        /* [string][in] */ pwcsName As *OLECHAR,
    … …  
    203309        /* [in] */ grfMode As DWord,
    204310        /* [in] */ reserved2 As DWord,
    205         /* [out] */ ByRef pstm As *IStream) As HRESULT
     311        /* [out] */ ByRef stm As IStream) As HRESULT
    206312    Function CreateStorage(
    207313        /* [string][in] */ pwcsName As *OLECHAR,
    … …  
    209315        /* [in] */ reserved1 As DWord,
    210316        /* [in] */ reserved2 As DWord,
    211         /* [out] */ ByRef pstg As *IStorage) As HRESULT
     317        /* [out] */ ByRef stg As IStorage) As HRESULT
    212318    Function OpenStorage(
    213319        /* [string][unique][in] */ pwcsName As *OLECHAR,
    … …  
    216322        /* [unique][in] */ snbExclude As SNB,
    217323        /* [in] */ reserved As DWord,
    218         /* [out] */ ByRef pstg As *IStorage) As HRESULT
     324        /* [out] */ ByRef stg As IStorage) As HRESULT
    219325    /* [local] */ Function CopyTo(
    220326        /* [in] */ ciidExclude As DWord,
    221         /* [size_is][unique][in] */ ByRef rgiidExclude As * /*Const*/ IID,
     327        /* [size_is][unique][in] */ rgiidExclude As * /*Const*/ IID,
    222328        /* [unique][in] */ snbExclude As SNB,
    223         /* [unique][in] */ pstgDest As *IStorage) As HRESULT
     329        /* [unique][in] */ stgDest As IStorage) As HRESULT
    224330    Function MoveElementTo(
    225331        /* [string][in] */ pwcsName As *OLECHAR,
    226         /* [unique][in] */ pstgDest As *IStorage,
     332        /* [unique][in] */ stgDest As IStorage,
    227333        /* [string][in] */ pwcsNewName As *OLECHAR,
    228334        /* [in] */ grfFlags As DWord) As HRESULT
    … …  
    234340        /* [size_is][unique][in] */ reserved2 As VoidPtr,
    235341        /* [in] */ reserved3 As DWord,
    236         /* [out] */ ByRef penum As *IEnumSTATSTG) As HRESULT
     342        /* [out] */ ByRef enum_ As IEnumSTATSTG) As HRESULT
    237343    Function DestroyElement(
    238344        /* [string][in] */ pwcsName As *OLECHAR) As HRESULT
    … …  
    241347        /* [string][in] */ pwcsNewName As *OLECHAR) As HRESULT
    242348    Function SetElementTimes(
    243             /* [string][unique][in] */ pwcsName As *OLECHAR,
    244             /* [unique][in] */ ByRef ctime As /*Const*/ FILETIME,
    245             /* [unique][in] */ ByRef atime As /*Const*/ FILETIME,
    246             /* [unique][in] */ ByRef mtime As /*Const*/ FILETIME) As HRESULT
     349        /* [string][unique][in] */ pwcsName As *OLECHAR,
     350        /* [unique][in] */ ByRef ctime As /*Const*/ FILETIME,
     351        /* [unique][in] */ ByRef atime As /*Const*/ FILETIME,
     352        /* [unique][in] */ ByRef mtime As /*Const*/ FILETIME) As HRESULT
    247353    Function SetClass(
    248             /* [in] */ ByRef clsid As CLSID) As HRESULT
     354        /* [in] */ ByRef clsid As CLSID) As HRESULT
    249355    Function SetStateBits(
    250             /* [in] */ grfStateBits As DWord,
    251             /* [in] */ grfMask As DWord) As HRESULT
     356        /* [in] */ grfStateBits As DWord,
     357        /* [in] */ grfMask As DWord) As HRESULT
    252358    Function Stat(
    253             /* [out] */ ByRef statstg As STATSTG,
    254             /* [in] */ grfStatFlag As DWord) As HRESULT
     359        /* [out] */ ByRef statstg As STATSTG,
     360        /* [in] */ grfStatFlag As DWord) As HRESULT
    255361End Interface
    256362
    … …  
    289395End Type
    290396
    291 TypeDef CLIPFORMAT = Word
    292397TypeDef LPCLIPFORMAT = *CLIPFORMAT
    293398
    … …  
    356461        /* [unique][in] */ ByRef rformatetcIn As FORMATETC,
    357462        /* [out] */ ByRef rmedium As STGMEDIUM) As HRESULT
    358 
    359463    Function /* [local] */ GetDataHere(
    360464        /* [unique][in] */ ByRef rformatetcIn As FORMATETC,
    361465        /* [out] */ ByRef pmedium As STGMEDIUM) As HRESULT
    362 
    363466    Function QueryGetData(
    364467        /* [unique][in] */ ByRef pformatetc As FORMATETC) As HRESULT
    365 
    366468    Function GetCanonicalFormatEtc(
    367469        /* [unique][in] */ ByRef pformatetcIn As FORMATETC,
    368470        /* [out] */ ByRef pmedium As STGMEDIUM) As HRESULT
    369 
    370471    Function /* [local] */ SetData(
    371472        /* [unique][in] */ pformatetcIn As *FORMATETC,
    372473        /* [out] */ pmedium As *STGMEDIUM,
    373474        /* [in] */ fRelease As BOOL) As HRESULT
    374 
    375475    Function EnumFormatEtc(
    376         /* [in] */ ByVal dwDirection As DWord,
    377         /* [out] */ ByRef rpenumFormatEtc As *IEnumFORMATETC) As HRESULT
    378 
     476        /* [in] */ dwDirection As DWord,
     477        /* [out] */ ByRef rpenumFormatEtc As IEnumFORMATETC) As HRESULT
    379478    Function DAdvise(
    380479        /* [in] */ ByRef pformatetc As FORMATETC,
    381         /* [in] */ ByVal advf As DWord,
    382         /* [unique][in] */ ByVal pAdvSink As *IAdviseSink,
    383         /* [out] */ ByVal pdwConnection As *DWord) As HRESULT
    384 
     480        /* [in] */ advf As DWord,
     481        /* [unique][in] */ pAdvSink As IAdviseSink,
     482        /* [out] */ pdwConnection As *DWord) As HRESULT
    385483    Function DUnadvise(
    386         /* [in] */ ByVal dwConnection As DWord) As HRESULT
    387 
     484        /* [in] */ dwConnection As DWord) As HRESULT
    388485    Function EnumDAdvise(
    389         /* [out] */ ByRef rpenumAdvise As *IEnumSTATDATA) As HRESULT
     486        /* [out] */ ByRef rpenumAdvise As IEnumSTATDATA) As HRESULT
    390487End Interface
    391488

  • Include/ole2.ab

    r223 r285  
    11#ifndef __OLE2_AB__
    22#define __OLE2_AB__
    3 
    4 TypeDef CLIPFORMAT = Word
    53
    64' 暫定措置

  • Include/windows.sbp

    r179 r285  
    77TypeDef OLECHAR = WCHAR
    88TypeDef LPOLESTR = *OLECHAR
    9 TypeDef LPCOLESTR = LPOLESTR
    10 
    11 TypeDef BSTR = LPOLESTR
     9TypeDef LPCOLESTR = *OLECHAR
    1210
    1311TypeDef LANGID = Word

  • Include/windows/WindowHandle.sbp

    r282 r285  
    4141Declare Function _System_SetScrollInfo Lib "user32" Alias "SetScrollInfo" (hWnd As HWND, fnBar As Long, ByRef lpsi As SCROLLINFO, bRedraw As Long) As BOOL
    4242Declare Function _System_GetSystemMenu Lib "user32" Alias "GetSystemMenu" (hWnd As HWND, bRevert As BOOL) As HMENU
     43Declare Function _System_GetDC Lib "gdi32" Alias "GetDC" (hwnd As HWND) As HDC
     44Declare Function _System_ReleaseDC Lib "gdi32" Alias "ReleaseDC" (hwnd As HWND, hdc As HDC) As BOOL
    4345
    4446Class WindowHandle
    … …  
    147149
    148150    Function GetDC() As HDC
    149         Return GetDC(hwnd)
     151        Return _System_GetDC(hwnd)
    150152    End Function
    151153
    … …  
    171173
    172174    Const Function GetParent() As WindowHandle
    173         Dim w As WindowHandle(_System_GetParent(hwnd))
    174         Return w
     175        Return New WindowHandle(_System_GetParent(hwnd))
    175176    End Function
    176177
    … …  
    368369
    369370    Function ReleaseDC(hdc As HDC) As Boolean
    370         Return ReleaseDC(hwnd, hdc) As Boolean
     371        Return _System_ReleaseDC(hwnd, hdc) As Boolean
    371372    End Function
    372373
Note: See TracChangeset for help on using the changeset viewer.