Changeset 150


Ignore:
Timestamp:
Mar 11, 2007, 1:11:46 PM (18 years ago)
Author:
イグトランス (egtra)
Message:

参照型導入に備え、構造体 (Type)代わりにクラスを使っていた部分を構造体へ戻すほか

Location:
Include
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • Include/OAIdl.ab

    r137 r150  
    2121Const VARIANT_FALSE = (0 As VARIANT_BOOL) ' WTypes.ab
    2222TypeDef SCODE = Long
    23 Class CY ' WTypes.ab
     23Type /*Class*/ CY ' WTypes.ab
    2424Public
    2525    int64 As Int64
    26 
     26/*
    2727    Function Lo() As DWord
    2828        Return GetDWord(VarPtr(int64))
    … …  
    4040        SetDWord(VarPtr(int64) + SizeOf (DWord, lo As DWord))
    4141    End Sub
    42 End Class
    43 
    44 Class DECIMAL ' WTypes.ab
    45 Public
     42*/
     43End Type'Class
     44
     45Type /*Class*/ DECIMAL ' WTypes.ab
     46'Public
    4647    wReserved As Word
    4748    signscale As Word
    4849    Hi32 As DWord
    4950    Lo64 As QWord
    50 
     51/*
    5152    Function scale() As Byte
    5253        Return GetByte(VarPtr(signscale))
    … …  
    7374    End Sub
    7475
    75 
    7676    Function Mid32() As DWord
    7777        Return GetDWord(VarPtr(Lo64) As *DWord)
    … …  
    8181        SetDWord(VarPtr(Lo64) As *DWord + SizeOf (DWord), m)
    8282    End Sub
    83 End Class
     83*/
     84End Type ' Class
    8485
    8586TypeDef DATE = Double ' WTypes.ab
    … …  
    214215End Enum
    215216
    216 Class VARIANT
     217Type /*Class*/ VARIANT
    217218Public
    218219    vt As VARTYPE
    … …  
    221222    wReserved3 As Word
    222223    val As QWord
    223 
     224/*
    224225    Function llVal() As Int64
    225226        Return val As Int64
    … …  
    457458        val = v As ULONG_PTR
    458459    End Sub
    459 /*
    460     Function byref() As VoidPtr
    461         Return val As ULONG_PTR As VoidPtr
    462     End Function
    463 
    464     Sub byref(v As VoidPtr)
    465         val = v As ULONG_PTR
    466     End Sub
    467 */
     460
     461'   Function byref() As VoidPtr
     462'       Return val As ULONG_PTR As VoidPtr
     463'   End Function
     464
     465'   Sub byref(v As VoidPtr)
     466'       val = v As ULONG_PTR
     467'   End Sub
     468
    468469    Function cVal() As Char
    469470        Return val As Byte As Char
    … …  
    597598        p[0] = v
    598599    End Sub
    599 End Class
     600*/
     601End Type 'Class
    600602
    601603TypeDef LPVARIANT = *VARIANT
    … …  
    625627End Enum
    626628
    627 Class TYPEDESC
    628 Private
     629Type /*Class*/ TYPEDESC
     630' Private
    629631    p As VoidPtr
    630632'   /* [switch_is][switch_type] */ Union
    … …  
    634636'       /* [default] */  /* Empty union arm */
    635637'   End Union
    636 Public
     638'Public
    637639    vt As VARTYPE
    638 
     640/*
    639641    Function lptdesc() As *TYPEDESC
    640642        Return p
    … …  
    660662        p = prd
    661663    End Sub
    662 End Class
     664*/
     665End Type 'Class
    663666
    664667Type ARRAYDESC
    … …  
    704707Const IDLFLAG_FRETVAL = PARAMFLAG_FRETVAL
    705708
    706 Class ELEMDESC
    707 Public
     709Type /*Class*/ ELEMDESC
     710'Public
    708711    tdesc As TYPEDESC
    709712    idldesc As IDLDESC
    710 
     713/*
    711714    Function paramdesc() As PARAMDESC
    712715        Dim p As *PARAMDESC
    … …  
    720723        p[0] = pd
    721724    End Sub
    722 End Class
     725*/
     726End Type 'Class
    723727
    724728Type TYPEATTR
    … …  
    828832Const IMPLTYPEFLAG_FDEFAULTVTABLE = &h8
    829833
    830 Class VARDESC
    831 Public
     834Type /*Class*/ VARDESC
     835'Public
    832836    memid As MEMBERID
    833837    lpstrSchema As LPOLESTR
    … …  
    839843    wVarFlags As Word
    840844    varkind As VARKIND
    841 
     845/*
    842846    Function oInst() As DWord
    843847        Return lpvarValue As ULONG_PTR As DWord
    … …  
    847851        lpvarValue = o As ULONG_PTR As *VARIANT
    848852    End Sub
    849 End Class
     853*/
     854End Type 'Class
    850855
    851856TypeDef LPVARDESC = VARDESC

  • Include/OleAuto.ab

    r137 r150  
    514514Declare Function VarRound Lib "oleaut32" (ByRef in As VARIANT, cDecimals As Long, ByRef result As VARIANT) As HRESULT
    515515
    516 Declare Function VarCmp Lib "oleaut32" (ByRef lhs As VARIANT, ByRef rhs As VARIANT, lcid As LCID, ByRef dwFlags As DWord) As HRESULT
     516Declare Function VarCmp Lib "oleaut32" (ByRef lhs As VARIANT, ByRef rhs As VARIANT, lcid As LCID, dwFlags As DWord) As HRESULT
    517517
    518518Declare Function VarDecAdd Lib "oleaut32" (ByRef lhs As DECIMAL, ByRef rhs As DECIMAL, ByRef result As DECIMAL) As HRESULT

  • Include/api_winsock2.sbp

    r42 r150  
    109109
    110110
    111 Class hostent
    112 Public
     111Type /*Class*/ hostent
     112'Public
    113113    h_name As *Byte
    114114    h_aliases As **Byte
    … …  
    116116    h_lengt As Integer
    117117    h_addr_list As **Byte
    118 
     118/*
    119119    Function h_addr() As *Byte
    120120        Return h_addr_list[0]
    … …  
    124124        h_addr_list[0] = i
    125125    End Sub
    126 End Class
     126*/
     127End /*Class*/
    127128
    128129Type netent
    … …  
    220221#define s_addr
    221222' Internet address (old style... should be updated)
    222 Class in_addr
    223 Public
     223Type /*Class*/ in_addr
     224'Public
    224225/*
    225226    Union S_un
    … …  
    238239*/
    239240    s_addr As DWord
    240 
     241/*
    241242    Function s_host() As Byte
    242243        Return GetByte(VarPtr(s_addr) + 1)
    … …  
    278279        Return SetByte(VarPtr(s_addr) + 2, l)
    279280    End Sub
    280 End Class
     281*/
     282End Type 'Class
    281283#endif
    282284
    … …  
    835837End Type
    836838
    837 Class WSACOMPLETION
    838 Public
     839Type /*Class*/ WSACOMPLETION
     840'Public
    839841    Type_ As WSACOMPLETIONTYPE
    840842/*
    … …  
    847849*/
    848850    Port As _System_WinSock_WSACOMPLETION_PORT
    849 
     851/*
    850852    Function WindowMessage() As _System_WinSock_WSACOMPLETION_WINDOWMESSAGE
    851853        Dim p As *_System_WinSock_WSACOMPLETION_WINDOWMESSAGE
    … …  
    896898    End Sub
    897899*/
    898 End Class
     900End Type 'Class
    899901
    900902TypeDef PWSACOMPLETION = *WSACOMPLETION

  • Include/basic.sbp

    r146 r150  
    6565#endif
    6666TypeDef DWORD_PTR = ULONG_PTR
     67
     68Sub SetPointer(pPtr As VoidPtr, p As VoidPtr)
     69    Set_LONG_PTR(pPtr, p As LONG_PTR)
     70End Sub
     71
     72Function GetPointer(pPtr As VoidPtr) As VoidPtr
     73    GetPointer = Get_LONG_PTR(pPtr) As VoidPtr
     74End Function
    6775
    6876Sub Set_LONG_PTR(pPtr As VoidPtr, lpData As LONG_PTR)

  • Include/ole2.ab

    r42 r150  
    141141/* Object creation APIs */
    142142
    143 Declare Function OleCreate Lib "ole32.dll" (/*IN*/ ByRef rclsid As CLSID, /*IN*/ ByRef riid As IID, /*IN*/ ByVal renderopt As DWord,
    144                 /*IN*/ ByVal pFormatEtc As *FORMATETC, /*IN*/ ByVal pClientSite As *IOleClientSite,
     143Declare Function OleCreate Lib "ole32.dll" (/*IN*/ ByRef rclsid As CLSID, /*IN*/ ByRef riid As IID, /*IN*/ ByVal renderopt As DWord, _
     144                /*IN*/ ByVal pFormatEtc As *FORMATETC, /*IN*/ ByVal pClientSite As *IOleClientSite, _
    145145                /*IN*/ ByVal pStg As *IStorage, /*OUT*/ ByRef ppvObj As Any) As HRESULT
    146146
Note: See TracChangeset for help on using the changeset viewer.