diff --git a/inc/CUnit/CUnit.bi b/inc/CUnit/CUnit.bi index c56695876f..d66343efa9 100644 --- a/inc/CUnit/CUnit.bi +++ b/inc/CUnit/CUnit.bi @@ -6,6 +6,9 @@ #include once "TestDB.bi" #include once "TestRun.bi" +'' The following symbols have been renamed: +'' #define CU_TEST => CU_TEST_ + #define CUNIT_CUNIT_H_SEEN #define CU_VERSION "2.1-3" #define CU_MAX_TEST_NAME_LENGTH 256 @@ -14,108 +17,38 @@ #define CU_FALSE 0 #define CU_MAX(a, b) iif((a) >= (b), (a), (b)) #define CU_MIN(a, b) iif((a) >= (b), (b), (a)) -#macro CU_PASS(msg) - CU_assertImplementation(CU_TRUE, __LINE__, "CU_PASS(" #msg ")", __FILE__, "", CU_FALSE) -#endmacro -#macro CU_ASSERT(value) - CU_assertImplementation((value), __LINE__, #value, __FILE__, "", CU_FALSE) -#endmacro -#macro CU_ASSERT_FATAL(value) - CU_assertImplementation((value), __LINE__, #value, __FILE__, "", CU_TRUE) -#endmacro -#macro CU_TEST_(value) - CU_assertImplementation((value), __LINE__, #value, __FILE__, "", CU_FALSE) -#endmacro -#macro CU_TEST_FATAL(value) - CU_assertImplementation((value), __LINE__, #value, __FILE__, "", CU_TRUE) -#endmacro -#macro CU_FAIL(msg) - CU_assertImplementation(CU_FALSE, __LINE__, "CU_FAIL(" #msg ")", __FILE__, "", CU_FALSE) -#endmacro -#macro CU_FAIL_FATAL(msg) - CU_assertImplementation(CU_FALSE, __LINE__, "CU_FAIL_FATAL(" #msg ")", __FILE__, "", CU_TRUE) -#endmacro -#macro CU_ASSERT_TRUE(value) - CU_assertImplementation((value), __LINE__, "CU_ASSERT_TRUE(" #value ")", __FILE__, "", CU_FALSE) -#endmacro -#macro CU_ASSERT_TRUE_FATAL(value) - CU_assertImplementation((value), __LINE__, "CU_ASSERT_TRUE_FATAL(" #value ")", __FILE__, "", CU_TRUE) -#endmacro -#macro CU_ASSERT_FALSE(value) - CU_assertImplementation(-((value) = 0), __LINE__, "CU_ASSERT_FALSE(" #value ")", __FILE__, "", CU_FALSE) -#endmacro -#macro CU_ASSERT_FALSE_FATAL(value) - CU_assertImplementation(-((value) = 0), __LINE__, "CU_ASSERT_FALSE_FATAL(" #value ")", __FILE__, "", CU_TRUE) -#endmacro -#macro CU_ASSERT_EQUAL(actual, expected) - CU_assertImplementation(-((actual) = (expected)), __LINE__, "CU_ASSERT_EQUAL(" #actual "," #expected ")", __FILE__, "", CU_FALSE) -#endmacro -#macro CU_ASSERT_EQUAL_FATAL(actual, expected) - CU_assertImplementation(-((actual) = (expected)), __LINE__, "CU_ASSERT_EQUAL_FATAL(" #actual "," #expected ")", __FILE__, "", CU_TRUE) -#endmacro -#macro CU_ASSERT_NOT_EQUAL(actual, expected) - CU_assertImplementation(-((actual) <> (expected)), __LINE__, "CU_ASSERT_NOT_EQUAL(" #actual "," #expected ")", __FILE__, "", CU_FALSE) -#endmacro -#macro CU_ASSERT_NOT_EQUAL_FATAL(actual, expected) - CU_assertImplementation(-((actual) <> (expected)), __LINE__, "CU_ASSERT_NOT_EQUAL_FATAL(" #actual "," #expected ")", __FILE__, "", CU_TRUE) -#endmacro -#macro CU_ASSERT_PTR_EQUAL(actual, expected) - CU_assertImplementation(-(cptr(const any ptr, (actual)) = cptr(const any ptr, (expected))), __LINE__, "CU_ASSERT_PTR_EQUAL(" #actual "," #expected ")", __FILE__, "", CU_FALSE) -#endmacro -#macro CU_ASSERT_PTR_EQUAL_FATAL(actual, expected) - CU_assertImplementation(-(cptr(const any ptr, (actual)) = cptr(const any ptr, (expected))), __LINE__, "CU_ASSERT_PTR_EQUAL_FATAL(" #actual "," #expected ")", __FILE__, "", CU_TRUE) -#endmacro -#macro CU_ASSERT_PTR_NOT_EQUAL(actual, expected) - CU_assertImplementation(-(cptr(const any ptr, (actual)) <> cptr(const any ptr, (expected))), __LINE__, "CU_ASSERT_PTR_NOT_EQUAL(" #actual "," #expected ")", __FILE__, "", CU_FALSE) -#endmacro -#macro CU_ASSERT_PTR_NOT_EQUAL_FATAL(actual, expected) - CU_assertImplementation(-(cptr(const any ptr, (actual)) <> cptr(const any ptr, (expected))), __LINE__, "CU_ASSERT_PTR_NOT_EQUAL_FATAL(" #actual "," #expected ")", __FILE__, "", CU_TRUE) -#endmacro -#macro CU_ASSERT_PTR_NULL(value) - CU_assertImplementation(-(NULL = cptr(const any ptr, (value))), __LINE__, "CU_ASSERT_PTR_NULL(" #value ")", __FILE__, "", CU_FALSE) -#endmacro -#macro CU_ASSERT_PTR_NULL_FATAL(value) - CU_assertImplementation(-(NULL = cptr(const any ptr, (value))), __LINE__, "CU_ASSERT_PTR_NULL_FATAL(" #value ")", __FILE__, "", CU_TRUE) -#endmacro -#macro CU_ASSERT_PTR_NOT_NULL(value) - CU_assertImplementation(-(NULL <> cptr(const any ptr, (value))), __LINE__, "CU_ASSERT_PTR_NOT_NULL(" #value ")", __FILE__, "", CU_FALSE) -#endmacro -#macro CU_ASSERT_PTR_NOT_NULL_FATAL(value) - CU_assertImplementation(-(NULL <> cptr(const any ptr, (value))), __LINE__, "CU_ASSERT_PTR_NOT_NULL_FATAL(" #value ")", __FILE__, "", CU_TRUE) -#endmacro -#macro CU_ASSERT_STRING_EQUAL(actual, expected) - CU_assertImplementation(-(strcmp(cptr(const zstring ptr, (actual)), cptr(const zstring ptr, (expected))) = 0), __LINE__, "CU_ASSERT_STRING_EQUAL(" #actual "," #expected ")", __FILE__, "", CU_FALSE) -#endmacro -#macro CU_ASSERT_STRING_EQUAL_FATAL(actual, expected) - CU_assertImplementation(-(strcmp(cptr(const zstring ptr, (actual)), cptr(const zstring ptr, (expected))) = 0), __LINE__, "CU_ASSERT_STRING_EQUAL_FATAL(" #actual "," #expected ")", __FILE__, "", CU_TRUE) -#endmacro -#macro CU_ASSERT_STRING_NOT_EQUAL(actual, expected) - CU_assertImplementation(strcmp(cptr(const zstring ptr, (actual)), cptr(const zstring ptr, (expected))), __LINE__, "CU_ASSERT_STRING_NOT_EQUAL(" #actual "," #expected ")", __FILE__, "", CU_FALSE) -#endmacro -#macro CU_ASSERT_STRING_NOT_EQUAL_FATAL(actual, expected) - CU_assertImplementation(strcmp(cptr(const zstring ptr, (actual)), cptr(const zstring ptr, (expected))), __LINE__, "CU_ASSERT_STRING_NOT_EQUAL_FATAL(" #actual "," #expected ")", __FILE__, "", CU_TRUE) -#endmacro -#macro CU_ASSERT_NSTRING_EQUAL(actual, expected, count) - CU_assertImplementation(-(strncmp(cptr(const zstring ptr, (actual)), cptr(const zstring ptr, (expected)), cuint((count))) = 0), __LINE__, "CU_ASSERT_NSTRING_EQUAL(" #actual "," #expected "," #count ")", __FILE__, "", CU_FALSE) -#endmacro -#macro CU_ASSERT_NSTRING_EQUAL_FATAL(actual, expected, count) - CU_assertImplementation(-(strncmp(cptr(const zstring ptr, (actual)), cptr(const zstring ptr, (expected)), cuint((count))) = 0), __LINE__, "CU_ASSERT_NSTRING_EQUAL_FATAL(" #actual "," #expected "," #count ")", __FILE__, "", CU_TRUE) -#endmacro -#macro CU_ASSERT_NSTRING_NOT_EQUAL(actual, expected, count) - CU_assertImplementation(strncmp(cptr(const zstring ptr, (actual)), cptr(const zstring ptr, (expected)), cuint((count))), __LINE__, "CU_ASSERT_NSTRING_NOT_EQUAL(" #actual "," #expected "," #count ")", __FILE__, "", CU_FALSE) -#endmacro -#macro CU_ASSERT_NSTRING_NOT_EQUAL_FATAL(actual, expected, count) - CU_assertImplementation(strncmp(cptr(const zstring ptr, (actual)), cptr(const zstring ptr, (expected)), cuint((count))), __LINE__, "CU_ASSERT_NSTRING_NOT_EQUAL_FATAL(" #actual "," #expected "," #count ")", __FILE__, "", CU_TRUE) -#endmacro -#macro CU_ASSERT_DOUBLE_EQUAL(actual, expected, granularity) - CU_assertImplementation(-(fabs(cdbl((actual)) - (expected)) <= fabs(cdbl((granularity)))), __LINE__, "CU_ASSERT_DOUBLE_EQUAL(" #actual "," #expected "," #granularity ")", __FILE__, "", CU_FALSE) -#endmacro -#macro CU_ASSERT_DOUBLE_EQUAL_FATAL(actual, expected, granularity) - CU_assertImplementation(-(fabs(cdbl((actual)) - (expected)) <= fabs(cdbl((granularity)))), __LINE__, "CU_ASSERT_DOUBLE_EQUAL_FATAL(" #actual "," #expected "," #granularity ")", __FILE__, "", CU_TRUE) -#endmacro -#macro CU_ASSERT_DOUBLE_NOT_EQUAL(actual, expected, granularity) - CU_assertImplementation(-(fabs(cdbl((actual)) - (expected)) > fabs(cdbl((granularity)))), __LINE__, "CU_ASSERT_DOUBLE_NOT_EQUAL(" #actual "," #expected "," #granularity ")", __FILE__, "", CU_FALSE) -#endmacro -#macro CU_ASSERT_DOUBLE_NOT_EQUAL_FATAL(actual, expected, granularity) - CU_assertImplementation(-(fabs(cdbl((actual)) - (expected)) > fabs(cdbl((granularity)))), __LINE__, "CU_ASSERT_DOUBLE_NOT_EQUAL_FATAL(" #actual "," #expected "," #granularity ")", __FILE__, "", CU_TRUE) -#endmacro +#define CU_PASS(msg) CU_assertImplementation(CU_TRUE, __LINE__, "CU_PASS(" #msg ")", __FILE__, "", CU_FALSE) +#define CU_ASSERT(value) CU_assertImplementation((value), __LINE__, #value, __FILE__, "", CU_FALSE) +#define CU_ASSERT_FATAL(value) CU_assertImplementation((value), __LINE__, #value, __FILE__, "", CU_TRUE) +#define CU_TEST_(value) CU_assertImplementation((value), __LINE__, #value, __FILE__, "", CU_FALSE) +#define CU_TEST_FATAL(value) CU_assertImplementation((value), __LINE__, #value, __FILE__, "", CU_TRUE) +#define CU_FAIL(msg) CU_assertImplementation(CU_FALSE, __LINE__, "CU_FAIL(" #msg ")", __FILE__, "", CU_FALSE) +#define CU_FAIL_FATAL(msg) CU_assertImplementation(CU_FALSE, __LINE__, "CU_FAIL_FATAL(" #msg ")", __FILE__, "", CU_TRUE) +#define CU_ASSERT_TRUE(value) CU_assertImplementation((value), __LINE__, "CU_ASSERT_TRUE(" #value ")", __FILE__, "", CU_FALSE) +#define CU_ASSERT_TRUE_FATAL(value) CU_assertImplementation((value), __LINE__, "CU_ASSERT_TRUE_FATAL(" #value ")", __FILE__, "", CU_TRUE) +#define CU_ASSERT_FALSE(value) CU_assertImplementation(-((value) = 0), __LINE__, "CU_ASSERT_FALSE(" #value ")", __FILE__, "", CU_FALSE) +#define CU_ASSERT_FALSE_FATAL(value) CU_assertImplementation(-((value) = 0), __LINE__, "CU_ASSERT_FALSE_FATAL(" #value ")", __FILE__, "", CU_TRUE) +#define CU_ASSERT_EQUAL(actual, expected) CU_assertImplementation(-((actual) = (expected)), __LINE__, "CU_ASSERT_EQUAL(" #actual "," #expected ")", __FILE__, "", CU_FALSE) +#define CU_ASSERT_EQUAL_FATAL(actual, expected) CU_assertImplementation(-((actual) = (expected)), __LINE__, "CU_ASSERT_EQUAL_FATAL(" #actual "," #expected ")", __FILE__, "", CU_TRUE) +#define CU_ASSERT_NOT_EQUAL(actual, expected) CU_assertImplementation(-((actual) <> (expected)), __LINE__, "CU_ASSERT_NOT_EQUAL(" #actual "," #expected ")", __FILE__, "", CU_FALSE) +#define CU_ASSERT_NOT_EQUAL_FATAL(actual, expected) CU_assertImplementation(-((actual) <> (expected)), __LINE__, "CU_ASSERT_NOT_EQUAL_FATAL(" #actual "," #expected ")", __FILE__, "", CU_TRUE) +#define CU_ASSERT_PTR_EQUAL(actual, expected) CU_assertImplementation(-(cptr(const any ptr, (actual)) = cptr(const any ptr, (expected))), __LINE__, "CU_ASSERT_PTR_EQUAL(" #actual "," #expected ")", __FILE__, "", CU_FALSE) +#define CU_ASSERT_PTR_EQUAL_FATAL(actual, expected) CU_assertImplementation(-(cptr(const any ptr, (actual)) = cptr(const any ptr, (expected))), __LINE__, "CU_ASSERT_PTR_EQUAL_FATAL(" #actual "," #expected ")", __FILE__, "", CU_TRUE) +#define CU_ASSERT_PTR_NOT_EQUAL(actual, expected) CU_assertImplementation(-(cptr(const any ptr, (actual)) <> cptr(const any ptr, (expected))), __LINE__, "CU_ASSERT_PTR_NOT_EQUAL(" #actual "," #expected ")", __FILE__, "", CU_FALSE) +#define CU_ASSERT_PTR_NOT_EQUAL_FATAL(actual, expected) CU_assertImplementation(-(cptr(const any ptr, (actual)) <> cptr(const any ptr, (expected))), __LINE__, "CU_ASSERT_PTR_NOT_EQUAL_FATAL(" #actual "," #expected ")", __FILE__, "", CU_TRUE) +#define CU_ASSERT_PTR_NULL(value) CU_assertImplementation(-(NULL = cptr(const any ptr, (value))), __LINE__, "CU_ASSERT_PTR_NULL(" #value ")", __FILE__, "", CU_FALSE) +#define CU_ASSERT_PTR_NULL_FATAL(value) CU_assertImplementation(-(NULL = cptr(const any ptr, (value))), __LINE__, "CU_ASSERT_PTR_NULL_FATAL(" #value ")", __FILE__, "", CU_TRUE) +#define CU_ASSERT_PTR_NOT_NULL(value) CU_assertImplementation(-(NULL <> cptr(const any ptr, (value))), __LINE__, "CU_ASSERT_PTR_NOT_NULL(" #value ")", __FILE__, "", CU_FALSE) +#define CU_ASSERT_PTR_NOT_NULL_FATAL(value) CU_assertImplementation(-(NULL <> cptr(const any ptr, (value))), __LINE__, "CU_ASSERT_PTR_NOT_NULL_FATAL(" #value ")", __FILE__, "", CU_TRUE) +#define CU_ASSERT_STRING_EQUAL(actual, expected) CU_assertImplementation(-(strcmp(cptr(const zstring ptr, (actual)), cptr(const zstring ptr, (expected))) = 0), __LINE__, "CU_ASSERT_STRING_EQUAL(" #actual "," #expected ")", __FILE__, "", CU_FALSE) +#define CU_ASSERT_STRING_EQUAL_FATAL(actual, expected) CU_assertImplementation(-(strcmp(cptr(const zstring ptr, (actual)), cptr(const zstring ptr, (expected))) = 0), __LINE__, "CU_ASSERT_STRING_EQUAL_FATAL(" #actual "," #expected ")", __FILE__, "", CU_TRUE) +#define CU_ASSERT_STRING_NOT_EQUAL(actual, expected) CU_assertImplementation(strcmp(cptr(const zstring ptr, (actual)), cptr(const zstring ptr, (expected))), __LINE__, "CU_ASSERT_STRING_NOT_EQUAL(" #actual "," #expected ")", __FILE__, "", CU_FALSE) +#define CU_ASSERT_STRING_NOT_EQUAL_FATAL(actual, expected) CU_assertImplementation(strcmp(cptr(const zstring ptr, (actual)), cptr(const zstring ptr, (expected))), __LINE__, "CU_ASSERT_STRING_NOT_EQUAL_FATAL(" #actual "," #expected ")", __FILE__, "", CU_TRUE) +#define CU_ASSERT_NSTRING_EQUAL(actual, expected, count) CU_assertImplementation(-(strncmp(cptr(const zstring ptr, (actual)), cptr(const zstring ptr, (expected)), cuint((count))) = 0), __LINE__, "CU_ASSERT_NSTRING_EQUAL(" #actual "," #expected "," #count ")", __FILE__, "", CU_FALSE) +#define CU_ASSERT_NSTRING_EQUAL_FATAL(actual, expected, count) CU_assertImplementation(-(strncmp(cptr(const zstring ptr, (actual)), cptr(const zstring ptr, (expected)), cuint((count))) = 0), __LINE__, "CU_ASSERT_NSTRING_EQUAL_FATAL(" #actual "," #expected "," #count ")", __FILE__, "", CU_TRUE) +#define CU_ASSERT_NSTRING_NOT_EQUAL(actual, expected, count) CU_assertImplementation(strncmp(cptr(const zstring ptr, (actual)), cptr(const zstring ptr, (expected)), cuint((count))), __LINE__, "CU_ASSERT_NSTRING_NOT_EQUAL(" #actual "," #expected "," #count ")", __FILE__, "", CU_FALSE) +#define CU_ASSERT_NSTRING_NOT_EQUAL_FATAL(actual, expected, count) CU_assertImplementation(strncmp(cptr(const zstring ptr, (actual)), cptr(const zstring ptr, (expected)), cuint((count))), __LINE__, "CU_ASSERT_NSTRING_NOT_EQUAL_FATAL(" #actual "," #expected "," #count ")", __FILE__, "", CU_TRUE) +#define CU_ASSERT_DOUBLE_EQUAL(actual, expected, granularity) CU_assertImplementation(-(fabs(cdbl((actual)) - (expected)) <= fabs(cdbl((granularity)))), __LINE__, "CU_ASSERT_DOUBLE_EQUAL(" #actual "," #expected "," #granularity ")", __FILE__, "", CU_FALSE) +#define CU_ASSERT_DOUBLE_EQUAL_FATAL(actual, expected, granularity) CU_assertImplementation(-(fabs(cdbl((actual)) - (expected)) <= fabs(cdbl((granularity)))), __LINE__, "CU_ASSERT_DOUBLE_EQUAL_FATAL(" #actual "," #expected "," #granularity ")", __FILE__, "", CU_TRUE) +#define CU_ASSERT_DOUBLE_NOT_EQUAL(actual, expected, granularity) CU_assertImplementation(-(fabs(cdbl((actual)) - (expected)) > fabs(cdbl((granularity)))), __LINE__, "CU_ASSERT_DOUBLE_NOT_EQUAL(" #actual "," #expected "," #granularity ")", __FILE__, "", CU_FALSE) +#define CU_ASSERT_DOUBLE_NOT_EQUAL_FATAL(actual, expected, granularity) CU_assertImplementation(-(fabs(cdbl((actual)) - (expected)) > fabs(cdbl((granularity)))), __LINE__, "CU_ASSERT_DOUBLE_NOT_EQUAL_FATAL(" #actual "," #expected "," #granularity ")", __FILE__, "", CU_TRUE) diff --git a/inc/CUnit/TestDB.bi b/inc/CUnit/TestDB.bi index 0def468bf0..b7d25a4a12 100644 --- a/inc/CUnit/TestDB.bi +++ b/inc/CUnit/TestDB.bi @@ -4,6 +4,9 @@ #include once "CUnit.bi" #include once "CUError.bi" +'' The following symbols have been renamed: +'' #define CU_ADD_TEST => CU_ADD_TEST_ + extern "C" #define CUNIT_TESTDB_H_SEEN diff --git a/inc/IUP/iup.bi b/inc/IUP/iup.bi index 45550d213a..082bd09f31 100644 --- a/inc/IUP/iup.bi +++ b/inc/IUP/iup.bi @@ -1,6 +1,7 @@ #pragma once #inclib "iup" + #ifdef __FB_WIN32__ #inclib "gdi32" #inclib "user32" diff --git a/inc/Lua/lauxlib.bi b/inc/Lua/lauxlib.bi index c8bf19c9db..68fb1985c1 100644 --- a/inc/Lua/lauxlib.bi +++ b/inc/Lua/lauxlib.bi @@ -56,7 +56,6 @@ declare sub luaL_setfuncs(byval L as lua_State ptr, byval l as const luaL_Reg pt declare function luaL_getsubtable(byval L as lua_State ptr, byval idx as long, byval fname as const zstring ptr) as long declare sub luaL_traceback(byval L as lua_State ptr, byval L1 as lua_State ptr, byval msg as const zstring ptr, byval level as long) declare sub luaL_requiref(byval L as lua_State ptr, byval modname as const zstring ptr, byval openf as lua_CFunction, byval glb as long) - #define luaL_newlibtable(L, l_) lua_createtable(L, 0, (ubound(l_) - lbound(l_) + 1) - 1) #macro luaL_newlib(L, l_) scope @@ -91,7 +90,7 @@ type luaL_Buffer size as uinteger n as uinteger L as lua_State ptr - initb(0 to LUAL_BUFFERSIZE-1) as byte + initb(0 to LUAL_BUFFERSIZE - 1) as byte end type #macro luaL_addchar(B,c) diff --git a/inc/Lua/lua.bi b/inc/Lua/lua.bi index 9680f8e786..dbb8b4fc4f 100644 --- a/inc/Lua/lua.bi +++ b/inc/Lua/lua.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "lua" #include once "crt/stdarg.bi" @@ -40,14 +41,12 @@ extern "C" #define LUA_QL(x) "'" x "'" #define LUA_QS LUA_QL("%s") #define LUA_IDSIZE 60 - #macro luai_writestringerror(s, p) scope fprintf(stderr, (s), (p)) fflush(stderr) end scope #endmacro - #define LUAI_MAXSHORTLEN 40 #define LUAI_BITSINT 32 #define LUA_INT32 long @@ -124,7 +123,8 @@ type lua_Alloc as function(byval ud as any ptr, byval ptr as any ptr, byval osiz type lua_Number as double type lua_Integer as integer type lua_Unsigned as ulong -extern lua_ident as const zstring * len("$LuaVersion: " LUA_COPYRIGHT " $" "$LuaAuthors: " LUA_AUTHORS " $") +extern __lua_ident alias "lua_ident" as const byte +#define lua_ident (*cptr(const zstring ptr, @__lua_ident)) declare function lua_newstate(byval f as lua_Alloc, byval ud as any ptr) as lua_State ptr declare sub lua_close(byval L as lua_State ptr) @@ -282,7 +282,6 @@ declare function lua_sethook(byval L as lua_State ptr, byval func as lua_Hook, b declare function lua_gethook(byval L as lua_State ptr) as lua_Hook declare function lua_gethookmask(byval L as lua_State ptr) as long declare function lua_gethookcount(byval L as lua_State ptr) as long - type CallInfo as CallInfo_ type lua_Debug_ diff --git a/inc/allegro.bi b/inc/allegro.bi index 719a770ed9..94f6cf4624 100644 --- a/inc/allegro.bi +++ b/inc/allegro.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "alleg" #undef screen @@ -16,6 +17,69 @@ #include once "crt/time.bi" #include once "crt/string.bi" +'' The following symbols have been renamed: +'' #define MID => AL_MID +'' #define EMPTY_STRING => EMPTY_STRING_ +'' #define SYSTEM_NONE => SYSTEM_NONE_ +'' #define MOUSEDRV_NONE => MOUSEDRV_NONE_ +'' #define DRAW_SPRITE_H_FLIP => DRAW_SPRITE_H_FLIP_ +'' #define DRAW_SPRITE_V_FLIP => DRAW_SPRITE_V_FLIP_ +'' #define DRAW_SPRITE_VH_FLIP => DRAW_SPRITE_VH_FLIP_ +'' #define MIDI_DIGMID => MIDI_DIGMID_ +'' #define EOF => EOF_ +'' #define cpu_fpu => cpu_fpu_ +'' #define cpu_mmx => cpu_mmx_ +'' #define cpu_3dnow => cpu_3dnow_ +'' #ifdef __FB_WIN32__ +'' #define SYSTEM_DIRECTX => SYSTEM_DIRECTX_ +'' #define GFX_DIRECTX_ACCEL => GFX_DIRECTX_ACCEL_ +'' #define GFX_DIRECTX_SAFE => GFX_DIRECTX_SAFE_ +'' #define GFX_DIRECTX_SOFT => GFX_DIRECTX_SOFT_ +'' #define GFX_DIRECTX_WIN => GFX_DIRECTX_WIN_ +'' #define GFX_DIRECTX_OVL => GFX_DIRECTX_OVL_ +'' #define GFX_GDI => GFX_GDI_ +'' #elseif defined(__FB_LINUX__) +'' #define TIMERDRV_UNIX_PTHREADS => TIMERDRV_UNIX_PTHREADS_ +'' #define SYSTEM_LINUX => SYSTEM_LINUX_ +'' #else +'' #define SYSTEM_DOS => SYSTEM_DOS_ +'' #define KEYDRV_PCDOS => KEYDRV_PCDOS_ +'' #define TIMEDRV_FIXED_RATE => TIMEDRV_FIXED_RATE_ +'' #define TIMEDRV_VARIABLE_RATE => TIMEDRV_VARIABLE_RATE_ +'' #define MOUSEDRV_MICKEYS => MOUSEDRV_MICKEYS_ +'' #define MOUSEDRV_INT33 => MOUSEDRV_INT33_ +'' #define MOUSEDRV_POLLING => MOUSEDRV_POLLING_ +'' #define MOUSEDRV_WINNT => MOUSEDRV_WINNT_ +'' #define MOUSEDRV_WIN2K => MOUSEDRV_WIN2K_ +'' #endif +'' #if defined(__FB_DOS__) or defined(__FB_LINUX__) +'' #define GFX_VGA => GFX_VGA_ +'' #define GFX_MODEX => GFX_MODEX_ +'' #define GFX_VBEAF => GFX_VBEAF_ +'' #endif +'' #ifdef __FB_LINUX__ +'' #define MOUSEDRV_LINUX_PS2 => MOUSEDRV_LINUX_PS2_ +'' #define MOUSEDRV_LINUX_IPS2 => MOUSEDRV_LINUX_IPS2_ +'' #define MOUSEDRV_LINUX_GPMDATA => MOUSEDRV_LINUX_GPMDATA_ +'' #define MOUSEDRV_LINUX_MS => MOUSEDRV_LINUX_MS_ +'' #define MOUSEDRV_LINUX_IMS => MOUSEDRV_LINUX_IMS_ +'' #define MOUSEDRV_LINUX_EVDEV => MOUSEDRV_LINUX_EVDEV_ +'' #elseif defined(__FB_DOS__) +'' #define GFX_XTENDED => GFX_XTENDED_ +'' #define DIGI_SB10 => DIGI_SB10_ +'' #define DIGI_SB15 => DIGI_SB15_ +'' #define DIGI_SB20 => DIGI_SB20_ +'' #define DIGI_SBPRO => DIGI_SBPRO_ +'' #define DIGI_SB16 => DIGI_SB16_ +'' #define DIGI_AUDIODRIVE => DIGI_AUDIODRIVE_ +'' #define DIGI_SOUNDSCAPE => DIGI_SOUNDSCAPE_ +'' #define MIDI_OPL2 => MIDI_OPL2_ +'' #define MIDI_2XOPL2 => MIDI_2XOPL2_ +'' #define MIDI_OPL3 => MIDI_OPL3_ +'' #define MIDI_SB_OUT => MIDI_SB_OUT_ +'' #define MIDI_AWE32 => MIDI_AWE32_ +'' #endif + extern "C" #define ALLEGRO_H @@ -130,7 +194,6 @@ extern "C" (s) = sin(x) end scope #endmacro - #define END_OF_MAIN() #if defined(__FB_WIN32__) or defined(__FB_LINUX__) @@ -193,12 +256,10 @@ extern "C" #if defined(__FB_WIN32__) or defined(__FB_LINUX__) #define bmp_select(bmp) - #define bmp_write8(addr, c) *cptr(ubyte ptr, (addr)) = (c) #define bmp_write15(addr, c) *cptr(ushort ptr, (addr)) = (c) #define bmp_write16(addr, c) *cptr(ushort ptr, (addr)) = (c) #define bmp_write32(addr, c) *cptr(ulong ptr, (addr)) = (c) - #define bmp_read8(addr) (*cptr(ubyte ptr, (addr))) #define bmp_read15(addr) (*cptr(ushort ptr, (addr))) #define bmp_read16(addr) (*cptr(ushort ptr, (addr))) @@ -457,7 +518,6 @@ declare sub check_cpu() #define CPU_MODEL_POWERPC_750 9 #define CPU_MODEL_POWERPC_7400 10 #define CPU_MODEL_POWERPC_7450 11 - #define _AL_CPU_VENDOR_SIZE 32 extern _AL_DLL __cpu_vendor alias "cpu_vendor" as byte #define cpu_vendor (*cptr(zstring ptr, @__cpu_vendor)) @@ -682,7 +742,6 @@ extern _AL_DLL keyboard_ucallback as function(byval key as long, byval scancode extern _AL_DLL keyboard_lowlevel_callback as sub(byval scancode as long) declare sub install_keyboard_hooks(byval keypressed as function() as long, byval readkey as function() as long) - #define key(i) ((@__key)[i]) extern _AL_DLL __key alias "key" as byte extern _AL_DLL key_shifts as long @@ -1059,10 +1118,8 @@ extern _AL_DLL joystick_none as JOYSTICK_DRIVER extern _AL_DLL joystick_driver as JOYSTICK_DRIVER ptr #define _joystick_driver_list(i) ((@___joystick_driver_list)[i]) extern _AL_DLL ___joystick_driver_list alias "_joystick_driver_list" as _DRIVER_INFO - #define BEGIN_JOYSTICK_DRIVER_LIST dim as _DRIVER_INFO _joystick_driver_list(0 to ...) = { #define END_JOYSTICK_DRIVER_LIST ( JOY_TYPE_NONE, @joystick_none, TRUE ), ( 0, NULL, 0 ) } - declare function install_joystick(byval type as long) as long declare sub remove_joystick() declare function poll_joystick() as long @@ -1230,10 +1287,8 @@ end type extern _AL_DLL gfx_driver as GFX_DRIVER ptr #define _gfx_driver_list(i) ((@___gfx_driver_list)[i]) extern _AL_DLL ___gfx_driver_list alias "_gfx_driver_list" as _DRIVER_INFO - #define BEGIN_GFX_DRIVER_LIST dim as _DRIVER_INFO _gfx_driver_list(0 to ...) = { #define END_GFX_DRIVER_LIST ( 0, NULL, 0 ) } - #define GFX_CAN_SCROLL &h00000001 #define GFX_CAN_TRIPLE_BUFFER &h00000002 #define GFX_HW_CURSOR &h00000004 @@ -1345,7 +1400,6 @@ end type #define _vtable_list(i) ((@___vtable_list)[i]) extern _AL_DLL ___vtable_list alias "_vtable_list" as _VTABLE_INFO - #define BEGIN_COLOR_DEPTH_LIST dim as _VTABLE_INFO _vtable_list(0 to ...) = { #define END_COLOR_DEPTH_LIST ( 0, NULL ) } #define COLOR_DEPTH_8 ( 8, @__linear_vtable8 ), @@ -1371,7 +1425,7 @@ type BITMAP_ x_ofs as long y_ofs as long seg as long - line as ubyte ptr + line(0 to 1 - 1) as ubyte ptr end type #define BMP_ID_VIDEO &h80000000 @@ -1739,7 +1793,7 @@ type RLE_SPRITE_ h as long color_depth as long size as long - dat as byte + dat(0 to 1 - 1) as byte end type declare function get_rle_sprite(byval bitmap as BITMAP ptr) as RLE_SPRITE ptr @@ -1775,7 +1829,7 @@ declare sub destroy_font(byval f as FONT ptr) type FONT_GLYPH_ w as short h as short - dat as ubyte + dat(0 to 1 - 1) as ubyte end type type FONT_VTABLE as FONT_VTABLE_ @@ -2078,7 +2132,6 @@ end type #define _digi_driver_list(i) ((@___digi_driver_list)[i]) extern _AL_DLL ___digi_driver_list alias "_digi_driver_list" as _DRIVER_INFO - #define BEGIN_DIGI_DRIVER_LIST dim as _DRIVER_INFO _digi_driver_list(0 to ...) = { #define END_DIGI_DRIVER_LIST ( 0, NULL, 0 ) } @@ -2216,7 +2269,6 @@ end type extern _AL_DLL midi_digmid as MIDI_DRIVER #define _midi_driver_list(i) ((@___midi_driver_list)[i]) extern _AL_DLL ___midi_driver_list alias "_midi_driver_list" as _DRIVER_INFO - #define BEGIN_MIDI_DRIVER_LIST dim as _DRIVER_INFO _midi_driver_list(0 to ...) = { #define END_MIDI_DRIVER_LIST ( 0, NULL, 0 ) } #define MIDI_DRIVER_DIGMID ( MIDI_DIGMID, @midi_digmid, TRUE ), @@ -2318,7 +2370,6 @@ declare sub al_findclose(byval info as al_ffblk ptr) #define PACKFILE_FLAG_ERROR 16 #define PACKFILE_FLAG_OLD_CRYPT 32 #define PACKFILE_FLAG_EXEDAT 64 - type LZSS_PACK_DATA as LZSS_PACK_DATA_ type LZSS_UNPACK_DATA as LZSS_UNPACK_DATA_ @@ -2687,14 +2738,12 @@ declare function timer_is_using_retrace() as long #define GFX_DIRECTX_WIN_ AL_ID(asc("D"), asc("X"), asc("W"), asc("N")) #define GFX_DIRECTX_OVL_ AL_ID(asc("D"), asc("X"), asc("O"), asc("V")) #define GFX_GDI_ AL_ID(asc("G"), asc("D"), asc("I"), asc("B")) - extern _AL_DLL gfx_directx_accel as GFX_DRIVER extern _AL_DLL gfx_directx_safe as GFX_DRIVER extern _AL_DLL gfx_directx_soft as GFX_DRIVER extern _AL_DLL gfx_directx_win as GFX_DRIVER extern _AL_DLL gfx_directx_ovl as GFX_DRIVER extern _AL_DLL gfx_gdi as GFX_DRIVER - #define GFX_DRIVER_DIRECTX ( GFX_DIRECTX_ACCEL, @gfx_directx_accel, TRUE ), ( GFX_DIRECTX_SOFT, @gfx_directx_soft, TRUE ), ( GFX_DIRECTX_SAFE, @gfx_directx_safe, TRUE ), ( GFX_DIRECTX_WIN, @gfx_directx_win, TRUE ), ( GFX_DIRECTX_OVL, @gfx_directx_ovl, TRUE ), ( GFX_GDI, @gfx_gdi, FALSE ), #define DIGI_DIRECTX(n) AL_ID(asc("D"), asc("X"), asc("A") + (n), asc(" ")) #define DIGI_DIRECTAMX(n) AL_ID(asc("A"), asc("X"), asc("A") + (n), asc(" ")) @@ -2704,7 +2753,6 @@ declare function timer_is_using_retrace() as long #define MIDI_WIN32_IN(n) AL_ID(asc("W"), asc("3"), asc("2"), asc("A") + (n)) #define JOY_TYPE_DIRECTX AL_ID(asc("D"), asc("X"), asc(" "), asc(" ")) #define JOY_TYPE_WIN32 AL_ID(asc("W"), asc("3"), asc("2"), asc(" ")) - extern _AL_DLL joystick_directx as JOYSTICK_DRIVER extern _AL_DLL joystick_win32 as JOYSTICK_DRIVER #define JOYSTICK_DRIVER_DIRECTX ( JOY_TYPE_DIRECTX, @joystick_directx, TRUE ), @@ -2746,7 +2794,6 @@ declare function timer_is_using_retrace() as long #define MOUSEDRV_LINUX_IMS_ AL_ID(asc("I"), asc("M"), asc("S"), asc(" ")) #define MOUSEDRV_LINUX_EVDEV_ AL_ID(asc("E"), asc("V"), asc(" "), asc(" ")) #define JOY_TYPE_LINUX_ANALOGUE AL_ID(asc("L"), asc("N"), asc("X"), asc("A")) - extern system_linux as SYSTEM_DRIVER extern mousedrv_linux_ps2 as MOUSE_DRIVER extern mousedrv_linux_ips2 as MOUSE_DRIVER @@ -2769,13 +2816,11 @@ declare function timer_is_using_retrace() as long #define MOUSEDRV_POLLING_ AL_ID(asc("P"), asc("O"), asc("L"), asc("L")) #define MOUSEDRV_WINNT_ AL_ID(asc("W"), asc("N"), asc("T"), asc(" ")) #define MOUSEDRV_WIN2K_ AL_ID(asc("W"), asc("2"), asc("K"), asc(" ")) - extern mousedrv_mickeys as MOUSE_DRIVER extern mousedrv_int33 as MOUSE_DRIVER extern mousedrv_polling as MOUSE_DRIVER extern mousedrv_winnt as MOUSE_DRIVER extern mousedrv_win2k as MOUSE_DRIVER - #define JOY_TYPE_STANDARD AL_ID(asc("S"), asc("T"), asc("D"), asc(" ")) #define JOY_TYPE_2PADS AL_ID(asc("2"), asc("P"), asc("A"), asc("D")) #define JOY_TYPE_4BUTTON AL_ID(asc("4"), asc("B"), asc("U"), asc("T")) @@ -2808,7 +2853,6 @@ declare function timer_is_using_retrace() as long #define JOY_TYPE_IFSEGA_PCI AL_ID(asc("S"), asc("E"), asc("G"), asc("P")) #define JOY_TYPE_IFSEGA_PCI_FAST AL_ID(asc("S"), asc("G"), asc("P"), asc("F")) #define JOY_TYPE_WINGWARRIOR AL_ID(asc("W"), asc("W"), asc("A"), asc("R")) - extern joystick_standard as JOYSTICK_DRIVER extern joystick_2pads as JOYSTICK_DRIVER extern joystick_4button as JOYSTICK_DRIVER @@ -2841,7 +2885,6 @@ declare function timer_is_using_retrace() as long extern joystick_sg2 as JOYSTICK_DRIVER extern joystick_sg2f as JOYSTICK_DRIVER extern joystick_ww as JOYSTICK_DRIVER - #define JOYSTICK_DRIVER_STANDARD ( JOY_TYPE_STANDARD, @joystick_standard, TRUE ), ( JOY_TYPE_2PADS, @joystick_2pads, FALSE ), ( JOY_TYPE_4BUTTON, @joystick_4button, FALSE ), ( JOY_TYPE_6BUTTON, @joystick_6button, FALSE ), ( JOY_TYPE_8BUTTON, @joystick_8button, FALSE ), ( JOY_TYPE_FSPRO, @joystick_fspro, FALSE ), ( JOY_TYPE_WINGEX, @joystick_wingex, FALSE ), #define JOYSTICK_DRIVER_SIDEWINDER ( JOY_TYPE_SIDEWINDER, @joystick_sw, TRUE ), ( JOY_TYPE_SIDEWINDER_AG, @joystick_sw_ag, TRUE ), ( JOY_TYPE_SIDEWINDER_PP, @joystick_sw_pp, TRUE ), #define JOYSTICK_DRIVER_GAMEPAD_PRO ( JOY_TYPE_GAMEPAD_PRO, @joystick_gpro, TRUE ), @@ -2855,7 +2898,6 @@ declare function timer_is_using_retrace() as long #define JOYSTICK_DRIVER_IFSEGA_PCI ( JOY_TYPE_IFSEGA_PCI, @joystick_sg2, FALSE ), #define JOYSTICK_DRIVER_IFSEGA_PCI_FAST ( JOY_TYPE_IFSEGA_PCI_FAST,@joystick_sg2f, FALSE ), #define JOYSTICK_DRIVER_WINGWARRIOR ( JOY_TYPE_WINGWARRIOR, @joystick_ww, TRUE ), - #define joy_FSPRO_trigger joy_b1 #define joy_FSPRO_butleft joy_b2 #define joy_FSPRO_butright joy_b3 @@ -2864,7 +2906,6 @@ declare function timer_is_using_retrace() as long #define joy_WINGEX_buttop joy_b2 #define joy_WINGEX_butthumb joy_b3 #define joy_WINGEX_butmiddle joy_b4 - declare function calibrate_joystick_tl() as long declare function calibrate_joystick_br() as long declare function calibrate_joystick_throttle_min() as long @@ -2880,7 +2921,6 @@ declare function timer_is_using_retrace() as long #define GFX_VESA3 AL_ID(asc("V"), asc("B"), asc("E"), asc("3")) #define GFX_VBEAF_ AL_ID(asc("V"), asc("B"), asc("A"), asc("F")) #define GFX_XTENDED_ AL_ID(asc("X"), asc("T"), asc("N"), asc("D")) - extern gfx_vga as GFX_DRIVER extern gfx_modex as GFX_DRIVER extern gfx_vesa_1 as GFX_DRIVER @@ -2889,7 +2929,6 @@ declare function timer_is_using_retrace() as long extern gfx_vesa_3 as GFX_DRIVER extern gfx_vbeaf as GFX_DRIVER extern gfx_xtended as GFX_DRIVER - #define GFX_DRIVER_VGA ( GFX_VGA, @gfx_vga, TRUE ), #define GFX_DRIVER_MODEX ( GFX_MODEX, @gfx_modex, TRUE ), #define GFX_DRIVER_VBEAF ( GFX_VBEAF, @gfx_vbeaf, TRUE ), @@ -2920,7 +2959,6 @@ declare function timer_is_using_retrace() as long #define MIDI_SB_OUT_ AL_ID(asc("S"), asc("B"), asc(" "), asc(" ")) #define MIDI_MPU AL_ID(asc("M"), asc("P"), asc("U"), asc(" ")) #define MIDI_AWE32_ AL_ID(asc("A"), asc("W"), asc("E"), asc(" ")) - extern digi_sb10 as DIGI_DRIVER extern digi_sb15 as DIGI_DRIVER extern digi_sb20 as DIGI_DRIVER @@ -2935,7 +2973,6 @@ declare function timer_is_using_retrace() as long extern midi_sb_out as MIDI_DRIVER extern midi_mpu401 as MIDI_DRIVER extern midi_awe32 as MIDI_DRIVER - #define DIGI_DRIVER_WINSOUNDSYS ( DIGI_WINSOUNDSYS, @digi_wss, FALSE ), #define DIGI_DRIVER_AUDIODRIVE ( DIGI_AUDIODRIVE, @digi_audiodrive, TRUE ), #define DIGI_DRIVER_SOUNDSCAPE ( DIGI_SOUNDSCAPE, @digi_soundscape, TRUE ), diff --git a/inc/allegro/algif.bi b/inc/allegro/algif.bi index e4329b57c8..b08ba81264 100644 --- a/inc/allegro/algif.bi +++ b/inc/allegro/algif.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "algif" #include once "allegro.bi" diff --git a/inc/allegro/alpng.bi b/inc/allegro/alpng.bi index 4bec09a2cd..cd140d8922 100644 --- a/inc/allegro/alpng.bi +++ b/inc/allegro/alpng.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "alpng" #include once "allegro.bi" diff --git a/inc/allegro5/allegro.bi b/inc/allegro5/allegro.bi index 240847f153..9260b47368 100644 --- a/inc/allegro5/allegro.bi +++ b/inc/allegro5/allegro.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "allegro" #include once "crt/errno.bi" @@ -300,7 +301,6 @@ declare function al_ustr_size_utf16(byval us as const ALLEGRO_USTR ptr) as uinte declare function al_ustr_encode_utf16(byval us as const ALLEGRO_USTR ptr, byval s as ushort ptr, byval n as uinteger) as uinteger declare function al_utf16_width(byval c as long) as uinteger declare function al_utf16_encode(byval s as ushort ptr, byval c as long) as uinteger - type ALLEGRO_FILE as ALLEGRO_FILE_ type ALLEGRO_FILE_INTERFACE diff --git a/inc/allegro5/allegro_acodec.bi b/inc/allegro5/allegro_acodec.bi index 37f763d4bc..69dba54378 100644 --- a/inc/allegro5/allegro_acodec.bi +++ b/inc/allegro5/allegro_acodec.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "allegro_acodec" #include once "allegro5/allegro.bi" diff --git a/inc/allegro5/allegro_audio.bi b/inc/allegro5/allegro_audio.bi index 96b419c422..f26abc3942 100644 --- a/inc/allegro5/allegro_audio.bi +++ b/inc/allegro5/allegro_audio.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "allegro_audio" #include once "allegro5/allegro.bi" diff --git a/inc/allegro5/allegro_color.bi b/inc/allegro5/allegro_color.bi index a860c9ff5b..739b0d3db8 100644 --- a/inc/allegro5/allegro_color.bi +++ b/inc/allegro5/allegro_color.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "allegro_color" #include once "allegro5/allegro.bi" diff --git a/inc/allegro5/allegro_font.bi b/inc/allegro5/allegro_font.bi index 07fb5c9e58..40e6bc12ef 100644 --- a/inc/allegro5/allegro_font.bi +++ b/inc/allegro5/allegro_font.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "allegro_font" #include once "allegro5/allegro.bi" diff --git a/inc/allegro5/allegro_image.bi b/inc/allegro5/allegro_image.bi index a54e42304d..67f53419a6 100644 --- a/inc/allegro5/allegro_image.bi +++ b/inc/allegro5/allegro_image.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "allegro_image" extern "C" diff --git a/inc/allegro5/allegro_memfile.bi b/inc/allegro5/allegro_memfile.bi index 0cd0ddaf34..335d092b4e 100644 --- a/inc/allegro5/allegro_memfile.bi +++ b/inc/allegro5/allegro_memfile.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "allegro_memfile" #include once "allegro5/allegro.bi" diff --git a/inc/allegro5/allegro_native_dialog.bi b/inc/allegro5/allegro_native_dialog.bi index 31081bb8fa..c1f5aef827 100644 --- a/inc/allegro5/allegro_native_dialog.bi +++ b/inc/allegro5/allegro_native_dialog.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "allegro_dialog" #include once "allegro5/allegro.bi" diff --git a/inc/allegro5/allegro_physfs.bi b/inc/allegro5/allegro_physfs.bi index d21ec02077..c610fd8f79 100644 --- a/inc/allegro5/allegro_physfs.bi +++ b/inc/allegro5/allegro_physfs.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "allegro_physfs" #include once "allegro5/allegro.bi" diff --git a/inc/allegro5/allegro_primitives.bi b/inc/allegro5/allegro_primitives.bi index 99752e6acd..7349444701 100644 --- a/inc/allegro5/allegro_primitives.bi +++ b/inc/allegro5/allegro_primitives.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "allegro_primitives" #include once "allegro5/allegro.bi" diff --git a/inc/allegro5/allegro_ttf.bi b/inc/allegro5/allegro_ttf.bi index 88cf290156..aa863752cc 100644 --- a/inc/allegro5/allegro_ttf.bi +++ b/inc/allegro5/allegro_ttf.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "allegro_ttf" #include once "allegro5/allegro.bi" diff --git a/inc/cgui.bi b/inc/cgui.bi index ea6772cd6c..5c1b0aa247 100644 --- a/inc/cgui.bi +++ b/inc/cgui.bi @@ -1,22 +1,174 @@ #pragma once + #inclib "cgui" #include once "crt/long.bi" #include once "crt/stdio.bi" #include once "crt/errno.bi" #include once "crt/stdlib.bi" +#include once "allegro.bi" '' The following symbols have been renamed: +'' #define DIR_TOPLEFT => CGUI_DIR_TOPLEFT +'' #define DIR_RIGHT => CGUI_DIR_RIGHT +'' #define DIR_LEFT => CGUI_DIR_LEFT +'' #define DIR_DOWNLEFT => CGUI_DIR_DOWNLEFT +'' #define DIR_DOWN => CGUI_DIR_DOWN +'' #define AUTOINDICATOR => CGUI_AUTOINDICATOR +'' #define ALIGNCENTRE => CGUI_ALIGNCENTRE +'' #define ALIGNBOTTOM => CGUI_ALIGNBOTTOM +'' #define ALIGNRIGHT => CGUI_ALIGNRIGHT +'' #define HORIZONTAL => CGUI_HORIZONTAL +'' #define VERTICAL => CGUI_VERTICAL +'' #define FILLSPACE => CGUI_FILLSPACE +'' #define EQUALWIDTH => CGUI_EQUALWIDTH +'' #define EQUALHEIGHT => CGUI_EQUALHEIGHT +'' #define W_SIBLING => CGUI_W_SIBLING +'' #define W_NOMOVE => CGUI_W_NOMOVE +'' #define W_FLOATING => CGUI_W_FLOATING +'' #define W_TOP => CGUI_W_TOP +'' #define W_BOTTOM => CGUI_W_BOTTOM +'' #define W_LEFT => CGUI_W_LEFT +'' #define W_RIGHT => CGUI_W_RIGHT +'' #define W_CENTRE_H => CGUI_W_CENTRE_H +'' #define W_CENTRE_V => CGUI_W_CENTRE_V +'' #define W_CENTRE => CGUI_W_CENTRE +'' #define ID_DESKTOP => CGUI_ID_DESKTOP +'' #define R_HORIZONTAL => CGUI_R_HORIZONTAL +'' #define R_VERTICAL => CGUI_R_VERTICAL +'' #define TR_SHOWPOS => CGUI_TR_SHOWPOS +'' #define SL_SCALE => CGUI_SL_SCALE +'' #define SL_LABEL => CGUI_SL_LABEL +'' #define SL_STYLE1 => CGUI_SL_STYLE1 +'' #define SL_STYLE2 => CGUI_SL_STYLE2 +'' #define SL_STYLE3 => CGUI_SL_STYLE3 +'' #define TB_FRAMERAISE => CGUI_TB_FRAMERAISE +'' #define TB_FRAMESINK => CGUI_TB_FRAMESINK +'' #define TB_PREFORMAT => CGUI_TB_PREFORMAT +'' #define TB_LINEFEED_ => CGUI_TB_LINEFEED_ +'' #define TB_FIXFONT => CGUI_TB_FIXFONT +'' #define TB_WHITE => CGUI_TB_WHITE +'' #define TB_TEXTFILE => CGUI_TB_TEXTFILE +'' #define TB_FOCUS_END => CGUI_TB_FOCUS_END +'' #define TERMINATE_EDIT => CGUI_TERMINATE_EDIT +'' #define FBYTE => CGUI_FBYTE +'' #define FSHORT => CGUI_FSHORT +'' #define FINT => CGUI_FINT +'' #define FLONG => CGUI_FLONG +'' #define FSTRING => CGUI_FSTRING +'' #define FPTRSTR => CGUI_FPTRSTR +'' #define FPOINTS => CGUI_FPOINTS +'' #define FBPOINTS => CGUI_FBPOINTS +'' #define FFLOAT => CGUI_FFLOAT +'' #define FHEX1 => CGUI_FHEX1 +'' #define FHEX2 => CGUI_FHEX2 +'' #define FHEX4 => CGUI_FHEX4 +'' #define FOCT1 => CGUI_FOCT1 +'' #define FOCT2 => CGUI_FOCT2 +'' #define FOCT3 => CGUI_FOCT3 +'' #define FOCT4 => CGUI_FOCT4 +'' #define FNAME => CGUI_FNAME +'' #define FBLANK0 => CGUI_FBLANK0 +'' #define FUNDEF => CGUI_FUNDEF +'' #define B_UNDEF_VAL => CGUI_B_UNDEF_VAL +'' #define S_UNDEF_VAL => CGUI_S_UNDEF_VAL +'' #define I_UNDEF_VAL => CGUI_I_UNDEF_VAL +'' #define L_UNDEF_VAL => CGUI_L_UNDEF_VAL +'' #define P_UNDEF_VAL => CGUI_P_UNDEF_VAL +'' #define BP_UNDEF_VAL => CGUI_BP_UNDEF_VAL +'' #define IMAGE_BMP => CGUI_IMAGE_BMP +'' #define IMAGE_TRANS_BMP => CGUI_IMAGE_TRANS_BMP +'' #define IMAGE_RLE_SPRITE => CGUI_IMAGE_RLE_SPRITE +'' #define IMAGE_CMP_SPRITE => CGUI_IMAGE_CMP_SPRITE +'' #define LEFT_MOUSE => CGUI_LEFT_MOUSE +'' #define RIGHT_MOUSE => CGUI_RIGHT_MOUSE +'' #define DD_GRIPPED => CGUI_DD_GRIPPED +'' #define DD_UNGRIPPED => CGUI_DD_UNGRIPPED +'' #define DD_SUCCESS => CGUI_DD_SUCCESS +'' #define DD_OVER_GRIP => CGUI_DD_OVER_GRIP +'' #define DD_OVER_DROP => CGUI_DD_OVER_DROP +'' #define DD_END_OVER_DROP => CGUI_DD_END_OVER_DROP +'' #define SL_OVER => CGUI_SL_OVER +'' #define SL_OVER_END => CGUI_SL_OVER_END +'' #define SL_STARTED => CGUI_SL_STARTED +'' #define SL_PROGRESS => CGUI_SL_PROGRESS +'' #define SL_STOPPED => CGUI_SL_STOPPED +'' #define SV_HIDE_LABEL => CGUI_SV_HIDE_LABEL +'' #define SV_HIDE_ICON => CGUI_SV_HIDE_ICON +'' #define SV_NO_TOOLTIP => CGUI_SV_NO_TOOLTIP +'' #define SV_ONLY_BRIEF => CGUI_SV_ONLY_BRIEF +'' #define SV_ONLY_LONG => CGUI_SV_ONLY_LONG +'' #define SV_PREFERE_BRIEF => CGUI_SV_PREFERE_BRIEF +'' #define SV_PREFERE_LONG => CGUI_SV_PREFERE_LONG '' procedure Remove => Remove_ +'' #define CT_BORDER => CGUI_CT_BORDER +'' #define CT_OBJECT_TABLE => CGUI_CT_OBJECT_TABLE +'' #define OFF => CGUI_OFF +'' #define ON => CGUI_ON +'' #define ROW_STRIKE => CGUI_ROW_STRIKE +'' #define ROW_UNDERLINE => CGUI_ROW_UNDERLINE +'' #define ROW_CHECK => CGUI_ROW_CHECK +'' #define ROW_UNCHECK => CGUI_ROW_UNCHECK +'' #define COL_RIGHT_ALIGN => CGUI_COL_RIGHT_ALIGN +'' #define ROW_COLUMN_UNDERLINE => CGUI_ROW_COLUMN_UNDERLINE +'' #define TR_HIDE_ROOT => CGUI_TR_HIDE_ROOT +'' #define LIST_COLUMNS_ADJUSTABLE => CGUI_LIST_COLUMNS_ADJUSTABLE +'' #define LIST_COLUMNS_ADJUSTABLE_KEEP_BOX_WIDTH => CGUI_LIST_COLUMNS_ADJUSTABLE_KEEP_BOX_WIDTH +'' #define LIST_COLUMNS_DELIMITER => CGUI_LIST_COLUMNS_DELIMITER +'' #define FS_BROWSE_DAT => CGUI_FS_BROWSE_DAT +'' #define FS_DISABLE_EDIT_DAT => CGUI_FS_DISABLE_EDIT_DAT +'' #define FS_WARN_EXISTING_FILE => CGUI_FS_WARN_EXISTING_FILE +'' #define FS_FORBID_EXISTING_FILE => CGUI_FS_FORBID_EXISTING_FILE +'' #define FS_REQUIRE_EXISTING_FILE => CGUI_FS_REQUIRE_EXISTING_FILE +'' #define FS_SELECT_DIR => CGUI_FS_SELECT_DIR +'' #define FS_DISABLE_CREATE_DIR => CGUI_FS_DISABLE_CREATE_DIR +'' #define FS_DISABLE_DELETING => CGUI_FS_DISABLE_DELETING +'' #define FS_DISABLE_COPYING => CGUI_FS_DISABLE_COPYING +'' #define FS_SHOW_MENU => CGUI_FS_SHOW_MENU +'' #define FS_NO_SETTINGS_IN_CONFIG => CGUI_FS_NO_SETTINGS_IN_CONFIG +'' #define FS_MULTIPLE_SELECTION => CGUI_FS_MULTIPLE_SELECTION +'' #define FS_NO_DRAG_DROP => CGUI_FS_NO_DRAG_DROP +'' #define FS_DIRECT_SELECT_BY_DOUBLE_CLICK => CGUI_FS_DIRECT_SELECT_BY_DOUBLE_CLICK +'' #define FS_SAVE_AS => CGUI_FS_SAVE_AS +'' #define FS_SHOW_DIR_TREE => CGUI_FS_SHOW_DIR_TREE +'' #define FS_SHOW_DIRS_IN_FILE_VIEW => CGUI_FS_SHOW_DIRS_IN_FILE_VIEW +'' #define FS_HIDE_LOCATION => CGUI_FS_HIDE_LOCATION +'' #define FS_HIDE_UP_BUTTON => CGUI_FS_HIDE_UP_BUTTON +'' #define FS_HIDE_UP_DIRECTORY => CGUI_FS_HIDE_UP_DIRECTORY +'' #define FS_FILE_FILTER_IS_READ_ONLY => CGUI_FS_FILE_FILTER_IS_READ_ONLY +'' #define FM_HIDE_FILE_VEW => CGUI_FM_HIDE_FILE_VEW +'' #define FM_DO_NOT_SHOW_MENU => CGUI_FM_DO_NOT_SHOW_MENU +'' #define FM_NO_FLOATING => CGUI_FM_NO_FLOATING +'' #define FM_BROWSE_DAT => CGUI_FM_BROWSE_DAT +'' #define FM_DISABLE_EDIT_DAT => CGUI_FM_DISABLE_EDIT_DAT +'' #define FM_DISABLE_CREATE_DIR => CGUI_FM_DISABLE_CREATE_DIR +'' #define FM_DISABLE_DELETING => CGUI_FM_DISABLE_DELETING +'' #define FM_DISABLE_COPYING => CGUI_FM_DISABLE_COPYING +'' #define FM_NO_SETTINGS_IN_CONFIG => CGUI_FM_NO_SETTINGS_IN_CONFIG +'' #define FM_SHOW_DIR_TREE => CGUI_FM_SHOW_DIR_TREE +'' #define FM_SHOW_DIRS_IN_FILE_VIEW => CGUI_FM_SHOW_DIRS_IN_FILE_VIEW +'' #define FM_HIDE_LOCATION => CGUI_FM_HIDE_LOCATION +'' #define FM_HIDE_UP_BUTTON => CGUI_FM_HIDE_UP_BUTTON +'' #define FM_HIDE_UP_DIRECTORY => CGUI_FM_HIDE_UP_DIRECTORY +'' #define CLOCK_SHOW_SECONDS => CGUI_CLOCK_SHOW_SECONDS +'' #define CLOCK_SHOW_MINUTES => CGUI_CLOCK_SHOW_MINUTES +'' #define CLOCK_NO_DIALOGUE => CGUI_CLOCK_NO_DIALOGUE +'' #define CURS_ILLEGAL => CGUI_CURS_ILLEGAL +'' #define CURS_DRAGGABLE => CGUI_CURS_DRAGGABLE +'' #define CURS_DRAG_V => CGUI_CURS_DRAG_V +'' #define CURS_DRAG_H => CGUI_CURS_DRAG_H +'' #define CURS_CROSS => CGUI_CURS_CROSS +'' #define CURS_BUSY => CGUI_CURS_BUSY +'' #define CURS_DEFAULT => CGUI_CURS_DEFAULT +'' #define NO_VERTICAL => CGUI_NO_VERTICAL +'' #define NO_HORIZONTAL => CGUI_NO_HORIZONTAL +'' #define FRAMERAISE => CGUI_FRAMERAISE +'' #define FRAMESINK => CGUI_FRAMESINK +'' #define W_NOMODAL => CGUI_W_NOMODAL +'' #define W_CHILD => CGUI_W_CHILD extern "C" -#ifndef FONT -type FONT as FONT_ -type BITMAP as BITMAP_ -type DATAFILE as DATAFILE_ -#endif - #if defined(CGUI_STATICLINK) or ((not defined(CGUI_STATICLINK)) and (defined(__FB_DOS__) or defined(__FB_LINUX__))) #define EXTERNVAR extern #else @@ -445,8 +597,7 @@ enum NR_OF_CGUI_COLORS end enum -EXTERNVAR cgui_colors(0 to NR_OF_CGUI_COLORS-1) as long - +EXTERNVAR cgui_colors(0 to NR_OF_CGUI_COLORS - 1) as long declare function CguiSetColor(byval color_name as long, byval r as long, byval g as long, byval b as long) as long declare sub NameCase(byval text as zstring ptr) declare sub Sound(byval freq as long, byval duration as long) diff --git a/inc/curl.bi b/inc/curl.bi index 775ca3245d..935f555d2c 100644 --- a/inc/curl.bi +++ b/inc/curl.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "curl" #include once "crt/long.bi" @@ -61,7 +62,6 @@ extern "C" #endif type curl_off_t as longint - #define __CURL_CURLRULES_H #define CURL_ISOCPP #define __CURL_OFF_T_C_HLPR2(Val, Suffix) Val##Suffix diff --git a/inc/curses/ncurses.bi b/inc/curses/ncurses.bi index f904e4c364..84ffca37a2 100644 --- a/inc/curses/ncurses.bi +++ b/inc/curses/ncurses.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "curses" #include once "crt/long.bi" @@ -8,7 +9,7 @@ '' The following symbols have been renamed: '' #define NCURSES_BOOL => NCURSES_BOOL_ '' #define ERR => ERR_ -'' typedef screen => screen_ +'' typedef SCREEN => SCREEN_ '' typedef WINDOW => WINDOW_ '' procedure beep => beep_ '' #define clear => clear_ @@ -17,6 +18,7 @@ '' #define slk_attr_off => slk_attr_off_ '' #define slk_attr_on => slk_attr_on_ '' procedure getmouse => getmouse_ +'' procedure mouse_trafo => mouse_trafo_ extern "C" @@ -69,8 +71,8 @@ type NCURSES_BOOL as ubyte #define COLOR_MAGENTA 5 #define COLOR_CYAN 6 #define COLOR_WHITE 7 -#define ACS_LEN 128 -extern acs_map(0 to ACS_LEN-1) as chtype +#define acs_map(i) ((@__acs_map)[i]) +extern __acs_map alias "acs_map" as chtype #define NCURSES_ACS(c) (acs_map(cubyte(c))) #define ACS_ULCORNER NCURSES_ACS(asc("l")) #define ACS_LLCORNER NCURSES_ACS(asc("m")) @@ -182,8 +184,8 @@ declare function curs_set(byval as long) as long declare function def_prog_mode() as long declare function def_shell_mode() as long declare function delay_output(byval as long) as long -type screen_ as screen__ -declare sub delscreen(byval as screen_ ptr) +type SCREEN_ as SCREEN__ +declare sub delscreen(byval as SCREEN_ ptr) declare function delwin(byval as WINDOW_ ptr) as long declare function derwin(byval as WINDOW_ ptr, byval as long, byval as long, byval as long, byval as long) as WINDOW_ ptr declare function doupdate() as long @@ -224,7 +226,7 @@ declare function mvwprintw(byval as WINDOW_ ptr, byval as long, byval as long, b declare function mvwscanw(byval as WINDOW_ ptr, byval as long, byval as long, byval as zstring ptr, ...) as long declare function napms(byval as long) as long declare function newpad(byval as long, byval as long) as WINDOW_ ptr -declare function newterm(byval as zstring ptr, byval as FILE ptr, byval as FILE ptr) as screen_ ptr +declare function newterm(byval as zstring ptr, byval as FILE ptr, byval as FILE ptr) as SCREEN_ ptr declare function newwin(byval as long, byval as long, byval as long, byval as long) as WINDOW_ ptr declare function nl() as long declare function nocbreak() as long @@ -255,7 +257,7 @@ declare function scr_init(byval as const zstring ptr) as long declare function scrollok(byval as WINDOW_ ptr, byval as byte) as long declare function scr_restore(byval as const zstring ptr) as long declare function scr_set(byval as const zstring ptr) as long -declare function set_term(byval as screen_ ptr) as screen_ ptr +declare function set_term(byval as SCREEN_ ptr) as SCREEN_ ptr declare function slk_attroff(byval as const chtype) as long declare function slk_attr_off(byval as const attr_t, byval as any ptr) as long declare function slk_attron(byval as const chtype) as long @@ -333,7 +335,7 @@ declare function tiparm(byval as const zstring ptr, ...) as zstring ptr #define vid_attr(a, pair, opts) vidattr(a) #define NCURSES_EXT_FUNCS 20110404 type NCURSES_WINDOW_CB as function(byval as WINDOW_ ptr, byval as any ptr) as long -type NCURSES_SCREEN_CB as function(byval as screen_ ptr, byval as any ptr) as long +type NCURSES_SCREEN_CB as function(byval as SCREEN_ ptr, byval as any ptr) as long declare function is_term_resized(byval as long, byval as long) as byte declare function keybound(byval as long, byval as long) as zstring ptr declare function curses_version() as const zstring ptr @@ -349,7 +351,7 @@ declare function set_tabsize(byval as long) as long declare function use_default_colors() as long declare function use_extended_names(byval as byte) as long declare function use_legacy_coding(byval as long) as long -declare function use_screen(byval as screen_ ptr, byval as NCURSES_SCREEN_CB, byval as any ptr) as long +declare function use_screen(byval as SCREEN_ ptr, byval as NCURSES_SCREEN_CB, byval as any ptr) as long declare function use_window(byval as WINDOW_ ptr, byval as NCURSES_WINDOW_CB, byval as any ptr) as long declare function wresize(byval as WINDOW_ ptr, byval as long, byval as long) as long declare sub nofilter() @@ -570,10 +572,8 @@ end function extern curscr as WINDOW_ ptr extern newscr as WINDOW_ ptr extern stdscr as WINDOW_ ptr - -#define NAMESIZE 256 -extern ttytype as zstring * NAMESIZE - +extern __ttytype alias "ttytype" as byte +#define ttytype (*cptr(zstring ptr, @__ttytype)) extern COLORS as long extern COLOR_PAIRS as long extern COLS as long diff --git a/inc/curses/pdcurses.bi b/inc/curses/pdcurses.bi index 137c1dcde6..72eb5934a6 100644 --- a/inc/curses/pdcurses.bi +++ b/inc/curses/pdcurses.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "pdcurses" #include once "crt/long.bi" @@ -197,8 +198,6 @@ end type extern import COLORS as long extern import COLOR_PAIRS as long extern import TABSIZE as long - extern import acs_map(0 to 128-1) as chtype - extern import ttytype as zstring * 128 #else extern LINES as long extern COLS as long @@ -209,10 +208,19 @@ end type extern COLORS as long extern COLOR_PAIRS as long extern TABSIZE as long - extern acs_map(0 to 128-1) as chtype - extern ttytype as zstring * 128 #endif +#define acs_map(i) ((@__acs_map)[i]) + +#if defined(__FB_WIN32__) and defined(PDC_DLL_BUILD) + extern import __acs_map alias "acs_map" as chtype + extern import __ttytype alias "ttytype" as byte +#else + extern __acs_map alias "acs_map" as chtype + extern __ttytype alias "ttytype" as byte +#endif + +#define ttytype (*cptr(zstring ptr, @__ttytype)) #define A_NORMAL cast(chtype, 0) #define A_ALTCHARSET cast(chtype, &h00010000) #define A_RIGHTLINE cast(chtype, &h00020000) diff --git a/inc/fastcgi/fcgi_stdio.bi b/inc/fastcgi/fcgi_stdio.bi index 05e3b6e99d..ce1ebadf94 100644 --- a/inc/fastcgi/fcgi_stdio.bi +++ b/inc/fastcgi/fcgi_stdio.bi @@ -1,14 +1,15 @@ #pragma once +#include once "crt.bi" +#include once "crt/long.bi" +#include once "fcgiapp.bi" +#include once "crt.bi" + '' The following symbols have been renamed: '' #define FCGI_stdin => FCGI_stdin_ '' #define FCGI_stdout => FCGI_stdout_ '' #define FCGI_stderr => FCGI_stderr_ -#include once "crt.bi" -#include once "crt/long.bi" -#include once "fcgiapp.bi" - extern "C" #define _FCGI_STDIO 1 @@ -26,9 +27,9 @@ declare sub FCGI_SetExitStatus(byval status as long) #define FCGI_ToFcgiStream(fcgi_file) fcgi_file->fcgx_stream #ifdef __FB_WIN32__ - extern import _fcgi_sF(0 to 2) as FCGI_FILE + extern import _fcgi_sF(0 to 3 - 1) as FCGI_FILE #else - extern _fcgi_sF(0 to 2) as FCGI_FILE + extern _fcgi_sF(0 to 3 - 1) as FCGI_FILE #endif #define FCGI_stdin_ (@_fcgi_sF(0)) @@ -70,90 +71,88 @@ declare function FCGI_popen(byval cmd as const zstring ptr, byval type as const declare function FCGI_pclose(byval as FCGI_FILE ptr) as long #ifndef NO_FCGI_DEFINES - -#undef FILE -#define FILE FCGI_FILE -#undef stdin -#define stdin FCGI_stdin_ -#undef stdout -#define stdout FCGI_stdout_ -#undef stderr -#define stderr FCGI_stderr_ -#undef perror -#define perror FCGI_perror -#undef fopen -#define fopen FCGI_fopen -#undef fclose -#define fclose FCGI_fclose -#undef fflush -#define fflush FCGI_fflush -#undef freopen -#define freopen FCGI_freopen -#undef setvbuf -#define setvbuf FCGI_setvbuf -#undef setbuf -#define setbuf FCGI_setbuf -#undef fseek -#define fseek FCGI_fseek -#undef ftell -#define ftell FCGI_ftell -#undef rewind -#define rewind FCGI_rewind -#undef fgetpos -#define fgetpos FCGI_fgetpos -#undef fsetpos -#define fsetpos FCGI_fsetpos -#undef fgetc -#define fgetc FCGI_fgetc -#undef getc -#define getc FCGI_fgetc -#undef getchar -#define getchar FCGI_getchar -#undef ungetc -#define ungetc FCGI_ungetc -#undef fgets -#define fgets FCGI_fgets -#undef gets -#define gets FCGI_gets -#undef fputc -#define fputc FCGI_fputc -#undef putc -#define putc FCGI_fputc -#undef putchar -#define putchar FCGI_putchar -#undef fputs -#define fputs FCGI_fputs -#undef puts -#define puts FCGI_puts -#undef fprintf -#define fprintf FCGI_fprintf -#undef printf -#define printf FCGI_printf -#undef vfprintf -#define vfprintf FCGI_vfprintf -#undef vprintf -#define vprintf FCGI_vprintf -#undef fread -#define fread FCGI_fread -#undef fwrite -#define fwrite FCGI_fwrite -#undef feof -#define feof FCGI_feof -#undef ferror -#define ferror FCGI_ferror -#undef clearerr -#define clearerr FCGI_clearerr -#undef tmpfile -#define tmpfile FCGI_tmpfile -#undef fileno -#define fileno FCGI_fileno -#undef fdopen -#define fdopen FCGI_fdopen -#undef popen -#define popen FCGI_popen -#undef pclose -#define pclose FCGI_pclose - + #undef FILE + #define FILE FCGI_FILE + #undef stdin + #define stdin FCGI_stdin_ + #undef stdout + #define stdout FCGI_stdout_ + #undef stderr + #define stderr FCGI_stderr_ + #undef perror + #define perror FCGI_perror + #undef fopen + #define fopen FCGI_fopen + #undef fclose + #define fclose FCGI_fclose + #undef fflush + #define fflush FCGI_fflush + #undef freopen + #define freopen FCGI_freopen + #undef setvbuf + #define setvbuf FCGI_setvbuf + #undef setbuf + #define setbuf FCGI_setbuf + #undef fseek + #define fseek FCGI_fseek + #undef ftell + #define ftell FCGI_ftell + #undef rewind + #define rewind FCGI_rewind + #undef fgetpos + #define fgetpos FCGI_fgetpos + #undef fsetpos + #define fsetpos FCGI_fsetpos + #undef fgetc + #define fgetc FCGI_fgetc + #undef getc + #define getc FCGI_fgetc + #undef getchar + #define getchar FCGI_getchar + #undef ungetc + #define ungetc FCGI_ungetc + #undef fgets + #define fgets FCGI_fgets + #undef gets + #define gets FCGI_gets + #undef fputc + #define fputc FCGI_fputc + #undef putc + #define putc FCGI_fputc + #undef putchar + #define putchar FCGI_putchar + #undef fputs + #define fputs FCGI_fputs + #undef puts + #define puts FCGI_puts + #undef fprintf + #define fprintf FCGI_fprintf + #undef printf + #define printf FCGI_printf + #undef vfprintf + #define vfprintf FCGI_vfprintf + #undef vprintf + #define vprintf FCGI_vprintf + #undef fread + #define fread FCGI_fread + #undef fwrite + #define fwrite FCGI_fwrite + #undef feof + #define feof FCGI_feof + #undef ferror + #define ferror FCGI_ferror + #undef clearerr + #define clearerr FCGI_clearerr + #undef tmpfile + #define tmpfile FCGI_tmpfile + #undef fileno + #define fileno FCGI_fileno + #undef fdopen + #define fdopen FCGI_fdopen + #undef popen + #define popen FCGI_popen + #undef pclose + #define pclose FCGI_pclose #endif end extern diff --git a/inc/fastcgi/fcgiapp.bi b/inc/fastcgi/fcgiapp.bi index 2f870d504d..7eca90242e 100644 --- a/inc/fastcgi/fcgiapp.bi +++ b/inc/fastcgi/fcgiapp.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "fcgi" #include once "crt/stdarg.bi" @@ -27,7 +28,6 @@ end type type FCGX_ParamArray as zstring ptr ptr #define FCGI_FAIL_ACCEPT_ON_INTR 1 - type Params as Params_ type FCGX_Request diff --git a/inc/ffi.bi b/inc/ffi.bi index 217627b4f5..4a4d28a1dd 100644 --- a/inc/ffi.bi +++ b/inc/ffi.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "ffi" #include once "crt/stddef.bi" diff --git a/inc/jit.bi b/inc/jit.bi index 10b41dd26f..3c487d256f 100644 --- a/inc/jit.bi +++ b/inc/jit.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "jit" #include once "crt/longdouble.bi" @@ -1520,19 +1521,16 @@ extern jit_opcodes(0 to 438) as const jit_opcode_info_t f = __f end scope #endmacro - #macro _JIT_ARCH_GET_NEXT_FRAME(n, f) scope (n) = cptr(any ptr, iif((f), cptr(_jit_arch_frame_t ptr, (f))->next_frame, 0)) end scope #endmacro - #macro _JIT_ARCH_GET_RETURN_ADDRESS(r, f) scope (r) = cptr(any ptr, iif((f), cptr(_jit_arch_frame_t ptr, (f))->return_address, 0)) end scope #endmacro - #macro _JIT_ARCH_GET_CURRENT_RETURN(r) scope dim __frame as any ptr @@ -1542,7 +1540,6 @@ extern jit_opcodes(0 to 438) as const jit_opcode_info_t #endmacro #else #define _JIT_ARCH_X86_H - #macro _JIT_ARCH_GET_CURRENT_FRAME(f) scope dim __f as any ptr diff --git a/inc/png12.bi b/inc/png12.bi index d35664bde2..440106f4b1 100644 --- a/inc/png12.bi +++ b/inc/png12.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "png" #inclib "z" @@ -11,11 +12,11 @@ #include once "crt/time.bi" '' The following symbols have been renamed: +'' #define PNG_LIBPNG_VER => PNG_LIBPNG_VER_ '' #define PNG_READ_TEXT_SUPPORTED => PNG_READ_TEXT_SUPPORTED_ '' #define PNG_TEXT_SUPPORTED => PNG_TEXT_SUPPORTED_ '' #define PNG_WRITE_TEXT_SUPPORTED => PNG_WRITE_TEXT_SUPPORTED_ -'' #define PNG_LIBPNG_VER => PNG_LIBPNG_VER_ -'' #define png_info_init => png_info_init_ +'' procedure png_info_init => png_info_init_ extern "C" diff --git a/inc/png14.bi b/inc/png14.bi index 7823f0d894..19b4ab7745 100644 --- a/inc/png14.bi +++ b/inc/png14.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "png" #inclib "z" @@ -12,10 +13,13 @@ #include once "crt/time.bi" '' The following symbols have been renamed: +'' #define PNG_LIBPNG_VER => PNG_LIBPNG_VER_ '' #define PNG_READ_TEXT_SUPPORTED => PNG_READ_TEXT_SUPPORTED_ '' #define PNG_TEXT_SUPPORTED => PNG_TEXT_SUPPORTED_ '' #define PNG_WRITE_TEXT_SUPPORTED => PNG_WRITE_TEXT_SUPPORTED_ -'' #define png_libpng_ver => png_libpng_ver_ +'' #define png_get_uint_32 => png_get_uint_32_ +'' #define png_get_uint_16 => png_get_uint_16_ +'' #define png_get_int_32 => png_get_int_32_ extern "C" @@ -37,7 +41,7 @@ extern "C" #define PNG_LIBPNG_BUILD_PRIVATE 16 #define PNG_LIBPNG_BUILD_SPECIAL 32 #define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE -#define PNG_LIBPNG_VER 10413 +#define PNG_LIBPNG_VER_ 10413 #define PNGCONF_H #define PNG_ZBUF_SIZE 8192 #define PNG_READ_SUPPORTED @@ -230,7 +234,7 @@ type png_charppp as zstring ptr ptr ptr #define png_snprintf6 snprintf type png_alloc_size_t as png_size_t #define PNG_LIBPNG_BUILD_TYPE PNG_LIBPNG_BUILD_BASE_TYPE -#define png_libpng_ver_ png_get_header_ver(NULL) +#define png_libpng_ver png_get_header_ver(NULL) type png_color_struct red as png_byte @@ -936,9 +940,9 @@ declare function png_get_io_chunk_name(byval png_ptr as png_structp) as png_byte (composite) = cast(png_uint_16, ((temp + (temp shr 16)) shr 16)) end scope #endmacro -#define png_get_uint_32(buf) ((((cast(png_uint_32, *(buf)) shl 24) + (cast(png_uint_32, *((buf) + 1)) shl 16)) + (cast(png_uint_32, *((buf) + 2)) shl 8)) + cast(png_uint_32, *((buf) + 3))) -#define png_get_uint_16(buf) cast(png_uint_16, culng(culng(culng(*(buf)) shl 8) + culng(*((buf) + 1)))) -#define png_get_int_32(buf) cast(png_int_32, iif((*(buf)) and &h80, -cast(png_int_32, (png_get_uint_32(buf) xor cast(clong, &hffffffff)) + 1), cast(png_int_32, png_get_uint_32(buf)))) +#define png_get_uint_32_(buf) ((((cast(png_uint_32, *(buf)) shl 24) + (cast(png_uint_32, *((buf) + 1)) shl 16)) + (cast(png_uint_32, *((buf) + 2)) shl 8)) + cast(png_uint_32, *((buf) + 3))) +#define png_get_uint_16_(buf) cast(png_uint_16, culng(culng(culng(*(buf)) shl 8) + culng(*((buf) + 1)))) +#define png_get_int_32_(buf) cast(png_int_32, iif((*(buf)) and &h80, -cast(png_int_32, (png_get_uint_32_(buf) xor cast(clong, &hffffffff)) + 1), cast(png_int_32, png_get_uint_32_(buf)))) declare function png_get_uint_31(byval png_ptr as png_structp, byval buf as png_bytep) as png_uint_32 declare sub png_save_uint_32(byval buf as png_bytep, byval i as png_uint_32) diff --git a/inc/png15.bi b/inc/png15.bi index 2d8b7d70f8..bf174516c7 100644 --- a/inc/png15.bi +++ b/inc/png15.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "png" #inclib "z" @@ -10,10 +11,10 @@ #include once "crt/stdio.bi" '' The following symbols have been renamed: -'' #define PNG_READ_tEXt_SUPPORTED => PNG_READ_tEXt_SUPPORTED_ -'' #define PNG_WRITE_tEXt_SUPPORTED => PNG_WRITE_tEXt_SUPPORTED_ -'' #define PNG_tEXt_SUPPORTED => PNG_tEXt_SUPPORTED_ -'' #define png_libpng_ver => png_libpng_ver_ +'' #define PNG_LIBPNG_VER => PNG_LIBPNG_VER_ +'' #define PNG_READ_TEXT_SUPPORTED => PNG_READ_TEXT_SUPPORTED_ +'' #define PNG_TEXT_SUPPORTED => PNG_TEXT_SUPPORTED_ +'' #define PNG_WRITE_TEXT_SUPPORTED => PNG_WRITE_TEXT_SUPPORTED_ '' #define png_get_uint_32 => png_get_uint_32_ '' #define png_get_uint_16 => png_get_uint_16_ '' #define png_get_int_32 => png_get_int_32_ @@ -38,7 +39,7 @@ extern "C" #define PNG_LIBPNG_BUILD_PRIVATE 16 #define PNG_LIBPNG_BUILD_SPECIAL 32 #define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE -#define PNG_LIBPNG_VER 10519 +#define PNG_LIBPNG_VER_ 10519 #define PNGLCONF_H #define PNG_16BIT_SUPPORTED #define PNG_ALIGNED_MEMORY_SUPPORTED @@ -91,7 +92,7 @@ extern "C" #define PNG_READ_SUPPORTED #define PNG_READ_SWAP_ALPHA_SUPPORTED #define PNG_READ_SWAP_SUPPORTED -#define PNG_READ_TEXT_SUPPORTED +#define PNG_READ_TEXT_SUPPORTED_ #define PNG_READ_TRANSFORMS_SUPPORTED #define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED #define PNG_READ_USER_CHUNKS_SUPPORTED @@ -120,7 +121,7 @@ extern "C" #define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED #define PNG_SET_USER_LIMITS_SUPPORTED #define PNG_STDIO_SUPPORTED -#define PNG_TEXT_SUPPORTED +#define PNG_TEXT_SUPPORTED_ #define PNG_TIME_RFC1123_SUPPORTED #define PNG_UNKNOWN_CHUNKS_SUPPORTED #define PNG_USER_CHUNKS_SUPPORTED @@ -150,7 +151,7 @@ extern "C" #define PNG_WRITE_SUPPORTED #define PNG_WRITE_SWAP_ALPHA_SUPPORTED #define PNG_WRITE_SWAP_SUPPORTED -#define PNG_WRITE_TEXT_SUPPORTED +#define PNG_WRITE_TEXT_SUPPORTED_ #define PNG_WRITE_TRANSFORMS_SUPPORTED #define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED #define PNG_WRITE_USER_TRANSFORM_SUPPORTED @@ -244,7 +245,7 @@ type png_doublepp as double ptr ptr type png_charppp as zstring ptr ptr ptr type png_alloc_size_t as png_size_t #define PNG_LIBPNG_BUILD_TYPE PNG_LIBPNG_BUILD_BASE_TYPE -#define png_libpng_ver_ png_get_header_ver(NULL) +#define png_libpng_ver png_get_header_ver(NULL) type png_libpng_version_1_5_19 as zstring ptr type png_color_struct diff --git a/inc/png16.bi b/inc/png16.bi index b249fb1e07..fe7ada5982 100644 --- a/inc/png16.bi +++ b/inc/png16.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "png" #inclib "z" @@ -10,10 +11,10 @@ #include once "crt/time.bi" '' The following symbols have been renamed: -'' #define PNG_READ_tEXt_SUPPORTED => PNG_READ_tEXt_SUPPORTED_ -'' #define PNG_WRITE_tEXt_SUPPORTED => PNG_WRITE_tEXt_SUPPORTED_ -'' #define PNG_tEXt_SUPPORTED => PNG_tEXt_SUPPORTED_ -'' #define png_libpng_ver => png_libpng_ver_ +'' #define PNG_LIBPNG_VER => PNG_LIBPNG_VER_ +'' #define PNG_READ_TEXT_SUPPORTED => PNG_READ_TEXT_SUPPORTED_ +'' #define PNG_TEXT_SUPPORTED => PNG_TEXT_SUPPORTED_ +'' #define PNG_WRITE_TEXT_SUPPORTED => PNG_WRITE_TEXT_SUPPORTED_ '' #define PNG_get_uint_32 => PNG_get_uint_32_ '' #define PNG_get_uint_16 => PNG_get_uint_16_ '' #define PNG_get_int_32 => PNG_get_int_32_ @@ -38,7 +39,7 @@ extern "C" #define PNG_LIBPNG_BUILD_PRIVATE 16 #define PNG_LIBPNG_BUILD_SPECIAL 32 #define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE -#define PNG_LIBPNG_VER 10614 +#define PNG_LIBPNG_VER_ 10614 #define PNGLCONF_H #define PNG_16BIT_SUPPORTED #define PNG_ALIGNED_MEMORY_SUPPORTED @@ -95,7 +96,7 @@ extern "C" #define PNG_READ_SUPPORTED #define PNG_READ_SWAP_ALPHA_SUPPORTED #define PNG_READ_SWAP_SUPPORTED -#define PNG_READ_TEXT_SUPPORTED +#define PNG_READ_TEXT_SUPPORTED_ #define PNG_READ_TRANSFORMS_SUPPORTED #define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED #define PNG_READ_USER_CHUNKS_SUPPORTED @@ -134,7 +135,7 @@ extern "C" #define PNG_SIMPLIFIED_WRITE_SUPPORTED #define PNG_STDIO_SUPPORTED #define PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED -#define PNG_TEXT_SUPPORTED +#define PNG_TEXT_SUPPORTED_ #define PNG_TIME_RFC1123_SUPPORTED #define PNG_UNKNOWN_CHUNKS_SUPPORTED #define PNG_USER_CHUNKS_SUPPORTED @@ -164,7 +165,7 @@ extern "C" #define PNG_WRITE_SUPPORTED #define PNG_WRITE_SWAP_ALPHA_SUPPORTED #define PNG_WRITE_SWAP_SUPPORTED -#define PNG_WRITE_TEXT_SUPPORTED +#define PNG_WRITE_TEXT_SUPPORTED_ #define PNG_WRITE_TRANSFORMS_SUPPORTED #define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED #define PNG_WRITE_USER_TRANSFORM_SUPPORTED @@ -267,7 +268,7 @@ type png_fixed_point_pp as png_fixed_point ptr ptr type png_doublepp as double ptr ptr type png_charppp as zstring ptr ptr ptr #define PNG_LIBPNG_BUILD_TYPE PNG_LIBPNG_BUILD_BASE_TYPE -#define png_libpng_ver_ png_get_header_ver(NULL) +#define png_libpng_ver png_get_header_ver(NULL) type png_libpng_version_1_6_14 as zstring ptr type png_struct as png_struct_def type png_const_structp as const png_struct ptr diff --git a/inc/win/aclapi.bi b/inc/win/aclapi.bi index 208d412331..07bfddb35b 100644 --- a/inc/win/aclapi.bi +++ b/inc/win/aclapi.bi @@ -1,12 +1,12 @@ #pragma once +#inclib "advapi32" + #include once "winapifamily.bi" #include once "_mingw_unicode.bi" #include once "windows.bi" #include once "accctrl.bi" -#inclib "advapi32" - extern "Windows" #define __ACCESS_CONTROL_API__ diff --git a/inc/win/aclui.bi b/inc/win/aclui.bi index 365467b970..88213979b9 100644 --- a/inc/win/aclui.bi +++ b/inc/win/aclui.bi @@ -1,13 +1,13 @@ #pragma once +#inclib "aclui" + #include once "winapifamily.bi" #include once "objbase.bi" #include once "commctrl.bi" #include once "accctrl.bi" #include once "authz.bi" -#inclib "aclui" - extern "Windows" #define _ACLUI_H_ diff --git a/inc/win/comcat.bi b/inc/win/comcat.bi index db6a5150bc..17b1a24e16 100644 --- a/inc/win/comcat.bi +++ b/inc/win/comcat.bi @@ -1,5 +1,7 @@ #pragma once +#inclib "uuid" + #include once "rpc.bi" #include once "rpcndr.bi" #include once "windows.bi" @@ -7,8 +9,6 @@ #include once "unknwn.bi" #include once "winapifamily.bi" -#inclib "uuid" - extern "Windows" #define __comcat_h__ diff --git a/inc/win/commctrl.bi b/inc/win/commctrl.bi index def4cfc2af..23184e20ea 100644 --- a/inc/win/commctrl.bi +++ b/inc/win/commctrl.bi @@ -1,5 +1,7 @@ #pragma once +#inclib "comctl32" + #include once "_mingw_unicode.bi" #include once "prsht.bi" #include once "rpc.bi" @@ -8,8 +10,6 @@ #include once "unknwnbase.bi" #include once "objidlbase.bi" -#inclib "comctl32" - extern "Windows" #define _INC_COMMCTRL @@ -75,8 +75,8 @@ type LPCOLORSCHEME as tagCOLORSCHEME ptr #define CCM_SETWINDOWTHEME (CCM_FIRST + &hb) #define CCM_DPISCALE (CCM_FIRST + &hc) #define INFOTIPSIZE 1024 -#define HANDLE_WM_NOTIFY(hwnd, wParam, lParam, fn) fn(hwnd, clng(wParam), cast(NMHDR ptr, lParam)) -#define FORWARD_WM_NOTIFY(hwnd, idFrom, pnmhdr, fn) cast(LRESULT, fn(hwnd, WM_NOTIFY, cast(WPARAM, clng(idFrom)), cast(LPARAM, cast(NMHDR ptr, pnmhdr)))) +#define HANDLE_WM_NOTIFY(hwnd, wParam, lParam, fn) fn((hwnd), clng((wParam)), cptr(NMHDR ptr, (lParam))) +#define FORWARD_WM_NOTIFY(hwnd, idFrom, pnmhdr, fn) cast(LRESULT, fn((hwnd), WM_NOTIFY, cast(WPARAM, clng((idFrom))), cast(LPARAM, cptr(NMHDR ptr, (pnmhdr))))) #define NM_OUTOFMEMORY (NM_FIRST - 1) #define NM_CLICK (NM_FIRST - 2) #define NM_DBLCLK (NM_FIRST - 3) @@ -3449,7 +3449,7 @@ type LPTVINSERTSTRUCTW as tagTVINSERTSTRUCTW ptr #define TVM_INSERTITEM TVM_INSERTITEMA #endif -#define TreeView_InsertItem(hwnd, lpis) cast(HTREEITEM, SNDMSG((hwnd), TVM_INSERTITEM, 0, cast(LPARAM, cast(LPTV_INSERTSTRUCT, lpis)))) +#define TreeView_InsertItem(hwnd, lpis) cast(HTREEITEM, SNDMSG((hwnd), TVM_INSERTITEM, 0, cast(LPARAM, cast(LPTV_INSERTSTRUCT, (lpis))))) #define TVM_DELETEITEM (TV_FIRST + 1) #define TreeView_DeleteItem(hwnd, hitem) cast(WINBOOL, SNDMSG((hwnd), TVM_DELETEITEM, 0, cast(LPARAM, cast(HTREEITEM, (hitem))))) #define TreeView_DeleteAllItems(hwnd) cast(WINBOOL, SNDMSG((hwnd), TVM_DELETEITEM, 0, cast(LPARAM, TVI_ROOT))) @@ -3542,7 +3542,7 @@ end function #define TVM_GETVISIBLECOUNT (TV_FIRST + 16) #define TreeView_GetVisibleCount(hwnd) cast(UINT, SNDMSG((hwnd), TVM_GETVISIBLECOUNT, 0, 0)) #define TVM_HITTEST (TV_FIRST + 17) -#define TreeView_HitTest(hwnd, lpht) cast(HTREEITEM, SNDMSG((hwnd), TVM_HITTEST, 0, cast(LPARAM, cast(LPTV_HITTESTINFO, lpht)))) +#define TreeView_HitTest(hwnd, lpht) cast(HTREEITEM, SNDMSG((hwnd), TVM_HITTEST, 0, cast(LPARAM, cast(LPTV_HITTESTINFO, (lpht))))) #define LPTV_HITTESTINFO LPTVHITTESTINFO #define TV_HITTESTINFO TVHITTESTINFO @@ -3573,7 +3573,7 @@ type LPTVHITTESTINFO as tagTVHITTESTINFO ptr #define TVM_ENSUREVISIBLE (TV_FIRST + 20) #define TreeView_EnsureVisible(hwnd, hitem) cast(WINBOOL, SNDMSG((hwnd), TVM_ENSUREVISIBLE, 0, cast(LPARAM, cast(HTREEITEM, (hitem))))) #define TVM_SORTCHILDRENCB (TV_FIRST + 21) -#define TreeView_SortChildrenCB(hwnd, psort, recurse) cast(WINBOOL, SNDMSG((hwnd), TVM_SORTCHILDRENCB, cast(WPARAM, recurse), cast(LPARAM, cast(LPTV_SORTCB, psort)))) +#define TreeView_SortChildrenCB(hwnd, psort, recurse) cast(WINBOOL, SNDMSG((hwnd), TVM_SORTCHILDRENCB, cast(WPARAM, (recurse)), cast(LPARAM, cast(LPTV_SORTCB, (psort))))) #define TVM_ENDEDITLABELNOW (TV_FIRST + 22) #define TreeView_EndEditLabelNow(hwnd, fCancel) cast(WINBOOL, SNDMSG((hwnd), TVM_ENDEDITLABELNOW, cast(WPARAM, (fCancel)), 0)) #define TVM_GETISEARCHSTRINGA (TV_FIRST + 23) diff --git a/inc/win/commdlg.bi b/inc/win/commdlg.bi index edb7cf1d69..80b08d6678 100644 --- a/inc/win/commdlg.bi +++ b/inc/win/commdlg.bi @@ -1,10 +1,10 @@ #pragma once +#inclib "comdlg32" + #include once "_mingw_unicode.bi" #include once "prsht.bi" -#inclib "comdlg32" - extern "Windows" #define _INC_COMMDLG diff --git a/inc/win/d3d.bi b/inc/win/d3d.bi index b1e38e494a..8307b7e1dc 100644 --- a/inc/win/d3d.bi +++ b/inc/win/d3d.bi @@ -1,12 +1,12 @@ #pragma once +#inclib "dxguid" + #include once "crt/stdlib.bi" #include once "objbase.bi" #include once "d3dtypes.bi" #include once "d3dcaps.bi" -#inclib "dxguid" - extern "Windows" #define __WINE_D3D_H diff --git a/inc/win/d3d9.bi b/inc/win/d3d9.bi index 8f2cec543f..8d6602f3c5 100644 --- a/inc/win/d3d9.bi +++ b/inc/win/d3d9.bi @@ -1,14 +1,14 @@ #pragma once +#inclib "dxguid" +#inclib "d3d9" + #include once "crt/stdlib.bi" #include once "objbase.bi" #include once "windows.bi" #include once "d3d9types.bi" #include once "d3d9caps.bi" -#inclib "dxguid" -#inclib "d3d9" - extern "Windows" #define _D3D9_H_ diff --git a/inc/win/d3drm.bi b/inc/win/d3drm.bi index 91f77259fe..55175acf61 100644 --- a/inc/win/d3drm.bi +++ b/inc/win/d3drm.bi @@ -1,10 +1,10 @@ #pragma once +#inclib "d3drm" + #include once "ddraw.bi" #include once "d3drmobj.bi" -#inclib "d3drm" - extern "Windows" #define __D3DRM_H__ diff --git a/inc/win/d3drmdef.bi b/inc/win/d3drmdef.bi index 8e85e8d275..cfeceee53e 100644 --- a/inc/win/d3drmdef.bi +++ b/inc/win/d3drmdef.bi @@ -95,7 +95,7 @@ type LPD3DRMRENDERQUALITY as DWORD ptr #define D3DRMRENDER_UNLITFLAT ((D3DRMSHADE_FLAT + D3DRMLIGHT_OFF) + D3DRMFILL_SOLID) #define D3DRMRENDER_FLAT ((D3DRMSHADE_FLAT + D3DRMLIGHT_ON) + D3DRMFILL_SOLID) #define D3DRMRENDER_GOURAUD ((D3DRMSHADE_GOURAUD + D3DRMLIGHT_ON) + D3DRMFILL_SOLID) -#define D3DRMRENDER_PHONG (D3DRMSHADE_PHONG + D3DRMLIGHT_ON + D3DRMFILL_SOLID) +#define D3DRMRENDER_PHONG ((D3DRMSHADE_PHONG + D3DRMLIGHT_ON) + D3DRMFILL_SOLID) #define D3DRMRENDERMODE_BLENDEDTRANSPARENCY 1 #define D3DRMRENDERMODE_SORTEDTRANSPARENCY 2 #define D3DRMRENDERMODE_LIGHTINMODELSPACE 8 diff --git a/inc/win/d3dx9.bi b/inc/win/d3dx9.bi index 9e3bcd4f91..7bf27ebdb6 100644 --- a/inc/win/d3dx9.bi +++ b/inc/win/d3dx9.bi @@ -1,5 +1,8 @@ #pragma once +#inclib "dxguid" +#inclib "d3dx9d" + #include once "crt/limits.bi" #include once "d3d9.bi" #include once "d3dx9math.bi" @@ -12,9 +15,6 @@ #include once "d3dx9anim.bi" #include once "d3dx9tex.bi" -#inclib "dxguid" -#inclib "d3dx9d" - #define __D3DX9_H__ #define D3DX_DEFAULT cast(UINT, -1) #define D3DX_DEFAULT_NONPOW2 cast(UINT, -2) diff --git a/inc/win/ddraw.bi b/inc/win/ddraw.bi index 45c5b390f3..bdc5e7f8c7 100644 --- a/inc/win/ddraw.bi +++ b/inc/win/ddraw.bi @@ -1,11 +1,11 @@ #pragma once -#include once "crt/long.bi" -#include once "objbase.bi" - #inclib "ddraw" #inclib "dxguid" +#include once "crt/long.bi" +#include once "objbase.bi" + extern "Windows" #define __DDRAW_INCLUDED__ diff --git a/inc/win/dinput.bi b/inc/win/dinput.bi index e5989c50fa..e51b641ab7 100644 --- a/inc/win/dinput.bi +++ b/inc/win/dinput.bi @@ -1,10 +1,10 @@ #pragma once +#inclib "uuid" + #include once "crt/long.bi" #include once "objbase.bi" -#inclib "uuid" - extern "Windows" #define __DINPUT_INCLUDED__ @@ -812,7 +812,7 @@ end type type LPDIPROPPOINTER as DIPROPPOINTER ptr type LPCDIPROPPOINTER as const DIPROPPOINTER ptr -#define MAKEDIPROP(prop) cast(REFGUID, prop) +#define MAKEDIPROP(prop) cast(REFGUID, (prop)) #define DIPROP_BUFFERSIZE MAKEDIPROP(1) #define DIPROP_AXISMODE MAKEDIPROP(2) #define DIPROPAXISMODE_ABS 0 diff --git a/inc/win/dmplugin.bi b/inc/win/dmplugin.bi index 5b354aba68..63770087f9 100644 --- a/inc/win/dmplugin.bi +++ b/inc/win/dmplugin.bi @@ -1,12 +1,12 @@ #pragma once +#inclib "dxguid" + #include once "windows.bi" #include once "objbase.bi" #include once "mmsystem.bi" #include once "dmusici.bi" -#inclib "dxguid" - extern "Windows" #define __WINE_DMUSIC_PLUGIN_H diff --git a/inc/win/dmusicc.bi b/inc/win/dmusicc.bi index 28877682f3..e2584cbc2e 100644 --- a/inc/win/dmusicc.bi +++ b/inc/win/dmusicc.bi @@ -1,5 +1,7 @@ #pragma once +#inclib "dxguid" + #include once "windows.bi" #include once "objbase.bi" #include once "mmsystem.bi" @@ -9,8 +11,6 @@ #include once "dsound.bi" #include once "dmusbuff.bi" -#inclib "dxguid" - extern "Windows" #define __WINE_DMUSIC_CORE_H diff --git a/inc/win/docobj.bi b/inc/win/docobj.bi index fec8c845fb..bb4c6523a0 100644 --- a/inc/win/docobj.bi +++ b/inc/win/docobj.bi @@ -1,5 +1,7 @@ #pragma once +#inclib "uuid" + #include once "crt/long.bi" #include once "rpc.bi" #include once "rpcndr.bi" @@ -12,8 +14,6 @@ #include once "servprov.bi" #include once "winapifamily.bi" -#inclib "uuid" - extern "Windows" #define __docobj_h__ diff --git a/inc/win/dplay.bi b/inc/win/dplay.bi index e47dcfb7a7..aead7325e9 100644 --- a/inc/win/dplay.bi +++ b/inc/win/dplay.bi @@ -1,10 +1,10 @@ #pragma once -#include once "ole2.bi" - #inclib "dplayx" #inclib "dxguid" +#include once "ole2.bi" + extern "Windows" #define __WINE_DPLAY_H diff --git a/inc/win/dplay8.bi b/inc/win/dplay8.bi index 921930d46c..634408938e 100644 --- a/inc/win/dplay8.bi +++ b/inc/win/dplay8.bi @@ -1,10 +1,10 @@ #pragma once +#inclib "dxguid" + #include once "ole2.bi" #include once "dpaddr.bi" -#inclib "dxguid" - extern "Windows" #define __WINE_DPLAY8_H diff --git a/inc/win/dsound.bi b/inc/win/dsound.bi index 014b9609bc..c8ca7b66c9 100644 --- a/inc/win/dsound.bi +++ b/inc/win/dsound.bi @@ -1,11 +1,11 @@ #pragma once -#include once "_mingw_unicode.bi" -#include once "objbase.bi" - #inclib "dsound" #inclib "uuid" +#include once "_mingw_unicode.bi" +#include once "objbase.bi" + extern "Windows" #define __DSOUND_INCLUDED__ diff --git a/inc/win/dxerr8.bi b/inc/win/dxerr8.bi index 73912c71a7..26e6bed642 100644 --- a/inc/win/dxerr8.bi +++ b/inc/win/dxerr8.bi @@ -1,9 +1,9 @@ #pragma once -#include once "_mingw_unicode.bi" - #inclib "dxerr8" +#include once "_mingw_unicode.bi" + extern "Windows" #define __WINE_DXERR8_H diff --git a/inc/win/dxerr9.bi b/inc/win/dxerr9.bi index 36b6e82086..95f15d8bad 100644 --- a/inc/win/dxerr9.bi +++ b/inc/win/dxerr9.bi @@ -1,9 +1,9 @@ #pragma once -#include once "_mingw_unicode.bi" - #inclib "dxerr9" +#include once "_mingw_unicode.bi" + extern "Windows" #define __WINE_DXERR9_H diff --git a/inc/win/exdisp.bi b/inc/win/exdisp.bi index 10eba34eaa..1ffea74357 100644 --- a/inc/win/exdisp.bi +++ b/inc/win/exdisp.bi @@ -1,12 +1,12 @@ #pragma once +#inclib "uuid" + #include once "rpc.bi" #include once "rpcndr.bi" #include once "ocidl.bi" #include once "docobj.bi" -#inclib "uuid" - extern "Windows" #define __exdisp_h__ diff --git a/inc/win/imagehlp.bi b/inc/win/imagehlp.bi index 9a26cff95b..e233fc4ad1 100644 --- a/inc/win/imagehlp.bi +++ b/inc/win/imagehlp.bi @@ -1,10 +1,10 @@ #pragma once +#inclib "imagehlp" + #include once "_mingw_unicode.bi" #include once "wintrust.bi" -#inclib "imagehlp" - extern "Windows" #define _IMAGEHLP_ diff --git a/inc/win/imm.bi b/inc/win/imm.bi index 5aab903851..ae13e3c6f4 100644 --- a/inc/win/imm.bi +++ b/inc/win/imm.bi @@ -1,9 +1,9 @@ #pragma once -#include once "_mingw_unicode.bi" - #inclib "imm32" +#include once "_mingw_unicode.bi" + extern "Windows" #define _IMM_ diff --git a/inc/win/intshcut.bi b/inc/win/intshcut.bi index e4af422b94..bbc1c88e5d 100644 --- a/inc/win/intshcut.bi +++ b/inc/win/intshcut.bi @@ -1,10 +1,10 @@ #pragma once +#inclib "url" + #include once "_mingw_unicode.bi" #include once "isguids.bi" -#inclib "url" - extern "Windows" #define __INTSHCUT_H__ diff --git a/inc/win/iphlpapi.bi b/inc/win/iphlpapi.bi index 1dc2d89ee6..9942a9d47d 100644 --- a/inc/win/iphlpapi.bi +++ b/inc/win/iphlpapi.bi @@ -1,5 +1,7 @@ #pragma once +#inclib "iphlpapi" + #include once "iprtrmib.bi" #include once "ipexport.bi" #include once "iptypes.bi" @@ -12,8 +14,6 @@ #include once "windns.bi" #endif -#inclib "iphlpapi" - extern "Windows" #define __IPHLPAPI_H__ diff --git a/inc/win/isguids.bi b/inc/win/isguids.bi index fb9e6682db..3b55205550 100644 --- a/inc/win/isguids.bi +++ b/inc/win/isguids.bi @@ -1,9 +1,9 @@ #pragma once -#include once "_mingw_unicode.bi" - #inclib "uuid" +#include once "_mingw_unicode.bi" + extern "C" #define _ISGUIDS_H_ diff --git a/inc/win/mmsystem.bi b/inc/win/mmsystem.bi index 3f6a459660..18ae258c59 100644 --- a/inc/win/mmsystem.bi +++ b/inc/win/mmsystem.bi @@ -1,9 +1,9 @@ #pragma once -#include once "_mingw_unicode.bi" - #inclib "winmm" +#include once "_mingw_unicode.bi" + extern "Windows" #define _INC_MMSYSTEM diff --git a/inc/win/mshtml.bi b/inc/win/mshtml.bi index a25623921c..9d4ccaa151 100644 --- a/inc/win/mshtml.bi +++ b/inc/win/mshtml.bi @@ -1,5 +1,5 @@ #pragma once -#include once "mshtmlc.bi" - #inclib "uuid" + +#include once "mshtmlc.bi" diff --git a/inc/win/nspapi.bi b/inc/win/nspapi.bi index f4aced2b8a..174d85d8ee 100644 --- a/inc/win/nspapi.bi +++ b/inc/win/nspapi.bi @@ -1,9 +1,9 @@ #pragma once -#include once "_mingw_unicode.bi" - #inclib "wsock32" +#include once "_mingw_unicode.bi" + extern "Windows" #define _NSPAPI_INCLUDED diff --git a/inc/win/ntdef.bi b/inc/win/ntdef.bi index ef0aa970d5..92b4b3b60a 100644 --- a/inc/win/ntdef.bi +++ b/inc/win/ntdef.bi @@ -228,7 +228,6 @@ end type type STRING_ as _STRING type PSTRING as _STRING ptr #endif - type ANSI_STRING as STRING_ type PANSI_STRING as PSTRING type OEM_STRING as STRING_ diff --git a/inc/win/ntsecapi.bi b/inc/win/ntsecapi.bi index c7c1f2af16..4defc3b4ad 100644 --- a/inc/win/ntsecapi.bi +++ b/inc/win/ntsecapi.bi @@ -1,9 +1,9 @@ #pragma once -#include once "guiddef.bi" - #inclib "advapi32" +#include once "guiddef.bi" + '' The following symbols have been renamed: '' typedef STRING => STRING_ diff --git a/inc/win/oaidl.bi b/inc/win/oaidl.bi index 691d03f9bb..e76a347bbc 100644 --- a/inc/win/oaidl.bi +++ b/inc/win/oaidl.bi @@ -1,5 +1,7 @@ #pragma once +#inclib "uuid" + #include once "rpc.bi" #include once "rpcndr.bi" #include once "windows.bi" @@ -7,8 +9,6 @@ #include once "objidl.bi" #include once "winapifamily.bi" -#inclib "uuid" - extern "Windows" #define __oaidl_h__ diff --git a/inc/win/objidl.bi b/inc/win/objidl.bi index 397a22798f..36715d93a9 100644 --- a/inc/win/objidl.bi +++ b/inc/win/objidl.bi @@ -1,13 +1,13 @@ #pragma once +#inclib "uuid" + #include once "rpc.bi" #include once "rpcndr.bi" #include once "windows.bi" #include once "wtypes.bi" #include once "winapifamily.bi" -#inclib "uuid" - extern "Windows" #define __objidl_h__ diff --git a/inc/win/ole.bi b/inc/win/ole.bi index 4d95cb36f3..f9cba4a041 100644 --- a/inc/win/ole.bi +++ b/inc/win/ole.bi @@ -1,9 +1,9 @@ #pragma once -#include once "winapifamily.bi" - #inclib "ole32" +#include once "winapifamily.bi" + extern "Windows" #define _INC_OLE diff --git a/inc/win/ole2.bi b/inc/win/ole2.bi index be5f82d54e..a698ee7319 100644 --- a/inc/win/ole2.bi +++ b/inc/win/ole2.bi @@ -1,13 +1,13 @@ #pragma once +#inclib "ole32" + #include once "winapifamily.bi" #include once "winerror.bi" #include once "objbase.bi" #include once "oleauto.bi" #include once "oleidl.bi" -#inclib "ole32" - extern "Windows" #define _OLE2_H_ diff --git a/inc/win/oleacc.bi b/inc/win/oleacc.bi index e5b09bb9f5..e7dd0b89fc 100644 --- a/inc/win/oleacc.bi +++ b/inc/win/oleacc.bi @@ -1,5 +1,7 @@ #pragma once +#inclib "oleacc" + #include once "rpc.bi" #include once "rpcndr.bi" #include once "windows.bi" @@ -7,8 +9,6 @@ #include once "oaidl.bi" #include once "_mingw_unicode.bi" -#inclib "oleacc" - extern "Windows" #define __oleacc_h__ diff --git a/inc/win/oleauto.bi b/inc/win/oleauto.bi index 38cde89dbd..f4ff4ae78c 100644 --- a/inc/win/oleauto.bi +++ b/inc/win/oleauto.bi @@ -1,9 +1,9 @@ #pragma once -#include once "oaidl.bi" - #inclib "oleaut32" +#include once "oaidl.bi" + extern "Windows" #define _OLEAUTO_H_ diff --git a/inc/win/olectl.bi b/inc/win/olectl.bi index d55642ca8e..36b9478e55 100644 --- a/inc/win/olectl.bi +++ b/inc/win/olectl.bi @@ -1,9 +1,9 @@ #pragma once -#include once "ocidl.bi" - #inclib "oleaut32" +#include once "ocidl.bi" + extern "Windows" #define _OLECTL_H_ diff --git a/inc/win/oledlg.bi b/inc/win/oledlg.bi index 770ac3e9ce..c201f79719 100644 --- a/inc/win/oledlg.bi +++ b/inc/win/oledlg.bi @@ -1,5 +1,7 @@ #pragma once +#inclib "oledlg" + #include once "_mingw_unicode.bi" #include once "windows.bi" #include once "shellapi.bi" @@ -8,8 +10,6 @@ #include once "dlgs.bi" #include once "prsht.bi" -#inclib "oledlg" - extern "Windows" #define _OLEDLG_H_ diff --git a/inc/win/oleidl.bi b/inc/win/oleidl.bi index 1ab6d0beb9..74a10b1445 100644 --- a/inc/win/oleidl.bi +++ b/inc/win/oleidl.bi @@ -1,5 +1,7 @@ #pragma once +#inclib "uuid" + #include once "rpc.bi" #include once "rpcndr.bi" #include once "windows.bi" @@ -7,8 +9,6 @@ #include once "objidl.bi" #include once "winapifamily.bi" -#inclib "uuid" - extern "Windows" #define __oleidl_h__ diff --git a/inc/win/psapi.bi b/inc/win/psapi.bi index db8ba815a4..79f7089cc5 100644 --- a/inc/win/psapi.bi +++ b/inc/win/psapi.bi @@ -1,9 +1,9 @@ #pragma once -#include once "_mingw_unicode.bi" - #inclib "psapi" +#include once "_mingw_unicode.bi" + extern "Windows" #define _PSAPI_H_ diff --git a/inc/win/ras.bi b/inc/win/ras.bi index 3051b5082b..565da3804c 100644 --- a/inc/win/ras.bi +++ b/inc/win/ras.bi @@ -1,12 +1,12 @@ #pragma once +#inclib "rasapi32" + #include once "_mingw_unicode.bi" #include once "inaddr.bi" #include once "in6addr.bi" #include once "naptypes.bi" -#inclib "rasapi32" - extern "Windows" #define _RAS_H_ diff --git a/inc/win/rasdlg.bi b/inc/win/rasdlg.bi index 51f135483a..928d8e7130 100644 --- a/inc/win/rasdlg.bi +++ b/inc/win/rasdlg.bi @@ -1,10 +1,10 @@ #pragma once +#inclib "rasdlg" + #include once "_mingw_unicode.bi" #include once "ras.bi" -#inclib "rasdlg" - extern "Windows" #define _RASDLG_H_ diff --git a/inc/win/richole.bi b/inc/win/richole.bi index d81149f718..11b3822616 100644 --- a/inc/win/richole.bi +++ b/inc/win/richole.bi @@ -1,9 +1,9 @@ #pragma once -#include once "richedit.bi" - #inclib "uuid" +#include once "richedit.bi" + extern "Windows" #define _RICHOLE_ diff --git a/inc/win/rpcndr.bi b/inc/win/rpcndr.bi index 49d7636f1c..7179a73237 100644 --- a/inc/win/rpcndr.bi +++ b/inc/win/rpcndr.bi @@ -70,7 +70,6 @@ declare sub NDRSContextMarshall2(byval BindingHandle as RPC_BINDING_HANDLE, byva declare function NDRSContextUnmarshallEx(byval BindingHandle as RPC_BINDING_HANDLE, byval pBuff as any ptr, byval DataRepresentation as ulong) as NDR_SCONTEXT declare function NDRSContextUnmarshall2(byval BindingHandle as RPC_BINDING_HANDLE, byval pBuff as any ptr, byval DataRepresentation as ulong, byval CtxGuard as any ptr, byval Flags as ulong) as NDR_SCONTEXT declare sub RpcSsDestroyClientContext(byval ContextHandle as any ptr ptr) - #macro byte_from_ndr(source, target) scope *(target) = **cptr(byte ptr ptr, @(source)->Buffer) @@ -127,11 +126,11 @@ end type type MIDL_SYNTAX_INFO as _MIDL_SYNTAX_INFO type PMIDL_SYNTAX_INFO as _MIDL_SYNTAX_INFO ptr +type NDR_ALLOC_ALL_NODES_CONTEXT as NDR_ALLOC_ALL_NODES_CONTEXT_ +type NDR_POINTER_QUEUE_STATE as NDR_POINTER_QUEUE_STATE_ type _MIDL_STUB_DESC as _MIDL_STUB_DESC_ type _FULL_PTR_XLAT_TABLES as _FULL_PTR_XLAT_TABLES_ type IRpcChannelBuffer as IRpcChannelBuffer_ -type NDR_ALLOC_ALL_NODES_CONTEXT as NDR_ALLOC_ALL_NODES_CONTEXT_ -type NDR_POINTER_QUEUE_STATE as NDR_POINTER_QUEUE_STATE_ type _NDR_PROC_CONTEXT as _NDR_PROC_CONTEXT_ type _MIDL_STUB_MESSAGE_ diff --git a/inc/win/schannel.bi b/inc/win/schannel.bi index e173760512..cb29314875 100644 --- a/inc/win/schannel.bi +++ b/inc/win/schannel.bi @@ -177,7 +177,6 @@ type PSecPkgContext_SessionAppData as _SecPkgContext_SessionAppData ptr #define SCH_CRED_VERSION &h00000002 #define SCH_CRED_V3 &h00000003 #define SCHANNEL_CRED_VERSION &h00000004 - type _HMAPPER as _HMAPPER_ type _SCHANNEL_CRED diff --git a/inc/win/security.bi b/inc/win/security.bi index 2cfd244018..a6c00ed706 100644 --- a/inc/win/security.bi +++ b/inc/win/security.bi @@ -1,11 +1,11 @@ #pragma once +#inclib "secur32" + #include once "_mingw_unicode.bi" #include once "sspi.bi" #include once "secext.bi" -#inclib "secur32" - #define NTLMSP_NAME_A "NTLM" #define NTLMSP_NAME wstr("NTLM") #define MICROSOFT_KERBEROS_NAME_A "Kerberos" diff --git a/inc/win/setupapi.bi b/inc/win/setupapi.bi index 012f3feb10..2d9296d999 100644 --- a/inc/win/setupapi.bi +++ b/inc/win/setupapi.bi @@ -1,10 +1,10 @@ #pragma once +#inclib "setupapi" + #include once "_mingw_unicode.bi" #include once "commctrl.bi" -#inclib "setupapi" - extern "Windows" #define _INC_SETUPAPI diff --git a/inc/win/shellapi.bi b/inc/win/shellapi.bi index cb06ca33d8..67bebb0d35 100644 --- a/inc/win/shellapi.bi +++ b/inc/win/shellapi.bi @@ -1,10 +1,10 @@ #pragma once +#inclib "shell32" + #include once "winapifamily.bi" #include once "_mingw_unicode.bi" -#inclib "shell32" - extern "Windows" #define _INC_SHELLAPI @@ -1225,7 +1225,6 @@ declare function IsLFNDriveW(byval pszPath as LPCWSTR) as WINBOOL declare function InitNetworkAddressControl() as WINBOOL #define NCM_GETADDRESS (WM_USER + 1) #define NetAddr_GetAddress(hwnd, pv) cast(HRESULT, SNDMSG(hwnd, NCM_GETADDRESS, 0, cast(LPARAM, pv))) - type NET_ADDRESS_INFO_ as NET_ADDRESS_INFO__ type tagNC_ADDRESS diff --git a/inc/win/shlguid.bi b/inc/win/shlguid.bi index 1ddc21af42..1fac8bb1d9 100644 --- a/inc/win/shlguid.bi +++ b/inc/win/shlguid.bi @@ -1,5 +1,8 @@ #pragma once +#inclib "uuid" +#inclib "shell32" + #include once "winapifamily.bi" #include once "_mingw_unicode.bi" #include once "isguids.bi" @@ -7,9 +10,6 @@ #include once "shldisp.bi" #include once "knownfolders.bi" -#inclib "uuid" -#inclib "shell32" - extern "C" #define STR_MYDOCS_CLSID "{450D8FBA-AD25-11D0-98A8-0800361B1103}" diff --git a/inc/win/shlobj.bi b/inc/win/shlobj.bi index 9db20ce17f..2c48d0284f 100644 --- a/inc/win/shlobj.bi +++ b/inc/win/shlobj.bi @@ -1,5 +1,7 @@ #pragma once +#inclib "shell32" + #include once "crt/long.bi" #include once "winapifamily.bi" #include once "_mingw_unicode.bi" @@ -10,8 +12,6 @@ #include once "shellapi.bi" #include once "mshtmlc.bi" -#inclib "shell32" - extern "Windows" #define _SHLOBJ_H_ @@ -543,7 +543,7 @@ declare function SHILCreateFromPath(byval pszPath as PCWSTR, byval ppidl as LPIT #define VOID_OFFSET(pv, cb) cptr(any ptr, cptr(UBYTE ptr, (pv)) + (cb)) #define ILCloneFull ILClone #define ILCloneChild ILCloneFirst -#define ILSkip(P, C) cptr(PUIDLIST_RELATIVE, VOID_OFFSET((P), (C))) +#define ILSkip(P, C) cast(PUIDLIST_RELATIVE, VOID_OFFSET((P), (C))) #define ILNext(P) ILSkip(P, (P)->mkid.cb) #define ILIsAligned(P) ((cast(DWORD_PTR, (P)) and (sizeof(any ptr) - 1)) = 0) #define ILIsEmpty(P) (((P) = 0) orelse ((P)->mkid.cb = 0)) diff --git a/inc/win/shlwapi.bi b/inc/win/shlwapi.bi index c25b6a7212..864fba357a 100644 --- a/inc/win/shlwapi.bi +++ b/inc/win/shlwapi.bi @@ -1,11 +1,11 @@ #pragma once +#inclib "shlwapi" + #include once "_mingw_unicode.bi" #include once "objbase.bi" #include once "shtypes.bi" -#inclib "shlwapi" - extern "Windows" #define _INC_SHLWAPI diff --git a/inc/win/snmp.bi b/inc/win/snmp.bi index 323b042706..cc938c4945 100644 --- a/inc/win/snmp.bi +++ b/inc/win/snmp.bi @@ -1,10 +1,10 @@ #pragma once -#include once "windows.bi" - #inclib "snmpapi" #inclib "igmpagnt" +#include once "windows.bi" + extern "Windows" #define _INC_SNMP diff --git a/inc/win/sql.bi b/inc/win/sql.bi index d22300d057..d72be3f1a7 100644 --- a/inc/win/sql.bi +++ b/inc/win/sql.bi @@ -1,9 +1,9 @@ #pragma once -#include once "sqltypes.bi" - #inclib "odbc32" +#include once "sqltypes.bi" + extern "Windows" #define __SQL diff --git a/inc/win/strmif.bi b/inc/win/strmif.bi index 69a0788165..fb362b4b91 100644 --- a/inc/win/strmif.bi +++ b/inc/win/strmif.bi @@ -1,5 +1,7 @@ #pragma once +#inclib "strmiids" + #include once "rpc.bi" #include once "rpcndr.bi" #include once "windows.bi" @@ -10,8 +12,6 @@ #include once "ocidl.bi" #include once "ddraw.bi" -#inclib "strmiids" - extern "Windows" #define __strmif_h__ diff --git a/inc/win/unknwn.bi b/inc/win/unknwn.bi index 0d81733a98..f1ed92415b 100644 --- a/inc/win/unknwn.bi +++ b/inc/win/unknwn.bi @@ -1,5 +1,7 @@ #pragma once +#inclib "uuid" + #include once "rpc.bi" #include once "rpcndr.bi" #include once "windows.bi" @@ -7,6 +9,4 @@ #include once "wtypes.bi" #include once "winapifamily.bi" -#inclib "uuid" - #define __unknwn_h__ diff --git a/inc/win/userenv.bi b/inc/win/userenv.bi index bcafe27232..eda99eff8f 100644 --- a/inc/win/userenv.bi +++ b/inc/win/userenv.bi @@ -1,11 +1,11 @@ #pragma once +#inclib "userenv" + #include once "_mingw_unicode.bi" #include once "wbemcli.bi" #include once "profinfo.bi" -#inclib "userenv" - extern "Windows" #define _USERENV_H_ diff --git a/inc/win/uxtheme.bi b/inc/win/uxtheme.bi index cf0686c239..197c56a602 100644 --- a/inc/win/uxtheme.bi +++ b/inc/win/uxtheme.bi @@ -1,9 +1,9 @@ #pragma once -#include once "commctrl.bi" - #inclib "uxtheme" +#include once "commctrl.bi" + extern "Windows" #define _UXTHEME_H_ diff --git a/inc/win/vfw.bi b/inc/win/vfw.bi index fa39d08b07..552ec03282 100644 --- a/inc/win/vfw.bi +++ b/inc/win/vfw.bi @@ -1,15 +1,15 @@ #pragma once -#include once "_mingw_unicode.bi" -#include once "mmreg.bi" -#include once "ole2.bi" -#include once "msacm.bi" - #inclib "avifil32" #inclib "avicap32" #inclib "uuid" #inclib "vfw32" +#include once "_mingw_unicode.bi" +#include once "mmreg.bi" +#include once "ole2.bi" +#include once "msacm.bi" + extern "Windows" #define _INC_VFW @@ -307,6 +307,7 @@ declare function ICSendMessage(byval hic as HIC, byval msg as UINT, byval dw1 as #define ICGetState(hic, pv, cb) ICSendMessage(hic, ICM_GETSTATE, cast(DWORD_PTR, cast(LPVOID, (pv))), cast(DWORD_PTR, (cb))) #define ICSetState(hic, pv, cb) ICSendMessage(hic, ICM_SETSTATE, cast(DWORD_PTR, cast(LPVOID, (pv))), cast(DWORD_PTR, (cb))) #define ICGetStateSize(hic) cast(DWORD, ICGetState(hic, NULL, 0)) + dim shared dwICValue as DWORD private function ICGetDefaultQuality(byval hic as HIC) as DWORD diff --git a/inc/win/winbase.bi b/inc/win/winbase.bi index 6342abde66..58a441b297 100644 --- a/inc/win/winbase.bi +++ b/inc/win/winbase.bi @@ -1,5 +1,7 @@ #pragma once +#inclib "kernel32" + #include once "_mingw_unicode.bi" #include once "intrin.bi" #include once "winapifamily.bi" @@ -10,8 +12,6 @@ '' procedure Sleep => Sleep_ '' procedure Beep => Beep_ -#inclib "kernel32" - extern "Windows" #define _WINBASE_ @@ -1548,7 +1548,7 @@ declare function OpenWaitableTimerW(byval dwDesiredAccess as DWORD, byval bInher declare function EnterSynchronizationBarrier(byval lpBarrier as LPSYNCHRONIZATION_BARRIER, byval dwFlags as DWORD) as WINBOOL declare function InitializeSynchronizationBarrier(byval lpBarrier as LPSYNCHRONIZATION_BARRIER, byval lTotalThreads as LONG, byval lSpinCount as LONG) as WINBOOL declare function DeleteSynchronizationBarrier(byval lpBarrier as LPSYNCHRONIZATION_BARRIER) as WINBOOL -declare sub Sleep(byval dwMilliseconds as DWORD) +declare sub Sleep_ alias "Sleep"(byval dwMilliseconds as DWORD) declare function SignalObjectAndWait(byval hObjectToSignal as HANDLE, byval hObjectToWaitOn as HANDLE, byval dwMilliseconds as DWORD, byval bAlertable as WINBOOL) as DWORD #if _WIN32_WINNT = &h0602 diff --git a/inc/win/winber.bi b/inc/win/winber.bi index 6e3313fc5e..445c66bacd 100644 --- a/inc/win/winber.bi +++ b/inc/win/winber.bi @@ -1,9 +1,9 @@ #pragma once -#include once "winapifamily.bi" - #inclib "wldap32" +#include once "winapifamily.bi" + extern "C" #define _WINBER_DEFINED_ diff --git a/inc/win/windef.bi b/inc/win/windef.bi index 3739a94510..88b04f0b1c 100644 --- a/inc/win/windef.bi +++ b/inc/win/windef.bi @@ -5,6 +5,7 @@ #include once "basetsd.bi" '' The following symbols have been renamed: +'' typedef BYTE => UBYTE '' typedef INT => INT_ extern "Windows" diff --git a/inc/win/wingdi.bi b/inc/win/wingdi.bi index 7d1f8a6644..393044ed7a 100644 --- a/inc/win/wingdi.bi +++ b/inc/win/wingdi.bi @@ -1,23 +1,23 @@ #pragma once +#inclib "gdi32" + #include once "winapifamily.bi" #include once "_mingw_unicode.bi" '' The following symbols have been renamed: '' #define ERROR => ERROR_ -'' #define RGB => BGR -'' #define STRETCHBLT => STRETCHBLT_ -'' #define STARTDOC => STARTDOC_ -'' #define EXTTEXTOUT => EXTTEXTOUT_ -'' #define ENDDOC => ENDDOC_ '' #define ABORTDOC => ABORTDOC_ '' #define SETABORTPROC => SETABORTPROC_ +'' #define STARTDOC => STARTDOC_ +'' #define ENDDOC => ENDDOC_ '' #define SETMITERLIMIT => SETMITERLIMIT_ +'' #define EXTTEXTOUT => EXTTEXTOUT_ +'' #define STRETCHBLT => STRETCHBLT_ +'' #define RGB => BGR '' #define BITSPIXEL => BITSPIXEL_ '' #define PLANES => PLANES_ -#inclib "gdi32" - extern "Windows" #define _WINGDI_ diff --git a/inc/win/wininet.bi b/inc/win/wininet.bi index 92676b14bc..927b8aad7a 100644 --- a/inc/win/wininet.bi +++ b/inc/win/wininet.bi @@ -1,9 +1,9 @@ #pragma once -#include once "_mingw_unicode.bi" - #inclib "wininet" +#include once "_mingw_unicode.bi" + extern "Windows" #define _WININET_ diff --git a/inc/win/winldap.bi b/inc/win/winldap.bi index 14bdaf0be4..cac1171027 100644 --- a/inc/win/winldap.bi +++ b/inc/win/winldap.bi @@ -1,9 +1,9 @@ #pragma once -#include once "schnlsp.bi" - #inclib "wldap32" +#include once "schnlsp.bi" + extern "C" #define LDAP_CLIENT_DEFINED diff --git a/inc/win/winnt.bi b/inc/win/winnt.bi index 32d314d01a..157ba4966a 100644 --- a/inc/win/winnt.bi +++ b/inc/win/winnt.bi @@ -12,6 +12,7 @@ #include once "guiddef.bi" '' The following symbols have been renamed: +'' typedef INT => INT_ '' #define DELETE => DELETE__ extern "Windows" diff --git a/inc/win/winreg.bi b/inc/win/winreg.bi index 7f2ecc1452..161c97123d 100644 --- a/inc/win/winreg.bi +++ b/inc/win/winreg.bi @@ -1,10 +1,10 @@ #pragma once +#inclib "advapi32" + #include once "_mingw_unicode.bi" #include once "reason.bi" -#inclib "advapi32" - extern "Windows" #define _WINREG_ diff --git a/inc/win/winsnmp.bi b/inc/win/winsnmp.bi index e8b32bb6cf..1a67348a6e 100644 --- a/inc/win/winsnmp.bi +++ b/inc/win/winsnmp.bi @@ -1,9 +1,9 @@ #pragma once -#include once "crt/limits.bi" - #inclib "wsnmp32" +#include once "crt/limits.bi" + extern "Windows" #define _INC_WINSNMP diff --git a/inc/win/winsock.bi b/inc/win/winsock.bi index 742b2c8252..a58b77cf74 100644 --- a/inc/win/winsock.bi +++ b/inc/win/winsock.bi @@ -1,12 +1,12 @@ #pragma once +#inclib "wsock32" + #include once "windows.bi" #include once "crt/sys/time.bi" #include once "_bsd_types.bi" #include once "inaddr.bi" -#inclib "wsock32" - extern "Windows" #define _WINSOCKAPI_ @@ -45,7 +45,7 @@ declare function __WSAFDIsSet(byval as SOCKET, byval as FD_SET ptr) as long cptr(fd_set ptr, set)->fd_count = 0 end scope #endmacro -#define FD_ISSET(fd, set) __WSAFDIsSet(cast(SOCKET, (fd)), cptr(fd_set ptr, (set))) +#define FD_ISSET(fd, set) __WSAFDIsSet(cast(SOCKET, (fd)), cptr(FD_SET ptr, (set))) #define _FD_SET_WINSOCK_DEFINED #macro FD_SET_(fd, set) scope @@ -55,7 +55,6 @@ declare function __WSAFDIsSet(byval as SOCKET, byval as FD_SET ptr) as long end if end scope #endmacro - type PFD_SET as FD_SET ptr type LPFD_SET as FD_SET ptr #define _MINGW_IP_TYPES_H diff --git a/inc/win/winsock2.bi b/inc/win/winsock2.bi index 3e75b34308..34adefe23a 100644 --- a/inc/win/winsock2.bi +++ b/inc/win/winsock2.bi @@ -1,5 +1,7 @@ #pragma once +#inclib "ws2_32" + #include once "_mingw_unicode.bi" #include once "windows.bi" #include once "crt/sys/time.bi" @@ -10,8 +12,6 @@ #include once "rpc.bi" #include once "wtypesbase.bi" -#inclib "ws2_32" - extern "Windows" #define _WINSOCK2API_ @@ -53,7 +53,7 @@ declare function __WSAFDIsSet(byval as SOCKET, byval as FD_SET ptr) as long cptr(fd_set ptr, set)->fd_count = 0 end scope #endmacro -#define FD_ISSET(fd, set) __WSAFDIsSet(cast(SOCKET, (fd)), cptr(fd_set ptr, (set))) +#define FD_ISSET(fd, set) __WSAFDIsSet(cast(SOCKET, (fd)), cptr(FD_SET ptr, (set))) #macro FD_SET_(fd, set) scope dim __i as u_int @@ -71,7 +71,6 @@ declare function __WSAFDIsSet(byval as SOCKET, byval as FD_SET ptr) as long end if end scope #endmacro - type PFD_SET as FD_SET ptr type LPFD_SET as FD_SET ptr #define _MINGW_IP_TYPES_H diff --git a/inc/win/winspool.bi b/inc/win/winspool.bi index 481184cfd2..59d9a89457 100644 --- a/inc/win/winspool.bi +++ b/inc/win/winspool.bi @@ -1,10 +1,10 @@ #pragma once +#inclib "winspool" + #include once "_mingw_unicode.bi" #include once "prsht.bi" -#inclib "winspool" - extern "Windows" #define _WINSPOOL_ diff --git a/inc/win/winsvc.bi b/inc/win/winsvc.bi index acba92be48..6eee117c16 100644 --- a/inc/win/winsvc.bi +++ b/inc/win/winsvc.bi @@ -1,10 +1,10 @@ #pragma once +#inclib "advapi32" + #include once "_mingw.bi" #include once "_mingw_unicode.bi" -#inclib "advapi32" - extern "Windows" #define _WINSVC_ diff --git a/inc/win/winuser.bi b/inc/win/winuser.bi index 7ca0dd39c0..7dd1bd7e63 100644 --- a/inc/win/winuser.bi +++ b/inc/win/winuser.bi @@ -1,12 +1,12 @@ #pragma once +#inclib "user32" + #include once "_mingw_unicode.bi" #include once "_mingw.bi" #include once "crt/stdarg.bi" #include once "guiddef.bi" -#inclib "user32" - extern "Windows" #define _WINUSER_ @@ -925,13 +925,13 @@ type MSG as tagMSG type PMSG as tagMSG ptr type NPMSG as tagMSG ptr type LPMSG as tagMSG ptr - #macro POINTSTOPOINT(pt, pts) scope (pt).x = cast(LONG, cast(SHORT, LOWORD(*cptr(LONG ptr, @pts)))) (pt).y = cast(LONG, cast(SHORT, HIWORD(*cptr(LONG ptr, @pts)))) end scope #endmacro + #define POINTTOPOINTS(pt) MAKELONG(cshort((pt).x), cshort((pt).y)) #define MAKEWPARAM(l, h) cast(WPARAM, cast(DWORD, MAKELONG(l, h))) #define MAKELPARAM(l, h) cast(LPARAM, cast(DWORD, MAKELONG(l, h))) diff --git a/inc/win/winver.bi b/inc/win/winver.bi index e5160ee264..5ae1efe927 100644 --- a/inc/win/winver.bi +++ b/inc/win/winver.bi @@ -1,10 +1,10 @@ #pragma once +#inclib "version" + #include once "_mingw.bi" #include once "_mingw_unicode.bi" -#inclib "version" - extern "Windows" #define VER_H diff --git a/inc/win/wtypes.bi b/inc/win/wtypes.bi index 1c0dfaae33..56f006d032 100644 --- a/inc/win/wtypes.bi +++ b/inc/win/wtypes.bi @@ -4,6 +4,9 @@ #include once "rpcndr.bi" #include once "wtypesbase.bi" +'' The following symbols have been renamed: +'' typedef DATE => DATE_ + extern "C" #define __REQUIRED_RPCNDR_H_VERSION__ 475 diff --git a/inc/zip.bi b/inc/zip.bi index 51cc34e9c8..30514c7316 100644 --- a/inc/zip.bi +++ b/inc/zip.bi @@ -1,14 +1,11 @@ -'' libzip 0.11.2 #pragma once #inclib "zip" - -'' At least when using a static libzip, zlib needs to be linked in too. #inclib "z" -#include once "crt/stdint.bi" #include once "crt/stdio.bi" #include once "crt/time.bi" +#include once "crt/stdint.bi" '' The following symbols have been renamed: '' enum constant ZIP_SOURCE_FREE => ZIP_SOURCE_FREE_ @@ -16,10 +13,6 @@ extern "C" -type zip as zip_ -type zip_file as zip_file_ -type zip_source as zip_source_ - #define LIBZIP_VERSION "0.11.2" #define LIBZIP_VERSION_MAJOR 0 #define LIBZIP_VERSION_MINOR 11 @@ -177,6 +170,9 @@ end type type zip_flags_t as zip_uint32_t type zip_source_callback as function(byval as any ptr, byval as any ptr, byval as zip_uint64_t, byval as zip_source_cmd) as zip_int64_t +type zip as zip_ +type zip_source as zip_source_ + declare function zip_add(byval as zip ptr, byval as const zstring ptr, byval as zip_source ptr) as zip_int64_t declare function zip_add_dir(byval as zip ptr, byval as const zstring ptr) as zip_int64_t declare function zip_get_file_comment(byval as zip ptr, byval as zip_uint64_t, byval as long ptr, byval as long) as const zstring ptr @@ -193,6 +189,7 @@ declare sub zip_error_clear(byval as zip ptr) declare sub zip_error_get(byval as zip ptr, byval as long ptr, byval as long ptr) declare function zip_error_get_sys_type(byval as long) as long declare function zip_error_to_str(byval as zstring ptr, byval as zip_uint64_t, byval as long, byval as long) as long +type zip_file as zip_file_ declare function zip_fclose(byval as zip_file ptr) as long declare function zip_fdopen(byval as long, byval as long, byval as long ptr) as zip ptr declare function zip_file_add(byval as zip ptr, byval as const zstring ptr, byval as zip_source ptr, byval as zip_flags_t) as zip_int64_t diff --git a/inc/zlib.bi b/inc/zlib.bi index 1328d95954..83a7d43178 100644 --- a/inc/zlib.bi +++ b/inc/zlib.bi @@ -1,4 +1,5 @@ #pragma once + #inclib "z" #include once "crt/long.bi"