Changeset 497


Ignore:
Timestamp:
Mar 28, 2008, 5:43:34 PM (17 years ago)
Author:
イグトランス (egtra)
Message:

インクルードガードとその他不要な前処理定義などの削除

Location:
trunk/Include
Files:
88 edited

Legend:

Unmodified
Added
Removed

  • trunk/Include/Classes/ActiveBasic/Strings/Strings.ab

    r478 r497  
    191191
    192192Namespace Detail
    193 Function Split(s As String, c As StrChar) As System.Collections.Generic.List<String>
     193Function Split(s As String, c As Char) As System.Collections.Generic.List<String>
    194194    Split = New System.Collections.Generic.List<String>
    195195

  • trunk/Include/Classes/System/Data/Odbc/Odbc.ab

    r1 r497  
    11' odbc.sbp
    22
    3 #ifndef _INC_SQLEXT
    4 #include <api_sqlext.sbp>
    5 #endif
    6 
    7 
     3#require <api_sqlext.sbp>
    84
    95'===========================================================
    … …  
    143139
    144140        'ステートメントハンドルを取得する
    145         SQLAllocHandle( SQL_HANDLE_STMT, hDbc, hStmt ) 
     141        SQLAllocHandle( SQL_HANDLE_STMT, hDbc, hStmt )
    146142
    147143        'SQL文を発行
    … …  
    154150
    155151        'ステートメントハンドルを取得する
    156         SQLAllocHandle( SQL_HANDLE_STMT, hDbc, hStmt ) 
     152        SQLAllocHandle( SQL_HANDLE_STMT, hDbc, hStmt )
    157153
    158154        Prepare = SQLPrepare( hStmt, lpszSQL, SQL_NTS ) 'SQL文を設定する
    … …  
    244240        SQLAllocHandle( SQL_HANDLE_STMT,
    245241            pobj_Command->pobj_Connection->GetDbcHandle(),
    246             hStmt ) 
     242            hStmt )
    247243
    248244        'SQL文を発行

  • trunk/Include/Classes/System/Drawing/CharacterRange.ab

    r473 r497  
    11' Classes/System/Drawing/CharacterRange.ab
    2 
    3 #ifndef __SYSTEM_DRAWING_CHARACTERRANGE_AB__
    4 #define __SYSTEM_DRAWING_CHARACTERRANGE_AB__
    52
    63Class CharacterRange
    … …  
    5249    length As Long
    5350End Class
    54 
    55 #endif '__SYSTEM_DRAWING_CHARACTERRANGE_AB__

  • trunk/Include/Classes/System/Drawing/Color.ab

    r473 r497  
    11' Classes/System/Drawing/Color.ab
    22
    3 #ifndef __SYSTEM_DRAWING_COLOR_AB__
    4 #define __SYSTEM_DRAWING_COLOR_AB__
    5 
    6 #include <Classes/System/Drawing/Imaging/misc.ab>
     3#require <Classes/System/Drawing/Imaging/misc.ab>
    74
    85Class Color
    … …  
    309306    argb As ARGB
    310307End Class
    311 
    312 #endif '__SYSTEM_DRAWING_COLOR_AB__

  • trunk/Include/Classes/System/Drawing/Drawing2D/Matrix.ab

    r77 r497  
    11' Classes/System/Drawing/Drawing2D/Matrix.ab
    2 
    3 #ifndef __SYSTEM_DRAWING_DRAWING2D_MATRIX_AB__
    4 #define __SYSTEM_DRAWING_DRAWING2D_MATRIX_AB__
    52
    63Class Matrix
    74End Class
    8 
    9 #endif '__SYSTEM_DRAWING_DRAWING2D_MATRIX_AB__

  • trunk/Include/Classes/System/Drawing/Drawing2D/misc.ab

    r77 r497  
    11' Classes/System/Drawing/Drawing2D/misc.ab
    2 
    3 #ifndef __SYSTEM_DRAWING_DRAWING2D_MISC_AB__
    4 #define __SYSTEM_DRAWING_DRAWING2D_MISC_AB__
    52
    63Enum CombineMode
    … …  
    8481    Device
    8582End Enum
    86 
    87 #endif '__SYSTEM_DRAWING_DRAWING2D_MISC_AB__

  • trunk/Include/Classes/System/Drawing/Font.ab

    r473 r497  
    250250
    251251    Const Function Name() As String
    252 #ifdef __STRING_IS_NOT_UNICODE
     252#ifdef UNICODE
     253        Dim lf As LOGFONTW
     254        GetLogFontW(0, lf)
     255#else
    253256        Dim lf As LOGFONTA
    254257        GetLogFontA(0, lf)
    255 #else
    256         Dim lf As LOGFONTW
    257         GetLogFontW(0, lf)
    258258#endif
    259259        Return lf.lfFaceName

  • trunk/Include/Classes/System/Drawing/Graphics.ab

    r473 r497  
    11' Classes/System/Drawing/Graphics.ab
    2 
    3 #ifndef __SYSTEM_DRAWING_GRAPHICS_AB__
    4 #define __SYSTEM_DRAWING_GRAPHICS_AB__
    52
    63Class Brush : End Class
    … …  
    20112008End Class
    20122009
    2013 #endif

  • trunk/Include/Classes/System/Drawing/Imaging/MetafileHeader.ab

    r12 r497  
    11' Classes/System/Drawing/Imaging/MetafileHeader.ab
    2 
    3 #ifndef __SYSTEM_DRAWING_IMAGING_METAFILEHEADER_AB__
    4 #define __SYSTEM_DRAWING_IMAGING_METAFILEHEADER_AB__
    52
    63Type Align(8) ENHMETAHEADER3
    … …  
    154151    End Function
    155152End Class
    156 
    157 #endif '__SYSTEM_DRAWING_IMAGING_METAFILEHEADER_AB__

  • trunk/Include/Classes/System/Drawing/Imaging/misc.ab

    r447 r497  
    11' Classes/System/Drawing/Imaging/misc.ab
    22
    3 #ifndef __SYSTEM_DRAWING_IMAGING_MISC_AB__
    4 #define __SYSTEM_DRAWING_IMAGING_MISC_AB__
    5 
    6 #include <Classes/System/Drawing/Color.ab>
     3#require <Classes/System/Drawing/Color.ab>
    74
    85TypeDef ARGB = DWord
    … …  
    436433    ColorChannelLast
    437434End Enum
    438 
    439 #endif '__SYSTEM_DRAWING_IMAGING_MISC_AB__

  • trunk/Include/Classes/System/Drawing/Text/misc.ab

    r77 r497  
    11' Classes/System/Drawing/Text/misc.ab
    2 
    3 #ifndef __SYSTEM_DRAWING_TEXT_MISC_AB__
    4 #define __SYSTEM_DRAWING_TEXT_MISC_AB__
    52
    63Enum TextRenderingHint
    … …  
    129    ClearTypeGridFit
    1310End Enum
    14 
    15 #endif '__SYSTEM_DRAWING_TEXT_MISC_AB__

  • trunk/Include/Classes/System/Environment.ab

    r427 r497  
    2020    Static Function CommandLine() As String
    2121        If Object.ReferenceEquals(cmdLine, Nothing) Then
    22 #ifdef __STRING_IS_NOT_UNICODE
     22#ifdef UNICODE
     23            cmdLine = New String(GetCommandLineW())
     24#else
    2325            cmdLine = New String(GetCommandLineA())
    24 #else
    25             cmdLine = New String(GetCommandLineW())
    2626#endif
    2727        End If
    … …  
    120120Public
    121121    'NTでしか使用できない仕様
    122     Static Function WorkingSet() As Int64
     122    Static Function WorkingSet() As SIZE_T
    123123        Dim hmodPSAPI = LoadLibrary("PSAPI.DLL")
    124124        If hmodPSAPI = 0 Then Return 0
    … …  
    141141
    142142    Static Function ExpandEnvironmentVariables(s As String) As String
     143        If ActiveBasic.IsNothing(s) Then
     144            Throw New ArgumentNullException("s")
     145        End If
    143146        Dim src = ToTCStr(s)
    144147        Dim size = ExpandEnvironmentStrings(src, 0, 0)
    145         Dim dst = GC_malloc_atomic(SizeOf (TCHAR) * size) As PTSTR
    146         ExpandEnvironmentStrings(src, dst, size)
    147         ExpandEnvironmentVariables = New String(dst, size - 1)
     148        Dim dst = New Text.StringBuilder
     149        dst.Length = size As Long
     150        ExpandEnvironmentStrings(src, StrPtr(dst), size)
     151        dst.Length = (size - 1) As Long
     152        ExpandEnvironmentVariables = dst.ToString
    148153    End Function
    149154
    … …  
    155160
    156161    Static Function GetEnvironmentVariable(variable As String) As String
     162        If ActiveBasic.IsNothing(variable) Then
     163            Throw New ArgumentNullException("variable")
     164        End If
    157165        Dim tcsVariable = ToTCStr(variable)
    158166        Dim size = _System_GetEnvironmentVariable(tcsVariable, 0, 0)
    159         Dim p = GC_malloc_atomic(SizeOf (TCHAR) * size) As PTSTR
    160         Dim len = _System_GetEnvironmentVariable(tcsVariable, p, size)
    161         GetEnvironmentVariable = New String(p, len As Long)
     167        Dim buf = New Text.StringBuilder
     168        buf.Length = size As Long
     169        buf.Length  = _System_GetEnvironmentVariable(tcsVariable, StrPtr(buf), size)
     170        GetEnvironmentVariable = buf.ToString
    162171    End Function
    163172
    … …  
    176185
    177186    Static Sub SetEnvironmentVariable(variable As String, value As String)
     187        If ActiveBasic.IsNothing(variable) Then
     188            Throw New ArgumentNullException("variable")
     189        End If
    178190        _System_SetEnvironmentVariable(ToTCStr(variable), ToTCStr(value))
    179191    End Sub

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

    r469 r497  
    1010Class Path
    1111Public
    12     Static Const AltDirectorySeparatorChar = &H2F As StrChar '/
    13     Static Const DirectorySeparatorChar    = &H5C As StrChar '\
    14     Static Const PathSeparator             = &H3B As StrChar ';
    15     Static Const VolumeSeparatorChar       = &H3A As StrChar ':
     12    Static Const AltDirectorySeparatorChar = &H2F As Char '/
     13    Static Const DirectorySeparatorChar    = &H5C As Char '\
     14    Static Const PathSeparator             = &H3B As Char ';
     15    Static Const VolumeSeparatorChar       = &H3A As Char ':
    1616
    1717    '----------------------------------------------------------------
    … …  
    135135        If IsPathRooted(path) Then
    136136            If path.Contains(UniformNamingConventionString) Then
    137                 Return path.Remove(path.IndexOf(DirectorySeparatorChar, 
     137                Return path.Remove(path.IndexOf(DirectorySeparatorChar,
    138138                                                      UniformNamingConventionString.Length) + 1)
    139139            Else
    … …  
    214214
    215215Private
    216     Static Const ExtensionSeparatorChar = &H2E As StrChar
     216    Static Const ExtensionSeparatorChar = &H2E As Char
    217217    Static Const InvalidPathChars = Ex"\q<>|\0\t" As String
    218218    Static Const UniformNamingConventionString = "\\" As String
    … …  
    258258    */
    259259    Static Function GetLastSeparatorIndex(path As String) As Long
    260         Return System.Math.Max(path.LastIndexOf(DirectorySeparatorChar), 
     260        Return System.Math.Max(path.LastIndexOf(DirectorySeparatorChar),
    261261                               path.LastIndexOf(AltDirectorySeparatorChar)) As Long
    262262    End Function

  • trunk/Include/Classes/System/IO/StreamReader.ab

    r435 r497  
    9393    @auther Egtra
    9494    */
    95     Override Function ReadImpl(buffer As *StrChar, index As Long, count As Long) As Long
     95    Override Function ReadImpl(buffer As *Char, index As Long, count As Long) As Long
    9696        Dim n = last - cur
    9797        If count <= n Then
    … …  
    143143    文字数が足りなくても、元のストリームまで読みには行かない。
    144144    */
    145     Function ReadFromBuffer(p As *StrChar, index As Long, count As Long) As Long
    146         memcpy(VarPtr(p[index]), VarPtr(buf[cur]), count * SizeOf (StrChar))
     145    Function ReadFromBuffer(p As *Char, index As Long, count As Long) As Long
     146        memcpy(VarPtr(p[index]), VarPtr(buf[cur]), count * SizeOf (Char))
    147147        cur += count
    148148        ReadFromBuffer = count

  • trunk/Include/Classes/System/IO/StringReader.ab

    r432 r497  
    7575    @auther Egtra
    7676    */
    77     Override Function ReadImpl(buffer As *StrChar, index As Long, count As Long) As Long
     77    Override Function ReadImpl(buffer As *Char, index As Long, count As Long) As Long
    7878        ReadImpl = Math.Min(count, s.Length - i)
    79         ActiveBasic.Strings.ChrCopy(VarPtr(buffer[index]) As *StrChar, (StrPtr(s) + i * SizeOf (StrChar)) As *StrChar, ReadImpl As SIZE_T) 'ToDo: ポインタに対する+演算
     79        ActiveBasic.Strings.ChrCopy(VarPtr(buffer[index]) As *Char, (StrPtr(s) + i * SizeOf (Char)) As *Char, ReadImpl As SIZE_T) 'ToDo: ポインタに対する+演算
    8080    End Function
    8181

  • trunk/Include/Classes/System/IO/TextReader.ab

    r473 r497  
    3131    @auther Egtra
    3232    */
    33     Function Read(buffer As *StrChar, index As Long, count As Long) As Long
     33    Function Read(buffer As *Char, index As Long, count As Long) As Long
    3434        If buffer = 0 Then
    3535        ElseIf index < 0 Then
    … …  
    7676'                   Exit Do
    7777            End Select
    78             sb.Append(ch As StrChar) 'ToDo キャスト不要にすべきというチケットを書くこと
     78            sb.Append(ch As Char) 'ToDo キャスト不要にすべきというチケットを書くこと
    7979        Loop
    8080        ReadLine = sb.ToString
    … …  
    9393                Exit Function
    9494            End If
    95             sb.Append(ch As StrChar)
     95            sb.Append(ch As Char)
    9696        Loop
    9797    End Function
    … …  
    109109    @auther Egtra
    110110    */
    111     Virtual Function ReadImpl(buffer As *StrChar, index As Long, count As Long) As Long
     111    Virtual Function ReadImpl(buffer As *Char, index As Long, count As Long) As Long
    112112        Dim i As Long
    113113        Dim p = VarPtr(buffer[index])
    … …  
    118118                Exit Function
    119119            Else
    120                 p[i] = c As StrChar
     120                p[i] = c As Char
    121121            End If
    122122        Next
    … …  
    171171    End Sub
    172172
    173     Override Function ReadImpl(buffer As *StrChar, index As Long, count As Long) As Long
     173    Override Function ReadImpl(buffer As *Char, index As Long, count As Long) As Long
    174174'       Using lock = cs.Lock
    175175            ReadImpl = base.ReadImpl(buffer, index, count)

  • trunk/Include/Classes/System/Math.ab

    r457 r497  
    22
    33#require <Classes/ActiveBasic/Math/Math.ab>
    4 
    5 #ifndef __SYSTEM_MATH_AB__
    6 #define __SYSTEM_MATH_AB__
    74
    85Namespace System
    … …  
    600597Const _System_InverseLn10 = 0.43429448190325182765112891891661 '1 / (ln 10)
    601598Const _System_InverseSqrt2 = 0.70710678118654752440084436210485 '1 / (√2)
    602 
    603 #endif '__SYSTEM_MATH_AB__

  • trunk/Include/Classes/System/OperatingSystem.ab

    r258 r497  
    11' Classes/System/OperatingSystem.ab
    2 
    3 #ifndef __SYSYTEM_OPERATINGSYSTEM_AB__
    4 #define __SYSYTEM_OPERATINGSYSTEM_AB__
    52
    63#require <Classes/System/Version.ab>
    … …  
    8683
    8784End Namespace
    88 
    89 #endif '__SYSYTEM_OPERATINGSYSTEM_AB__

  • trunk/Include/Classes/System/String.ab

    r478 r497  
    11' Classes/System/String.ab
    2 
    3 #require <basic/function.sbp>
    4 #require <Classes/System/Text/StringBuilder.ab>
    5 #require <Classes/ActiveBasic/Strings/Strings.ab>
    6 
    7 TypeDef StrChar = Char
    8 
    9 #ifdef UNICODE
    10 #define __STRING_IS_UNICODE
    11 #else
    12 #define __STRING_IS_NOT_UNICODE
    13 #endif
    142
    153Namespace System
    … …  
    270258
    271259        Sub Assign(text As PCSTR, textLengthA As Long)
    272 #ifdef __STRING_IS_NOT_UNICODE
    273             AssignFromCharPtr(text, textLengthA)
    274 #else
     260#ifdef UNICODE
    275261            Dim textLengthW = MultiByteToWideChar(CP_THREAD_ACP, 0, text, textLengthA, 0, 0)
    276262            If AllocStringBuffer(textLengthW) <> 0 Then
    … …  
    278264                Chars[textLengthW] = 0
    279265            End If
     266#else
     267            AssignFromCharPtr(text, textLengthA)
    280268#endif
    281269        End Sub
    282270
    283271        Sub Assign(text As PCWSTR, textLengthW As Long)
    284 #ifdef __STRING_IS_NOT_UNICODE
     272#ifdef UNICODE
     273            AssignFromCharPtr(text, textLengthW)
     274#else
    285275            Dim textLengthA = WideCharToMultiByte(CP_THREAD_ACP, 0, text, textLengthW, 0, 0, 0, 0)
    286276            If AllocStringBuffer(textLengthA) <> 0 Then
    … …  
    288278                Chars[textLengthA] = 0
    289279            End If
    290 #else
    291             AssignFromCharPtr(text, textLengthW)
    292280#endif
    293281        End Sub
    … …  
    305293    Public
    306294        Const Function Concat(text As PCSTR, len As Long) As String
    307 #ifdef __STRING_IS_NOT_UNICODE
    308             Return ConcatChar(This.Chars, m_Length, text, len)
    309 #else
     295#ifdef UNICODE
    310296            With Concat
    311297                Dim lenW = MultiByteToWideChar(CP_THREAD_ACP, 0, text, len, 0, 0)
    … …  
    316302                .Chars[m_Length + lenW] = 0
    317303            End With
     304#else
     305            Return ConcatChar(This.Chars, m_Length, text, len)
    318306#endif
    319307        End Function
    320308
    321309        Const Function Concat(text As PCWSTR, len As Long) As String
    322 #ifdef __STRING_IS_NOT_UNICODE
     310#ifdef UNICODE
     311            Return ConcatChar(This.Chars, m_Length, text, len)
     312#else
    323313            With Concat
    324314                Concat = New String
    … …  
    329319                .Chars[m_Length + lenA] = 0
    330320            End With
    331 #else
    332             Return ConcatChar(This.Chars, m_Length, text, len)
    333321#endif
    334322        End Function
    … …  
    600588
    601589        Override Function GetHashCode() As Long
    602 #ifdef __STRING_IS_NOT_UNICODE
     590#ifdef UNICODE
     591            Dim size = m_Length
     592#else
    603593            Dim size = (m_Length + 1) >> 1
    604 #else
    605             Dim size = m_Length
    606594#endif
    607595            Return _System_GetHashFromWordArray(Chars As *Word, size) Xor m_Length

  • trunk/Include/Classes/System/Text/DecoderFallback.ab

    r411 r497  
    7777        len = length
    7878    End Sub
    79 #ifndef __STRING_IS_NOT_UNICODE
     79#ifdef UNICODE
    8080    /*!
    8181    @brief  指定された文字列でDecoderReplacementFallbackを構築する。
    … …  
    124124    End Function
    125125
    126 #ifndef __STRING_IS_NOT_UNICODE
     126#ifdef UNICODE
    127127    /*!
    128128    @brief  代替文字列を返す
    … …  
    167167        End If
    168168    End Sub
    169 #ifndef __STRING_IS_NOT_UNICODE
     169#ifdef UNICODE
    170170    /*!
    171171    @brief  指定された文字列でDecoderReplacementFallbackを構築する。

  • trunk/Include/Classes/System/Text/Encoding.ab

    r411 r497  
    1 #define __STRING_IS_NOT_UNICODE 'なぜか認識されないので
    2 
    31/*!
    42@file   Classes/System/Text/Encoding.ab
    … …  
    5250        Return GetBytesCountCore(s, n)
    5351    End Function
    54 #ifndef __STRING_IS_NOT_UNICODE
     52#ifdef UNICODE
    5553    /*!
    5654    @brief  符号化して得られる文字列の長さを計算する。
    … …  
    141139        Return GetBytesCore(VarPtr(chars[index]), count, bytes, byteCount)
    142140    End Function
    143 #ifndef __STRING_IS_NOT_UNICODE
     141#ifdef UNICODE
    144142    /*!
    145143    @brief  符号化する。
    … …  
    289287    Abstract Function GetCharsCore(bytes As *Byte, byteCount As Long, chars As *WCHAR, charCount As Long) As Long
    290288Public
    291 #ifndef __STRING_IS_NOT_UNICODE
     289#ifdef UNICODE
    292290    /*!
    293291    @brief  復号し、Stringで結果を返す。

  • trunk/Include/Classes/System/Text/StringBuilder.ab

    r468 r497  
    11'Classes/System/Text/StringBuilder.ab
    2 
    3 #require <Classes/ActiveBasic/Strings/Strings.ab>
    42
    53Namespace System
    … …  
    75
    86Class StringBuilder
    9     'Inherits ISerializable
    107Public
    118    Sub StringBuilder()
    … …  
    196193
    197194    Override Function GetHashCode() As Long
    198 #ifdef __STRING_IS_NOT_UNICODE
     195#ifdef UNICODE
     196        Dim n = size
     197#else
    199198        Dim n = (size + 1) >> 1
    200 #else
    201         Dim n = size
    202199#endif
    203200        Return _System_GetHashFromWordArray(chars As *Word, n As SIZE_T) Xor capacity Xor maxCapacity
    … …  
    214211        Return This
    215212    End Function
    216 #ifdef __STRING_IS_NOT_UNICODE
     213#ifdef UNICODE
     214    Function Insert(i As Long, x As SByte) As StringBuilder
     215        rangeCheck(i)
     216        insertCore(i, Str$(x As Long))
     217        Return This
     218    End Function
     219#else
    217220    Function Insert(i As Long, x As Word) As StringBuilder
    218221        rangeCheck(i)
    219222        insertCore(i, Str$(x As DWord))
    220         Return This
    221     End Function
    222 #else
    223     Function Insert(i As Long, x As SByte) As StringBuilder
    224         rangeCheck(i)
    225         insertCore(i, Str$(x As Long))
    226223        Return This
    227224    End Function

  • trunk/Include/Classes/System/Threading/Timeout.ab

    r419 r497  
    11' Classes/System/Threading/Timeout.ab
    2 
    3 #ifndef __SYSTEM_THREADING_TIMEOUT_AB__
    4 #define __SYSTEM_THREADING_TIMEOUT_AB__
    52
    63Namespace System
    … …  
    1411End Namespace 'Threading
    1512End Namespace 'System
    16 
    17 #endif

  • trunk/Include/Classes/System/Version.ab

    r257 r497  
    1 ' System/Version.ab
    2 
    3 #ifndef __SYSTEM_VERSION_AB__
    4 #define __SYSTEM_VERSION_AB__
    5 
    6 #require <api_winsock2.sbp>
     1' Classes/System/Version.ab
    72
    83Namespace System
    … …  
    121116    Function ToString(fieldCount As Long) As String
    122117        If fieldCount < 0 Or fieldCount > 4 Then
    123             ' Throw ArgumentException
    124             Debug
     118            Throw New ArgumentOutOfRangeException("fieldCount")
    125119        End If
    126120        ToString = ""
    … …  
    132126
    133127        If build < 0 Then
    134             ' Throw ArgumentException
    135             Debug
     128            Throw New ArgumentException
    136129        End If
    137130        ToString = ToString + "." + Str$(build)
    … …  
    139132
    140133        If revision < 0 Then
    141             ' Throw ArgumentException
    142             Debug
     134            Throw New ArgumentException
    143135        End If
    144136        ToString = ToString + "." + Str$(revision)
    … …  
    152144
    153145End Namespace 'System
    154 
    155 #endif '__SYSTEM_VERSION_AB__

  • trunk/Include/Classes/System/Xml/XmlDocument.ab

    r468 r497  
    9999    Virtual Sub Load( inStream As System.IO.Stream )
    100100        Dim length = inStream.Length As DWord
    101         Dim xmlBuffer = calloc( length + 1 ) As *StrChar
     101        Dim xmlBuffer = calloc( length + 1 ) As *Char
    102102        inStream.Read( xmlBuffer As *Byte, 0, length )
    103103        inStream.Close()
    … …  
    124124    Virtual Sub Save( outStream As System.IO.Stream )
    125125        Dim xmlStr = InnerXmlSupportedIndent( True )
    126         outStream.Write( xmlStr.StrPtr As *Byte, 0, xmlStr.Length * SizeOf( StrChar ) )
     126        outStream.Write( xmlStr.StrPtr As *Byte, 0, xmlStr.Length * SizeOf( Char ) )
    127127        outStream.Close()
    128128    End Sub

  • trunk/Include/GdiPlus.ab

    r473 r497  
    11' Gdiplus.ab
    2 
    3 #ifndef GDIPLUS_AB
    4 #define GDIPLUS_AB
    52
    63Declare Function GdipAlloc Lib "Gdiplus.dll" (size As SIZE_T) As VoidPtr
    … …  
    1714'#require <Classes/System/Drawing/Imaging/misc.ab>
    1815'#require <Classes/System/Drawing/Imaging/MetafileHeader.ab>
    19 
    20 #endif 'GDIPLUS_AB

  • trunk/Include/GdiPlusEnums.ab

    r300 r497  
    11' GdiPlusEnums.ab
    2 
    3 #ifndef __GDUPLUSENUMS_AB__
    4 #define __GDUPLUSENUMS_AB__
    52
    63Const FlatnessDefault = 1.0 / 4.0
    … …  
    606603End Enum
    607604
    608 
    609605Const Enum EmfToWmfBitsFlags
    610606    EmfToWmfBitsFlagsDefault          = &h00000000
    … …  
    619615    TestControlGetBuildNumber = 2
    620616End Enum
    621 
    622 #endif '__GDUPLUSENUMS_AB__

  • trunk/Include/GdiPlusFlat.ab

    r300 r497  
    11' GdiPlusFlat.ab
    2 
    3 #ifndef __GDIPLUS_FLATAPI_AB__
    4 #define __GDIPLUS_FLATAPI_AB__
    52
    63#require <GdiPlusEnums.ab>
    … …  
    665662Declare Function  GdiplusNotificationHook Lib "gdiplus.dll" (ByRef token As ULONG_PTR) As GpStatus
    666663Declare Sub GdiplusNotificationUnhook Lib "gdiplus.dll" (ByVal token As ULONG_PTR)
    667 
    668 #endif '__GDIPLUS_FLATAPI_AB__

  • trunk/Include/GdiPlusGpStubs.ab

    r473 r497  
    11' GdiplusGpStubs.ab
    2 
    3 #ifndef __GDIPLUSGPSTUBS_AB__
    4 #define __GDIPLUSGPSTUBS_AB__
    52
    63#require <Classes/System/Drawing/Drawing2D/misc.ab>
    … …  
    9996TypeDef GpFlushIntention = FlushIntention
    10097TypeDef GpPathData = PathData
    101 
    102 #endif '__GDIPLUSGPSTUBS_AB__
    103 

  • trunk/Include/GdiPlusInit.ab

    r473 r497  
    11' GdiPlusInit.ab
    2 
    3 #ifndef __GDIPLUSINIT_AB__
    4 #define __GDIPLUSINIT_AB__
    52
    63Enum DebugEventLevel
    … …  
    4239
    4340Declare Sub GdiplusShutdown Lib "GdiPlus.dll" (ByVal token As ULONG_PTR)
    44 
    45 #endif '__GDIPLUSINIT_AB__

  • trunk/Include/GdiPlusTypes.ab

    r473 r497  
    11' GdiPlusTypes.sbp
    2 
    3 #ifndef __GDIPLUSTYPES_AB__
    4 #define __GDIPLUSTYPES_AB__
    52
    63TypeDef ImageAbort = *Function(p As VoidPtr) As BOOL
    … …  
    6259*/
    6360End Class
    64 
    65 
    66 #endif '__GDIPLUSTYPES_AB__

  • trunk/Include/OAIdl.ab

    r478 r497  
    44
    55#require <objidl.sbp>
    6 
    7 #ifndef __IOleAutomationTypes_INTERFACE_DEFINED__
    8 #define __IOleAutomationTypes_INTERFACE_DEFINED__
    96
    107/* interface IOleAutomationTypes */
    … …  
    788785TypeDef LPCUSTDATA = *CUSTDATA
    789786
    790 #endif /* __IOleAutomationTypes_INTERFACE_DEFINED__ */
    791 
    792 #ifndef __ICreateTypeInfo_INTERFACE_DEFINED__
    793 #define __ICreateTypeInfo_INTERFACE_DEFINED__
    794 
    795787/* interface ICreateTypeInfo */
    796788/* [local][unique][uuid][object] */
    797 
    798 TypeDef LPCREATETYPEINFO = * /* [unique] */ ICreateTypeInfo
    799789
    800790Dim IID_ICreateTypeInfo = [&h00020405, &h0000, &h0000, [&hC0, &h00, &h00, &h00, &h00, &h00, &h00, &h46]] As IID
    … …  
    866856End Interface
    867857
    868 #endif  /* __ICreateTypeInfo_INTERFACE_DEFINED__ */
    869 
    870 #ifndef __ICreateTypeInfo2_INTERFACE_DEFINED__
    871 #define __ICreateTypeInfo2_INTERFACE_DEFINED__
    872 
    873858/* interface ICreateTypeInfo2 */
    874859/* [local][unique][uuid][object] */
    875 
    876 TypeDef LPCREATETYPEINFO2 = /* [unique] */ *ICreateTypeInfo2
    877860
    878861Dim IID_ICreateTypeInfo2 = [&h0002040E, &h0000, &h0000, [&hC0, &h00, &h00, &h00, &h00, &h00, &h00, &h46]] As IID
    … …  
    925908End Interface
    926909
    927 #endif  /* __ICreateTypeInfo2_INTERFACE_DEFINED__ */
    928 
    929 
    930 #ifndef __ICreateTypeLib_INTERFACE_DEFINED__
    931 #define __ICreateTypeLib_INTERFACE_DEFINED__
    932 
    933910/* interface ICreateTypeLib */
    934911/* [local][unique][uuid][object] */
    935 
    936 TypeDef LPCREATETYPELIB = /* [unique] */ *ICreateTypeLib
    937912
    938913Dim IID_ICreateTypeLib = [&h00020406, &h0000, &h0000, [&hC0, &h00, &h00, &h00, &h00, &h00, &h00, &h46]] As IID
    … …  
    964939End Interface
    965940
    966 #endif  /* __ICreateTypeLib_INTERFACE_DEFINED__ */
    967 
    968 #ifndef __ICreateTypeLib2_INTERFACE_DEFINED__
    969 #define __ICreateTypeLib2_INTERFACE_DEFINED__
    970 
    971941/* interface ICreateTypeLib2 */
    972942/* [local][unique][uuid][object] */
    973 
    974 TypeDef LPCREATETYPELIB2 = /* [unique] */ *ICreateTypeLib2
    975 
    976943
    977944Dim IID_ICreateTypeLib2 = [&h0002040F, &h0000, &h0000, [&hC0, &h00, &h00, &h00, &h00, &h00, &h00, &h46]] As IID
    … …  
    991958End Interface
    992959
    993 
    994 #endif  /* __ICreateTypeLib2_INTERFACE_DEFINED__ */
    995 
    996 #ifndef __IDispatch_INTERFACE_DEFINED__
    997 #define __IDispatch_INTERFACE_DEFINED__
    998 
    999960/* interface IDispatch */
    1000961/* [unique][uuid][object] */
    1001 
    1002 Typedef LPDISPATCH = /* [unique] */ *IDispatch
    1003962
    1004963Const DISPID_UNKNOWN = -1
    … …  
    10471006End Interface
    10481007
    1049 #endif  /* __IDispatch_INTERFACE_DEFINED__ */
    1050 
    1051 #ifndef __IEnumVARIANT_INTERFACE_DEFINED__
    1052 #define __IEnumVARIANT_INTERFACE_DEFINED__
    1053 
    10541008/* interface IEnumVARIANT */
    10551009/* [unique][uuid][object] */
    1056 
    1057 Typedef LPENUMVARIANT = /* [unique] */ *IEnumVARIANT
    10581010
    10591011Dim IID_IEnumVARIANT = [&h00020404, &h0000, &h0000, [&hC0, &h00, &h00, &h00, &h00, &h00, &h00, &h46]] As IID
    … …  
    10741026End Interface
    10751027
    1076 #endif  /* __IEnumVARIANT_INTERFACE_DEFINED__ */
    1077 
    1078 #ifndef __ITypeComp_INTERFACE_DEFINED__
    1079 #define __ITypeComp_INTERFACE_DEFINED__
    1080 
    10811028/* interface ITypeComp */
    10821029/* [unique][uuid][object] */
    1083 
    1084 TypeDef LPTYPECOMP = /* [unique] */ *ITypeComp
    10851030
    10861031/* [v1_enum] */
    … …  
    11261071End Interface
    11271072
    1128 #endif  /* __ITypeComp_INTERFACE_DEFINED__ */
    1129 
    1130 #ifndef __ITypeInfo_INTERFACE_DEFINED__
    1131 #define __ITypeInfo_INTERFACE_DEFINED__
    1132 
    11331073/* interface ITypeInfo */
    11341074/* [unique][uuid][object] */
    1135 
    1136 TypeDef LPTYPEINFO = /* [unique] */ *ITypeInfo
    11371075
    11381076Dim IID_ITypeInfo = [&h00020401, &h0000, &h0000, [&hC0, &h00, &h00, &h00, &h00, &h00, &h00, &h46]] As IID
    … …  
    12111149End Interface
    12121150
    1213 #endif  /* __ITypeInfo_INTERFACE_DEFINED__ */
    1214 
    1215 #ifndef __ITypeInfo2_INTERFACE_DEFINED__
    1216 #define __ITypeInfo2_INTERFACE_DEFINED__
    1217 
    12181151/* interface ITypeInfo2 */
    12191152/* [unique][uuid][object] */
    1220 
    1221 TypeDef LPTYPEINFO2 = /* [unique] */ *ITypeInfo2
    12221153
    12231154Dim IID_ITypeInfo2 = [&h00020412, &h0000, &h0000, [&hC0, &h00, &h00, &h00, &h00, &h00, &h00, &h46]] As IID
    … …  
    12791210        /* [out] */ ByRef CustData As CUSTDATA) As HRESULT
    12801211End Interface
    1281 
    1282 #endif  /* __ITypeInfo2_INTERFACE_DEFINED__ */
    1283 
    1284 #ifndef __ITypeLib_INTERFACE_DEFINED__
    1285 #define __ITypeLib_INTERFACE_DEFINED__
    12861212
    12871213/* interface ITypeLib */
    … …  
    13561282End Interface
    13571283
    1358 #endif  /* __ITypeLib_INTERFACE_DEFINED__ */
    1359 
    1360 
    1361 #ifndef __ITypeLib2_INTERFACE_DEFINED__
    1362 #define __ITypeLib2_INTERFACE_DEFINED__
    1363 
    13641284/* interface ITypeLib2 */
    13651285/* [unique][uuid][object] */
    1366 
    1367 TypeDef LPTYPELIB2 = /* [unique] */ *ITypeLib2
    13681286
    13691287Dim IID_ITypeLib2 = [&h00020411, &h0000, &h0000, [&hC0, &h00, &h00, &h00, &h00, &h00, &h00, &h46]] As IID
    … …  
    13791297        /* [out] */ ByRef chUniqueNames As DWord) As HRESULT
    13801298    /* [local] */ Function GetDocumentation2(
    1381             /* [in] */ index As Long,
    1382             /* [in] */ lcid As LCID,
    1383             /* [out] */ ByRef bstrHelpString As BSTR,
    1384             /* [out] */ ByRef dwHelpStringContext As DWord,
    1385             /* [out] */ ByRef bstrHelpStringDll As BSTR) As HRESULT
     1299        /* [in] */ index As Long,
     1300        /* [in] */ lcid As LCID,
     1301        /* [out] */ ByRef bstrHelpString As BSTR,
     1302        /* [out] */ ByRef dwHelpStringContext As DWord,
     1303        /* [out] */ ByRef bstrHelpStringDll As BSTR) As HRESULT
    13861304    Function GetAllCustData(
    13871305        /* [out] */ ByRef CustData As CUSTDATA) As HRESULT
    13881306End Interface
    13891307
    1390 #endif  /* __ITypeLib2_INTERFACE_DEFINED__ */
    1391 
    1392 
    1393 #ifndef __ITypeChangeEvents_INTERFACE_DEFINED__
    1394 #define __ITypeChangeEvents_INTERFACE_DEFINED__
    1395 
    13961308/* interface ITypeChangeEvents */
    13971309/* [local][unique][uuid][object] */
    1398 
    1399 TypeDef LPTYPECHANGEEVENTS = /* [unique] */ *ITypeChangeEvents
    14001310
    14011311Enum CHANGEKIND
    … …  
    14261336End Interface
    14271337
    1428 #endif  /* __ITypeChangeEvents_INTERFACE_DEFINED__ */
    1429 
    1430 
    1431 #ifndef __IErrorInfo_INTERFACE_DEFINED__
    1432 #define __IErrorInfo_INTERFACE_DEFINED__
    1433 
    14341338/* interface IErrorInfo */
    14351339/* [unique][uuid][object] */
    1436 
    1437 TypeDef LPERRORINFO = /* [unique] */ *IErrorInfo
    14381340
    14391341Dim IID_IErrorInfo = [&h1CF2B120, &h547D, &h101B, [&h8E, &h65, &h08, &h00, &h2B, &h2B, &hD1, &h19]] As IID
    … …  
    14541356End Interface
    14551357
    1456 #endif  /* __IErrorInfo_INTERFACE_DEFINED__ */
    1457 
    1458 
    1459 #ifndef __ICreateErrorInfo_INTERFACE_DEFINED__
    1460 #define __ICreateErrorInfo_INTERFACE_DEFINED__
    1461 
    14621358/* interface ICreateErrorInfo */
    14631359/* [unique][uuid][object] */
    … …  
    14821378End Interface
    14831379
    1484 #endif  /* __ICreateErrorInfo_INTERFACE_DEFINED__ */
    1485 
    1486 
    1487 #ifndef __ISupportErrorInfo_INTERFACE_DEFINED__
    1488 #define __ISupportErrorInfo_INTERFACE_DEFINED__
    1489 
    14901380/* interface ISupportErrorInfo */
    14911381/* [unique][uuid][object] */
    14921382
    1493 TypeDef LPSUPPORTERRORINFO = /* [unique] */ *ISupportErrorInfo
    1494 
    14951383Dim IID_ISupportErrorInfo = [&hDF0B3D60, &h548F, &h101B, [&h8E, &h65, &h08, &h00, &h2B, &h2B, &hD1, &h19]] As IID
    14961384
    … …  
    15011389        /* [in] */ ByRef riid As IID) As HRESULT
    15021390End Interface
    1503 
    1504 #endif  /* __ISupportErrorInfo_INTERFACE_DEFINED__ */
    1505 
    1506 
    1507 #ifndef __ITypeFactory_INTERFACE_DEFINED__
    1508 #define __ITypeFactory_INTERFACE_DEFINED__
    15091391
    15101392/* interface ITypeFactory */
    … …  
    15211403        /* [iid_is][out] */ ByRef pv As IUnknown) As HRESULT
    15221404End Interface
    1523 
    1524 #endif  /* __ITypeFactory_INTERFACE_DEFINED__ */
    1525 
    1526 
    1527 #ifndef __ITypeMarshal_INTERFACE_DEFINED__
    1528 #define __ITypeMarshal_INTERFACE_DEFINED__
    15291405
    15301406/* interface ITypeMarshal */
    … …  
    15581434End Interface
    15591435
    1560 #endif  /* __ITypeMarshal_INTERFACE_DEFINED__ */
    1561 
    1562 
    1563 #ifndef __IRecordInfo_INTERFACE_DEFINED__
    1564 #define __IRecordInfo_INTERFACE_DEFINED__
    1565 
    15661436/* interface IRecordInfo */
    15671437/* [uuid][object][local] */
    1568 
    1569 TypeDef LPRECORDINFO = /* [unique] */ *IRecordInfo
    15701438
    15711439Dim IID_IRecordInfo = [&h0000002F, &h0000, &h0000, [&hC0, &h00, &h00, &h00, &h00, &h00, &h00, &h46]] As IID
    … …  
    16211489End Interface
    16221490
    1623 #endif  /* __IRecordInfo_INTERFACE_DEFINED__ */
    1624 
    1625 
    1626 #ifndef __IErrorLog_INTERFACE_DEFINED__
    1627 #define __IErrorLog_INTERFACE_DEFINED__
    1628 
    16291491/* interface IErrorLog */
    16301492/* [unique][uuid][object] */
    1631 
    1632 TypeDef LPERRORLOG = *IErrorLog
    16331493
    16341494Dim IID_IErrorLog = [&h3127CA40, &h446E, &h11CE, [&h81, &h35, &h00, &hAA, &h00, &h4B, &hB8, &h51]] As IID
    … …  
    16421502End Interface
    16431503
    1644 #endif  /* __IErrorLog_INTERFACE_DEFINED__ */
    1645 
    1646 
    1647 #ifndef __IPropertyBag_INTERFACE_DEFINED__
    1648 #define __IPropertyBag_INTERFACE_DEFINED__
    1649 
    16501504/* interface IPropertyBag */
    16511505/* [unique][uuid][object] */
    1652 
    1653 TypeDef LPPROPERTYBAG = *IPropertyBag
    16541506
    16551507Dim IID_IPropertyBag = [&h55272A00, &h42CB, &h11CE, [&h81, &h35, &h00, &hAA, &h00, &h4B, &hB8, &h51]] As IID
    … …  
    16671519        /* [in] */ ByRef Var As VARIANT) As HRESULT
    16681520End Interface
    1669 
    1670 #endif  /* __IPropertyBag_INTERFACE_DEFINED__ */
    1671 

  • trunk/Include/OleAuto.ab

    r303 r497  
    11' OleAuto.ab
    2 
    3 #ifndef _INC_OLEAUTO_AB
    4 #define _INC_OLEAUTO_AB
    52
    63' EXTERN_C const IID IID_StdOle;
    … …  
    1512Const STDOLE2_LCID = &h0000
    1613
    17 /*
    18 #ifndef _LCID_DEFINED
    19 TypeDef LCID = DWord
    20 #define _LCID_DEFINED
    21 #endif
    22 */
    23 
    2414#require <oaidl.ab>
    25 'Dummy
    2615
    2716' BSTR API
    … …  
    571560Declare Function VarTokenizeFormatString Lib "oleaut32" (pstrFormat As LPOLESTR, rgbTok As *Byte, cbTok As Long, iFirstDay As Long, iFirstWeek As Long, lcid As LCID, ByRef cbActual As Long) As HRESULT
    572561
    573 ' ITypeLib
    574 TypeDef PTYPELIB = *ITypeLib
    575 
    576562' ITypeInfo
    577563TypeDef DISPID = Long
    … …  
    627613
    628614' IDispatch implementation support
    629 TypeDef LPDISPATCH = *IDispatch
    630615
    631616Type PARAMDATA
    … …  
    683668Declare Function OaBuildVersion Lib "oleaut32" () As DWord
    684669Declare Sub ClearCustData Lib "oleaut32" (ByRef CustData As CUSTDATA)
    685 
    686 #endif '_INC_OLEAUTO_AB

  • trunk/Include/WinNT.ab

    r322 r497  
    11' winnt.ab
    2 
    3 #ifndef _WINNT_
    4 #define _WINNT_
    52
    63'#include <ctype.h>
    … …  
    7269#endif
    7370
    74 '#ifndef VOID
    75 '#define VOID void
    7671TypeDef CHAR = SByte
    7772TypeDef SHORT = Integer
    7873TypeDef LONG = Long
    7974TypeDef INT = Long
    80 '#endif
    8175
    8276TypeDef WCHAR = Word
    … …  
    138132
    139133#ifdef UNICODE
    140 
    141 #ifndef _TCHAR_DEFINED
    142134TypeDef TCHAR = WCHAR
    143135TypeDef PTCHAR = *WCHAR
    144136TypeDef TBYTE = WCHAR
    145137TypeDef PTBYTE = *WCHAR
    146 #define _TCHAR_DEFINED
    147 #endif
    148138
    149139TypeDef PTCH = PWCH
    … …  
    158148TypeDef LPCUTSTR = LPCUWSTR
    159149'TypeDef LP = LPWSTR
    160 
    161150#else
    162 
    163 #ifndef _TCHAR_DEFINED
    164151TypeDef TCHAR = Char
    165152TypeDef PTCHAR = *Char
    166153TypeDef TBYTE = Byte
    167154TypeDef PTBYTE = *Byte
    168 #define _TCHAR_DEFINED
    169 #endif
    170155
    171156TypeDef PTCH = PCH
    … …  
    191176TypeDef FLONG = DWord
    192177
    193 #ifndef _HRESULT_DEFINED
    194 #define _HRESULT_DEFINED
    195178TypeDef HRESULT = Long
    196 #endif
    197179
    198180TypeDef CCHAR = CHAR
    … …  
    212194TypeDef PFLOAT128 = FLOAT128
    213195
    214 '#define _ULONGLONG_
    215196TypeDef LONGLONG = Int64
    216197TypeDef ULONGLONG = QWord
    217198
    218199Const MAXLONGLONG = (&h7fffffffffffffff)
    219 '#endif
    220200
    221201TypeDef PLONGLONG = *LONGLONG
    … …  
    242222TypeDef PLUID = *LUID
    243223
    244 '#define _DWORDLONG_
    245224'TypeDef DWORDLONG = ULONGLONG
    246225'TypeDef PDWORDLONG = DWORDLONG
    … …  
    285264#require <guiddef.ab>
    286265
    287 #ifndef __OBJECTID_DEFINED
    288 #define __OBJECTID_DEFINED
    289 
    290266Type OBJECTID
    291267    Lineage As GUID
    292268    Uniquifier As DWord
    293269End Type
    294 #endif
    295270
    296271Const MINCHAR = &h80
    … …  
    10771052#endif
    10781053
    1079 #ifndef _LDT_ENTRY_DEFINED
    1080 #define _LDT_ENTRY_DEFINED
    1081 
    10821054Type LDT_ENTRY
    10831055    LimitLow As Word
    … …  
    10891061End Type
    10901062TypeDef PLDT_ENTRY = *LDT_ENTRY
    1091 
    1092 #endif
    10931063
    10941064Const WOW64_CONTEXT_i386 = &h00010000
    … …  
    12501220' Security Id (SID)
    12511221
    1252 #ifndef SID_IDENTIFIER_AUTHORITY_DEFINED
    1253 #define SID_IDENTIFIER_AUTHORITY_DEFINED
    12541222Type SID_IDENTIFIER_AUTHORITY
    12551223    Value[ELM(6)] As Byte
    12561224End Type
    12571225TypeDef PSID_IDENTIFIER_AUTHORITY = *SID_IDENTIFIER_AUTHORITY
    1258 #endif
    1259 
    1260 #ifndef SID_DEFINED
    1261 #define SID_DEFINED
     1226
    12621227Type SID
    12631228    Revision As Byte
    … …  
    12671232End Type
    12681233TypeDef PSID = *SID
    1269 #endif
    12701234
    12711235Const SID_REVISION = (1)
    … …  
    41914155
    41924156Const BTYPE(x) = ((x) And N_BTMASK)
    4193 
    4194 #ifndef ISPTR
    4195 #define ISPTR
    41964157Const ISPTR(x) = (((x) And N_TMASK) = (IMAGE_SYM_DTYPE_POINTER << N_BTSHFT))
    4197 #endif
    4198 
    4199 #ifndef ISFCN
    4200 #define ISFCN
    42014158Const ISFCN(x) = (((x) And N_TMASK) = (IMAGE_SYM_DTYPE_FUNCTION << N_BTSHFT))
    4202 #endif
    4203 
    4204 #ifndef ISARY
    4205 #define ISARY
    42064159Const ISARY(x) = (((x) And N_TMASK) = (IMAGE_SYM_DTYPE_ARRAY << N_BTSHFT))
    4207 #endif
    4208 
    4209 #ifndef ISTAG
    4210 #define ISTAG
    42114160Const ISTAG(x) = ((x) = IMAGE_SYM_CLASS_STRUCT_TAG Or (x) = IMAGE_SYM_CLASS_UNION_TAG Or (x) = IMAGE_SYM_CLASS_ENUM_TAG)
    4212 #endif
    4213 
    4214 #ifndef INCREF
    4215 #define INCREF
    42164161Const INCREF(x) = ((((x) And (Not N_BTMASK)) << N_TSHIFT) Or (IMAGE_SYM_DTYPE_POINTER << N_BTSHFT) Or ((x) And N_BTMASK))
    4217 #endif
    4218 
    4219 #ifndef DECREF
    4220 #define DECREF
    42214162Const DECREF(x) = ((((x) >> N_TSHIFT) And (Not N_BTMASK)) Or ((x) And N_BTMASK))
    4222 #endif
    42234163
    42244164' Auxiliary entry format.
    … …  
    51965136#endif
    51975137
    5198 ' for move macros
    5199 '#include <string.h>
    5200 
    5201 #ifndef _SLIST_HEADER_
    5202 #define _SLIST_HEADER_
    5203 
    52045138#ifdef _WIN64
    52055139Type Align(16) SLIST_ENTRY
    … …  
    52545188#endif
    52555189
    5256 #endif
    52575190
    52585191Declare Sub RtlInitializeSListHead Lib "kernel32" (/*IN*/ ByRef ListHead As SLIST_HEADER)
    … …  
    52635196Declare Function RtlQueryDepthSList Lib "kernel32" (/*IN*/ ByRef ListHead As SLIST_HEADER) As Word
    52645197
    5265 #ifndef _RTL_RUN_ONCE_DEF
    5266 #define _RTL_RUN_ONCE_DEF
    5267 
    52685198'Const RTL_RUN_ONCE_INIT {0} 'Static initializer
    52695199
    … …  
    52805210
    52815211TypeDef PRTL_RUN_ONCE_INIT_FN = *Function(ByRef RunOnce As RTL_RUN_ONCE, Parameter As VoidPtr, ByRef Context As VoidPtr) As DWord'LOGICAL
    5282 #endif
    52835212
    52845213Declare Sub RtlRunOnceInitialize Lib "kernel32" (ByRef RunOnce As RTL_RUN_ONCE)
    … …  
    61086037End Enum
    61096038
    6110 #ifndef _NTTMAPI_
    6111 #define _NTTMAPI_
     6039'#ifndef _NTTMAPI_
     6040'#define _NTTMAPI_
    61126041
    61136042'#include <ktmtypes.ab>
    … …  
    61706099End Enum
    61716100
    6172 
    61736101Enum TRANSACTION_STATE
    61746102    TransactionStateNormal = 1
    … …  
    63216249TypeDef PKTMOBJECT_CURSOR = *KTMOBJECT_CURSOR
    63226250
    6323 #endif
     6251'#endif
    63246252
    63256253TypeDef TP_VERSION = DWord
    … …  
    64396367'#endif // winnt_only
    64406368
    6441 #endif

  • trunk/Include/api_commdlg.sbp

    r300 r497  
    11' api_commdlg.sbp
    2 
    3 #ifndef _INC_COMMDLG
    4 #define _INC_COMMDLG
    52
    63#ifdef UNICODE
    … …  
    485482#endif
    486483Declare Function PrintDlg Lib "comdlg32" Alias _FuncName_PrintDlg (ByRef pd As PRINTDLG) As BOOL
    487 
    488 
    489 #endif '_INC_COMMDLG

  • trunk/Include/api_console.sbp

    r300 r497  
    11'api_console.sbp
    2 
    3 #ifndef _INC_CONSOLE
    4 #define _INC_CONSOLE
    52
    63#ifdef UNICODE
    … …  
    225222Declare Function GetConsoleOutputCP Lib "kernel32" () As DWord
    226223Declare Function SetConsoleOutputCP Lib "kernel32" (wCodePageID As DWord) As BOOL
    227 
    228 
    229 
    230 #endif '_INC_CONSOLE

  • trunk/Include/api_gdi.sbp

    r300 r497  
    11' api_gdi.sbp - Graphics Device Integerface API
    2 
    3 
    4 #ifndef _INC_GDI
    5 #define _INC_GDI
    62
    73#ifdef UNICODE
    … …  
    13441340
    13451341'Declare Function wglSwapMultipleBuffers Lib "opengl32" (u As DWord, lpwglswap As *WGLSWAP) As DWord
    1346 
    1347 #endif '_INC_GDI

  • trunk/Include/api_imm.sbp

    r478 r497  
    250250Declare Function ImmSetOpenStatus Lib "imm32" (himc As HIMC, fOpen As BOOL) As BOOL
    251251
    252 #ifdef _INC_GDI '_WINGDI_
    253252#ifndef NOGDI
    254253Declare Function ImmGetCompositionFontA Lib "imm32" (hIMC As HIMC, ByRef lf As LOGFONTA) As BOOL
    … …  
    268267#endif
    269268#endif 'NOGDI
    270 #endif '_INC_GDI
    271269
    272270Declare Function ImmConfigureIMEA Lib "imm32" (hkl As HKL, hwnd As HWND, dwMode As DWord, lpData As VoidPtr) As BOOL

  • trunk/Include/api_msg.sbp

    r473 r497  
    11' api_msg.sbp - declarations file for window control.
    2 
    3 
    4 #ifndef _INC_MSG
    5 #define _INC_MSG
    6 
    72
    83'------------------------------
    … …  
    10611056Const CBN_SELENDOK =      9
    10621057Const CBN_SELENDCANCEL =  10
    1063 
    1064 
    1065 #endif '_INC_MSG

  • trunk/Include/api_psapi.sbp

    r300 r497  
    11' api_psapi.sbp
    2 
    3 #ifndef _INC_PSAPI_
    4 #define _INC_PSAPI_
    52
    63#ifdef UNICODE
    … …  
    128125Declare Function EnumPageFiles Lib "psapi" Alias _FuncName_EnumPageFiles (pCallBackRoutine As PENUM_PAGE_FILE_CALLBACK, pContext As VoidPtr) As BOOL
    129126Declare Function GetProcessImageFileName Lib "psapi" Alias _FuncName_GetProcessImageFileName (hProcess As HANDLE, lpImageFileName As LPTSTR, nSize As DWord) As DWORD
    130 
    131 #endif '_INC_PSAPI

  • trunk/Include/api_reg.sbp

    r300 r497  
    11' api_reg.sbp
    22' Registry Operation
    3 
    4 
    5 #ifndef _INC_REG
    6 #define _INC_REG
    73
    84#ifdef UNICODE
    … …  
    165161Declare Function RegSaveKeyEx Lib "advapi32" Alias _FuncName_RegSaveKeyEx (hKey As HKEY, lpFile As LPCTSTR, lpSecurityAttributes As *SECURITY_ATTRIBUTES, Flags As DWord) As Long
    166162'#endif
    167 #endif '_INC_REG

  • trunk/Include/api_shell.sbp

    r300 r497  
    11' api_shell.sbp
    2 
    3 
    4 #ifndef _INC_SHELL
    5 #define _INC_SHELL
    62
    73#ifdef UNICODE
    … …  
    712708        /* [out] */ ByRef ppidlOut As LPITEMIDLIST) As HRESULT
    713709End Interface
    714 
    715 #endif '_INC_SHELL

  • trunk/Include/api_shlwapi.sbp

    r300 r497  
    11' api_shlwapi.sbp
    2 
    3 
    4 #ifndef _INC_SHLWAPI
    5 #define _INC_SHLWAPI
    6 
    72
    83Declare Function PathGetArgsA Lib "shlwapi" (pszPath As LPCWSTR) As LPWSTR
    … …  
    8681Declare Function PathRenameExtension Lib "shlwapi" Alias "PathRenameExtensionA" (hKey As HKEY, pszSubKey As LPCSTR) As DWord
    8782#endif
    88 
    89 #endif '_INC_SHLWAPI

  • trunk/Include/api_sql.sbp

    r337 r497  
    11' api_sql.sbp
    2 
    3 #ifndef _INC_SQL
    4 #define _INC_SQL
    5 
    62
    73/* API declaration data types */
    … …  
    809805Declare Function SQLTransact Lib "odbc32.dll" (EnvironmentHandle As SQLHENV,
    810806           ConnectionHandle As SQLHDBC, CompletionType As SQLUSMALLINT) As SQLRETURN
    811 
    812 
    813 #endif '_INC_SQL

  • trunk/Include/api_sqlext.sbp

    r300 r497  
    11' api_sqlext.sbp
    22
    3 
    4 #ifndef _INC_SQLEXT
    5 #define _INC_SQLEXT
    6 
    7 #ifndef _INC_SQL
    8 #include <api_sql.sbp>
    9 #endif
    10 
     3#require <api_sql.sbp>
    114
    125/* generally useful constants */
    … …  
    17931786    RetCode As RETCODE
    17941787End Type
    1795 
    1796 
    1797 #endif /* _INC_SQLEXT */

  • trunk/Include/api_system.sbp

    r466 r497  
    11' api_system.sbp - System API
    2 
    3 #ifndef _INC_SYSTEM
    4 #define _INC_SYSTEM
    52
    63#ifdef UNICODE
    … …  
    970967Const MAKEINTATOM(i) = (i As Word As ULONG_PTR As LPTSTR)
    971968Const INVALID_ATOM = 0 As ATOM
    972 
    973 #endif '_INC_SYSTEM

  • trunk/Include/api_tlhelp32.sbp

    r300 r497  
    11' api_tlhelp32.sbp
    2 
    3 #ifndef _INC_TOOLHELP32
    4 #define _INC_TOOLHELP32
    52
    63Const MAX_MODULE_NAME32 = 255
    … …  
    134131Declare Function Module32First Lib "kernel32" (hSnapshot As HANDLE, ByRef me As MODULEENTRY32) As BOOL
    135132Declare Function Module32Next Lib "kernel32" (hSnapshot As HANDLE, ByRef me As MODULEENTRY32) As BOOL
    136 
    137 
    138 
    139 #endif ' _INC_TOOLHELP32

  • trunk/Include/api_window.sbp

    r418 r497  
    11' api_window.sbp - Window Control API
    2 
    3 
    4 #ifndef _INC_WINDOW
    5 #define _INC_WINDOW
    62
    73'-------------
    … …  
    16471643    lfMessageFont As LOGFONTA
    16481644End Type
    1649 #ifdef
     1645#ifdef UNICODE
    16501646TypeDef NONCLIENTMETRICS = NONCLIENTMETRICSW
    16511647#else
    … …  
    21312127Declare Function GetAltTabInfo Lib "user32" Alias "GetAltTabInfoA" (ByVal hwnd As HWND, ByVal iItem As Long, ByRef pati As ALTTABINFO, ByVal pszItemText As LPSTR, ByVal cchItemText As DWord) As BOOL
    21322128#endif ' !UNICODE
    2133 #endif '_INC_WINDOW

  • trunk/Include/api_windowstyles.sbp

    r300 r497  
    11' api_windowstyles.sbp
    2 
    3 
    4 #ifndef _INC_WINDOWSTYLES
    5 #define _INC_WINDOWSTYLES
    6 
    72
    83'---------------
    … …  
    237232Const DS_CENTERMOUSE =    &H1000
    238233Const DS_CONTEXTHELP =    &H2000
    239 
    240 
    241 #endif '_INC_WINDOWSTYLES

  • trunk/Include/api_winerror.sbp

    r300 r497  
    11' api_winerror.sbp
    2 
    3 
    4 #ifndef _INC_WINERROR
    5 #define _INC_WINERROR
    62
    73Const FACILITY_WINDOWSUPDATE = 36
    … …  
    16081604Const DNS_ERROR_DP_NOT_AVAILABLE = 9905
    16091605Const DNS_ERROR_DP_FSMO_ERROR = 9906
    1610 #ifndef WSABASEERR
    1611 #define WSABASEERR
     1606
    16121607Const WSABASEERR = 10000
    16131608Const WSAEINTR = 10004
    … …  
    17001695Const WSA_QOS_ESHAPERATEOBJ = 11030
    17011696Const WSA_QOS_RESERVED_PETYPE = 11031
    1702 #endif
     1697
    17031698Const ERROR_SXS_SECTION_NOT_FOUND = 14000
    17041699Const ERROR_SXS_CANT_GEN_ACTCTX = 14001
    … …  
    30983093Const COMADMIN_E_REGISTRY_ACCESSDENIED = _HRESULT_TYPEDEF_(&h80110823)
    30993094Const COMADMIN_E_PARTITIONS_DISABLED = _HRESULT_TYPEDEF_(&h80110824)
    3100 
    3101 #endif '_INC_WINERROR

  • trunk/Include/api_wininet.sbp

    r300 r497  
    11' api_wininet.sbp
    2 
    3 
    4 #ifndef _INC_WININET
    5 #define _INC_WININET
    62
    73#ifdef UNICODE
    … …  
    107103    hFind As HINTERNET,
    108104    ByREf vFindData As Any) As BOOL
    109 
    110 
    111 #endif '_INC_WININET

  • trunk/Include/api_winsock2.sbp

    r300 r497  
    22#define _WINSOCK2API_
    33#define _WINSOCKAPI_
    4 /*
    5 #ifndef INCL_WINSOCK_API_PROTOTYPES
    6 #define INCL_WINSOCK_API_PROTOTYPES 1
    7 #endif
    8 
    9 #ifndef INCL_WINSOCK_API_TYPEDEFS
    10 #define INCL_WINSOCK_API_TYPEDEFS 0
    11 #endif
    12 */
    134
    145Const WINSOCK_VERSION = MAKEWORD(2, 2)
    … …  
    218209Const IMPLINK_HIGHEXPER = 158
    219210
    220 #ifndef s_addr
    221 #define s_addr
    222211' Internet address (old style... should be updated)
    223212Type /*Class*/ in_addr
    … …  
    281270*/
    282271End Type 'Class
    283 #endif
    284272
    285273Const IN_CLASSA(i) = (((i) As DWord And &h80000000) = 0)
    … …  
    557545Const FD_ALL_EVENTS = ((1 << FD_MAX_EVENTS) - 1)
    558546
    559 #include <api_winerror.sbp>
     547#require <api_winerror.sbp>
    560548
    561549' Compatibility macros.
    … …  
    602590TypeDef LPWSABUF = *WSABUF
    603591
    604 #include <qos.ab>
     592#require <qos.ab>
    605593
    606594Type QOS 'struct _QualityOfService
    … …  
    918906' registration (RNR) API
    919907
    920 #ifndef _tagBLOB_DEFINED
    921 #define _tagBLOB_DEFINED
    922 #define _BLOB_DEFINED
    923 #define _LPBLOB_DEFINED
    924908Type BLOB
    925909    cbSize As DWord
    … …  
    931915End Type
    932916TypeDef LPBLOB = *BLOB
    933 #endif
    934917
    935918' Service Install Flags
    … …  
    970953Const RES_UNUSED_1 = (&h00000001)
    971954Const RES_FLUSH_CACHE = (&h00000002)
    972 #ifndef RES_SERVICE
    973 #define RES_SERVICE
    974955Const RES_SERVICE = (&h00000004)
    975 #endif /* RES_SERVICE */
    976956
    977957' Well known value names for Service Types
    978958
    979 Const SERVICE_TYPE_VALUE_IPXPORTA = "IpxSocket"
     959'Const SERVICE_TYPE_VALUE_IPXPORTA = "IpxSocket"
    980960'Const SERVICE_TYPE_VALUE_IPXPORTW = L"IpxSocket"
    981 Const SERVICE_TYPE_VALUE_SAPIDA = "SapId"
     961'Const SERVICE_TYPE_VALUE_SAPIDA = "SapId"
    982962'Const SERVICE_TYPE_VALUE_SAPIDW = L"SapId"
    983963
    984 Const SERVICE_TYPE_VALUE_TCPPORTA = "TcpPort"
     964'Const SERVICE_TYPE_VALUE_TCPPORTA = "TcpPort"
    985965'Const SERVICE_TYPE_VALUE_TCPPORTW = L"TcpPort"
    986966
    987 Const SERVICE_TYPE_VALUE_UDPPORTA = "UdpPort"
     967'Const SERVICE_TYPE_VALUE_UDPPORTA = "UdpPort"
    988968'Const SERVICE_TYPE_VALUE_UDPPORTW = L"UdpPort"
    989969
    990 Const SERVICE_TYPE_VALUE_OBJECTIDA = "ObjectId"
     970'Const SERVICE_TYPE_VALUE_OBJECTIDA = "ObjectId"
    991971'Const SERVICE_TYPE_VALUE_OBJECTIDW = L"ObjectId"
    992 
    993 #ifdef UNICODE
    994972/*
     973#ifdef UNICODE
    995974Const SERVICE_TYPE_VALUE_SAPID = SERVICE_TYPE_VALUE_SAPIDW
    996975Const SERVICE_TYPE_VALUE_TCPPORT = SERVICE_TYPE_VALUE_TCPPORTW
    997976Const SERVICE_TYPE_VALUE_UDPPORT = SERVICE_TYPE_VALUE_UDPPORTW
    998977Const SERVICE_TYPE_VALUE_OBJECTID = SERVICE_TYPE_VALUE_OBJECTIDW
    999 */
    1000 #else
    1001 
     978#else
    1002979Const SERVICE_TYPE_VALUE_SAPID = SERVICE_TYPE_VALUE_SAPIDA
    1003980Const SERVICE_TYPE_VALUE_TCPPORT = SERVICE_TYPE_VALUE_TCPPORTA
    1004981Const SERVICE_TYPE_VALUE_UDPPORT = SERVICE_TYPE_VALUE_UDPPORTA
    1005982Const SERVICE_TYPE_VALUE_OBJECTID = SERVICE_TYPE_VALUE_OBJECTIDA
    1006 
    1007 #endif
    1008 
    1009 #ifndef __CSADDR_DEFINED__
    1010 #define __CSADDR_DEFINED__
     983#endif
     984*/
     985Const SERVICE_TYPE_VALUE_IPXPORT = "IpxSocket"
     986Const SERVICE_TYPE_VALUE_SAPID = "SapId"
     987Const SERVICE_TYPE_VALUE_TCPPORT = "TcpPort"
     988Const SERVICE_TYPE_VALUE_UDPPORT = "UdpPort"
     989Const SERVICE_TYPE_VALUE_OBJECTID = "ObjectId"
    1011990
    1012991' SockAddr Information
    … …  
    10271006TypeDef PCSADDR_INFO = *CSADDR_INFO
    10281007TypeDef LPCSADDR_INFO = *CSADDR_INFO
    1029 #endif
    10301008
    10311009' Address list returned via SIO_ADDRESS_LIST_QUERY
    … …  
    21362114Const WSAGETSELECTERROR(lParam) = HIWORD(lParam)
    21372115
    2138 #ifdef IPV6STRICT
    2139 '#include <wsipv6ok.ab>
    2140 #endif
    2141 
    2142 #endif
     2116'#ifdef IPV6STRICT
     2117'#require <wsipv6ok.ab>
     2118'#endif
     2119
     2120#endif

  • trunk/Include/api_winspool.sbp

    r300 r497  
    11'api_winspool.sbp
    2 
    3 
    4 #ifndef _INC_WINSPOOL
    5 #define _INC_WINSPOOL
    62
    73#ifdef UNICODE
    … …  
    6056Const SPOOL_FILE_PERSISTENT    = &H00000001
    6157Const SPOOL_FILE_TEMPORARY     = &H00000002
    62 
    63 
    64 #endif '_INC_WINSPOOL

  • trunk/Include/basic.sbp

    r468 r497  
    22
    33#_core
    4 
    5 ' Unicodeが不安定な間の暫定対応
    6 #define __STRING_IS_NOT_ALWAYS_UNICODE
    7 
    8 #ifndef _INC_BASIC
    9 #define _INC_BASIC
    104
    115Sub _System_InitDllGlobalVariables()    'dummy
    … …  
    186180#require <basic\function.sbp>
    187181#require <basic\command.sbp>
    188 
    189 
    190 #endif '_INC_BASIC

  • trunk/Include/basic/command.sbp

    r478 r497  
    11'command.sbp
    2 
    3 
    4 #ifndef _INC_COMMAND
    5 #define _INC_COMMAND
    62
    73Const _System_Type_SByte = 1
    … …  
    152148Sub INPUT_FromFile(FileNumber As Long)
    153149    FileNumber--
    154    
     150
    155151    Dim i = 0 As Long
    156152    Dim buffer = New System.Text.StringBuilder(256)
    157     Dim temp[1] As StrChar
     153    Dim temp[1] As Char
    158154    Dim dwAccessBytes As DWord
    159155    Dim IsStr As Long
    … …  
    162158        '次のデータをサーチ
    163159        Do
    164             Dim ret = ReadFile(_System_hFile[FileNumber],temp,SizeOf (StrChar),VarPtr(dwAccessBytes),ByVal 0)
     160            Dim ret = ReadFile(_System_hFile[FileNumber],temp,SizeOf (Char),VarPtr(dwAccessBytes),ByVal 0)
    165161            If ret=0 or dwAccessBytes=0 Then
    166162                'error
    … …  
    173169        IsStr=0
    174170        While 1
    175             Dim ret = ReadFile(_System_hFile[FileNumber],temp,SizeOf (StrChar),VarPtr(dwAccessBytes),ByVal 0)
     171            Dim ret = ReadFile(_System_hFile[FileNumber],temp,SizeOf (Char),VarPtr(dwAccessBytes),ByVal 0)
    176172            If ret = 0 or dwAccessBytes = 0 Then
    177173                'error
    … …  
    183179            If dwAccessBytes=0 or temp[0]=0 or temp[0]=13 or temp[0]=10 or (IsStr=0 and temp[0]=Asc(",")) or (IsStr=0 and (temp[0]=32 or temp[0]=9) and _System_InputDataType[i]<>_System_Type_String) Then
    184180                If temp[0]=13 Then
    185                     ReadFile(_System_hFile[FileNumber],temp,SizeOf (StrChar),VarPtr(dwAccessBytes),ByVal 0)
     181                    ReadFile(_System_hFile[FileNumber],temp,SizeOf (Char),VarPtr(dwAccessBytes),ByVal 0)
    186182                    If Not(dwAccessBytes<>0 And temp[0]=10) Then
    187183                        SetFilePointer(_System_hFile[FileNumber],-1,0,FILE_CURRENT)
    … …  
    202198                End If
    203199
    204                 buffer.Append(0 As StrChar)
     200                buffer.Append(0 As Char)
    205201                Exit While
    206202            End If
    … …  
    252248Function _System_GetUsingFormat(UsingStr As String) As String
    253249    Dim i2 As Long, i3 As Long, i4 As Long, i5 As Long, ParmNum As Long
    254     Dim temporary[255] As StrChar
     250    Dim temporary[255] As Char
    255251    Dim buffer = New System.Text.StringBuilder(1024)
    256252
    … …  
    270266        If UsingStr[i2]=Asc("#") Then
    271267            Dim dec As Long, sign As Long
    272             Dim temp2 As *StrChar
     268            Dim temp2 As *Char
    273269
    274270            Dim length_num As Long, length_buf As Long
    … …  
    325321
    326322                If dec > 0 Then
    327                     memcpy(VarPtr(buffer.Chars[i3]), temp2, SizeOf (StrChar) * length_num)
     323                    memcpy(VarPtr(buffer.Chars[i3]), temp2, SizeOf (Char) * length_num)
    328324                Else
    329325                    buffer[i3] = &H30
    … …  
    376372                    ActiveBasic.Strings.Detail.ChrFill(VarPtr(buffer.Chars[i3]), i4, &h20) 'Asc(" ")
    377373                End If
    378                 memcpy(VarPtr(buffer.Chars[i3]), _System_UsingStrData[ParmNum], SizeOf (StrChar) * i5)
     374                memcpy(VarPtr(buffer.Chars[i3]), _System_UsingStrData[ParmNum], SizeOf (Char) * i5)
    379375                i3 += i4
    380376            Else
    … …  
    416412    RecodeNumber--
    417413
    418     SetFilePointer(_System_hFile(FileNumber), SizeOf (StrChar) * RecodeNumber * _System_FieldSize(FileNumber), 0, FILE_BEGIN)
     414    SetFilePointer(_System_hFile(FileNumber), SizeOf (Char) * RecodeNumber * _System_FieldSize(FileNumber), 0, FILE_BEGIN)
    419415    Dim t = ZeroString(_System_FieldSize(FileNumber))
    420     ReadFile(_System_hFile(FileNumber), StrPtr(t), SizeOf (StrChar) * _System_FieldSize(FileNumber), VarPtr(dwAccessByte), ByVal 0)
     416    ReadFile(_System_hFile(FileNumber), StrPtr(t), SizeOf (Char) * _System_FieldSize(FileNumber), VarPtr(dwAccessByte), ByVal 0)
    421417    If dwAccessByte = _System_FieldSize(FileNumber) Then
    422418        buffer = t.ToString
    … …  
    431427    RecodeNumber--
    432428
    433     SetFilePointer(_System_hFile(FileNumber), SizeOf (StrChar) * RecodeNumber*_System_FieldSize(FileNumber), 0, FILE_BEGIN)
    434     WriteFile(_System_hFile(FileNumber), StrPtr(buffer), SizeOf (StrChar) * _System_FieldSize(FileNumber), VarPtr(dwAccessByte), ByVal 0)
     429    SetFilePointer(_System_hFile(FileNumber), SizeOf (Char) * RecodeNumber*_System_FieldSize(FileNumber), 0, FILE_BEGIN)
     430    WriteFile(_System_hFile(FileNumber), StrPtr(buffer), SizeOf (Char) * _System_FieldSize(FileNumber), VarPtr(dwAccessByte), ByVal 0)
    435431End Macro
    436432
    … …  
    444440    DeleteFile(ToTCStr(path))
    445441End Macro
    446 
    447 
    448 #endif '_INC_COMMAND

  • trunk/Include/basic/dos_console.sbp

    r473 r497  
    3030
    3131    'データを変数に格納
    32     Const comma = &h2c As StrChar 'Asc(",")
     32    Const comma = &h2c As Char 'Asc(",")
    3333    Dim broken = ActiveBasic.Strings.Detail.Split(input, comma)
    3434    Dim i As Long

  • trunk/Include/basic/function.sbp

    r457 r497  
    11'function.sbp
    2 
    3 
    4 #ifndef _INC_FUNCTION
    5 #define _INC_FUNCTION
    6 
    72
    83Const _System_PI = 3.14159265358979323846264
    … …  
    105Const _System_SQRT2 = 1.41421356237309504880168872421
    116Const _System_Log_N = 7 As Long
    12 
    13 
    14 #require <Classes/System/Math.ab>
    15 #require <Classes/System/DateTime.ab>
    16 #require <Classes/System/Text/StringBuilder.ab>
    17 #require <Classes/ActiveBasic/Math/Math.ab>
    18 #require <Classes/ActiveBasic/Strings/Strings.ab>
    19 
    207
    218'------------- サポート関数の定義 -------------
    … …  
    243230'------------
    244231
    245 Function Asc(buf As String) As StrChar
     232Function Asc(buf As String) As Char
    246233    Asc = buf[0]
    247234End Function
    248235
    249 Function Chr$(code As StrChar) As String
     236Function Chr$(code As Char) As String
    250237    Chr$ = New String(code, 1)
    251238End Function
    252239
    253 #ifndef __STRING_IS_NOT_UNICODE
     240#ifdef UNICODE
    254241Function AscW(s As String) As UCSCHAR
    255242    If String.IsNullOrEmpty(s) Then
    … …  
    275262Function ChrW(c As UCSCHAR) As String
    276263    If c <= &hFFFF Then
    277         Return New String(c As StrChar, 1)
     264        Return New String(c As Char, 1)
    278265    ElseIf c <= &h10FFFF Then
    279266        c -= &h10000
    … …  
    390377
    391378Function Space$(length As Long) As String
    392     Return New String(&h20 As StrChar, length)
    393 End Function
    394 
    395 Sub _ecvt_support(buf As *StrChar, count As Long, size As Long)
     379    Return New String(&h20 As Char, length)
     380End Function
     381
     382Sub _ecvt_support(buf As *Char, count As Long, size As Long)
    396383    Dim i As Long
    397384    If buf[count] = 9 Then
    … …  
    410397End Sub
    411398
    412 Sub _ecvt(buffer As *StrChar, value As Double, count As Long, ByRef dec As Long, ByRef sign As Boolean)
     399Sub _ecvt(buffer As *Char, value As Double, count As Long, ByRef dec As Long, ByRef sign As Boolean)
    413400    Dim i As Long, i2 As Long
    414401
    415402    '値が0の場合
    416403    If value = 0 Then
    417         ActiveBasic.Strings.ChrFill(buffer, count As SIZE_T, &h30 As StrChar)
     404        ActiveBasic.Strings.ChrFill(buffer, count As SIZE_T, &h30 As Char)
    418405        buffer[count] = 0
    419406        dec = 0
    … …  
    442429
    443430    For i = 0 To count - 1
    444         buffer[i] = Int(value) As StrChar
     431        buffer[i] = Int(value) As Char
    445432        value = (value-CDbl(Int(value))) * 10
    446433    Next
    … …  
    471458    End If
    472459    Dim dec As Long, sign As Boolean
    473     Dim buffer[32] As StrChar, temp[15] As StrChar
     460    Dim buffer[32] As Char, temp[15] As Char
    474461    Dim i = 0 As Long
    475462
    … …  
    585572End Function
    586573
    587 Function String$(n As Long, s As StrChar) As String
     574Function String$(n As Long, s As Char) As String
    588575    Return New String(s, n)
    589576End Function
    590        
     577
    591578#ifdef _AB4_COMPATIBILITY_STRING$_
    592579Function String$(n As Long, s As String) As String
    … …  
    594581        'Throw ArgumentOutOfRangeException
    595582    End If
    596 
    597583    Dim buf = New System.Text.StringBuilder(s.Length * n)
    598584    Dim i As Long
    599     For i = 0 To n
     585    For i = 1 To n
    600586        buf.Append(s)
    601587    Next
    … …  
    603589#else
    604590Function String$(n As Long, s As String) As String
     591    Dim c As Char
    605592    If String.IsNullOrEmpty(s) Then
    606         Return New String(0 As StrChar, n)
    607     Else
    608         Return New String(s[0], n)
    609     End If
     593        c = 0
     594    Else
     595        c = s[0]
     596    End If
     597    String$ = New String(c, n)
    610598End Function
    611599#endif
    … …  
    613601Function Time$() As String
    614602    Dim time = System.DateTime.Now
    615 
    616603    Dim buf = New System.Text.StringBuilder(8)
    617 
    618604    'hour
    619605    If time.Hour < 10 Then
    … …  
    640626End Function
    641627
    642 Function Val(buf As *StrChar) As Double
     628Function Val(buf As *Char) As Double
    643629    Dim i As Long, i2 As Long, i3 As Long, i4 As Long
    644630    Dim temporary As String
    645     Dim TempPtr As *StrChar
     631    Dim TempPtr As *Char
    646632    Dim dbl As Double
    647633    Dim i64data As Int64
    … …  
    665651                If Not (0<=i3 And i3<=7) Then Exit While
    666652
    667                 TempPtr[i]=i3 As StrChar
     653                TempPtr[i]=i3 As Char
    668654                i++
    669655            Wend
    … …  
    688674                End If
    689675
    690                 TempPtr[i]=i3 As StrChar
     676                TempPtr[i]=i3 As Char
    691677                i++
    692678            Wend
    … …  
    703689    Else
    704690        '10進数
    705 #ifdef __STRING_IS_NOT_UNICODE
     691#ifdef UNICODE
     692        swscanf(buf,"%lf",VarPtr(Val))
     693#else
    706694        sscanf(buf,"%lf",VarPtr(Val))
    707 #else
    708         swscanf(buf,ToWCStr("%lf"),VarPtr(Val))
    709695#endif
    710696    End If
    … …  
    981967
    982968Function _System_IsLowSurrogate(c As WCHAR) As Boolean
    983     Return &hDC00 <= c And c < &hE000 
     969    Return &hDC00 <= c And c < &hE000
    984970End Function
    985971
    … …  
    1000986    _System_GetHashFromWordArray = hash As Long
    1001987End Function
    1002 
    1003 #endif '_INC_FUNCTION

  • trunk/Include/basic/prompt.sbp

    r411 r497  
    88Namespace Prompt
    99Namespace Detail
    10    
     10
    1111Function _PromptSys_GetTextExtentPoint32(hdc As HDC, psz As PCSTR, cb As Long, ByRef Size As SIZE) As Long
    1212    _PromptSys_GetTextExtentPoint32 = GetTextExtentPoint32A(hdc, psz, cb, Size)
    … …  
    4747Type _PromptSys_LineInformation
    4848    Length As Long
    49     Text As *StrChar
     49    Text As *Char
    5050    CharInfo As *_PromptSys_CharacterInformation
    5151End Type
    … …  
    5353Dim _PromptSys_hFont As HFONT
    5454Dim _PromptSys_FontSize As SIZE
    55 Dim _PromptSys_InputStr[255] As StrChar
     55Dim _PromptSys_InputStr[255] As Char
    5656Dim _PromptSys_InputLen = -1 As Long
    5757Dim _PromptSys_KeyChar As Byte
    … …  
    9797        Next
    9898        _PromptSys_TextLine[100].Length = 0
    99         _PromptSys_TextLine[100].Text = _System_calloc(SizeOf (StrChar) * 255)
     99        _PromptSys_TextLine[100].Text = _System_calloc(SizeOf (Char) * 255)
    100100        _PromptSys_TextLine[100].CharInfo = _System_calloc(SizeOf (_PromptSys_CharacterInformation) * 255)
    101101        _PromptSys_CurPos.y--
    … …  
    136136                End If
    137137                With _PromptSys_FontSize
    138                     _PromptSys_TextOut(hDC, currentLineCharInfo[i2].StartPos, i * .cy, VarPtr(_PromptSys_TextLine[i].Text[i2]) As *StrChar, tempLen)
     138                    _PromptSys_TextOut(hDC, currentLineCharInfo[i2].StartPos, i * .cy, VarPtr(_PromptSys_TextLine[i].Text[i2]) As *Char, tempLen)
    139139                End With
    140140                i2 += tempLen
    … …  
    191191                        EndIf
    192192                        Dim p = buf.StrPtr
    193                         _PromptSys_GetTextExtentPoint32(hdc, VarPtr(p[i2]) As *StrChar, charLen, sz)
     193                        _PromptSys_GetTextExtentPoint32(hdc, VarPtr(p[i2]) As *Char, charLen, sz)
    194194                        currentLineCharInfo[.x + 1].StartPos = currentLineCharInfo[.x].StartPos + sz.cx
    195195                    End If
    … …  
    421421        End If
    422422        Dim tempStr = Nothing As String
    423         Dim str As *StrChar
    424 #ifdef __STRING_IS_NOT_UNICODE
    425         Dim size = _PromptWnd_GetCompositionStringA(himc, str)
    426         tempStr = New String(str, size As Long)
    427 #else
     423        Dim str As *Char
     424#ifdef UNICODE
    428425        Dim osver = System.Environment.OSVersion
    429426        With osver
    430             ' GetCompositionStringW is not implimented in Windows 95 
     427            ' GetCompositionStringW is not implimented in Windows 95
    431428            If .Version.Major = 4 And .Version.Minor = 0 And .Platform = System.PlatformID.Win32Windows Then
    432429                Dim strA As PCSTR
    … …  
    438435            End If
    439436        End With
     437#else
     438        Dim size = _PromptWnd_GetCompositionStringA(himc, str)
     439        tempStr = New String(str, size As Long)
    440440#endif
    441441        ImmReleaseContext(hwnd, himc)
    … …  
    460460        With _PromptSys_TextLine[i]
    461461            .Length = 0
    462             .Text = _System_calloc(SizeOf (StrChar) * 255)
     462            .Text = _System_calloc(SizeOf (Char) * 255)
    463463            .CharInfo = _System_calloc(SizeOf (_PromptSys_CharacterInformation) * 255)
    464464        End With
    … …  
    543543        For i = 0 To 100
    544544            With _PromptSys_TextLine[i]
    545                 .Text[0] = 0 '_System_FillChar(_PromptSys_TextLine[i].Text, -1 As StrChar, 0)
     545                .Text[0] = 0 '_System_FillChar(_PromptSys_TextLine[i].Text, -1 As Char, 0)
    546546                .Length = 0
    547547            End With
    … …  
    589589
    590590    'Set value to variable
    591     Const comma = &h2c As StrChar 'Asc(",")
     591    Const comma = &h2c As Char 'Asc(",")
    592592    Dim broken = ActiveBasic.Strings.Detail.Split(New String(_PromptSys_InputStr), comma)
    593593    Dim i As Long
    … …  
    617617    Dim i = _PromptSys_TextLine[y].Length
    618618    If i < x Then
    619         ActiveBasic.Strings.ChrFill(VarPtr(_PromptSys_TextLine[y].Text[i]), x - i, &h20 As StrChar) 'Asc(" ")
     619        ActiveBasic.Strings.ChrFill(VarPtr(_PromptSys_TextLine[y].Text[i]), x - i, &h20 As Char) 'Asc(" ")
    620620        Dim i2 As Long
    621621        For i2 = i To ELM(x)

  • trunk/Include/com/index.ab

    r355 r497  
    1 ' com/index.ab
    2 
    31#require <com/bstring.ab>
    42#require <com/variant.ab>

  • trunk/Include/com/vbobject.ab

    r355 r497  
    11' com/vbobject.ab
    22
    3 #ifndef _COM_VBIBJECT_AB
    4 #define _COM_VBIBJECT_AB
    5 
    6 #include <com/variant.ab>
     3#require <com/variant.ab>
    74
    85Namespace ActiveBasic
    … …  
    371368End Namespace 'COM
    372369End Namespace 'ActiveBasic
    373 
    374 #endif '_COM_VBIBJECT_AB

  • trunk/Include/crt.sbp

    r400 r497  
    11'crt.sbp
    2 
    3 #ifndef _INC_CRT
    4 #define _INC_CRT
    52
    63#ifndef _DEFINE_CRTDLL_NAME
    … …  
    7673Declare Function memcmp cdecl lib "msvcrt" (p1 As VoidPtr, p2 As VoidPtr, n As SIZE_T) As Long
    7774Declare Function wmemcmp cdecl lib "msvcrt" (p1 As *WCHAR, p2 As WCHAR, n As SIZE_T) As Long
    78 
    79 
    80 #endif '_INC_CRT

  • trunk/Include/directx9/d3d9caps.sbp

    r1 r497  
    11'd3d9caps.sbp
    2 
    3 
    4 #ifndef _INC_D3D9CAPS
    5 #define _INC_D3D9CAPS
    6 
    72
    83Type D3DVSHADERCAPS2_0
    … …  
    139134    MaxVShaderInstructionsExecuted As DWord
    140135    MaxPShaderInstructionsExecuted As DWord
    141     MaxVertexShader30InstructionSlots As DWord 
     136    MaxVertexShader30InstructionSlots As DWord
    142137    MaxPixelShader30InstructionSlots As DWord
    143138End Type
    … …  
    163158Const D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD = &H00000020
    164159
    165 ' Indicates that the device can perform a gamma correction from 
     160' Indicates that the device can perform a gamma correction from
    166161' a windowed back buffer containing linear content to the sRGB desktop.
    167162Const D3DCAPS3_LINEAR_TO_SRGB_PRESENTATION = &H00000080
    … …  
    246241Const D3DPRASTERCAPS_SCISSORTEST         = &H01000000
    247242Const D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS = &H02000000
    248 Const D3DPRASTERCAPS_DEPTHBIAS           = &H04000000 
     243Const D3DPRASTERCAPS_DEPTHBIAS           = &H04000000
    249244Const D3DPRASTERCAPS_MULTISAMPLE_TOGGLE  = &H08000000
    250245
    … …  
    395390Const D3DDTCAPS_FLOAT16_2 = &H00000100
    396391Const D3DDTCAPS_FLOAT16_4 = &H00000200
    397 
    398 
    399 #endif '_INC_D3D9CAPS

  • trunk/Include/directx9/d3d9types.sbp

    r1 r497  
    11' d3d9types.sbp
    2 
    3 
    4 #ifndef _INC_D3D9TYPES
    5 #define _INC_D3D9TYPES
    6 
    72
    83Const D3DCOLOR_ARGB(a,r,g,b) = ((a and &HFF)<<24) or ((r and &HFF)<<16) or ((g and &HFF)<<8) or (b and &HFF)
    … …  
    263258    D3DRS_FOGTABLEMODE              = 35   'D3DFOGMODE
    264259    D3DRS_FOGSTART                  = 36   'Fog start (for both vertex and pixel fog)
    265     D3DRS_FOGEND                    = 37   'Fog end     
    266     D3DRS_FOGDENSITY                = 38   'Fog density 
     260    D3DRS_FOGEND                    = 37   'Fog end
     261    D3DRS_FOGDENSITY                = 38   'Fog density
    267262    D3DRS_RANGEFOGENABLE            = 48   'Enables range-based fog
    268263    D3DRS_STENCILENABLE             = 52   'BOOL enable/disable stenciling
    … …  
    983978Const D3DLOCK_NOOVERWRITE     = &H00001000
    984979Const D3DLOCK_NOSYSLOCK       = &H00000800
    985 Const D3DLOCK_DONOTWAIT       = &H00004000                 
     980Const D3DLOCK_DONOTWAIT       = &H00004000
    986981Const D3DLOCK_NO_DIRTY_UPDATE = &H00008000
    987982
    … …  
    12041199    PostTransformVertexCacheHitRate As Single
    12051200End Type
    1206 
    1207 
    1208 #endif '_INC_D3D9TYPES

  • trunk/Include/directx9/d3dx9.sbp

    r1 r497  
    1313Const D3DX_FROM_FILE       = -3
    1414
    15 #include <directx9\d3d9.sbp>
    16 #include <directx9\d3dx9math.sbp>
    17 #include <directx9\d3dx9core.sbp>
    18 #include <directx9\d3dx9xof.sbp>
    19 #include <directx9\d3dx9mesh.sbp>
    20 #include <directx9\d3dx9shader.sbp>
    21 #include <directx9\d3dx9tex.sbp>
     15#require <directx9\d3d9.sbp>
     16#require <directx9\d3dx9math.sbp>
     17#require <directx9\d3dx9core.sbp>
     18#require <directx9\d3dx9xof.sbp>
     19#require <directx9\d3dx9mesh.sbp>
     20#require <directx9\d3dx9shader.sbp>
     21#require <directx9\d3dx9tex.sbp>
    2222
    2323

  • trunk/Include/directx9/d3dx9core.sbp

    r1 r497  
    11' d3dx9core.sbp
    2 
    3 
    4 #ifndef _INC_D3DX9CORE
    5 #define _INC_D3DX9CORE
    6 
    72
    83Class ID3DXBuffer
    … …  
    214209
    215210Declare Function D3DXCreateLine Lib "dx9abm" Alias "D3DXCreateLine_abm" (pDevice As LPDIRECT3DDEVICE9, ppLine As **ID3DXLine) As DWord
    216 
    217 
    218 #endif '_INC_D3DX9CORE

  • trunk/Include/directx9/d3dx9math.sbp

    r1 r497  
    11'd3dx9math.sbp
    2 
    3 
    4 #ifndef _INC_D3DX9MATH
    5 #define _INC_D3DX9MATH
    6 
    72
    83'---------------------------
    … …  
    3631
    3732Type D3DXMATRIX
    38     m[3,3] As Single
     33    m[3,3] As Single
    3934End Type
    4035
    … …  
    265260
    266261Declare Function D3DXCreateMatrixStack Lib "dx9abm" Alias "D3DXCreateMatrixStack_abm" (Flags As DWord, ppStack As **ID3DXMatrixStack) As DWord
    267 
    268 
    269 #endif '_INC_D3DX9MATH

  • trunk/Include/directx9/d3dx9mesh.sbp

    r1 r497  
    11'd3dx9mesh.sbp
    2 
    3 
    4 #ifndef _INC_D3DX9MESH
    5 #define _INC_D3DX9MESH
    6 
    72
    83' patch mesh can be quads or tris
    … …  
    1914    D3DXMESH_32BIT                  = &H001  'If set, then use 32 bit indices, if not set use 16 bit indices.
    2015    D3DXMESH_DONOTCLIP              = &H002  'Use D3DUSAGE_DONOTCLIP for VB & IB.
    21     D3DXMESH_POINTS                 = &H004  'Use D3DUSAGE_POINTS for VB & IB. 
    22     D3DXMESH_RTPATCHES              = &H008  'Use D3DUSAGE_RTPATCHES for VB & IB. 
    23     D3DXMESH_NPATCHES               = &H4000 'Use D3DUSAGE_NPATCHES for VB & IB. 
     16    D3DXMESH_POINTS                 = &H004  'Use D3DUSAGE_POINTS for VB & IB.
     17    D3DXMESH_RTPATCHES              = &H008  'Use D3DUSAGE_RTPATCHES for VB & IB.
     18    D3DXMESH_NPATCHES               = &H4000 'Use D3DUSAGE_NPATCHES for VB & IB.
    2419    D3DXMESH_VB_SYSTEMMEM           = &H010  'Use D3DPOOL_SYSTEMMEM for VB. Overrides D3DXMESH_MANAGEDVERTEXBUFFER
    25     D3DXMESH_VB_MANAGED             = &H020  'Use D3DPOOL_MANAGED for VB. 
     20    D3DXMESH_VB_MANAGED             = &H020  'Use D3DPOOL_MANAGED for VB.
    2621    D3DXMESH_VB_WRITEONLY           = &H040  'Use D3DUSAGE_WRITEONLY for VB.
    2722    D3DXMESH_VB_DYNAMIC             = &H080  'Use D3DUSAGE_DYNAMIC for VB.
    … …  
    7469
    7570Const Enum D3DXEFFECTDEFAULTTYPE
    76     D3DXEDT_STRING = &H1       ' pValue points to a null terminated ASCII string 
     71    D3DXEDT_STRING = &H1       ' pValue points to a null terminated ASCII string
    7772    D3DXEDT_FLOATS = &H2       ' pValue points to an array of floats - number of floats is NumBytes / sizeof(float)
    7873    D3DXEDT_DWORD  = &H3       ' pValue points to a DWORD
    … …  
    292287    Abstract Function GetPatchInfo(PatchInfo As *D3DXPATCHINFO) As DWord
    293288
    294     'Control mesh access   
     289    'Control mesh access
    295290    Abstract Function GetVertexBuffer(ppVB As **IDirect3DVertexBuffer9) As DWord
    296291    Abstract Function GetIndexBuffer(ppIB As **IDirect3DIndexBuffer9) As DWord
    … …  
    336331    'Set min bone influence. Bone influences that are smaller than this are ignored
    337332    Abstract Function SetMinBoneInfluence(MinInfl As Single) As DWord
    338     'Get min bone influence. 
     333    'Get min bone influence.
    339334    Abstract Function GetMinBoneInfluence() As Single
    340335
    … …  
    350345    Abstract Function Clone(ppSkinInfo As **ID3DXSkinInfo) As DWord
    351346
    352     'Update bone influence information to match vertices after they are reordered. This should be called 
     347    'Update bone influence information to match vertices after they are reordered. This should be called
    353348    'if the target vertex buffer has been reordered externally.
    354349    Abstract Function Remap(NumVertices As DWord, pVertexRemap As DWordPtr) As DWord
    … …  
    367362    Abstract Function ConvertToBlendedMesh(pMesh As *ID3DXMesh, Options As DWord, pAdjacencyIn As DWordPtr, pAdjacencyOut As DWordPtr, pFaceRemap As DWordPtr, ppVertexRemap As **ID3DXBuffer, pMaxFaceInfl As DWordPtr, pNumBoneCombinations As DWordPtr, ppBoneCombinationTable As **ID3DXBuffer, ppMesh As **ID3DXMesh) As DWord
    368363
    369     'Takes a mesh and returns a new mesh with per vertex blend weights and indices 
     364    'Takes a mesh and returns a new mesh with per vertex blend weights and indices
    370365    'and a bone combination table that describes which bones palettes affect which subsets of the mesh
    371366    Abstract Function ConvertToIndexedBlendedMesh(pMesh As *ID3DXMesh, Options As DWord, paletteSize As DWord, pAdjacencyIn As DWordPtr, pAdjacencyOut As DWordPtr, pFaceRemap As DWordPtr, ppVertexRemap As **ID3DXBuffer, pMaxVertexInfl As DWordPtr, pNumBoneCombinations As DWordPtr, ppBoneCombinationTable As **ID3DXBuffer, ppMesh As **ID3DXMesh) As DWord
    … …  
    430425Declare Function D3DXOptimizeFaces Lib "dx9abm" Alias "D3DXOptimizeFaces_abm" (pbIndices As VoidPtr, cFaces As DWord, cVertices As DWord, b32BitIndices As Long, pFaceRemap As DWordPtr) As DWord
    431426Declare Function D3DXOptimizeVertices Lib "dx9abm" Alias "D3DXOptimizeVertices_abm" (pbIndices As VoidPtr, cFaces As DWord, cVertices As DWord, b32BitIndices As Long, pFaceRemap As DWordPtr) As DWord
    432 
    433 
    434 #endif '_INC_D3DX9MESH

  • trunk/Include/directx9/d3dx9shader.sbp

    r1 r497  
    11' d3dx9shader.sbp
    2 
    3 
    4 #ifndef _INC_D3DX9SHADER
    5 #define _INC_D3DX9SHADER
    6 
    72
    83TypeDef D3DXHANDLE = BytePtr
    … …  
    217212Declare Function D3DXCompileShaderFromResource Lib "dx9abm" Alias "D3DXCompileShaderFromResource_abm" (hSrcModule As HINSTANCE, pSrcResource As BytePtr, pDefines As *D3DXMACRO, pInclude As LPD3DXINCLUDE, pFunctionName As BytePtr, pProfile As BytePtr, Flags As DWord, ppShader As *LPD3DXBUFFER, ppErrorMsgs As *LPD3DXBUFFER, ppConstantTable As *LPD3DXCONSTANTTABLE) As DWord
    218213Declare Function D3DXCompileShader Lib "dx9abm" Alias "D3DXCompileShader_abm" (pSrcData As BytePtr, SrcDataLen As DWord, pDefines As *D3DXMACRO, pInclude As LPD3DXINCLUDE, pFunctionName As BytePtr, pProfile As BytePtr, Flags As DWord, ppShader As *LPD3DXBUFFER, ppErrorMsgs As *LPD3DXBUFFER, ppConstantTable As *LPD3DXCONSTANTTABLE) As DWord
    219 
    220 
    221 #endif '_INC_D3DX9SHADER

  • trunk/Include/directx9/d3dx9tex.sbp

    r381 r497  
    11'd3dx9tex.sbp
    2 
    3 
    4 #ifndef _INC_D3DX9TEX
    5 #define _INC_D3DX9TEX
    6 
    72
    83' D3DX_FILTER flags
    … …  
    143138Declare Function D3DXFillVolumeTextureTX Lib "dx9abm" Alias "D3DXFillVolumeTextureTX_abm" (pVolumeTexture As LPDIRECT3DVOLUMETEXTURE9, pTextureShader As LPD3DXTEXTURESHADER) As DWord
    144139Declare Function D3DXComputeNormalMap Lib "dx9abm" Alias "D3DXComputeNormalMap_abm" (pTexture As LPDIRECT3DTEXTURE9, pSrcTexture As LPDIRECT3DTEXTURE9, pSrcPalette As *PALETTEENTRY, Flags As DWord, Channel As DWord, Amplitude As Single) As DWord
    145 
    146 
    147 #endif '_INC_D3DX9TEX
    148 

  • trunk/Include/directx9/d3dx9xof.sbp

    r1 r497  
    11' d3dx9xof.sbp
    2 
    3 
    4 #ifndef _INC_D3DX9XOF
    5 #define _INC_D3DX9XOF
    6 
    72
    83Class ID3DXFile
    … …  
    6459'未完成
    6560'Declare Function  Lib "dx9abm" Alias "_abm" () As DWord
    66 
    67 
    68 #endif '_INC_D3DX9XOF

  • trunk/Include/directx9/dmdls.sbp

    r1 r497  
    11' dmdls.sbp - DLS download definitions for DirectMusic API's
    2 
    3 
    4 #ifndef _INC_DMDLS
    5 #define _INC_DMDLS
    6 
    72
    83Type DMUS_NOTERANGE
    … …  
    105    dwHighNote As DWord  'Sets the high note for the range of MIDI note events to which the instrument responds.
    116End Type
    12 
    13 
    14 #endif '_INC_DMDLS

  • trunk/Include/directx9/dmplugin.sbp

    r1 r497  
    11' dmplugin.sbp - This module contains the API for plugins for the DirectMusic performance layer
    2 
    3 
    4 #ifndef _INC_DMPLUGIN
    5 #define _INC_DMPLUGIN
    6 
    72
    83Class IDirectMusicTool
    … …  
    5348    Abstract Function EndPlay(pStateData As VoidPtr) As DWord
    5449    Abstract Function Play(pStateData As VoidPtr, mtStart As MUSIC_TIME, mtEnd As MUSIC_TIME, mtOffset As MUSIC_TIME, dwFlags As DWord, pPerf As *IDirectMusicPerformance, pSegSt As *IDirectMusicSegmentState, dwVirtualID As DWord) As DWord
    55     Abstract Function GetParam(ByRef rguidType As GUID, mtTime As MUSIC_TIME, pmtNext As *MUSIC_TIME, pParam As VoidPtr) As DWord 
     50    Abstract Function GetParam(ByRef rguidType As GUID, mtTime As MUSIC_TIME, pmtNext As *MUSIC_TIME, pParam As VoidPtr) As DWord
    5651    Abstract Function SetParam(ByRef rguidType As GUID, mtTime As MUSIC_TIME, pParam As VoidPtr) As DWord
    5752    Abstract Function IsParamSupported(ByRef rguidType As GUID) As DWord
    … …  
    7166    Abstract Function Join(pNewTrack As *IDirectMusicTrack, mtJoin As MUSIC_TIME, pContext As *IUnknown, dwTrackGroup As DWord, ppResultTrack As **IDirectMusicTrack) As DWord
    7267End Class
    73 
    74 
    75 #endif '_INC_DMPLUGIN

  • trunk/Include/directx9/dmusic.sbp

    r1 r497  
    66
    77
    8 #include <directx9\dsound.sbp>
    9 #include <directx9\dmdls.sbp>
    10 #include <directx9\dmusicc.sbp>
    11 #include <directx9\dmplugin.sbp>
     8#require <directx9\dsound.sbp>
     9#require <directx9\dmdls.sbp>
     10#require <directx9\dmusicc.sbp>
     11#require <directx9\dmplugin.sbp>
    1212
    1313

  • trunk/Include/directx9/dmusicc.sbp

    r1 r497  
    11' dmusicc.sbp - This module defines the DirectMusic core API's
    2 
    3 
    4 #ifndef _INC_DMUSICC
    5 #define _INC_DMUSICC
    6 
    72
    83Const DMUS_MAX_DESCRIPTION = 128
    … …  
    5348    dwMemorySize As DWord
    5449    dwMaxChannelGroups As DWord
    55     dwMaxVoices As DWord   
     50    dwMaxVoices As DWord
    5651    dwMaxAudioChannels As DWord
    5752    dwEffectFlags As DWord
    … …  
    262257Dim IID_IDirectMusicInstrument = [&Hd2ac287d, &Hb39b, &H11d1, [&H87, &H4, &H0, &H60, &H8, &H93, &Hb1, &Hbd]] As GUID
    263258Dim IID_IDirectMusicDownloadedInstrument = [&Hd2ac287e, &Hb39b, &H11d1, [&H87, &H4, &H0, &H60, &H8, &H93, &Hb1, &Hbd]] As GUID
    264 
    265 
    266 #endif '_INC_DMUSICC

  • trunk/Include/directx9/dsound.sbp

    r1 r497  
    11' dsound.sbp
    2 
    3 
    4 #ifndef _INC_DSOUND
    5 #define _INC_DSOUND
    6 
    7 
    82Const DIRECTSOUND_VERSION = &H0900
    93
    … …  
    634628' Waves Reverberation {87FC0268-9A55-4360-95AA-004A1D9DE26C}
    635629Dim GUID_DSFX_WAVES_REVERB = [&H87fc0268, &H9a55, &H4360, [&H95, &Haa, &H00, &H4a, &H1d, &H9d, &He2, &H6c]] As GUID
    636 
    637 
    638 #endif '_INC_DSOUND

  • trunk/Include/gl/gl.sbp

    r184 r497  
    1 #ifndef _INC_GL
    2 #define _INC_GL
     1'gl/gl.sbp
    32
    43TypeDef GLenum = DWord
    … …  
    10181017TypeDef PFNGLGETCOLORTABLEPARAMETERIVEXTPROC = *Sub(target As GLenum, pname As GLenum, params As *GLint)
    10191018TypeDef PFNGLGETCOLORTABLEPARAMETERFVEXTPROC = *Sub(target As GLenum, pname As GLenum, params As *GLfloat)
    1020 
    1021 #endif /* _INC_GL */

  • trunk/Include/gl/glu.sbp

    r1 r497  
    1 #ifndef _INC_GLU
    2 #define _INC_GLU
    3 
    41Function gluErrorStringWIN(errCode As GLenum) As PSTR
    52    gluErrorStringWIN = gluErrorString(errCode) As PSTR
    … …  
    224221Const GLU_ERROR = GLU_TESS_ERROR
    225222Const GLU_EDGE_FLAG = GLU_TESS_EDGE_FLAG
    226 
    227 #endif '_INC_GLU

  • trunk/Include/gl/glut.sbp

    r1 r497  
    1 #ifndef _INC_GLUT
    2 #define _INC_GLUT
    3 
    4 #include <GL/gl.sbp>
    5 #include <GL/glu.sbp>
    6  
     1#require <GL/gl.sbp>
     2#require <GL/glu.sbp>
     3
    74Const GLUT_XLIB_IMPLEMENTATION = 13
    85
    … …  
    351348Declare Sub glutLeaveGameMode Lib "glut32" ()
    352349Declare Function glutGameModeGet Lib "glut32" (mode As GLenum) As Long
    353 
    354 #endif '_INC_GLUT

  • trunk/Include/guiddef.ab

    r300 r497  
    3030End Function
    3131
    32 #ifndef _SYS_GUID_OPERATOR_EQ_
    33 #ifdef _NO_SYS_GUID_OPERATOR_EQ_
    34 #define _SYS_GUID_OPERATOR_EQ_
    3532/*
    3633Function Operator ==(ByRef x As GUID, ByRef y As GUID) As Boolean
    … …  
    4239End Function
    4340*/
    44 #endif
    45 #endif

  • trunk/Include/objbase.sbp

    r303 r497  
    11' objbase.sbp
    2 
    3 #ifndef _INC_OBJBASE
    4 #define _INC_OBJBASE
    52
    63TypeDef RPC_AUTH_IDENTITY_HANDLE = VoidPtr 'Declared in Rpcdce.sbp; include Rpc.sbp.
    … …  
    8986Const CLSCTX_INPROC = CLSCTX_INPROC_SERVER or CLSCTX_INPROC_HANDLER
    9087'#if (_WIN32_WINNT >= &h0400) Or defined(_WIN32_DCOM)
    91 #ifdef _WIN32_DCOM
    9288Const CLSCTX_ALL    = CLSCTX_INPROC_SERVER or CLSCTX_INPROC_HANDLER or CLSCTX_LOCAL_SERVER or CLSCTX_REMOTE_SERVER
    9389Const CLSCTX_SERVER = CLSCTX_INPROC_SERVER or CLSCTX_LOCAL_SERVER or CLSCTX_REMOTE_SERVER
    94 #else
    95 Const CLSCTX_ALL    = CLSCTX_INPROC_SERVER or CLSCTX_INPROC_HANDLER or CLSCTX_LOCAL_SERVER
    96 Const CLSCTX_SERVER = CLSCTX_INPROC_SERVER or CLSCTX_LOCAL_SERVER
    97 #endif
     90'#else
     91'Const CLSCTX_ALL    = CLSCTX_INPROC_SERVER or CLSCTX_INPROC_HANDLER or CLSCTX_LOCAL_SERVER
     92'Const CLSCTX_SERVER = CLSCTX_INPROC_SERVER or CLSCTX_LOCAL_SERVER
     93'#endif
    9894
    9995Const Enum REGCLS
    … …  
    115111
    116112'#if (_WIN32_WINNT >= &h0400) Or defined(_WIN32_DCOM)
    117 #ifdef _WIN32_DCOM
    118113Const Enum COINIT
    119114    COINIT_MULTITHREADED     = &h0
    … …  
    124119Declare Function CoInitializeEx Lib "ole32" (pvReserved As VoidPtr, dwCoInit As DWord) As HRESULT
    125120Declare Function CoGetCallerTID Lib "ole32" (ByRef dwTID AS DWord) As HRESULT
    126 #endif
     121'#endif
    127122
    128123#ifdef __UNDECLARED__
    … …  
    220215
    221216'#if (_WIN32_WINNT >= &h0400) Or defined(_WIN32_DCOM) 'DCOM
    222 #ifdef _WIN32_DCOM
    223217
    224218/* Call Security. */
    225219
     220/*SOLE_AUTHENTICATION_SERVICE未定義
    226221Declare Function CoInitializeSecurity Lib "ole32" (
    227222    ByVal pSecDesc As *SECURITY_DESCRIPTOR,
    … …  
    231226    ByVal dwImpLevel As DWord,
    232227    ByVal pAuthList As VoidPtr,
    233     ByVal dwCapabilities As DWord
     228    ByVal dwCapabilities As DWord,
    234229    ByVal pReserved3 As VoidPtr) As HRESULT
     230*/
    235231Declare Function CoGetCallContext Lib "ole32" (
    236232    ByRef riid As IID,
    … …  
    243239    ByVal pAuthnLevel As *DWord,
    244240    ByVal pImpLevel As *DWord,
    245     ByVal pAuthInfo As *RPC_AUTH_IDENTITY_HANDLE
     241    ByVal pAuthInfo As *RPC_AUTH_IDENTITY_HANDLE,
    246242    ByVal pCapabilites As *DWord) As HRESULT
    247243Declare Function CoSetProxyBlanket Lib "ole32" (
    … …  
    263259    ByVal pAuthnLevel As *DWord,
    264260    ByVal pImpLevel As *DWord,
    265     ByVal pPrivs As *RPC_AUTHZ_HANDLE
     261    ByVal pPrivs As *RPC_AUTHZ_HANDLE,
    266262    ByVal pCapabilities As *DWord) As HRESULT
    267263Declare Function CoImpersonateClient Lib "ole32" () As HRESULT
    … …  
    281277Const COM_RIGHTS_ACTIVATE_LOCAL = 8
    282278Const COM_RIGHTS_ACTIVATE_REMOTE = 16
    283 
    284 #endif ' DCOM
     279'#endif ' DCOM
    285280
    286281Declare Function CoCreateInstance Lib "ole32" (ByRef clsid As CLSID, pUnknown As *IUnknown, dwClsContext As DWord, ByRef refiid As IID, ByRef pObj As Any) As HRESULT
    287282
    288283'#if (_WIN32_WINNT >= &h0400) Or defined(_WIN32_DCOM) 'DCOM
    289 #ifdef _WIN32_DCOM
    290284Declare Function CoGetInstanceFromFile Lib "ole32" (
    291285    ByVal pServerInfo As *COSERVERINFO,
    … …  
    294288    ByVal dwClsCtx As DWord,
    295289    ByVal grfMode As DWord,
    296     ByVal pwszName As *OLECHAR
     290    ByVal pwszName As *OLECHAR,
    297291    ByVal dwCount As DWord,
    298292    ByVal pResults As *MULTI_QI) As HRESULT
    … …  
    304298    ByVal dwClsCtx As DWord,
    305299    ByVal grfMode As DWord,
    306     ByVal pstg As *IStorage
     300    ByVal pstg As *IStorage,
    307301    ByVal dwCount As DWord,
    308302    ByVal pResults As *MULTI_QI) As HRESULT
    … …  
    312306    ByVal punkOuter As *IUnknown,
    313307    ByVal dwClsCtx As DWord,
    314     ByVal pServerInfo As COSERVERINFO,
     308    ByVal pServerInfo As *COSERVERINFO,
    315309    ByVal dwCount As DWord,
    316310    ByVal pResults As *MULTI_QI) As HRESULT
    317 #endif ' DCOM
     311'#endif ' DCOM
    318312
    319313/* Call related APIs */
    320314'#if (_WIN32_WINNT >= &h0400) Or defined(_WIN32_DCOM) 'DCOM
    321 #ifdef _WIN32_DCOM
    322 
    323315Declare Function CoGetCancelObject Lib "ole32" (dwThreadId As DWord, ByRef iid As IID, ByRef pUnk As Any) As HRESULT
    324316Declare Function CoSetCancelObject Lib "ole32" (pUnk As *IUnknown) As HRESULT
    … …  
    329321Declare Function CoAllowSetForegroundWindow Lib "ole32" (pUnk As *IUnknown, pvReserved As VoidPtr) As HRESULT
    330322Declare Function DcomChannelSetHResult Lib "ole32" (pvReserved As HRESULT, pulReserved As DWord, appsHR As HRESULT) As HRESULT
    331 
    332 #endif
     323'#endif
    333324
    334325/* other helpers */
    … …  
    353344
    354345'#if (_WIN32_WINNT >= &h0400) Or defined(_WIN32_DCOM) 'DCOM
    355 #ifdef _WIN32_DCOM
    356 Declare Function CoRegisterChannelHook Lib "ole32" (ByRef ExtensionUuid As GUID, pChannelHook As *IChannelHook) As HRESULT
    357 #endif ' DCOM
     346'IChannelHook未定義
     347'Declare Function CoRegisterChannelHook Lib "ole32" (ByRef ExtensionUuid As GUID, pChannelHook As *IChannelHook) As HRESULT
     348'#endif ' DCOM
    358349
    359350'#if (_WIN32_WINNT >= &h0400) Or defined(_WIN32_DCOM) 'DCOM
    360 #ifdef _WIN32_DCOM
    361351
    362352Declare Function CoWaitForMultipleHandles Lib "ole32" (
    … …  
    375365End Enum
    376366
    377 #endif ' DCOM
     367'#endif ' DCOM
    378368
    379369/* for flushing OLESCM remote binding handles */
    … …  
    551541    ByVal pIbscCaller As *IBindStatusCallback,
    552542    ByRef pIbsc As *IBindStatusCallback) As HRESULT
    553 
    554 
    555 #endif '_INC_OBJBASE

  • trunk/Include/objidl.sbp

    r478 r497  
    1 #ifndef _INC_OBJIDL
    2 #define _INC_OBJIDL
     1'Include/objidl.sbp
    32
    43TypeDef SNB = **OLECHAR
    … …  
    132131
    133132/* interface IExternalConnection */
    134 /* [uuid][local][object] */ 
     133/* [uuid][local][object] */
    135134
    136135Const Enum EXTCONN
    … …  
    144143Interface IExternalConnection
    145144    Inherits IUnknown
    146    
     145
    147146    Function AddConnection(
    148147        /* [in] */ extconn As DWord,
    149148        /* [in] */ reserved As DWord) As DWord
    150     Function ReleaseConnection( 
     149    Function ReleaseConnection(
    151150        /* [in] */ extconn As DWord,
    152151        /* [in] */ reserved As DWord,
    … …  
    170169
    171170/* interface AsyncIMultiQI */
    172 /* [uuid][local][object] */ 
     171/* [uuid][local][object] */
    173172
    174173
    … …  
    185184
    186185/* interface IInternalUnknown */
    187 /* [uuid][local][object] */ 
     186/* [uuid][local][object] */
    188187Dim IID_IInternalUnknown = [&h00000021, 0, 0, [&hC0, 0, 0, 0, 0, 0, 0, &h46]] As IID
    189188Interface IInternalUnknown
    … …  
    539538End Interface
    540539
    541 TypeDef LPSTREAM = *IStream
    542 
    543540/* interface IEnumSTATSTG */
    544541/* [unique][uuid][object] */
    … …  
    561558/* interface IStorage */
    562559/* [unique][uuid][object] */
    563 
    564 TypeDef LPSTORAGE = /* [unique] */ *IStorage
    565560
    566561Type RemSNB
    … …  
    989984
    990985Dim IID_IGlobalInterfaceTable = [&h00000146, 0, 0, [&hC0, 0, 0, 0, 0, 0, 0, &h46]] As IID
    991 Interface IGlobalInterfaceTable 
     986Interface IGlobalInterfaceTable
    992987    Inherits IUnknown
    993988
    … …  
    10671062
    10681063' IInitializeSpy
    1069 
    1070 #endif '_INC_OBJIDL

  • trunk/Include/ole2.ab

    r478 r497  
    1 #ifndef __OLE2_AB__
    2 #define __OLE2_AB__
    3 
    41' 暫定措置
    52
    … …  
    309306Declare Function OleLoadPicture Lib "olepro32" (stream As IStream, lSize As Long, fRunmode As BOOL, ByRef riid As IID, ppvObj As VoidPtr) As HRESULT
    310307#endif '__UNDEFINED
    311 #endif ' __OLE2_AB__

  • trunk/Include/qos.ab

    r300 r497  
    11' qos.ab
    2 #ifndef _INC_QOS_AB
    3 #define _INC_QOS_AB
    42
    53' Definitions for valued-based Service Type for each direction of data flow.
    … …  
    7674End Type
    7775TypeDef LPQOS_SHAPING_RATE = *QOS_SHAPING_RATE
    78 
    79 #endif '_INC_QOS_AB

  • trunk/Include/system/string.sbp

    r478 r497  
    11'string.sbp
    22'文字列変数の操作用
    3 
    4 #ifndef _INC_BASIC_STRING
    5 #define _INC_BASIC_STRING
    63
    74Function StrPtr(s As String) As *Char
    … …  
    319316
    320317#ifndef UNICODE
    321 Typedef BoxedStrChar = System.SByte
     318TypeDef BoxedStrChar = System.SByte
    322319#else
    323320TypeDef BoxedStrChar = System.UInt16
    324321#endif
    325 
    326 #endif '_INC_BASIC_STRING

  • trunk/Include/unknwn.sbp

    r381 r497  
    11' unknwn.sbp
    22' 本来はunknwn.idlから生成するのが正当ですが、これは手動で移植したものです。
    3 
    4 #ifndef _INC_UNKNWN
    5 #define _INC_UNKNWN
    63
    74'-------------------
    … …  
    1714    Function Release() As DWord
    1815End Interface
    19 TypeDef LPUNKNOWN = *IUnknown
    2016
    2117Dim IID_AsyncIUnknown = [&H000e0000, &H0000, &H0000, [&HC0, &H00, &H00, &H00, &H00, &H00, &H00, &H46]] As IID
    … …  
    3733    Inherits IUnknown
    3834
    39     Function CreateInstance(ByVal pUnkOuter As *IUnknown, ByRef riid As IID, ByRef ppvObject As Any) As HRESULT
     35    Function CreateInstance(ByVal unkOuter As IUnknown, ByRef riid As IID, ByRef ppvObject As Any) As HRESULT
    4036    Function LockServer(ByVal fLock As BOOL) As HRESULT
    4137End Interface
    42 
    43 #endif '_INC_UNKNWN

  • trunk/Include/windef.ab

    r300 r497  
    11' windef.ab
    2 
    3 #ifndef _WINDEF_
    4 #define _WINDEF_
    52
    63'#ifndef WINVER
    … …  
    85'#endif
    96
    10 #ifndef BASETYPES
    11 #define BASETYPES
    127'TypeDef ULONG = DWord
    138'TypeDef PULONG = *ULONG
    … …  
    1712TypeDef PUCHAR = *UCHAR
    1813'TypeDef PSZ = *SByte
    19 #endif
    2014
    2115Const MAX_PATH = 260
    2216
    23 '#ifndef NULL
    24 '#define NULL
    2517Const NULL = 0 As VoidPtr
    26 '#endif
    27 
    28 '#ifndef FALSE
    29 '#define FALSE
     18
    3019Const FALSE = 0
    31 '#endif
    32 
    33 '#ifndef TRUE
    34 '#define TRUE
    3520Const TRUE = 1
    36 '#endif
    3721
    3822TypeDef DWORD = DWord
    … …  
    6044'TypeDef PUINT = *DWord
    6145
    62 #ifndef NT_INCLUDED
    6346#require <winnt.ab>
    64 #endif
    6547
    6648'#require <specstrings.ab>
    … …  
    8870Const LOWORD(dw) = ((dw As DWord) And &HFFFF) As Word
    8971
    90 #ifndef WIN_INTERNAL
    9172Type _System_DeclareHandle_HWND:unused As DWord:End Type
    9273TypeDef HWND = *_System_DeclareHandle_HWND
    9374Type _System_DeclareHandle_HHOOK:unused As DWord:End Type
    9475TypeDef HHOOK = *_System_DeclareHandle_HHOOK
    95 #ifdef WINABLE
    96 Type _System_DeclareHandleHEVENT:unused As DWord:End Type
     76Type _System_DeclareHandle_HEVENT:unused As DWord:End Type
    9777TypeDef HEVENT = *_System_DeclareHandle_HEVENT
    98 #endif
    99 #endif
    10078
    10179TypeDef ATOM = Word
    … …  
    11795TypeDef PHKEY = *HKEY
    11896
    119 #ifndef WIN_INTERNAL
    12097Type _System_DeclareHandle_HACCEL:unused As DWord:End Type
    12198TypeDef HACCEL = *_System_DeclareHandle_HACCEL
    122 #endif
    123 #ifndef GDI_INTERNAL
    12499Type _System_DeclareHandle_HBITMAP:unused As DWord:End Type
    125100TypeDef HBITMAP = *_System_DeclareHandle_HBITMAP
    126101Type _System_DeclareHandle_HBRUSH:unused As DWord:End Type
    127102TypeDef HBRUSH = *_System_DeclareHandle_HBRUSH
    128 #endif
    129103Type _System_DeclareHandle_HCOLORSPACE:unused As DWord:End Type
    130104TypeDef HCOLORSPACE = *_System_DeclareHandle_HCOLORSPACE
    131 #ifndef GDI_INTERNAL
    132105Type _System_DeclareHandle_HDC:unused As DWord:End Type
    133106TypeDef HDC = *_System_DeclareHandle_HDC
    134 #endif
    135107Type _System_DeclareHandle_HGLRC:unused As DWord:End Type
    136108TypeDef HGLRC = *_System_DeclareHandle_HGLRC
    … …  
    139111Type _System_DeclareHandle_HENHMETAFILE:unused As DWord:End Type
    140112TypeDef HENHMETAFILE = *_System_DeclareHandle_HENHMETAFILE
    141 #ifndef GDI_INTERNAL
    142113Type _System_DeclareHandle_HFONT:unused As DWord:End Type
    143114TypeDef HFONT = *_System_DeclareHandle_HFONT
    144 #endif
    145115Type _System_DeclareHandle_HICON:unused As DWord:End Type
    146116TypeDef HICON = *_System_DeclareHandle_HICON
    147 #ifndef WIN_INTERNAL
    148117Type _System_DeclareHandle_HMENU:unused As DWord:End Type
    149118TypeDef HMENU = *_System_DeclareHandle_HMENU
    150 #endif
    151119Type _System_DeclareHandle_HMETAFILE:unused As DWord:End Type
    152120TypeDef HMETAFILE = *_System_DeclareHandle_HMETAFILE
    … …  
    154122TypeDef HINSTANCE = *_System_DeclareHandle_HINSTANCE
    155123TypeDef HMODULE = HINSTANCE
    156 #ifndef GDI_INTERNAL
    157124Type _System_DeclareHandle_HPALETTE:unused As DWord:End Type
    158125TypeDef HPALETTE = *_System_DeclareHandle_HPALETTE
    159126Type _System_DeclareHandle_HPEN:unused As DWord:End Type
    160127TypeDef HPEN = *_System_DeclareHandle_HPEN
    161 #endif
    162128Type _System_DeclareHandle_HRGN:unused As DWord:End Type
    163129TypeDef HRGN = *_System_DeclareHandle_HRGN
    … …  
    249215TypeDef PFILETIME = *FILETIME
    250216TypeDef LPFILETIME = *FILETIME
    251 
    252 #define _FILETIME_
    253217
    254218Const DM_UPDATE = 1
    … …  
    280244Const DC_ORIENTATION = 17
    281245Const DC_COPIES = 18
    282 
    283 #endif

  • trunk/Include/windows.sbp

    r473 r497  
    11' Windows.sbp - declarations file for Windows API.
    2 
    3 
    4 #ifndef _INC_WINDOWS
    5 #define _INC_WINDOWS
    62
    73TypeDef OLECHAR = WCHAR
    … …  
    4844Const GET_X_LPARAM(lp) = ((LOWORD(lp) As Integer) As Long)
    4945Const GET_Y_LPARAM(lp) = ((HIWORD(lp) As Integer) As Long)
    50 
    51 #endif '_INC_WINDOWS

  • trunk/Include/winver.ab

    r300 r497  
    11' Winver.ab
    2 
    3 #ifndef __WINVER_AB
    4 #define __WINVER_AB
    52
    63#ifdef UNICODE
    … …  
    210207    ByRef uLen As DWord _
    211208) As BOOL
    212 
    213 #endif '__WINVER_AB
Note: See TracChangeset for help on using the changeset viewer.