Index: Include/WinNT.ab =================================================================== --- Include/WinNT.ab (revision 178) +++ Include/WinNT.ab (revision 179) @@ -213,11 +213,12 @@ '#define _ULONGLONG_ -'TypeDef LONGLONG = Int64 -'TypeDef ULONGLONG = QWord - -'Const MAXLONGLONG = (&h7fffffffffffffff) - -'TypeDef PLONGLONG = *LONGLONG -'TypeDef PULONGLONG = *ULONGLONG +TypeDef LONGLONG = Int64 +TypeDef ULONGLONG = QWord + +Const MAXLONGLONG = (&h7fffffffffffffff) +'#endif + +TypeDef PLONGLONG = *LONGLONG +TypeDef PULONGLONG = *ULONGLONG TypeDef USN = LONGLONG @@ -262,6 +263,6 @@ Blink As *LIST_ENTRY End Type -TypeDef PLIST_ENTRY = *PLIST_ENTRY -TypeDef PRLIST_ENTRY = *PLIST_ENTRY +TypeDef PLIST_ENTRY = *LIST_ENTRY +TypeDef PRLIST_ENTRY = *LIST_ENTRY Type SINGLE_LIST_ENTRY @@ -2145,5 +2146,5 @@ TypeDef PSECURITY_QUALITY_OF_SERVICE = *SECURITY_QUALITY_OF_SERVICE -Type PSE_IMPERSONATION_STATE +Type SE_IMPERSONATION_STATE Token As PACCESS_TOKEN CopyOnOpen As BOOLEAN @@ -2277,5 +2278,5 @@ Const THREAD_BASE_PRIORITY_IDLE = (-15) -Type PQUOTA_LIMITS +Type QUOTA_LIMITS PagedPoolLimit As SIZE_T NonPagedPoolLimit As SIZE_T @@ -2317,5 +2318,5 @@ '#endif -Type PQUOTA_LIMITS_EX +Type QUOTA_LIMITS_EX PagedPoolLimit As SIZE_T NonPagedPoolLimit As SIZE_T @@ -2390,5 +2391,5 @@ TypeDef PJOBOBJECT_BASIC_UI_RESTRICTIONS = *JOBOBJECT_BASIC_UI_RESTRICTIONS -Type _JOBOBJECT_SECURITY_LIMIT_INFORMATION +Type JOBOBJECT_SECURITY_LIMIT_INFORMATION SecurityLimitFlags As DWord JobToken As HANDLE @@ -3105,5 +3106,5 @@ End Enum -Type +Type SET_POWER_SETTING_VALUE Version As DWord Guid As GUID @@ -4670,5 +4671,5 @@ Const IMAGE_ARCHIVE_LONGNAMES_MEMBER = Ex"// " -Type PIMAGE_ARCHIVE_MEMBER_HEADER +Type IMAGE_ARCHIVE_MEMBER_HEADER Name[ELM(16)] As Byte Date[ELM(12)] As Byte @@ -4769,5 +4770,5 @@ Const IMAGE_ORDINAL_FLAG = IMAGE_ORDINAL_FLAG32 Const IMAGE_ORDINAL(Ordinal) = IMAGE_ORDINAL32(Ordinal) -TypeDef IMAGE_THUNK_DATA = IMAGE_THUNK_DAT32 +TypeDef IMAGE_THUNK_DATA = IMAGE_THUNK_DATA32 TypeDef PIMAGE_THUNK_DATA = PIMAGE_THUNK_DATA32 Const IMAGE_SNAP_BY_ORDINAL(Ordinal) = IMAGE_SNAP_BY_ORDINAL32(Ordinal) @@ -5605,5 +5606,5 @@ Const WT_TRANSFER_IMPERSONATION = &h00000100 'Const WT_SET_MAX_THREADPOOL_THREADS(Flags, Limit) ((Flags) Or= (Limit)<<16) -TypeDef WAITORTIMERCALLBACKFUNC = *Sub(p As VoidPtr, b As BOOLEAN) +TypeDef WAITORTIMERCALLBACKFUNC = *Sub(p As VoidPtr, b As Boolean) TypeDef WORKERCALLBACKFUNC = *Sub(p As VoidPtr) TypeDef APC_CALLBACK_FUNCTION = *Sub(dw AS DWord, p1 As VoidPtr, p2 As VoidPtr) @@ -5650,6 +5651,6 @@ ' compatibility with old names -TypeDef _ASSEMBLY_DLL_REDIRECTION_DETAILED_INFORMATION = _ASSEMBLY_FILE_DETAILED_INFORMATION -TypeDef ASSEMBLY_DLL_REDIRECTION_DETAILED_INFORMATION = ASSEMBLY_FILE_DETAILED_INFORMATION +TypeDef _ASSEMBLY_DLL_REDIRECTION_DETAILED_INFORMATION = ASSEMBLY_FILE_DETAILED_INFORMATION +TypeDef ASSEMBLY_DLL_REDIRECTION_DETAILED_INFORMATION = ASSEMBLY_FILE_DETAILED_INFORMATION TypeDef PASSEMBLY_DLL_REDIRECTION_DETAILED_INFORMATION = PASSEMBLY_FILE_DETAILED_INFORMATION TypeDef PCASSEMBLY_DLL_REDIRECTION_DETAILED_INFORMATION = PCASSEMBLY_FILE_DETAILED_INFORMATION Index: Include/api_imm.sbp =================================================================== --- Include/api_imm.sbp (revision 178) +++ Include/api_imm.sbp (revision 179) @@ -116,5 +116,5 @@ #endif -#if (WINVER >= 0x040A) +'#if (WINVER >= 0x040A) Const IMEMENUITEM_STRING_SIZE = 80 @@ -221,10 +221,10 @@ #endif -Declare Function ImmSetCompositionStringA Lib "imm32" (himc As HIMC, dwIndex As DWord, lpComp As VoidPtr, dwCompLen As DWord, lpRead As VoidPtr, dwReadLen As DWord -Declare Function ImmSetCompositionStringW Lib "imm32" (himc As HIMC, dwIndex As DWord, lpComp As VoidPtr, dwCompLen As DWord, lpRead As VoidPtr, dwReadLen As DWord -#ifdef UNICODE -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 -#else -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 +Declare Function ImmSetCompositionStringA Lib "imm32" (himc As HIMC, dwIndex As DWord, lpComp As VoidPtr, dwCompLen As DWord, lpRead As VoidPtr, dwReadLen As DWord ) As BOOL +Declare Function ImmSetCompositionStringW Lib "imm32" (himc As HIMC, dwIndex As DWord, lpComp As VoidPtr, dwCompLen As DWord, lpRead As VoidPtr, dwReadLen As DWord ) As BOOL +#ifdef UNICODE +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 ) As BOOL +#else +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 ) As BOOL #endif @@ -260,11 +260,10 @@ #ifdef _INC_GDI '_WINGDI_ #ifndef NOGID -#ifdef UNICODE Declare Function ImmGetCompositionFontA Lib "imm32" (hIMC As HIMC, ByRef lf As LOGFONTA) As BOOL Declare Function ImmGetCompositionFontW Lib "imm32" (hIMC As HIMC, ByRef lf As LOGFONTW) As BOOL #ifdef UNICODE -Declare Function ImmGetCompositionFont Lib "imm32" Alias "ImmSetCompositionFontW" (hIMC As HIMC, ByRef lf As LOGFONT) As BOOL -#else -Declare Function ImmGetCompositionFont Lib "imm32" Alias "ImmSetCompositionFontA" (hIMC As HIMC, ByRef lf As LOGFONT) As BOOL +Declare Function ImmGetCompositionFont Lib "imm32" Alias "ImmGetCompositionFontW" (hIMC As HIMC, ByRef lf As LOGFONT) As BOOL +#else +Declare Function ImmGetCompositionFont Lib "imm32" Alias "ImmGetCompositionFontA" (hIMC As HIMC, ByRef lf As LOGFONT) As BOOL #endif @@ -276,5 +275,6 @@ Declare Function ImmSetCompositionFont Lib "imm32" Alias "ImmSetCompositionFontA" (hIMC As HIMC, ByRef lf As LOGFONT) As Long #endif -#endif +#endif 'NOGID +#endif '_INC_GDI Declare Function ImmConfigureIMEA Lib "imm32" (hkl As HKL, hwnd As HWND, dwMode As DWord, lpData As VoidPtr) As BOOL @@ -364,9 +364,8 @@ Declare 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 #ifdef UNICODE -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 -#else -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 -#endif -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 +Declare 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 +#else +Declare 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 +#endif Declare Function ImmDisableTextFrameService(idThread As DWord) As BOOL Index: Include/api_window.sbp =================================================================== --- Include/api_window.sbp (revision 178) +++ Include/api_window.sbp (revision 179) @@ -156,4 +156,7 @@ TypeDef HDWP = *_System_DeclareHandle_HDWP +TypeDef WNDPROC = *Function(hwnd As HWND, msg As DWord, wParam As WPARAM, lParam As LPARAM) As LRESULT +TypeDef DLGPROC = *Function(hwnd As HWND, msg As DWord, wParam As WPARAM, lParam As LPARAM) As LONG_PTR + Type MSG hwnd As HWND Index: Include/basic.sbp =================================================================== --- Include/basic.sbp (revision 178) +++ Include/basic.sbp (revision 179) @@ -38,11 +38,17 @@ TypeDef Int8 = SByte -' Boolean型の定数 +TypeDef BOOL = Long + +' Boolena型の定数 Const True = 1 As Boolean Const False = 0 As Boolean -' BOOL型の定数（Booleanへの移行を推奨） -Const _System_TRUE = -1 -Const _System_FALSE = 0 +' 文字型の定義 +TypeDef WCHAR = Word +#ifdef UNICODE +TypeDef Char = WCHAR +#else +TypeDef Char = SByte +#endif ' 文字型 @@ -94,4 +100,5 @@ GetChar = p[0] End Function + '-------------------------- Index: Include/basic/command.sbp =================================================================== --- Include/basic/command.sbp (revision 178) +++ Include/basic/command.sbp (revision 179) @@ -33,8 +33,12 @@ End Sub -Macro END() +Sub _System_End() Dim exitCode = Environment.ExitCode _System_EndProgram() ExitProcess(exitCode) +End Sub + +Macro END() + _System_End() End Macro Index: Include/windef.ab =================================================================== --- Include/windef.ab (revision 178) +++ Include/windef.ab (revision 179) @@ -36,8 +36,8 @@ '#endif -'TypeDef DWORD = DWord +TypeDef DWORD = DWord TypeDef BOOL = Long -'TypeDef BYTE = Byte -'TypeDef WORD = Word +TypeDef BYTE = Byte +TypeDef WORD = Word 'TypeDef FLOAT = Single 'TypeDef PFLOAT = *FLOAT @@ -166,5 +166,5 @@ Type _System_DeclareHandle_HSPRITE:unused As DWord:End Type TypeDef HSPRITE = *_System_DeclareHandle_HSPRITE -Type _System_DeclareHandle_HSTRC:unused As DWord:End Type +Type _System_DeclareHandle_HSTR:unused As DWord:End Type TypeDef HSTR = *_System_DeclareHandle_HSTR Type _System_DeclareHandle_HTASK:unused As DWord:End Type @@ -216,9 +216,9 @@ TypeDef PPOINT = *POINTAPI -TypeDef NPPOINT = *POINT -TypeDef LPPOINT = *POINT +TypeDef NPPOINT = *POINTAPI +TypeDef LPPOINT = *POINTAPI TypeDef POINTL = POINTAPI -TypeDef PPOINTL = *PPOINTL +TypeDef PPOINTL = *POINTL Type SIZE Index: Include/windows.sbp =================================================================== --- Include/windows.sbp (revision 178) +++ Include/windows.sbp (revision 179) @@ -18,7 +18,4 @@ TypeDef PROPID = DWord -TypeDef WNDPROC = *Function(hwnd As HWND, msg As DWord, wParam As WPARAM, lParam As LPARAM) As LRESULT -TypeDef DLGPROC = *Function(hwnd As HWND, msg As DWord, wParam As WPARAM, lParam As LPARAM) As LONG_PTR - #require #require