Changeset 179


Ignore:
Timestamp:
Mar 25, 2007, 6:20:49 AM (17 years ago)
Author:
dai
Message:

_SystemEnd関数を追加（コンパイラが内部的に使います）。
WCHAR、Charをbasic.sbpで定義した。
LONGLONG、LONG、DWORD、WORD、BYTEなどのTypeDefを有効にした（#92に関連する変更）。
その他タイプミスを修正。

Location:
Include
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • Include/WinNT.ab

    r176 r179  
    213213
    214214'#define _ULONGLONG_
    215 'TypeDef LONGLONG = Int64
    216 'TypeDef ULONGLONG = QWord
    217 
    218 'Const MAXLONGLONG = (&h7fffffffffffffff)
    219 
    220 'TypeDef PLONGLONG = *LONGLONG
    221 'TypeDef PULONGLONG = *ULONGLONG
     215TypeDef LONGLONG = Int64
     216TypeDef ULONGLONG = QWord
     217
     218Const MAXLONGLONG = (&h7fffffffffffffff)
     219'#endif
     220
     221TypeDef PLONGLONG = *LONGLONG
     222TypeDef PULONGLONG = *ULONGLONG
    222223
    223224TypeDef USN = LONGLONG
    … …  
    262263    Blink As *LIST_ENTRY
    263264End Type
    264 TypeDef PLIST_ENTRY = *PLIST_ENTRY
    265 TypeDef PRLIST_ENTRY = *PLIST_ENTRY
     265TypeDef PLIST_ENTRY = *LIST_ENTRY
     266TypeDef PRLIST_ENTRY = *LIST_ENTRY
    266267
    267268Type SINGLE_LIST_ENTRY
    … …  
    21452146TypeDef PSECURITY_QUALITY_OF_SERVICE = *SECURITY_QUALITY_OF_SERVICE
    21462147
    2147 Type PSE_IMPERSONATION_STATE
     2148Type SE_IMPERSONATION_STATE
    21482149    Token As PACCESS_TOKEN
    21492150    CopyOnOpen As BOOLEAN
    … …  
    22772278Const THREAD_BASE_PRIORITY_IDLE = (-15)
    22782279
    2279 Type PQUOTA_LIMITS
     2280Type QUOTA_LIMITS
    22802281    PagedPoolLimit As SIZE_T
    22812282    NonPagedPoolLimit As SIZE_T
    … …  
    23172318'#endif
    23182319
    2319 Type PQUOTA_LIMITS_EX
     2320Type QUOTA_LIMITS_EX
    23202321    PagedPoolLimit As SIZE_T
    23212322    NonPagedPoolLimit As SIZE_T
    … …  
    23902391TypeDef PJOBOBJECT_BASIC_UI_RESTRICTIONS = *JOBOBJECT_BASIC_UI_RESTRICTIONS
    23912392
    2392 Type _JOBOBJECT_SECURITY_LIMIT_INFORMATION
     2393Type JOBOBJECT_SECURITY_LIMIT_INFORMATION
    23932394    SecurityLimitFlags As DWord
    23942395    JobToken As HANDLE
    … …  
    31053106End Enum
    31063107
    3107 Type
     3108Type SET_POWER_SETTING_VALUE
    31083109    Version As DWord
    31093110    Guid As GUID
    … …  
    46704671Const IMAGE_ARCHIVE_LONGNAMES_MEMBER = Ex"//              "
    46714672
    4672 Type PIMAGE_ARCHIVE_MEMBER_HEADER
     4673Type IMAGE_ARCHIVE_MEMBER_HEADER
    46734674    Name[ELM(16)] As Byte
    46744675    Date[ELM(12)] As Byte
    … …  
    47694770Const IMAGE_ORDINAL_FLAG = IMAGE_ORDINAL_FLAG32
    47704771Const IMAGE_ORDINAL(Ordinal) = IMAGE_ORDINAL32(Ordinal)
    4771 TypeDef IMAGE_THUNK_DATA = IMAGE_THUNK_DAT32
     4772TypeDef IMAGE_THUNK_DATA = IMAGE_THUNK_DATA32
    47724773TypeDef PIMAGE_THUNK_DATA = PIMAGE_THUNK_DATA32
    47734774Const IMAGE_SNAP_BY_ORDINAL(Ordinal) = IMAGE_SNAP_BY_ORDINAL32(Ordinal)
    … …  
    56055606Const WT_TRANSFER_IMPERSONATION = &h00000100
    56065607'Const WT_SET_MAX_THREADPOOL_THREADS(Flags, Limit)  ((Flags) Or= (Limit)<<16)
    5607 TypeDef WAITORTIMERCALLBACKFUNC = *Sub(p As VoidPtr, b As BOOLEAN)
     5608TypeDef WAITORTIMERCALLBACKFUNC = *Sub(p As VoidPtr, b As Boolean)
    56085609TypeDef WORKERCALLBACKFUNC = *Sub(p As VoidPtr)
    56095610TypeDef APC_CALLBACK_FUNCTION = *Sub(dw AS DWord, p1 As VoidPtr, p2 As VoidPtr)
    … …  
    56505651
    56515652' compatibility with old names
    5652 TypeDef  _ASSEMBLY_DLL_REDIRECTION_DETAILED_INFORMATION =  _ASSEMBLY_FILE_DETAILED_INFORMATION
    5653 TypeDef   ASSEMBLY_DLL_REDIRECTION_DETAILED_INFORMATION =   ASSEMBLY_FILE_DETAILED_INFORMATION
     5653TypeDef  _ASSEMBLY_DLL_REDIRECTION_DETAILED_INFORMATION =  ASSEMBLY_FILE_DETAILED_INFORMATION
     5654TypeDef   ASSEMBLY_DLL_REDIRECTION_DETAILED_INFORMATION =  ASSEMBLY_FILE_DETAILED_INFORMATION
    56545655TypeDef  PASSEMBLY_DLL_REDIRECTION_DETAILED_INFORMATION =  PASSEMBLY_FILE_DETAILED_INFORMATION
    56555656TypeDef PCASSEMBLY_DLL_REDIRECTION_DETAILED_INFORMATION = PCASSEMBLY_FILE_DETAILED_INFORMATION

  • Include/api_imm.sbp

    r174 r179  
    116116#endif
    117117
    118 #if (WINVER >= 0x040A)
     118'#if (WINVER >= 0x040A)
    119119
    120120Const IMEMENUITEM_STRING_SIZE = 80
    … …  
    221221#endif
    222222
    223 Declare Function ImmSetCompositionStringA Lib "imm32" (himc As HIMC, dwIndex As DWord, lpComp As VoidPtr, dwCompLen As DWord, lpRead As VoidPtr, dwReadLen As DWord
    224 Declare Function ImmSetCompositionStringW Lib "imm32" (himc As HIMC, dwIndex As DWord, lpComp As VoidPtr, dwCompLen As DWord, lpRead As VoidPtr, dwReadLen As DWord
    225 #ifdef UNICODE
    226 Declare Function ImmSetCompositionString Lib "imm32" Alias "ImmSetCompositionStringW" (himc As HIMC, dwIndex As DWord, lpComp As VoidPtr, dwCompLen As DWord, lpRead As VoidPtr, dwReadLen As DWord
    227 #else
    228 Declare Function ImmSetCompositionString Lib "imm32" Alias "ImmSetCompositionStringA" (himc As HIMC, dwIndex As DWord, lpComp As VoidPtr, dwCompLen As DWord, lpRead As VoidPtr, dwReadLen As DWord
     223Declare Function ImmSetCompositionStringA Lib "imm32" (himc As HIMC, dwIndex As DWord, lpComp As VoidPtr, dwCompLen As DWord, lpRead As VoidPtr, dwReadLen As DWord ) As BOOL
     224Declare Function ImmSetCompositionStringW Lib "imm32" (himc As HIMC, dwIndex As DWord, lpComp As VoidPtr, dwCompLen As DWord, lpRead As VoidPtr, dwReadLen As DWord ) As BOOL
     225#ifdef UNICODE
     226Declare Function ImmSetCompositionString Lib "imm32" Alias "ImmSetCompositionStringW" (himc As HIMC, dwIndex As DWord, lpComp As VoidPtr, dwCompLen As DWord, lpRead As VoidPtr, dwReadLen As DWord ) As BOOL
     227#else
     228Declare Function ImmSetCompositionString Lib "imm32" Alias "ImmSetCompositionStringA" (himc As HIMC, dwIndex As DWord, lpComp As VoidPtr, dwCompLen As DWord, lpRead As VoidPtr, dwReadLen As DWord ) As BOOL
    229229#endif
    230230
    … …  
    260260#ifdef _INC_GDI '_WINGDI_
    261261#ifndef NOGID
    262 #ifdef UNICODE
    263262Declare Function ImmGetCompositionFontA Lib "imm32" (hIMC As HIMC, ByRef lf As LOGFONTA) As BOOL
    264263Declare Function ImmGetCompositionFontW Lib "imm32" (hIMC As HIMC, ByRef lf As LOGFONTW) As BOOL
    265264#ifdef UNICODE
    266 Declare Function ImmGetCompositionFont Lib "imm32" Alias "ImmSetCompositionFontW" (hIMC As HIMC, ByRef lf As LOGFONT) As BOOL
    267 #else
    268 Declare Function ImmGetCompositionFont Lib "imm32" Alias "ImmSetCompositionFontA" (hIMC As HIMC, ByRef lf As LOGFONT) As BOOL
     265Declare Function ImmGetCompositionFont Lib "imm32" Alias "ImmGetCompositionFontW" (hIMC As HIMC, ByRef lf As LOGFONT) As BOOL
     266#else
     267Declare Function ImmGetCompositionFont Lib "imm32" Alias "ImmGetCompositionFontA" (hIMC As HIMC, ByRef lf As LOGFONT) As BOOL
    269268#endif
    270269
    … …  
    276275Declare Function ImmSetCompositionFont Lib "imm32" Alias "ImmSetCompositionFontA" (hIMC As HIMC, ByRef lf As LOGFONT) As Long
    277276#endif
    278 #endif
     277#endif 'NOGID
     278#endif '_INC_GDI
    279279
    280280Declare Function ImmConfigureIMEA Lib "imm32" (hkl As HKL, hwnd As HWND, dwMode As DWord, lpData As VoidPtr) As BOOL
    … …  
    364364Declare Function ImmGetImeMenuItemsW Lib "imm32" (himc As HIMC, dwFlags As DWord, dwType As DWord, ByRef ImeParentMenu As IMEMENUITEMINFOW, lpImeMenu As LPIMEMENUITEMINFOW, dwSoze As DWord) As DWord
    365365#ifdef UNICODE
    366 Declare Function ImmGetImeMenuItemsW Lib "imm32" Alias "ImmGetImeMenuItemsW" (himc As HIMC, dwFlags As DWord, dwType As DWord, ByRef ImeParentMenu As IMEMENUITEMINFOW, lpImeMenu As LPIMEMENUITEMINFOW, dwSoze As DWord) As DWord
    367 #else
    368 Declare Function ImmGetImeMenuItemsA Lib "imm32" Alias "ImmGetImeMenuItemsA" (himc As HIMC, dwFlags As DWord, dwType As DWord, ByRef ImeParentMenu As IMEMENUITEMINFOA, lpImeMenu As LPIMEMENUITEMINFOA, dwSoze As DWord) As DWord
    369 #endif
    370 Declare Function ImmGetImeMenuItems Lib "imm32" (himc As HIMC, dwFlags As DWord, dwType As DWord, ByRef ImeParentMenu As IMEMENUITEMINFO, lpImeMenu As LPIMEMENUITEMINFO, dwSize As DWord) As DWord
     366Declare Function ImmGetImeMenuItems Lib "imm32" Alias "ImmGetImeMenuItemsW" (himc As HIMC, dwFlags As DWord, dwType As DWord, ByRef ImeParentMenu As IMEMENUITEMINFOW, lpImeMenu As LPIMEMENUITEMINFOW, dwSoze As DWord) As DWord
     367#else
     368Declare Function ImmGetImeMenuItems Lib "imm32" Alias "ImmGetImeMenuItemsA" (himc As HIMC, dwFlags As DWord, dwType As DWord, ByRef ImeParentMenu As IMEMENUITEMINFOA, lpImeMenu As LPIMEMENUITEMINFOA, dwSoze As DWord) As DWord
     369#endif
    371370Declare Function ImmDisableTextFrameService(idThread As DWord) As BOOL
    372371

  • Include/api_window.sbp

    r170 r179  
    156156TypeDef HDWP = *_System_DeclareHandle_HDWP
    157157
     158TypeDef WNDPROC = *Function(hwnd As HWND, msg As DWord, wParam As WPARAM, lParam As LPARAM) As LRESULT
     159TypeDef DLGPROC = *Function(hwnd As HWND, msg As DWord, wParam As WPARAM, lParam As LPARAM) As LONG_PTR
     160
    158161Type MSG
    159162    hwnd As HWND

  • Include/basic.sbp

    r170 r179  
    3838TypeDef Int8 = SByte
    3939
    40 ' Boolean型の定数
     40TypeDef BOOL = Long
     41
     42' Boolena型の定数
    4143Const True = 1 As Boolean
    4244Const False = 0 As Boolean
    4345
    44 ' BOOL型の定数（Booleanへの移行を推奨）
    45 Const _System_TRUE = -1
    46 Const _System_FALSE = 0
     46' 文字型の定義
     47TypeDef WCHAR = Word
     48#ifdef UNICODE
     49TypeDef Char = WCHAR
     50#else
     51TypeDef Char = SByte
     52#endif
    4753
    4854' 文字型
    … …  
    94100    GetChar = p[0]
    95101End Function
     102
    96103
    97104'--------------------------

  • Include/basic/command.sbp

    r175 r179  
    3333End Sub
    3434
    35 Macro END()
     35Sub _System_End()
    3636    Dim exitCode = Environment.ExitCode
    3737    _System_EndProgram()
    3838    ExitProcess(exitCode)
     39End Sub
     40
     41Macro END()
     42    _System_End()
    3943End Macro
    4044

  • Include/windef.ab

    r170 r179  
    3636'#endif
    3737
    38 'TypeDef DWORD = DWord
     38TypeDef DWORD = DWord
    3939TypeDef BOOL = Long
    40 'TypeDef BYTE = Byte
    41 'TypeDef WORD = Word
     40TypeDef BYTE = Byte
     41TypeDef WORD = Word
    4242'TypeDef FLOAT = Single
    4343'TypeDef PFLOAT = *FLOAT
    … …  
    166166Type _System_DeclareHandle_HSPRITE:unused As DWord:End Type
    167167TypeDef HSPRITE = *_System_DeclareHandle_HSPRITE
    168 Type _System_DeclareHandle_HSTRC:unused As DWord:End Type
     168Type _System_DeclareHandle_HSTR:unused As DWord:End Type
    169169TypeDef HSTR = *_System_DeclareHandle_HSTR
    170170Type _System_DeclareHandle_HTASK:unused As DWord:End Type
    … …  
    216216
    217217TypeDef PPOINT = *POINTAPI
    218 TypeDef NPPOINT = *POINT
    219 TypeDef LPPOINT = *POINT
     218TypeDef NPPOINT = *POINTAPI
     219TypeDef LPPOINT = *POINTAPI
    220220
    221221TypeDef POINTL = POINTAPI
    222 TypeDef PPOINTL = *PPOINTL
     222TypeDef PPOINTL = *POINTL
    223223
    224224Type SIZE

  • Include/windows.sbp

    r170 r179  
    1818TypeDef PROPID = DWord
    1919
    20 TypeDef WNDPROC = *Function(hwnd As HWND, msg As DWord, wParam As WPARAM, lParam As LPARAM) As LRESULT
    21 TypeDef DLGPROC = *Function(hwnd As HWND, msg As DWord, wParam As WPARAM, lParam As LPARAM) As LONG_PTR
    22 
    2320#require <windef.ab>
    2421#require <api_winerror.sbp>
Note: See TracChangeset for help on using the changeset viewer.