inc: Fix various #defines in fbfrog-based bindings

(cherry picked from commit 47056bf)

Author: dkl

changelog.txt

@@ -9,6 +9,7 @@ Version 1.02.1
 - 1.02.0 regression: win/winuser.bi: Renamed INPUT typedef to INPUT_ to avoid conflicts with the quirk keyword (due to bug #730)
 - 1.02.0 regression: OpenGL binding: glGetString() and some others use ZString Ptr instead of GLubyte Ptr again
 - 1.02.0 regression: Windows API binding: REFIID and some other REF* types were missing
+- bindings: Various previously untranslated (or wrongly translated) #defines in SDL2, X11, crt/pthread, Windows API
 
 
 Version 1.02.0

inc/SDL2/SDL.bi

@@ -183,12 +183,12 @@ declare sub SDL_SetMainReady()
 #endif
 
 const SDL_ASSERT_LEVEL = 2
-#define SDL_TriggerBreakpoint() '' TODO: __asm__ __volatile__ ( "int $3\n\t" )
-#define SDL_FUNCTION __func__
+#define SDL_TriggerBreakpoint() asm int 3
+#define SDL_FUNCTION __FUNCTION__
 #define SDL_FILE __FILE__
 #define SDL_LINE __LINE__
 const SDL_NULL_WHILE_LOOP_CONDITION = 0
-#define SDL_disabled_assert(condition) '' TODO: do { (void) sizeof ((condition)); } while (SDL_NULL_WHILE_LOOP_CONDITION)
+#define SDL_disabled_assert(condition) scope : end scope
 
 type SDL_assert_state as long
 enum
@@ -210,7 +210,21 @@ type SDL_assert_data
 end type
 
 declare function SDL_ReportAssertion(byval as SDL_assert_data ptr, byval as const zstring ptr, byval as const zstring ptr, byval as long) as SDL_assert_state
-#define SDL_enabled_assert(condition) '' TODO: do { while ( !(condition) ) { static struct SDL_assert_data assert_data = { 0, 0, #condition, 0, 0, 0, 0 }; const SDL_assert_state state = SDL_ReportAssertion(&assert_data, SDL_FUNCTION, SDL_FILE, SDL_LINE); if (state == SDL_ASSERTION_RETRY) { continue; } else if (state == SDL_ASSERTION_BREAK) { SDL_TriggerBreakpoint(); } break; } } while (SDL_NULL_WHILE_LOOP_CONDITION)
+#macro SDL_enabled_assert(condition)
+	scope
+		while (condition) = 0
+			static as SDL_assert_data assert_data = ( 0, 0, @#condition, 0, 0, 0, 0 )
+			dim as const SDL_assert_state state = SDL_ReportAssertion(@assert_data, SDL_FUNCTION, SDL_FILE, SDL_LINE)
+			select case state
+			case SDL_ASSERTION_RETRY
+				continue while
+			case SDL_ASSERTION_BREAK
+				SDL_TriggerBreakpoint()
+			end select
+			exit while
+		wend
+	end scope
+#endmacro
 #define SDL_assert(condition) SDL_enabled_assert(condition)
 #define SDL_assert_release(condition) SDL_enabled_assert(condition)
 #define SDL_assert_paranoid(condition) SDL_disabled_assert(condition)
@@ -227,8 +241,7 @@ type SDL_SpinLock as long
 declare function SDL_AtomicTryLock(byval lock as SDL_SpinLock ptr) as SDL_bool
 declare sub SDL_AtomicLock(byval lock as SDL_SpinLock ptr)
 declare sub SDL_AtomicUnlock(byval lock as SDL_SpinLock ptr)
-
-#define SDL_CompilerBarrier() '' TODO: __asm__ __volatile__ ("" : : : "memory")
+#define SDL_CompilerBarrier() asm nop
 #define SDL_MemoryBarrierRelease() SDL_CompilerBarrier()
 #define SDL_MemoryBarrierAcquire() SDL_CompilerBarrier()
 

inc/X11/Intrinsic.bi

@@ -343,7 +343,12 @@ declare sub XtSetMappedWhenManaged(byval as Widget, byval as byte)
 declare function XtNameToWidget(byval as Widget, byval as const zstring ptr) as Widget
 declare function XtWindowToWidget(byval as Display ptr, byval as Window) as Widget
 declare function XtGetClassExtension(byval as WidgetClass, byval as Cardinal, byval as XrmQuark, byval as clong, byval as Cardinal) as XtPointer
-#define XtSetArg(arg, n, d) '' TODO: ((void)( (arg).name = (n), (arg).value = (XtArgVal)(d) ))
+#macro XtSetArg(arg, n, d)
+	scope
+		(arg).name = (n)
+		(arg).value = cast(XtArgVal, d)
+	end scope
+#endmacro
 declare function XtMergeArgLists(byval as ArgList, byval as Cardinal, byval as ArgList, byval as Cardinal) as ArgList
 #define XtVaNestedList "XtVaNestedList"
 #define XtVaTypedArg "XtVaTypedArg"
@@ -431,8 +436,8 @@ const XtUnspecifiedShellInt = -1
 #define XtDefaultBackground "XtDefaultBackground"
 #define XtDefaultFont "XtDefaultFont"
 #define XtDefaultFontSet "XtDefaultFontSet"
-#define XtOffset(p_type, field) '' TODO: ((Cardinal) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
-#define XtOffsetOf(s_type, field) '' TODO: XtOffset(s_type*,field)
+#define XtOffset(p_type, field) cast(Cardinal, cptr(byte ptr, @cast(p_type, NULL)->field) - cptr(byte ptr, NULL))
+#define XtOffsetOf(s_type, field) XtOffset(s_type ptr, field)
 
 type _XtCheckpointTokenRec
 	save_type as long

inc/crt/bits/pthreadtypes.bi

@@ -110,7 +110,7 @@ end union
 
 #ifdef __FB_64BIT__
 	const __PTHREAD_MUTEX_HAVE_PREV = 1
-	#define __PTHREAD_SPINS '' TODO: 0, 0
+	#define __PTHREAD_SPINS 0, 0
 #else
 	#define __spins __elision_data.__espins
 	#define __elision __elision_data.__elision
@@ -186,7 +186,7 @@ union pthread_rwlock_t
 end union
 
 #ifdef __FB_64BIT__
-	#define __PTHREAD_RWLOCK_ELISION_EXTRA '' TODO: 0, { 0, 0, 0, 0, 0, 0, 0 }
+	#define __PTHREAD_RWLOCK_ELISION_EXTRA 0, { 0, 0, 0, 0, 0, 0, 0 }
 	const __PTHREAD_RWLOCK_INT_FLAGS_SHARED = 1
 #else
 	const __PTHREAD_RWLOCK_ELISION_EXTRA = 0

inc/win/apiset.bi

@@ -23,8 +23,8 @@ const API_SET_RELEASE_SCHEMA_ORDINAL = 3
 #define API_SET_STRING_U_X(s) API_SET_STRING_U_Y(s)
 #define API_SET_STRING_U(s) API_SET_STRING_U_X(API_SET_STRING(s))
 #define API_SET_OVERRIDE(X) X##Implementation
-#define API_SET_LEGACY_OVERRIDE_DEF(X) '' TODO: X = API_SET_OVERRIDE(X)
-#define API_SET_OVERRIDE_DEF(X) '' TODO: API_SET_LEGACY_OVERRIDE_DEF(X) PRIVATE
+'' TODO: #define API_SET_LEGACY_OVERRIDE_DEF(X) X = API_SET_OVERRIDE(X)
+'' TODO: #define API_SET_OVERRIDE_DEF(X) API_SET_LEGACY_OVERRIDE_DEF(X) PRIVATE
 #define API_SET_PRIVATE(X) X PRIVATE
 #define API_SET_LIBRARY(X) LIBRARY X
 #define API_SET(X) X

inc/win/dshow.bi

@@ -19,6 +19,6 @@
 #define __DSHOW_INCLUDED__
 #define AM_NOVTABLE
 #define NO_SHLWAPI_STRFCNS
-#define NUMELMS(array) (sizeof((array)) / sizeof((array)[0]))
+#define NUMELMS(array) (ubound(array) - lbound(array) + 1)
 const OATRUE = -1
 const OAFALSE = 0

inc/win/ntdef.bi

@@ -400,7 +400,7 @@ type PGROUP_AFFINITY as _GROUP_AFFINITY ptr
 #define RTL_FIELD_SIZE(type, field) sizeof(cptr(type ptr, 0)->field)
 #define RTL_SIZEOF_THROUGH_FIELD(type, field) (FIELD_OFFSET(type, field) + RTL_FIELD_SIZE(type, field))
 #define RTL_CONTAINS_FIELD(Struct, Size, Field) ((cast(PCHAR, @(Struct)->Field) + sizeof((Struct)->Field)) <= (cast(PCHAR, (Struct)) + (Size)))
-#define RTL_NUMBER_OF_V1(A) (sizeof((A)) / sizeof((A)[0]))
+#define RTL_NUMBER_OF_V1(A) (ubound(A) - lbound(A) + 1)
 #define RTL_NUMBER_OF_V2(A) RTL_NUMBER_OF_V1(A)
 #define RTL_NUMBER_OF(A) RTL_NUMBER_OF_V1(A)
 #define ARRAYSIZE(A) RTL_NUMBER_OF_V2(A)

inc/win/snmp.bi

@@ -184,7 +184,7 @@ const SNMP_OUTPUT_TO_EVENTLOG = &h4
 const SNMP_OUTPUT_TO_DEBUGGER = &h8
 declare sub SnmpUtilDbgPrint cdecl(byval nLogLevel as INT_, byval szFormat as LPSTR, ...)
 #define SNMPDBG(_x_)
-#define DEFINE_SIZEOF(Array) (sizeof((Array)) / sizeof((Array)[0]))
+#define DEFINE_SIZEOF(Array) (ubound(Array) - lbound(Array) + 1)
 #define DEFINE_OID(SubIdArray) (DEFINE_SIZEOF(SubIdArray), (SubIdArray))
 #define DEFINE_NULLOID() (0, NULL)
 #define DEFINE_NULLOCTETS() (NULL, 0, FALSE)

inc/win/winnt.bi

@@ -349,7 +349,7 @@ const MAXDWORD = &hffffffff
 #define RTL_FIELD_SIZE(type, field) sizeof(cptr(type ptr, 0)->field)
 #define RTL_SIZEOF_THROUGH_FIELD(type, field) (FIELD_OFFSET(type, field) + RTL_FIELD_SIZE(type, field))
 #define RTL_CONTAINS_FIELD(Struct, Size, Field) ((cast(PCHAR, @(Struct)->Field) + sizeof((Struct)->Field)) <= (cast(PCHAR, (Struct)) + (Size)))
-#define RTL_NUMBER_OF_V1(A) (sizeof((A)) / sizeof((A)[0]))
+#define RTL_NUMBER_OF_V1(A) (ubound(A) - lbound(A) + 1)
 #define RTL_NUMBER_OF_V2(A) RTL_NUMBER_OF_V1(A)
 #define RTL_NUMBER_OF(A) RTL_NUMBER_OF_V1(A)
 #define ARRAYSIZE(A) RTL_NUMBER_OF_V2(A)