[Vm-dev] [commit][3132] Add accessorDepths for the exported browser plugin primitives for Spur.

commits at squeakvm.org commits at squeakvm.org
Fri Nov 14 03:43:03 UTC 2014


Revision: 3132
Author:   eliot
Date:     2014-11-13 19:43:01 -0800 (Thu, 13 Nov 2014)
Log Message:
-----------
Add accessorDepths for the exported browser plugin primitives for Spur.

Modified Paths:
--------------
    branches/Cog/platforms/Mac OS/vm/osExports.c
    branches/Cog/platforms/RiscOS/vm/osExports.c
    branches/Cog/platforms/unix/vm/osExports.c
    branches/Cog/platforms/win32/vm/sqWin32Exports.c

Added Paths:
-----------
    branches/Cog/scripts/svntouch

Property Changed:
----------------
    branches/Cog/platforms/Cross/vm/sqSCCSVersion.h


Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
   - Wed Nov 12 11:52:26 PST 2014
   + Thu Nov 13 19:43:10 PST 2014

Modified: branches/Cog/platforms/Mac OS/vm/osExports.c
===================================================================
--- branches/Cog/platforms/Mac OS/vm/osExports.c	2014-11-13 22:36:48 UTC (rev 3131)
+++ branches/Cog/platforms/Mac OS/vm/osExports.c	2014-11-14 03:43:01 UTC (rev 3132)
@@ -17,7 +17,7 @@
 
 /* duh ... this is ugly */
 #define XFN(export) {"", #export, (void*)export},
-#define XFN2(plugin, export) {#plugin, #export, (void*)plugin##_##export},
+#define XFND(export,depth) {"", #export "\000" depth, (void*)export},
 
 WindowPtr getSTWindow(void);
 void setMessageHook(eventMessageHook theHook);
@@ -60,14 +60,14 @@
 /* Plugin support primitives
    We should make these primitives a proper plugin
    but right now we just need the exports. */
-	XFN(primitivePluginBrowserReady)
+	XFND(primitivePluginBrowserReady,"\377")
 #ifdef ENABLE_URL_FETCH
-	XFN(primitivePluginRequestURLStream)
-	XFN(primitivePluginRequestURL)
-	XFN(primitivePluginPostURL)
-	XFN(primitivePluginRequestFileHandle)
-	XFN(primitivePluginDestroyRequest)
-	XFN(primitivePluginRequestState)
+	XFND(primitivePluginRequestURLStream,"\001")
+	XFND(primitivePluginRequestURL,"\001")
+	XFND(primitivePluginPostURL,"\001")
+	XFND(primitivePluginRequestFileHandle,"\000")
+	XFND(primitivePluginDestroyRequest,"\000")
+	XFND(primitivePluginRequestState,"\000")
 #endif
 	{NULL, NULL, NULL}
 };

Modified: branches/Cog/platforms/RiscOS/vm/osExports.c
===================================================================
--- branches/Cog/platforms/RiscOS/vm/osExports.c	2014-11-13 22:36:48 UTC (rev 3131)
+++ branches/Cog/platforms/RiscOS/vm/osExports.c	2014-11-14 03:43:01 UTC (rev 3132)
@@ -28,7 +28,7 @@
 #include <stdio.h>
 /* duh ... this is ugly */
 #define XFN(export) {"", #export, (void*)export},
-#define XFN2(plugin, export) {#plugin, #export, (void*)plugin##_##export}
+#define XFND(export,depth) {"", #export "\000" depth, (void*)export},
 extern void  setSocketPollFunction(int spf );
 void *os_exports[][3] = {
    XFN(setSocketPollFunction)

Modified: branches/Cog/platforms/unix/vm/osExports.c
===================================================================
--- branches/Cog/platforms/unix/vm/osExports.c	2014-11-13 22:36:48 UTC (rev 3131)
+++ branches/Cog/platforms/unix/vm/osExports.c	2014-11-14 03:43:01 UTC (rev 3132)
@@ -1,5 +1,5 @@
 #define XFN(export) {"", #export, (void*)export},
-#define XFN2(plugin, export) {#plugin, #export, (void*)plugin##_##export},
+#define XFND(export,depth) {"", #export "\000" depth, (void*)export},
 
 char * GetAttributeString(int id);
 #if !defined(HEADLESS)
@@ -18,15 +18,15 @@
 {
   XFN(GetAttributeString)
 #if !defined(HEADLESS)
-  XFN(primitivePluginBrowserReady)
-  XFN(primitivePluginRequestURLStream)
-  XFN(primitivePluginRequestURL)
-  XFN(primitivePluginPostURL)
-  XFN(primitivePluginRequestFileHandle)
-  XFN(primitivePluginDestroyRequest)
-  XFN(primitivePluginRequestState)
-  XFN(ioGetDisplay)
-  XFN(ioGetWindow)
+	XFND(primitivePluginBrowserReady,"\377")
+	XFND(primitivePluginRequestURLStream,"\001")
+	XFND(primitivePluginRequestURL,"\001")
+	XFND(primitivePluginPostURL,"\001")
+	XFND(primitivePluginRequestFileHandle,"\000")
+	XFND(primitivePluginDestroyRequest,"\000")
+	XFND(primitivePluginRequestState,"\000")
+	XFN(ioGetDisplay)
+	XFN(ioGetWindow)
 #endif
   { 0, 0, 0 }
 };

Modified: branches/Cog/platforms/win32/vm/sqWin32Exports.c
===================================================================
--- branches/Cog/platforms/win32/vm/sqWin32Exports.c	2014-11-13 22:36:48 UTC (rev 3131)
+++ branches/Cog/platforms/win32/vm/sqWin32Exports.c	2014-11-14 03:43:01 UTC (rev 3132)
@@ -22,27 +22,30 @@
 extern void* preMessageHook;
 extern int fUseOpenGL;
 
+#define XFN(export) {"", #export, (void*)export},
+#define XFND(export,depth) {"", #export "\000" depth, (void*)export},
+#define XVAR(export) {"", #export, &export},
+
 void *os_exports[][3] = {
-  {"","GetAttributeString", GetAttributeString},
+	XFN(GetAttributeString)
 #if !NewspeakVM
-  {"","win32JoystickDebugInfo", win32JoystickDebugInfo},
-  {"","win32JoystickDebugPrintRawValues", win32JoystickDebugPrintRawValues},
-  {"","win32JoystickDebugPrintAlternativeValues", win32JoystickDebugPrintAlternativeValues},
+	XFN(win32JoystickDebugInfo)
+	XFN(win32JoystickDebugPrintRawValues)
+	XFN(win32JoystickDebugPrintAlternativeValues)
 #endif
-  {"","win32DebugPrintSocketState", win32DebugPrintSocketState},
-  {"","primitivePluginBrowserReady", primitivePluginBrowserReady},
-  {"","primitivePluginRequestURLStream", primitivePluginRequestURLStream},
-  {"","primitivePluginRequestURL", primitivePluginRequestURL},
-  {"","primitivePluginPostURL", primitivePluginPostURL},
-  {"","primitivePluginRequestFileHandle", primitivePluginRequestFileHandle},
-  {"","primitivePluginDestroyRequest", primitivePluginDestroyRequest},
-  {"","primitivePluginRequestState", primitivePluginRequestState},
-  {"","primitiveDnsInfo", primitiveDnsInfo},
-  {"","printf", printf},
-  {"","stWindow", &stWindow},
-  {"","firstMessageHook", &firstMessageHook},
-  {"","preMessageHook", &preMessageHook},
-  {"","fUseOpenGL", &fUseOpenGL},
-  {NULL,NULL, NULL}
+	XFN(win32DebugPrintSocketState)
+	XFND(primitivePluginBrowserReady,"\377")
+	XFND(primitivePluginRequestURLStream,"\001")
+	XFND(primitivePluginRequestURL,"\001")
+	XFND(primitivePluginPostURL,"\001")
+	XFND(primitivePluginRequestFileHandle,"\000")
+	XFND(primitivePluginDestroyRequest,"\000")
+	XFND(primitivePluginRequestState,"\000")
+	XFND(primitiveDnsInfo,"\377")
+	XFN(printf)
+	XVAR(stWindow)
+	XVAR(firstMessageHook)
+	XVAR(preMessageHook)
+	XVAR(fUseOpenGL)
+	{NULL,NULL, NULL}
 };
-

Added: branches/Cog/scripts/svntouch
===================================================================
--- branches/Cog/scripts/svntouch	                        (rev 0)
+++ branches/Cog/scripts/svntouch	2014-11-14 03:43:01 UTC (rev 3132)
@@ -0,0 +1,11 @@
+#!/bin/sh
+# Touch file(s) or all modified files in a directory back to the checkin date
+for f in "$@"
+do
+	if [ -d "$f" ]; then
+		$0 "$f"/*
+	else
+		changed="`svn info \"$f\" | grep 'Last Changed Date:' | sed 's/ *(.*//'`"
+		test -n "$changed" && touch -t "`date -j -f 'Last Changed Date: %Y-%m-%d %H:%M:%S %z' \"$changed\" '+%Y%m%d%H%M.%S'`" "$f"
+	fi
+done


Property changes on: branches/Cog/scripts/svntouch
___________________________________________________________________
Added: svn:executable
   + *



More information about the Vm-dev mailing list