CogVM source as per VMMaker.oscog-eem.3667

Fix Nico Papagna's BitBlt clipping bug which was due to use on int variables
on 64-bits so that negative values were truncated to extremely high positive
values, defeating the clipping logic.

As a result redefine the coordinate parameters of the surface functions to
take sqInts.

Change the signature of sqResolverGetAddressInfoResultSize
to eliminate a warning.

Slang: avoid adding struct type aliases for abstract classes,
eliminating some warnings in the ThreadeedFFI plugins.

Author: eliotmiranda

platforms/Cross/plugins/ExampleSurfacePlugin/sqMemorySurface.c

@@ -5,7 +5,7 @@
 #include "../SurfacePlugin/SurfacePlugin.h"
 
 typedef struct memSurface {
-  int width, height, depth, stride;
+  sqInt width, height, depth, stride;
   void *bits;
 } memSurface;
 
@@ -17,7 +17,8 @@ static fn_ioFindSurface findSurface = 0;
 extern struct VirtualMachine *interpreterProxy;
 
 /******************* Surface manager entry points *******************/
-static int memGetSurfaceFormat(sqIntptr_t handle, int *w, int *h, int *d, int *msbFlag) {
+static int memGetSurfaceFormat(sqIntptr_t handle, sqInt *w, sqInt *h, sqInt *d, sqInt *msbFlag)
+{
   memSurface *ms = (memSurface *) handle;
   *w = ms->width;
   *h = ms->height;
@@ -26,22 +27,18 @@ static int memGetSurfaceFormat(sqIntptr_t handle, int *w, int *h, int *d, int *m
   return 1;
 }
 
-static sqIntptr_t memLock(sqIntptr_t handle, int *stride, int x, int y, int w, int h){
+static sqIntptr_t memLock(sqIntptr_t handle, sqInt *stride, sqInt x, sqInt y, sqInt w, sqInt h)
+{
   /* Locking can be safely ignored for memory surfaces but we need to fill in 
      the stride and return the bits */
   memSurface *ms = (memSurface *) handle;
   *stride = ms->stride;
   return (sqIntptr_t)ms->bits;
 }
 
-static int memUnlock(sqIntptr_t handle, int x, int y, int w, int h){
-  return 1; /* ignored */
-}
+static int memUnlock(sqIntptr_t handle, sqInt x, sqInt y, sqInt w, sqInt h){ return 1; /* ignored */ }
 
-static int memShow(sqIntptr_t handle, int x, int y, int w, int h) {
-  /* unsupported */
-  return 0;
-}
+static int memShow(sqIntptr_t handle, sqInt x, sqInt y, sqInt w, sqInt h) { /* unsupported */ return 0; }
 
 static sqSurfaceDispatch memSurfaceDispatch = {
   1,
@@ -54,7 +51,7 @@ static sqSurfaceDispatch memSurfaceDispatch = {
 
 /******************* primitive entry points *******************/
 
-int memCreateSurfaceWidthHeightDepth(int w, int h, int d) {
+int memCreateSurfaceWidthHeightDepth(sqInt w, sqInt h, int d) {
   memSurface *ms;
   int id;
   /* since I'm lazy I'll only deal with d >= 8 */
@@ -124,4 +121,3 @@ int memInitialize(void) {
   if(!findSurface) return 0;
   return 1;
 }
-

platforms/Cross/plugins/SocketPlugin/SocketPlugin.h

@@ -94,7 +94,7 @@ void sqSocketSetReusable(SocketPtr s);
 void  sqResolverGetAddressInfoHostSizeServiceSizeFlagsFamilyTypeProtocol(char *hostName, sqInt hostSize, char *servName, sqInt servSize,
 																		 sqInt flags, sqInt family, sqInt type, sqInt protocol);
 sqInt sqResolverGetAddressInfoSize(void);
-void  sqResolverGetAddressInfoResultSize(char *addr, sqInt addrSize);
+void  sqResolverGetAddressInfoResultSize(unsigned char *addr, sqInt addrSize);
 sqInt sqResolverGetAddressInfoFamily(void);
 sqInt sqResolverGetAddressInfoType(void);
 sqInt sqResolverGetAddressInfoProtocol(void);

platforms/Cross/plugins/SqueakFFIPrims/sqFFI.h

@@ -2,7 +2,7 @@
 *   PROJECT: Squeak foreign function interface
 *   FILE:    sqFFI.h
 *   CONTENT: Declarations for the foreign function interface's surface support
-			 plus optional declaration of the sqFFITestFuncs.c test suite.
+*			 plus optional declaration of the sqFFITestFuncs.c test suite.
 *
 *   AUTHOR:  Andreas Raab (ar)
 *   ADDRESS: Walt Disney Imagineering, Glendale, CA
@@ -39,9 +39,9 @@ void initSurfacePluginFunctionPointers();
 void initManualSurfaceFunctionPointers
 	(fn_ioRegisterSurface, fn_ioUnregisterSurface, fn_ioFindSurface);
 int createManualSurface
-	(int width, int height, int rowPitch, int depth, int isMSB);
+	(sqInt width, sqInt height, sqInt rowPitch, sqInt depth, sqInt isMSB);
 int destroyManualSurface(int surfaceID);
-int setManualSurfacePointer(int surfaceID, void* ptr);
+int setManualSurfacePointer(int surfaceID, void *ptr);
 void doFFILogCallout(sqInt externalFunctionName);
 
 

platforms/Cross/plugins/SqueakFFIPrims/sqManualSurface.c

@@ -42,21 +42,21 @@ void initSurfacePluginFunctionPointers()
    it may be touched directly from Squeak code to set/clear "ptr", and also
    treated as a generic surface via BitBlt's use of the SurfacePlugin. */
 typedef struct {
-	int width;
-	int height;
-	int rowPitch;
-	int depth;
-	int isMSB;
-	void* ptr;
-	int isLocked;
+	sqInt width;
+	sqInt height;
+	sqInt rowPitch;
+	sqInt depth;
+	sqInt isMSB;
+	void *ptr;
+	sqInt isLocked;
 } ManualSurface;
 
 /* Create the dispatch-table that SurfacePlugin will use to interact with
    instances of "struct ManualSurface" */
-static int manualSurfaceGetFormat(sqIntptr_t, int*, int*, int*, int*);
-static sqIntptr_t manualSurfaceLock(sqIntptr_t, int *, int, int, int, int);
-static int manualSurfaceUnlock(sqIntptr_t, int, int, int, int);
-static int manualSurfaceShow(sqIntptr_t, int, int, int, int);
+static int manualSurfaceGetFormat(sqIntptr_t, sqInt *, sqInt *, sqInt *, sqInt *);
+static sqIntptr_t manualSurfaceLock(sqIntptr_t, sqInt *, sqInt, sqInt, sqInt, sqInt);
+static int manualSurfaceUnlock(sqIntptr_t, sqInt, sqInt, sqInt, sqInt);
+static int manualSurfaceShow(sqIntptr_t, sqInt, sqInt, sqInt, sqInt);
 static sqSurfaceDispatch manualSurfaceDispatch = {
   1,
   0,
@@ -68,7 +68,9 @@ static sqSurfaceDispatch manualSurfaceDispatch = {
 
 /* sqSurfaceDispatch functions *****************************************************************************/
 
-int manualSurfaceGetFormat(sqIntptr_t surfaceArg, int* width, int* height, int* depth, int* isMSB) {
+int
+manualSurfaceGetFormat(sqIntptr_t surfaceArg, sqInt *width, sqInt *height, sqInt *depth, sqInt *isMSB)
+{
 	ManualSurface* surface = (ManualSurface *)surfaceArg;
 	*width = surface->width;
 	*height = surface->height;
@@ -78,7 +80,9 @@ int manualSurfaceGetFormat(sqIntptr_t surfaceArg, int* width, int* height, int*
 	return 1;
 }
 
-sqIntptr_t manualSurfaceLock(sqIntptr_t surfaceArg, int *pitch, int x, int y, int w, int h) {
+sqIntptr_t
+manualSurfaceLock(sqIntptr_t surfaceArg, sqInt *pitch, sqInt x, sqInt y, sqInt w, sqInt h)
+{
 	ManualSurface* surface = (ManualSurface *)surfaceArg;
 	/* Ideally, would be atomic.  But it doens't matter for the forseeable future,
 	   since it is only called via BitBlt primitives. */
@@ -100,30 +104,34 @@ sqIntptr_t manualSurfaceLock(sqIntptr_t surfaceArg, int *pitch, int x, int y, in
 	return (sqIntptr_t)(surface->ptr);
 }
 
-int manualSurfaceUnlock(sqIntptr_t surfaceArg, int x, int y, int w, int h) {
+int
+manualSurfaceUnlock(sqIntptr_t surfaceArg, sqInt x, sqInt y, sqInt w, sqInt h)
+{
 	ManualSurface* surface = (ManualSurface *)surfaceArg;
     surface->isLocked = 0;
 	DPRINTF(("Unlocked Surface: %" PRIxSQPTR " Rect: %ld %ld %ld %ld\n", (sqIntptr_t) surface, x, y, w, h));
 	return 1;	
 }
 
-int manualSurfaceShow(sqIntptr_t surfaceArg, int x, int y, int w, int h) {
-	/* Unsupported */
-	return 0;
-}
+int
+manualSurfaceShow(sqIntptr_t surfaceArg, sqInt x, sqInt y, sqInt w, sqInt h) { /* Unsupported */ return 0; }
 
 /* primitive interface functions (i.e. called from Squeak) *********************************************/
 
 /* Answer non-negative surfaceID if successful, and -1 for failure. */
-int createManualSurface(int width, int height, int rowPitch, int depth, int isMSB) {
+int
+createManualSurface(sqInt width, sqInt height, sqInt rowPitch, sqInt depth, sqInt isMSB)
+{
 	ManualSurface* newSurface;
 	int surfaceID, result;
 
-	if (width < 0) return -1;
-	if (height < 0) return -1;
-	if (rowPitch < (width*depth)/8) return -1;
-	if (depth < 1 || depth > 32) return -1;
-	if (!registerSurface) return -1; /* failure... couldn't init function-pointer */
+	if (width < 0
+	 || height < 0
+	 || rowPitch < (width * depth)
+	 || depth < 1
+	 || depth > 32
+	 || !registerSurface)
+		return -1;
 
 	newSurface = (ManualSurface*)malloc(sizeof(ManualSurface));
 	if (!newSurface) return -1;
@@ -144,20 +152,23 @@ int createManualSurface(int width, int height, int rowPitch, int depth, int isMS
 	return surfaceID;
 }
 
-int destroyManualSurface(int surfaceID) {
+int
+destroyManualSurface(int surfaceID)
+{
 	if (!unregisterSurface) return 0; /* failure... couldn't init function-pointer */
 	return unregisterSurface(surfaceID);
 }
 
-int setManualSurfacePointer(int surfaceID, void* ptr) {
-	sqIntptr_t surfaceHandle;
+int
+setManualSurfacePointer(int surfaceID, void* ptr)
+{
 	ManualSurface *surface;
-	int result;
-	if (!findSurface) return FALSE; /* failure... couldn't init function-pointer */
-	result = findSurface(surfaceID, NULL, &surfaceHandle);
-	if (!result) return FALSE; /* failed to find surface */
-	surface = (ManualSurface*)surfaceHandle;	
-	if (surface->isLocked) return FALSE; /* can't set pointer while surface is locked */
+	if (!findSurface)
+		return FALSE; /* failure... couldn't init function-pointer */
+	if (!findSurface(surfaceID, NULL, (sqIntptr_t *)&surface))
+		return FALSE; /* failed to find surface */
+	if (surface->isLocked)
+		return FALSE; /* can't set pointer while surface is locked */
 	surface->ptr = ptr;
 	DPRINTF(("Set Surface: %lx Pointer: %" PRIxSQPTR "\n", surfaceID, (sqIntptr_t)ptr));
 	return TRUE;

platforms/Cross/plugins/SurfacePlugin/SurfacePlugin.c

@@ -67,12 +67,12 @@ EXPORT(long) initialiseModule(void);
 EXPORT(long) shutdownModule(void);
 
 /* critical FXBlt entry points */
-EXPORT(int) ioGetSurfaceFormat (int surfaceID, int* width, int* height, int* depth, int* isMSB);
-EXPORT(sqIntptr_t) ioLockSurface (int surfaceID, int *pitch, int x, int y, int w, int h);
-EXPORT(int) ioUnlockSurface(int surfaceID, int x, int y, int w, int h);
+EXPORT(int) ioGetSurfaceFormat (int surfaceID, sqInt *width, sqInt *height, sqInt *depth, sqInt *isMSB);
+EXPORT(sqIntptr_t) ioLockSurface (int surfaceID, sqInt *pitch, sqInt x, sqInt y, sqInt w, sqInt h);
+EXPORT(int) ioUnlockSurface(int surfaceID, sqInt x, sqInt y, sqInt w, sqInt h);
 
 /* interpreter entry point */
-EXPORT(int) ioShowSurface(int surfaceID, int x, int y, int w, int h);
+EXPORT(int) ioShowSurface(int surfaceID, sqInt x, sqInt y, sqInt w, sqInt h);
 
 /* client entry points */
 EXPORT(int) ioRegisterSurface(sqIntptr_t surfaceHandle, sqSurfaceDispatch *fn, int *surfaceID);
@@ -83,14 +83,16 @@ EXPORT(int) ioFindSurface(int surfaceID, sqSurfaceDispatch *fn, sqIntptr_t *surf
 /* ioGetSurfaceFormat:
 	Return information describing the given surface.
 	Return true if successful, false otherwise. */
-EXPORT(int) ioGetSurfaceFormat (int surfaceID, int* width, int* height, int* depth, int* isMSB)
+EXPORT(int) ioGetSurfaceFormat (int surfaceID, sqInt *width, sqInt *height, sqInt *depth, sqInt *isMSB)
 {
 	SqueakSurface *surface;
-	if(surfaceID < 0 || surfaceID >= maxSurfaces) FAIL;
+	if (surfaceID < 0 || surfaceID >= maxSurfaces)
+		FAIL;
 	surface = surfaceArray + surfaceID;
-	if(surface->dispatch == NULL) FAIL;
+	if (!surface->dispatch)
+		FAIL;
 	/* Allow getSurfaceFormat to be defaulted to 0 */
-	if(!surface->dispatch->getSurfaceFormat)
+	if (!surface->dispatch->getSurfaceFormat)
 		return -1;
 	return surface->dispatch->getSurfaceFormat(surface->handle, width, height, depth, isMSB);
 }
@@ -99,41 +101,48 @@ EXPORT(int) ioGetSurfaceFormat (int surfaceID, int* width, int* height, int* dep
 	Lock the bits of the surface. 
 	Return a pointer to the actual surface bits,
 	or NULL on failure. */
-EXPORT(sqIntptr_t) ioLockSurface (int surfaceID, int *pitch, int x, int y, int w, int h)
+EXPORT(sqIntptr_t) ioLockSurface (int surfaceID, sqInt *pitch, sqInt x, sqInt y, sqInt w, sqInt h)
 {
 	SqueakSurface *surface;
-	if(surfaceID < 0 || surfaceID >= maxSurfaces) FAIL;
+	if (surfaceID < 0 || surfaceID >= maxSurfaces)
+		FAIL;
 	surface = surfaceArray + surfaceID;
-	if(surface->dispatch == NULL) FAIL;
-	if(!surface->dispatch->lockSurface) FAIL;
+	if (!surface->dispatch)
+		FAIL;
+	if (!surface->dispatch->lockSurface)
+		FAIL;
 	return surface->dispatch->lockSurface(surface->handle, pitch, x, y, w, h);
 }
 
 /* ioUnlockSurface:
 	Unlock the bits of the surface. 
 	The return value is ignored. */
-EXPORT(int) ioUnlockSurface(int surfaceID, int x, int y, int w, int h)
+EXPORT(int) ioUnlockSurface(int surfaceID, sqInt x, sqInt y, sqInt w, sqInt h)
 {
 	SqueakSurface *surface;
-	if(surfaceID < 0 || surfaceID >= maxSurfaces) FAIL;
+	if (surfaceID < 0 || surfaceID >= maxSurfaces)
+		FAIL;
 	surface = surfaceArray + surfaceID;
-	if(surface->dispatch == NULL) FAIL;
+	if (!surface->dispatch)
+		FAIL;
 	/* Allow unlockSurface to be defaulted to 0 */
-	if(!surface->dispatch->unlockSurface)
+	if (!surface->dispatch->unlockSurface)
 		return -1;
 	return surface->dispatch->unlockSurface(surface->handle, x, y, w, h);
 }
 
 /* ioShowSurface:
 	Transfer the bits of a surface to the screen. */
-EXPORT(int) ioShowSurface(int surfaceID, int x, int y, int w, int h)
+EXPORT(int) ioShowSurface(int surfaceID, sqInt x, sqInt y, sqInt w, sqInt h)
 {
 	SqueakSurface *surface;
-	if(surfaceID < 0 || surfaceID >= maxSurfaces) FAIL;
+	if (surfaceID < 0 || surfaceID >= maxSurfaces)
+		FAIL;
 	surface = surfaceArray + surfaceID;
-	if(surface->dispatch == NULL) FAIL;
+	if (!surface->dispatch)
+		FAIL;
 	/* Allow showSurface to be defaulted to 0 */
-	if(!surface->dispatch->showSurface)
+	if (!surface->dispatch->showSurface)
 		-1;
 	return surface->dispatch->showSurface(surface->handle, x, y, w, h);
 }
@@ -147,9 +156,11 @@ EXPORT(int) ioRegisterSurface(sqIntptr_t surfaceHandle, sqSurfaceDispatch *fn, i
 {
 	int index;
 
-	if(!fn) return 0;
-	if(fn->majorVersion != 1 && fn->minorVersion != 0) return 0;
-	if(numSurfaces == maxSurfaces) {
+	if (!fn)
+		return 0;
+	if (fn->majorVersion != 1 && fn->minorVersion != 0)
+		return 0;
+	if (numSurfaces == maxSurfaces) {
 		maxSurfaces = maxSurfaces * 2 + 10;
 		surfaceArray = realloc(surfaceArray, sizeof(SqueakSurface) * maxSurfaces);
 		for(index = numSurfaces; index < maxSurfaces; index++){
@@ -159,10 +170,11 @@ EXPORT(int) ioRegisterSurface(sqIntptr_t surfaceHandle, sqSurfaceDispatch *fn, i
 		index = numSurfaces;
 	} else {
 		for(index = 0; index < maxSurfaces; index++)
-			if(surfaceArray[index].dispatch == NULL)
+			if (surfaceArray[index].dispatch == NULL)
 				break;
 	}
-	if(index >= maxSurfaces) return 0; /* should not happen */
+	if (index >= maxSurfaces)
+		return 0; /* should not happen */
 	surfaceArray[index].handle = surfaceHandle;
 	surfaceArray[index].dispatch = fn;
 	*surfaceID = index;
@@ -176,9 +188,11 @@ EXPORT(int) ioRegisterSurface(sqIntptr_t surfaceHandle, sqSurfaceDispatch *fn, i
 EXPORT(int) ioUnregisterSurface(int surfaceID)
 {
 	SqueakSurface *surface;
-	if(surfaceID < 0 || surfaceID >= maxSurfaces) return 0;
+	if (surfaceID < 0 || surfaceID >= maxSurfaces)
+		return 0;
 	surface = surfaceArray + surfaceID;
-	if(surface->dispatch == NULL) return 0;
+	if (!surface->dispatch)
+		return 0;
 	surface->handle = 0;
 	surface->dispatch = NULL;
 	numSurfaces--;
@@ -193,10 +207,13 @@ EXPORT(int) ioUnregisterSurface(int surfaceID)
 EXPORT(int) ioFindSurface(int surfaceID, sqSurfaceDispatch *fn, sqIntptr_t *surfaceHandle)
 {
 	SqueakSurface *surface;
-	if(surfaceID < 0 || surfaceID >= maxSurfaces) return 0;
+	if (surfaceID < 0 || surfaceID >= maxSurfaces)
+		return 0;
 	surface = surfaceArray + surfaceID;
-	if(surface->dispatch == NULL) return 0;
-	if(fn && fn != surface->dispatch) return 0;
+	if (!surface->dispatch)
+		return 0;
+	if (fn && fn != surface->dispatch)
+		return 0;
 	*surfaceHandle = surface->handle;
 	return 1;
 }
@@ -225,7 +242,8 @@ EXPORT(long) initialiseModule() {
 
 EXPORT(long) shutdownModule() {
 	/* This module can only be shut down if no surfaces are registered */
-	if(numSurfaces != 0) return 0;
+	if (numSurfaces != 0)
+		return 0;
 	free(surfaceArray);
 	return 1;
 }