sdlcp-commits — A mailing list for tracking SVN commits.

[Sdlcp-commits] SF.net SVN: sdlcp:[10] SDLCP/trunk

[<ja...@us...>]

Revision: 10
          http://sourceforge.net/p/sdlcp/code/10
Author:   jam555
Date:     2013-06-17 16:45:25 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
Apparently made more changes to my rbtree implementation here, and to my queue. Don't know when, and I think I actually reimplemented an rbtree in another project.

Added a spawn function, though there isn't a header, and the code isn't compile-ready yet.

Modified Paths:
--------------
    SDLCP/trunk/queue.hpp
    SDLCP/trunk/rbtree.h

Added Paths:
-----------
    SDLCP/trunk/sdlpipe_windows.c

Modified: SDLCP/trunk/queue.hpp
===================================================================
--- SDLCP/trunk/queue.hpp	2011-08-25 06:25:56 UTC (rev 9)
+++ SDLCP/trunk/queue.hpp	2013-06-17 16:45:25 UTC (rev 10)
@@ -26,10 +26,10 @@
 
 #ifndef SDLCP2_TEMPLATOMICQUEUE
 
-#include "SDL_atomic.h"
-#include "queue.h
+# include "SDL_atomic.h"
+# include "queue.h"
 
-#define SDLCP2_TEMPLATOMICQUEUE
+# define SDLCP2_TEMPLATOMICQUEUE
 
 namespace SDLCP_2
 {
@@ -43,109 +43,12 @@
 			
 			SDLCP2_AtomicQueueInit( static_cast< SDLCP2_AtomicQueue* >( q ) );
 		};
-		~TemplAtomicQueue()
-		{
-			bool rethrow = 0;
-			
-			try
-			{
-				while( 1 )
-				{
-					pop();
-				}
-			}
-			catch( ... )
-			{
-				rethrow = 1;
-			}
-			
-			delete static_cast< SDLCP2_AtomicQueue* >( q );
-			q = 0;
-			
-			if( rethrow )
-			{
-				throw;
-			}
-		};
+		~TemplAtomicQueue();
 		
-		TemplAtomicQueue cede_all() volatile
-		{
-			void *n = static_cast< void* >( new SDLCP2_AtomicQueue() );
-			
-			while( SDL_AtomicCAS( &l1, 0, 1 ) != SDL_TRUE )
-			{}
-			
-			while( SDL_AtomicCAS( &l2, 0, -1 ) != SDL_TRUE )
-			{}
-			
-			SDL_AtomicSet( &l1, 0 );
-			
-			void *o = fetch_queue();
-			release_queue( n );
-			
-			SDL_AtomicSet( &l2, 0 );
-			
-			return( TemplAtomicQueue( static_cast< SDLCP2_AtomicQueue* >( o ) ) );
-		};
+		TemplAtomicQueue cede_all() volatile;
 		
-		T pop() volatile
-		{
-			void *data;
-			
-			while( SDL_AtomicCAS( &l1, 0, 1 ) != SDL_TRUE )
-			{}
-			
-			int v = SDL_AtomicGet( &l2 );
-			while( v >= 0 || SDL_AtomicCAS( &l, v, v + 1 ) != SDL_TRUE )
-			{
-				v = SDL_AtomicGet( &l2 );
-			}
-			
-			SDL_AtomicSet( &l1, 0 );
-			
-			switch( SDLCP2_AtomicQueuePop( static_cast< SDLCP2_AtomicQueue* >( q ), &data ) )
-			{
-				case 1:
-					SDL_AtomicDecRef( &l2 );
-					break;
-				case 2:
-					SDL_AtomicDecRef( &l2 );
-					throw( "Out of data." );
-				default:
-					SDL_AtomicDecRef( &l2 );
-					throw( "Error." );
-			}
-			
-			T ret( *static_cast< T* >( data ) );
-			delete static_cast< T* >( data );
-			
-			return( ret );
-		};
-		void push( T &that ) volatile
-		{
-			T *tmp = new T( that );
-			
-			while( SDL_AtomicCAS( &l1, 0, 1 ) != SDL_TRUE )
-			{}
-			
-			int v = SDL_AtomicGet( &l2 );
-			while( v >= 0 || SDL_AtomicCAS( &l, v, v + 1 ) != SDL_TRUE )
-			{
-				v = SDL_AtomicGet( &l2 );
-			}
-			
-			SDL_AtomicSet( &l1, 0 );
-			
-			switch( SDLCP2_AtomicQueuePush( static_cast< SDLCP2_AtomicQueue* >( _q ), static_cast< void* >( tmp ) ) )
-			{
-				case 1:
-					SDL_AtomicDecRef( &l2 );
-					break;
-				default:
-					SDL_AtomicDecRef( &l2 );
-					throw( "Error." );
-			}
-		};
+		T pop() volatile;
+		void push( T &that ) volatile;
 	private:
 		void *q;
 		SDL_atomic_t l1, l2;
@@ -153,30 +56,144 @@
 		TemplAtomicQueue( SDLCP2_AtomicQueue *_q ) : q( static_cast< void* >( q ) )
 		{};
 		
-		TemplAtomicQueue( TemplAtomicQueue &that )
+		TemplAtomicQueue( TemplAtomicQueue &that );
+		
+		void* fetch_queue() volatile;
+		void release_queue( void *_q ) volatile
 		{
-			void *tmp = static_cast< void* >( new SDLCP2_AtomicQueue() );
-			q = that.fetch_queue();
-			that.release_queue( tmp );
+			SDL_AtomicSetPtr( &q, _q );
 		};
+	};
+	
+	template< class T >
+	TemplAtomicQueue< T >::~TemplAtomicQueue()
+	{
+		bool rethrow = 0;
 		
-		void* fetch_queue() volatile
+		try
 		{
-			void *ret;
-			
-			ret = SDL_AtomicGetPtr( &q );
-			while(  ret == 0 || SDL_AtomicCASPtr( &q, ret, 0 ) != SDL_TRUE )
+			while( 1 )
 			{
-				ret = SDL_AtomicGetPtr( &q );
+				pop();
 			}
-			
-			return( ret );
-		};
-		void release_queue( void *_q ) volatile
+		}
+		catch( ... )
 		{
-			SDL_AtomicSetPtr( &q, _q );
-		};
-	};
+			rethrow = 1;
+		}
+		
+		delete static_cast< SDLCP2_AtomicQueue* >( q );
+		q = 0;
+		
+		if( rethrow )
+		{
+			throw;
+		}
+	}
+	
+	template< class T >
+	TemplAtomicQueue< T > TemplAtomicQueue< T >::cede_all() volatile
+	{
+		void *n = static_cast< void* >( new SDLCP2_AtomicQueue() );
+		
+		while( SDL_AtomicCAS( &l1, 0, 1 ) != SDL_TRUE )
+		{}
+		
+		while( SDL_AtomicCAS( &l2, 0, -1 ) != SDL_TRUE )
+		{}
+		
+		SDL_AtomicSet( &l1, 0 );
+		
+		void *o = fetch_queue();
+		release_queue( n );
+		
+		SDL_AtomicSet( &l2, 0 );
+		
+		return( TemplAtomicQueue( static_cast< SDLCP2_AtomicQueue* >( o ) ) );
+	}
+	
+	template< class T >
+	T TemplAtomicQueue< T >::pop() volatile
+	{
+		void *data;
+		
+		while( SDL_AtomicCAS( &l1, 0, 1 ) != SDL_TRUE )
+		{}
+		
+		int v = SDL_AtomicGet( &l2 );
+		while( v >= 0 || SDL_AtomicCAS( &l, v, v + 1 ) != SDL_TRUE )
+		{
+			v = SDL_AtomicGet( &l2 );
+		}
+		
+		SDL_AtomicSet( &l1, 0 );
+		
+		switch( SDLCP2_AtomicQueuePop( static_cast< SDLCP2_AtomicQueue* >( q ), &data ) )
+		{
+			case 1:
+				SDL_AtomicDecRef( &l2 );
+				break;
+			case 2:
+				SDL_AtomicDecRef( &l2 );
+				throw( "Out of data." );
+			default:
+				SDL_AtomicDecRef( &l2 );
+				throw( "Error." );
+		}
+		
+		T ret( *static_cast< T* >( data ) );
+		delete static_cast< T* >( data );
+		
+		return( ret );
+	}
+	template< class T >
+	void TemplAtomicQueue< T >::push( T &that ) volatile
+	{
+		T *tmp = new T( that );
+		
+		while( SDL_AtomicCAS( &l1, 0, 1 ) != SDL_TRUE )
+		{}
+		
+		int v = SDL_AtomicGet( &l2 );
+		while( v >= 0 || SDL_AtomicCAS( &l, v, v + 1 ) != SDL_TRUE )
+		{
+			v = SDL_AtomicGet( &l2 );
+		}
+		
+		SDL_AtomicSet( &l1, 0 );
+		
+		switch( SDLCP2_AtomicQueuePush( static_cast< SDLCP2_AtomicQueue* >( _q ), static_cast< void* >( tmp ) ) )
+		{
+			case 1:
+				SDL_AtomicDecRef( &l2 );
+				break;
+			default:
+				SDL_AtomicDecRef( &l2 );
+				throw( "Error." );
+		}
+	}
+	
+	template< class T >
+	TemplAtomicQueue< T >::TemplAtomicQueue( TemplAtomicQueue &that )
+	{
+		void *tmp = static_cast< void* >( new SDLCP2_AtomicQueue() );
+		q = that.fetch_queue();
+		that.release_queue( tmp );
+	}
+	
+	template< class T >
+	void* TemplAtomicQueue< T >::fetch_queue() volatile
+	{
+		void *ret;
+		
+		ret = SDL_AtomicGetPtr( &q );
+		while(  ret == 0 || SDL_AtomicCASPtr( &q, ret, 0 ) != SDL_TRUE )
+		{
+			ret = SDL_AtomicGetPtr( &q );
+		}
+		
+		return( ret );
+	}
 };
 
 #endif /* SDLCP2_TEMPLATOMICQUEUE */

Modified: SDLCP/trunk/rbtree.h
===================================================================
--- SDLCP/trunk/rbtree.h	2011-08-25 06:25:56 UTC (rev 9)
+++ SDLCP/trunk/rbtree.h	2013-06-17 16:45:25 UTC (rev 10)
@@ -23,6 +23,11 @@
 /*
 	rbtree.h
 */
+/* Based on: http://www.eternallyconfuzzled.com/tuts/datastructures/jsw_tut_rbtree.aspx */
+/* Red-black trees are a simulation of a tree that uses nodes with 4 */
+/*  branches. The black nodes represent those nodes, the red nodes */
+/*  represent HALF of one of those nodes (so that 1 black with 2 red == 1 */
+/*  full 4-branch node). */
 
 /* This file is very much not finished. */
 
@@ -31,30 +36,174 @@
 	rbtree_lesser_element = 0,
 	rbtree_greater_element = 1,
 	
-	rbtree_parent_element = 2,
-	
-	rbtree_key_element = 3
+	rbtree_parent_element = 2
 };
 struct rbtree_element
 {
-	void *elements[ 4 ];
+	void *elements[ 3 ];
+	char red;
 };
 
+int is_red( rb_tree **node )
+{
+	if( node )
+	{
+		if( *node == (void*)0 )
+		{
+			return( 0 );
+		}
+		
+		return( ( *node )->red );
+	}
+	
+	return( -1 );
+}
+
+	/* Bug checking function. Will probably be slow. Recursive. */
+int assert
+(
+	rbtree_element **root,
+	void (*lesser_func)( void*, rbtree_element**, rbtree_element** ), void *lesser_data,
+	void (*puts_func)( void*, char* ), void *puts_data
+)
+{
+	if( !lesser_func )
+	{
+		return( -1 );
+	}
+	
+	if( root && *root )
+	{
+		int lh, rh;
+		rbtree_element *ln = ( *root )->elements[ 0 ], *rn = ( *root )->elements[ 1 ];
+		
+		if
+		(
+			is_red( root ) &&
+			(
+				is_red( &ln ) ||
+				is_red( &rn )
+			)
+		)
+		{
+			if( puts_func )
+			{
+				( *puts_func )( puts_data, "Red violation." );
+			}
+			
+			return( 0 );
+		}
+		
+		lh = assert( ln, lesser_func, lesser_data, puts_func, puts_data );
+		rh = assert( rn, lesser_func, lesser_data, puts_func, puts_data );
+		
+		if
+		(
+			( ln && !( *lesser_func )( lesser_data, &ln, root ) ) ||
+			( rn && !( *lesser_func )( lesser_data, root, &rn ) )
+		)
+		{
+			if( puts_func )
+				{
+					( *puts_func )( puts_data, "Sort violation." );
+				}
+				
+				return( 0 );
+		}
+		
+		if( lh && rh && lh != rh )
+		{
+			if( puts_func )
+			{
+				( *puts_func )( puts_data, "Black height violation." );
+			}
+			
+			return( 0 );
+		}
+		
+		if( lh && rh )
+		{
+			return( is_red( root ) ? lh : lh + 1 );
+		} else {
+			return( 0 );
+		}
+	}
+	
+	return( 1 );
+}
+
+int set_black( rb_tree **node )
+{
+	if( node )
+	{
+		if( *node != 0 )
+		{
+			( *node )->elements[ rbtree_key_element ] = ( ( *node )->elements[ rbtree_key_element ] & RBTREE_KEYVAL_SORTMASK );
+			
+			return( 1 );
+		}
+		
+		return( -2 );
+	}
+	
+	return( -1 );
+}
+int set_red( rb_tree **node )
+{
+	if( node )
+	{
+		if( *node != 0 )
+		{
+			( *node )->elements[ rbtree_key_element ] = ( ( *node )->elements[ rbtree_key_element ] & RBTREE_KEYVAL_SORTMASK ) | rbtree_keyval_red;
+			
+			return( 1 );
+		}
+		
+		return( -2 );
+	}
+	
+	return( -1 );
+}
 	/* Returns a pointer suitable for INSERTIONS and DELETIONS, not just searches. */
-rbtree_element** find( rbtree_element **root, void *key )
+	/* Also, proot should actually be a void**, but that typo occures throughout this file... */
+	/* proot is the parent root, mostly useful for insertions. */
+rbtree_element** find
+(
+	rbtree_element **root,
+	rbtree_element *key,
+	
+	rbtree_element **proot,
+	
+	void (*lesser_func)( void*, rbtree_element**, rbtree_element** ), void *lesser_data
+)
 {
-	if( root )
+	if( root && lesser_func )
 	{
+		if( proot )
+		{
+			proot = 0;
+		}
+		
 		while( *root )
 		{
-			if( ( *root )->elements[ rbtree_key_element ] == key )
+			if( ( *lesser_func )( lesser_data, root, &key ) )
 			{
-				return( (rbtree_element*)root );
-			} else if( ( *root )->elements[ rbtree_key_element ] > key )
+				if( proot )
+				{
+					proot = root;
+				}
+				
+				root = (rbtree_element*)&( ( *root )->elements[ rbtree_greater_element ] );
+			} else if( ( *lesser_func )( lesser_data, &key, root ) )
 			{
+				if( proot )
+				{
+					proot = root;
+				}
+				
 				root = (rbtree_element*)&( ( *root )->elements[ rbtree_lesser_element ] );
 			} else {
-				root = (rbtree_element*)&( ( *root )->elements[ rbtree_greater_element ] );
+				return( (rbtree_element*)root );
 			}
 		}
 		
@@ -73,7 +222,7 @@
 		dir = ( dir ? 1 : 0 );
 		
 		or = *root;
-		nr = (rbtree_element*)or->elements[ !dir ];
+		nr = (rbtree_element*)( or->elements[ !dir ] );
 		
 		if( !nr )
 		{
@@ -83,7 +232,7 @@
 		or->elements[ !dir ] = nr->elements[ dir ];
 		if( nr->elements[ dir ] )
 		{
-			(rbtree_element*)( nr->elements[ dir ] )->elements[ rbtree_parent_element ] = (void*)or;
+			( (rbtree_element*)( nr->elements[ dir ] ) )->elements[ rbtree_parent_element ] = (void*)or;
 		}
 		nr->elements[ dir ] = (void*)or;
 		nr->elements[ rbtree_parent_element ] = or->elements[ rbtree_parent_element ];
@@ -96,3 +245,28 @@
 	
 	return( 0 );
 }
+int rotate2( rbtree_element **root, int dir )
+{
+	if( root && *root )
+	{
+		int res;
+		
+		dir = dir ? 1 : 0;
+		
+		res = rotate1( &( ( *root )->elements[ !dir ] ), !dir );
+		if( !res )
+		{
+			return( res - 1 );
+		}
+		
+		res = rotate1( root, dir );
+		if( !res )
+		{
+			return( res - 1 );
+		}
+		
+		return( res - ( ( !res ) ? 3 : 0 ) );
+	}
+	
+	return( 0 );
+}

Added: SDLCP/trunk/sdlpipe_windows.c
===================================================================
--- SDLCP/trunk/sdlpipe_windows.c	                        (rev 0)
+++ SDLCP/trunk/sdlpipe_windows.c	2013-06-17 16:45:25 UTC (rev 10)
@@ -0,0 +1,549 @@
+/*
+	SDLCP version 2
+	Copyright (C) Aug 25, 2011 Jared Maddox <abs...@gm...>
+	
+	This software is provided 'as-is', without any express or implied
+	warranty. In no event will the authors be held liable for any damages
+	arising from the use of this software.
+	
+	Permission is granted to anyone to use this software for any purpose,
+	including commercial applications, and to alter it and redistribute it
+	freely, subject to the following restrictions:
+	
+	1. The origin of this software must not be misrepresented; you must not
+	   claim that you wrote the original software. If you use this software
+	   in a product, an acknowledgment in the product documentation would be
+	   appreciated but is not required.
+	2. Altered source versions must be plainly marked as such, and must not be
+	   misrepresented as being the original software.
+	3. This notice may not be removed or altered from any source distribution.
+	
+	Jared Maddox
+*/
+/*
+	sdlpipe_windows.c
+*/
+
+
+/* TODO: */
+/*   Missing SDLPIPE_TYPEID define. */
+/*   SDLPipe_ProgramResult() needs to have it's actual "body" filled out. */
+/*   Need to add includes. */
+/*   There are some C++isms. Need to convert them to C-friendly. */
+
+
+/* From reading online, it LOOKS like the only reason why Win32 gui programs */
+/*  don't have the standard io handles is only because they don't */
+/*  automagically allocate them beforehand. This redirection trick should */
+/*  seemingly solve that without client GUI programs having to do anything. */
+
+/* Microsoft apparently uses the redirection trick with another trick (the */
+/*  same-name .com trick) to allow a gui program called msdev to receive */
+/*  input from the console. I think msdev is part of Visual Studio. */
+
+
+#define INPUT 0
+#define OUTPUT 1
+#define ERROR 2
+
+typedef struct sdlpipe_data
+{
+	HANDLE pipein, pipeout, pipeerr;
+	PROCESS_INFORMATION child;
+} sdlpipe_data;
+
+
+static int sdlpipe_seek( SDL_RWops *context, int offset, int whence )
+{
+	SDL_SetError( "SDL Pipe RWops don't support seeking." );
+	
+	return( -1 );
+}
+
+static int sdlpipe_read( SDL_RWops *context, void *ptr, int size, int maxnum );
+static int sdlpipe_write( SDL_RWops *context, const void *ptr, int size, int num );
+
+static int sdlpipe_read_bb( SDL_RWops *context, void *ptr, int size, int maxnum );
+static int sdlpipe_write_bb( SDL_RWops *context, const void *ptr, int size, int num );
+
+static int sdlpipe_close( SDL_RWops *context );
+
+
+int build_pipe( HANDLE *e1, HANDLE *e2, SECURITY_ATTRIBUTES *sa )
+{
+	if( !CreatePipe( &( e1[ INPUT ] ), &( e2[ OUTPUT ] ), sa, 0 ) )
+	{
+		return( -1 );
+	}
+	if( !CreatePipe( &( e2[ INPUT ] ), &( e1[ OUTPUT ] ), sa, 0 ) )
+	{
+		CloseHandle( e1[ INPUT ] );
+		CloseHandle( e2[ OUTPUT ] );
+		
+		return( -2 );
+	}
+	if( !CreatePipe( &( e2[ ERROR ] ), &( e1[ ERROR ] ), sa, 0 ) )
+	{
+		CloseHandle( e1[ INPUT ] );
+		CloseHandle( e2[ OUTPUT ] );
+		
+		CloseHandle( e2[ INPUT ] );
+		CloseHandle( e1[ OUTPUT ] );
+		
+		return( -3 );
+	}
+	
+	return( 1 );
+}
+
+int set_pipe_side_inheritance( HANDLE *e, bool i )
+{
+	if
+	(
+		!SetHandleInformation
+		(
+			e[ INPUT ],
+			HANDLE_FLAG_INHERIT,
+			( i ? HANDLE_FLAG_INHERIT : 0 )
+		)
+	)
+	{
+		return( -1 );
+	}
+	if
+	(
+		!SetHandleInformation
+		(
+			e[ OUTPUT ],
+			HANDLE_FLAG_INHERIT,
+			( i ? HANDLE_FLAG_INHERIT : 0 )
+		)
+	)
+	{
+		return( -2 );
+	}
+	if
+	(
+		!SetHandleInformation
+		(
+			e[ ERROR ],
+			HANDLE_FLAG_INHERIT,
+			( i ? HANDLE_FLAG_INHERIT : 0 )
+		)
+	)
+	{
+		return( -3 );
+	}
+	
+	return( 1 );
+}
+void close_pipe_side( HANDLE *e )
+{
+	CloseHandle( e[ INPUT ] );
+	CloseHandle( e[ OUTPUT ] );
+	CloseHandle( e[ ERROR ] );
+}
+
+
+
+sdlpipe_data* SDLPipe_SpawnProgram( const char *command, char *const args[], int blocking )
+{
+	SDL_RWops *ret = SDL_AllocRW();
+	
+	if( !ret )
+	{
+		return( ret );
+	}
+	
+	sdlpipe_data *sdlpd = (sdlpipe_data*)SDL_malloc( sizeof( sdlpipe_data ) );
+	
+	if( sdlpd )
+	{
+		HANDLE here[ 3 ], child[ 3 ];
+		SECURITY_ATTRIBUTES sa;
+		STARTUPINFO si;
+		size_t arglen = 1;
+		DWORD flags;
+		char *arg = 0;
+		char *const *argiter = args;
+		
+			/* Assemble the command and arguments into a single construct. */
+		arglen += strlen( command );
+		while( *argiter )
+		{
+			arglen += 1 + strlen( *argiter );
+			++argiter;
+		}
+		arg = (char*)SDL_malloc( sizeof( char ) * arglen );
+		if( !arg )
+		{
+			SDL_free( sdlpd );
+			SDL_FreeRW( ret );
+			
+			SDL_SetError( "SDLPipe_SpawnProgram() failed to allocate memory for it's arguments." );
+			
+			return( 0 );
+		}
+		argiter = args;
+		strcpy( arg, command );
+		arglen = strlen( command );
+		while( *argiter )
+		{
+			/* NOTE: */
+			/*   This might copy nulls as well as string contents. If that causes */
+			/*   problems, then remove the "1 +" from the arglen increment, and */
+			/*   add "- 1" to the angle brackets on the "= ' ';" line. */
+			
+			arg[ arglen ] = ' ';
+			
+			strcpy( &( arg[ arglen + 1 ] ), *argiter );
+			
+			arglen += 1 + strlen( *argiter );
+			++argiter;
+		}
+		
+			/* We want the pipes inherited. */
+		memset( &sa, sizeof( SECURITY_ATTRIBUTES ), 0 );
+		sa.nLength = sizeof( SECURITY_ATTRIBUTES );
+		sa.bInheritHandle = TRUE;
+		sa.lpSecurityDescriptor = NULL;
+		
+			/* Allocate the pipes. */
+		if( !build_pipe( here, child, &sa ) )
+		{
+			SDL_free( arg );
+			SDL_free( sdlpd );
+			SDL_FreeRW( ret );
+			
+			SDL_SetError( "SDLPipe_SpawnProgram() failed to allocate pipes." );
+			
+			return( 0 );
+		}
+		
+			/* Keep this end from being inherited by this child, or any other. */
+		if( !set_pipe_side_inheritance( here, 0 ) )
+		{
+			close_pipe_side( ret->connection );
+			close_pipe_side( child );
+			
+			SDL_free( arg );
+			SDL_free( sdlpd );
+			SDL_FreeRW( ret );
+			
+			SDL_SetError( "SDLPipe_SpawnProgram() failed to set the pipe's inheritance values." );
+			
+			return( 0 );
+		}
+		
+			/* Setup for child creation. */
+		memset( &( ret->child ), sizeof( PROCESS_INFORMATION ), 0 );
+		memset( &si, sizeof( STARTUPINFO ), 0 );
+			/* Override the standard I/O handles. */
+		si.cb = sizeof( STARTUPINFO ); 
+		si.hStdError = child[ ERROR ]; /* Vista apparently needs this. */
+		si.hStdOutput = child[ OUTPUT ];
+		si.hStdInput = child[ INPUT ];
+		si.dwFlags = STARTF_USESTDHANDLES;
+		
+			/* Create the process. */
+		if
+		( !CreateProcessA
+			(
+				command, arg,
+				NULL, NULL, /* No inheriting the child's handles. */
+				TRUE, /* Let the child inherit the pipe ends. */
+				0, /* No flags. */
+				NULL, NULL,
+				&si, &( ret->child )
+			)
+		)
+		{
+			close_pipe_side( ret->connection );
+			close_pipe_side( child );
+			
+			SDL_free( arg );
+			SDL_free( sdlpd );
+			SDL_FreeRW( ret );
+			
+			SDL_SetError( "SDLPipe_SpawnProgram() failed to spawn the program." );
+			
+			return( 0 );
+		}
+		
+			/* We don't need arg's contents anymore. */
+		SDL_free( arg );
+		arg = 0;
+		
+			/* We don't need these pipe handles, either. Also, keeping them can */
+			/*  apparently cause a deadlock if we try to read from */
+			/*  ret->connection, so it's better to side-step the issue. */
+		close_pipe_side( child );
+		
+			/* Set the blocking state. */
+		if( !blocking )
+		{
+			flags = PIPE_NOWAIT;
+			
+			/* Special handling on failure. */
+			
+			if( !SetNamedPipeHandleState( here[ INPUT ], &flags, 0, 0 ) )
+			{
+				ret->read = sdlpipe_read_bb;
+			} else {
+				ret->read = sdlpipe_read;
+			}
+			if( !SetNamedPipeHandleState( here[ OUTPUT ], &flags, 0, 0 ) )
+			{
+				ret->write = sdlpipe_write_bb;
+			} else {
+				ret->write = sdlpipe_write;
+			}
+				/* Error always gets treated the same anyways, so no test. */
+			SetNamedPipeHandleState( here[ ERROR ], &flags, 0, 0 );
+		} else {
+			ret->read = sdlpipe_read;
+			ret->write = sdlpipe_write;
+		}
+		
+		/* Now we just need to assemble all of the relevant data into one spot... */
+		
+		ret->seek = sdlpipe_seek;
+		ret->close = sdlpipe_close;
+		ret->type = SDLPIPE_TYPEID;
+		ret->hidden.unknown.data1 = (void*)sdlpd;
+		
+		sdlpd->pipein = here[ INPUT ];
+		sdlpd->pipeout = here[ OUTPUT ];
+		sdlpd->pipeerr = here[ ERROR ];
+	} else {
+		SDL_free( ret );
+		ret = 0;
+		
+		SDL_SetError( "SDLPipe_SpawnProgram() failed to allocate a sdlpipe_data instance." );
+	}
+	
+	return( ret );
+}
+
+
+
+static int sdlpipe_read( SDL_RWops *context, void *ptr, int size, int maxnum )
+{
+	if( !context )
+	{
+		SDL_SetError( "sdlpipe_read_bb() called with null SDL_RWops*." );
+		
+		return( -1 );
+	}
+	if( context->type != SDLPIPE_TYPEID )
+	{
+		SDL_SetError( "sdlpipe_read_bb() called on unknown SDL_RWops type." );
+		
+		return( -1 );
+	}
+	if( size != 1 )
+	{
+		SDL_SetError( "sdlpipe_read_bb() with a data size other than 1." );
+		
+		return( -1 );
+	}
+	
+	
+	sdlpipe_data *sdlpd = (sdlpipe_data*)( context->hidden.unknown.data1 );
+	DWORD isize = 0;
+	
+	if( !GetNamedPipeInfo( sdlpd->pipeerr, 0, 0, &isize, 0 ) )
+	{
+		return( -2 );
+	}
+	if( isize && ReadFile( sdlpd->pipeerr, buffer, ( maxnum < isize ? maxnum : isize ), &isize, 0 ) )
+	{
+		return( isize );
+	}
+	
+	if( !ReadFile( sdlpd->pipein, buffer, maxnum, &isize, 0 ) )
+	{
+		return( -3 );
+	}
+	
+	
+	memset( ptr, 0, size * maxnum );
+	return( isize );
+}
+static int sdlpipe_write( SDL_RWops *context, const void *ptr, int size, int num )
+{
+	if( !context )
+	{
+		SDL_SetError( "sdlpipe_write_bb() called with null SDL_RWops*." );
+		
+		return( -1 );
+	}
+	if( context->type != SDLPIPE_TYPEID )
+	{
+		SDL_SetError( "sdlpipe_write_bb() called on unknown SDL_RWops type." );
+		
+		return( -1 );
+	}
+	if( size != 1 )
+	{
+		SDL_SetError( "sdlpipe_write_bb() with a data size other than 1." );
+		
+		return( -1 );
+	}
+	
+	
+	sdlpipe_data *sdlpd = (sdlpipe_data*)( context->hidden.unknown.data1 );
+	DWORD osize = 0;
+	
+	if( !WriteFile( sdlpd->pipeout, buffer, num, &osize, 0 ) )
+	{
+		return( -3 );
+	}
+	
+	
+	return( osize );
+}
+
+static int sdlpipe_read_bb( SDL_RWops *context, void *ptr, int size, int maxnum )
+{
+	if( !context )
+	{
+		SDL_SetError( "sdlpipe_read_bb() called with null SDL_RWops*." );
+		
+		return( -1 );
+	}
+	if( context->type != SDLPIPE_TYPEID )
+	{
+		SDL_SetError( "sdlpipe_read_bb() called on unknown SDL_RWops type." );
+		
+		return( -1 );
+	}
+	if( size != 1 )
+	{
+		SDL_SetError( "sdlpipe_read_bb() with a data size other than 1." );
+		
+		return( -1 );
+	}
+	
+	
+	sdlpipe_data *sdlpd = (sdlpipe_data*)( context->hidden.unknown.data1 );
+	DWORD isize = 0;
+	
+	if( !GetNamedPipeInfo( sdlpd->pipeerr, 0, 0, &isize, 0 ) )
+	{
+		return( -2 );
+	}
+	if( isize && ReadFile( sdlpd->pipeerr, buffer, ( maxnum < isize ? maxnum : isize ), &isize, 0 ) )
+	{
+		return( isize );
+	}
+	
+	if( !GetNamedPipeInfo( sdlpd->pipein, 0, 0, &isize, 0 ) )
+	{
+		return( -2 );
+	}
+	if( !ReadFile( sdlpd->pipein, buffer, ( maxnum < isize ? maxnum : isize ), &isize, 0 ) )
+	{
+		return( -3 );
+	}
+	
+	
+	memset( ptr, 0, size * maxnum );
+	return( isize );
+}
+static int sdlpipe_write_bb( SDL_RWops *context, const void *ptr, int size, int num )
+{
+	if( !context )
+	{
+		SDL_SetError( "sdlpipe_write_bb() called with null SDL_RWops*." );
+		
+		return( -1 );
+	}
+	if( context->type != SDLPIPE_TYPEID )
+	{
+		SDL_SetError( "sdlpipe_write_bb() called on unknown SDL_RWops type." );
+		
+		return( -1 );
+	}
+	if( size != 1 )
+	{
+		SDL_SetError( "sdlpipe_write_bb() with a data size other than 1." );
+		
+		return( -1 );
+	}
+	
+	
+	sdlpipe_data *sdlpd = (sdlpipe_data*)( context->hidden.unknown.data1 );
+	DWORD osize = 0;
+	
+	if( !GetNamedPipeInfo( sdlpd->pipeout, 0, &osize, 0, 0 ) )
+	{
+		return( -2 );
+	}
+	if( !WriteFile( sdlpd->pipeout, buffer, ( num < osize ? num : osize ), &osize, 0 ) )
+	{
+		return( -3 );
+	}
+	
+	
+	return( osize );
+}
+
+static int sdlpipe_close( SDL_RWops *context )
+{
+	if( !context )
+	{
+		SDL_SetError( "sdlpipe_close() called with null SDL_RWops*." );
+		
+		return( -1 );
+	}
+	if( context->type != SDLPIPE_TYPEID )
+	{
+		SDL_SetError( "sdlpipe_close() called on unknown SDL_RWops type." );
+		
+		return( -1 );
+	}
+	
+	sdlpipe_data *sdlpd = (sdlpipe_data*)( context->hidden.unknown.data1 );
+	
+	CloseHandle( sdlpd->pipein );
+	CloseHandle( sdlpd->pipeout );
+	CloseHandle( sdlpd->pipeerr );
+	
+	CloseHandle( sdlpd->child.hProcess );
+	CloseHandle( sdlpd->child.hThread );
+	
+		/* Release our memory blocks. */
+	SDL_free( sdlpd );
+	SDL_FreeRW( context );
+	
+	return( 0 );
+}
+
+int SDLPipe_ProgramResult( SDL_RWops *pipe, int *ret )
+{
+	if( !pipe )
+	{
+		SDL_SetError( "SDLPipe_ProgramResult() called with null SDL_RWops*." );
+		
+		return( SDLPipe_error );
+	}
+	if( !ret )
+	{
+		SDL_SetError( "SDLPipe_ProgramResult() called with null int *ret." );
+		
+		return( SDLPipe_error );
+	}
+	if( pipe->type != SDLPIPE_TYPEID )
+	{
+		SDL_SetError( "SDLPipe_ProgramResult() called on unknown SDL_RWops type." );
+		
+		return( SDLPipe_error );
+	}
+	
+	sdlpipe_data *sdlpd = (sdlpipe_data*)( pipe->hidden.unknown.data1 );
+	
+	/* Real contents here. */
+	
+	return( SDLPipe_unknown );
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sdlcp-commits] SF.net SVN: sdlcp:[9] SDLCP

[<ja...@us...>]

Revision: 9
          http://sdlcp.svn.sourceforge.net/sdlcp/?rev=9&view=rev
Author:   jam555
Date:     2011-08-25 06:25:56 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
Changed license to zlib; added an atomic queue, and in-development tree and dynamic library facilities; all C++ code is now under the SDLCP_2 namespace

Modified Paths:
--------------
    SDLCP/trunk/foundation/generic_pointers.hpp
    SDLCP/trunk/foundation/inner_pointers.hpp
    SDLCP/trunk/foundation.hpp
    SDLCP/trunk/thread.cpp
    SDLCP/trunk/thread.hpp

Added Paths:
-----------
    SDLCP/trunk/dynamic_library.hpp
    SDLCP/trunk/queue.c
    SDLCP/trunk/queue.h
    SDLCP/trunk/queue.hpp
    SDLCP/trunk/rbtree.h
    SDLCP/trunk/tree.hpp
    SDLCP/trunk/zlib_license.txt

Removed Paths:
-------------
    SDLCP/branches/
    SDLCP/trunk/gpl.txt
    SDLCP/trunk/license_exceptions.txt

Added: SDLCP/trunk/dynamic_library.hpp
===================================================================
--- SDLCP/trunk/dynamic_library.hpp	                        (rev 0)
+++ SDLCP/trunk/dynamic_library.hpp	2011-08-25 06:25:56 UTC (rev 9)
@@ -0,0 +1,217 @@
+/*
+  SDLCP version 2
+  Copyright (C) Aug 25, 2011 Jared Maddox <abs...@gm...>
+  
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+  
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+  
+  1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+  
+  Jared Maddox
+*/
+/*
+	dynamic_library.hpp
+*/
+
+#ifndef SDLCP2_DYNLIB
+
+#define SDLCP2_DYNLIB
+
+#include <string>
+#include <stdint>
+#include <set>
+
+#include "base_types/killable.hpp"
+#include "so_pointers/mutable.hpp"
+#include "utility/keyify_type.hpp"
+
+namespace SDLCP_2
+{
+	class dynamic_library_base;
+	
+	class dlib_function_base
+	{
+	public:
+		typedef LibAndria3::mutable_observer< dlib_function_base > pointer;
+		
+		dlib_function_base
+		(
+			dynamic_library_base *dl,
+			void *func_addr,
+			void *func_data,
+			std::string func_name
+		) :
+			data( func_data ),
+			src( dl ),
+			build_src( dl ),
+			func( func_addr ),
+			name( func_)name )
+		{
+			if( !dl )
+			{
+				throw( dl );
+			}
+		};
+		virtual ~dlib_function_base()
+		{};
+		
+		template< class T >
+		static uintptr_t identify_type() const
+		{
+			return( LibAndria3::keyify_type< T >() );
+		};
+		virtual std::set< uintptr_t > this_type_inheritance() const
+		{
+			return( std::set< uintptr_t >().push( this_type() ) );
+		};
+		virtual uintptr_t this_type() const
+		{
+			return( identify_type< dlib_function_base >() );
+		};
+		
+		virtual bool isValid() const
+		{
+			return( src && func );
+		};
+		void validate() const
+		{
+			if( src != build_src )
+			{
+				pointer p = src->getFunction( name );
+				
+				p->acceptOldData( data );
+				subj.mutate( &( p->subj ) );
+			}
+		};
+	protected:
+		void* getFuncPtr() const
+		{
+			return( func );
+		};
+		void* getData() const
+		{
+			return( data );
+		};
+	private:
+		LibAndria3::delegative_kill_proxy< dlib_function_base > k;
+		mutable LibAndria3::mutable_subject< dlib_function_base > subj;
+		
+		void *data;
+		
+		mutable dynamic_library_base::pointer src;
+		const dynamic_library_base *build_src;
+		const void *func;
+		const std::string name;
+		
+		virtual void acceptOldData( void* ) const
+		{};
+	};
+	
+	class dynamic_library_base
+	{
+	public:
+		typedef LibAndria3::mutable_observer< dynamic_library_base > pointer;
+		
+		dynamic_library_base( std::string filename, LibAndria3::killable *_k = 0 ) : k( this, _k ), subj( *this, k )
+		{
+			handle = SDL_LoadObject( filename.c_str() );
+			
+			if( handle == NULL )
+			{
+				throw( std::string( SDL_GetError() ) );
+			}
+		};
+		virtual ~dynamic_library_base()
+		{
+			SDL_UnloadObject( handle );
+		};
+		
+		virtual bool isValid() const
+		{
+			return( 0 );
+		};
+		
+		pointer operator & () const
+		{
+			return( &subj );
+		};
+		
+		dlib_function_base::pointer getFunction( const std::string C_name )
+		{
+			return( getFunction( C_name, (void*)0 ) );
+		};
+	protected:
+		void mutate( dynamic_library_base &nlib ) const
+		{
+			subj.mutate( &( nlib.subj ) );
+		};
+		
+		dlib_function_base::pointer getFunction( const std::string C_name, void *data ) const
+		{
+			void *func = SDL_LoadFunction( handle, C_name.c_str() );
+			
+			if( handle == NULL )
+			{
+				throw( std::string( SDL_GetError() ) );
+			}
+			
+			return( new dlib_function_base( this, func, data, C_name ) );
+		};
+	private:
+		LibAndria3::delegative_kill_proxy< dynamic_library_base > k;
+		mutable LibAndria3::mutable_subject< dynamic_library_base > subj;
+		
+		const void *handle;
+		
+		dynamic_library_base()
+		{};
+		dynamic_library_base( dynamic_library_base& )
+		{};
+	};
+	
+		/* This is mostly an example. A proper */
+		/*  implementation of this class requires the use of */
+		/*  C++-0x variadic templates for a function-call */
+		/*  operator, thus restricting audience. */
+	template< class FSig = extern "C" void (*)() >
+	class generic_dlib_function : public dlib_function_base
+	{
+	public:
+		generic_dlib_function
+		(
+			dynamic_library_base *dl,
+			void *func_addr,
+			void *func_data,
+			std::string func_name
+		) :
+			dlib_function_base( dl, func_addr, func_data, func_name )
+		{};
+		
+		operator FSig () const
+		{
+			return( static_cast< FSig >( getFuncPtr() ) );
+		};
+		
+		virtual std::set< uintptr_t > this_type_inheritance() const
+		{
+			return( this_type_inheritance().push( this_type() ) );
+		};
+		virtual uintptr_t this_type() const
+		{
+			return( identify_type< generic_dlib_function >() );
+		};
+	};
+};
+
+#endif

Modified: SDLCP/trunk/foundation/generic_pointers.hpp
===================================================================
--- SDLCP/trunk/foundation/generic_pointers.hpp	2011-01-20 08:35:45 UTC (rev 8)
+++ SDLCP/trunk/foundation/generic_pointers.hpp	2011-08-25 06:25:56 UTC (rev 9)
@@ -1,42 +1,28 @@
-/* Copyright 2010 Jared Maddox */
-/*  */
-/* This file is part of the SDLCP sub-project of SDLCP, henceforth */
-/* refered to as subSDLCP. */
-/*  */
-/* Use of this file (henceforth refered to as VerCurrent) is */
-/* granted under the terms in the GNU GPL version 3, or any later */
-/* version. A copy of the GNU GPL version 3 should be located in */
-/* the directory which contains the directory you obtained */
-/* VerCurrent from. If not, see <http://www.gnu.org/licenses/>. */
-/*  */
-/* If subsequent revisions (henceforth refered to as VerFuture) of */
-/* VerCurrent which are made availible as part of the subSDLCP */
-/* allow another (other) license(s) to be used, then unless */
-/* explicitly forbidden in every VerFuture that makes said */
-/* license(s) availible, VerCurrent shall also be availible under */
-/* the terms of that (those) license(s) at your discretion. The */
-/* particular license for VerCurrent that you choose shall */
-/* henceforth be refered to as the License. */
-/*  */
-/* If a subsequent revision (henceforth refered to as 'Ver2') of */
-/* VerCurrent does not state that it is made availible under the */
-/* GNU GPL version 3, then the fact that VerCurrent is licensed */
-/* under the GNU GPL version 3 SHALL NOT be construed to imply */
-/* that Ver2 is licensed under the GNU GPL version 3. However, */
-/* neither shall other revisions of VerCurrent, or other files */
-/* included with Ver2, be prevented by this clause from allowing */
-/* Ver2 to be licensed under the GNU GPL version 3. */
-/*  */
-/* For exceptions to the License, see the copy of */
-/* license_exceptions.txt located in the directory containing the */
-/* directory which you obtained VerCurrent from. If there is no */
-/* license_exceptions.txt file in that directory, then no */
-/* exceptions have been granted. */
-/*  */
-/* This library is distributed in the hope that it will be useful, */
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the */
-/* License for more details. */
+/*
+  SDLCP version 2
+  Copyright (C) Aug 25, 2011 Jared Maddox <abs...@gm...>
+  
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+  
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+  
+  1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+  
+  Jared Maddox
+*/
+/*
+	generic_pointers.hpp
+*/
 
 #include "../foundation.hpp"
 

Modified: SDLCP/trunk/foundation/inner_pointers.hpp
===================================================================
--- SDLCP/trunk/foundation/inner_pointers.hpp	2011-01-20 08:35:45 UTC (rev 8)
+++ SDLCP/trunk/foundation/inner_pointers.hpp	2011-08-25 06:25:56 UTC (rev 9)
@@ -1,42 +1,28 @@
-/* Copyright 2010 Jared Maddox */
-/*  */
-/* This file is part of the SDLCP sub-project of SDLCP, henceforth */
-/* refered to as subSDLCP. */
-/*  */
-/* Use of this file (henceforth refered to as VerCurrent) is */
-/* granted under the terms in the GNU GPL version 3, or any later */
-/* version. A copy of the GNU GPL version 3 should be located in */
-/* the directory which contains the directory you obtained */
-/* VerCurrent from. If not, see <http://www.gnu.org/licenses/>. */
-/*  */
-/* If subsequent revisions (henceforth refered to as VerFuture) of */
-/* VerCurrent which are made availible as part of the subSDLCP */
-/* allow another (other) license(s) to be used, then unless */
-/* explicitly forbidden in every VerFuture that makes said */
-/* license(s) availible, VerCurrent shall also be availible under */
-/* the terms of that (those) license(s) at your discretion. The */
-/* particular license for VerCurrent that you choose shall */
-/* henceforth be refered to as the License. */
-/*  */
-/* If a subsequent revision (henceforth refered to as 'Ver2') of */
-/* VerCurrent does not state that it is made availible under the */
-/* GNU GPL version 3, then the fact that VerCurrent is licensed */
-/* under the GNU GPL version 3 SHALL NOT be construed to imply */
-/* that Ver2 is licensed under the GNU GPL version 3. However, */
-/* neither shall other revisions of VerCurrent, or other files */
-/* included with Ver2, be prevented by this clause from allowing */
-/* Ver2 to be licensed under the GNU GPL version 3. */
-/*  */
-/* For exceptions to the License, see the copy of */
-/* license_exceptions.txt located in the directory containing the */
-/* directory which you obtained VerCurrent from. If there is no */
-/* license_exceptions.txt file in that directory, then no */
-/* exceptions have been granted. */
-/*  */
-/* This library is distributed in the hope that it will be useful, */
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the */
-/* License for more details. */
+/*
+  SDLCP version 2
+  Copyright (C) Aug 25, 2011 Jared Maddox <abs...@gm...>
+  
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+  
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+  
+  1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+  
+  Jared Maddox
+*/
+/*
+	inner_pointers.hpp
+*/
 
 #include "../foundation.hpp"
 

Modified: SDLCP/trunk/foundation.hpp
===================================================================
--- SDLCP/trunk/foundation.hpp	2011-01-20 08:35:45 UTC (rev 8)
+++ SDLCP/trunk/foundation.hpp	2011-08-25 06:25:56 UTC (rev 9)
@@ -1,41 +1,28 @@
-/* Copyright 2010 Jared Maddox */
-/*  */
-/* This file is part of the SDLCP sub-project of SDLCP, henceforth */
-/* refered to as subSDLCP. */
-/*  */
-/* Use of this file (henceforth refered to as VerCurrent) is */
-/* granted under the terms in the GNU GPL version 3, or any later */
-/* version. A copy of the GNU GPL version 3 should be located in */
-/* the directory which you obtained VerCurrent from. If not, see */
-/* <http://www.gnu.org/licenses/>. */
-/*  */
-/* If subsequent revisions (henceforth refered to as VerFuture) of */
-/* VerCurrent which are made availible as part of the subSDLCP */
-/* allow another (other) license(s) to be used, then unless */
-/* explicitly forbidden in every VerFuture that makes said */
-/* license(s) availible, VerCurrent shall also be availible under */
-/* the terms of that (those) license(s) at your discretion. The */
-/* particular license for VerCurrent that you choose shall */
-/* henceforth be refered to as the License. */
-/*  */
-/* If a subsequent revision (henceforth refered to as 'Ver2') of */
-/* VerCurrent does not state that it is made availible under the */
-/* GNU GPL version 3, then the fact that VerCurrent is licensed */
-/* under the GNU GPL version 3 SHALL NOT be construed to imply */
-/* that Ver2 is licensed under the GNU GPL version 3. However, */
-/* neither shall other revisions of VerCurrent, or other files */
-/* included with Ver2, be prevented by this clause from allowing */
-/* Ver2 to be licensed under the GNU GPL version 3. */
-/*  */
-/* For exceptions to the License, see the copy of */
-/* license_exceptions.txt located in the directory which you */
-/* obtained VerCurrent from. If there is no license_exceptions.txt */
-/* file in that directory, then no exceptions have been granted. */
-/*  */
-/* This library is distributed in the hope that it will be useful, */
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the */
-/* License for more details. */
+/*
+  SDLCP version 2
+  Copyright (C) Aug 25, 2011 Jared Maddox <abs...@gm...>
+  
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+  
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+  
+  1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+  
+  Jared Maddox
+*/
+/*
+	foundation.hpp
+*/
 
 #include "SDL/SDL.h"
 

Deleted: SDLCP/trunk/gpl.txt
===================================================================
--- SDLCP/trunk/gpl.txt	2011-01-20 08:35:45 UTC (rev 8)
+++ SDLCP/trunk/gpl.txt	2011-08-25 06:25:56 UTC (rev 9)
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

Deleted: SDLCP/trunk/license_exceptions.txt
===================================================================
--- SDLCP/trunk/license_exceptions.txt	2011-01-20 08:35:45 UTC (rev 8)
+++ SDLCP/trunk/license_exceptions.txt	2011-08-25 06:25:56 UTC (rev 9)
@@ -1,74 +0,0 @@
-Copyright 2010 Jared Maddox
-
-This file is part of the SDLCP sub-project of SDLCP, henceforth
-refered to as subSDLCP.
-
-Use of this file (henceforth refered to as VerCurrent) is
-granted under the terms in the GNU GPL version 3, or any later
-version. A copy of the GNU GPL version 3 should be located in
-the directory which you obtained VerCurrent from. If not, see
-<http://www.gnu.org/licenses/>.
-
-If subsequent revisions (henceforth refered to as VerFuture) of
-VerCurrent which are made availible as part of the subSDLCP
-allow another (other) license(s) to be used, then unless
-explicitly forbidden in every VerFuture that makes said
-license(s) availible, VerCurrent shall also be availible under
-the terms of that (those) license(s) at your discretion. The
-particular license for VerCurrent that you choose shall
-henceforth be refered to as the License.
-
-If a subsequent revision (henceforth refered to as 'Ver2') of
-VerCurrent does not state that it is made availible under the
-GNU GPL version 3, then the fact that VerCurrent is licensed
-under the GNU GPL version 3 SHALL NOT be construed to imply
-that Ver2 is licensed under the GNU GPL version 3. However,
-neither shall other revisions of VerCurrent, or other files
-included with Ver2, be prevented by this clause from allowing
-Ver2 to be licensed under the GNU GPL version 3.
-
-Linking subSDLCP statically or dynamically with other modules
-is making a combined work based on subSDLCP. Combining the
-source code of subSDLCP with non-subSDLCP code is also making
-a combined work based on subSDLCP. Thus, the terms and
-conditions of the License cover the whole combination.
-
-In addition, as a special exception, the copyright holders of
-subSDLCP give you permission to combine the subSDLCP library
-with free software programs or libraries that are released
-under the GNU LGPL or the GNU GPL. You may copy and distribute
-such a system following the terms of the License for subSDLCP
-and the licenses of the other code concerned, provided that you
-include the source code of that other code when and as the
-License requires distribution of source code.
-
-As a further special exception, the copyright holders of
-subSDLCP give you permission to combine the subSDLCP library
-with independent modules that communicate with subSDLCP solely
-through use of the templates, namespaces, functions,
-structures, and classes defined in subSDLCP, with the
-reservation that this exception will not be extended to
-templates, classes or structures which inherit from, subclass,
-override, overload, or specialize, whether partially or
-completely, those templates (including function templates),
-classes or structures which are defined in the subSDLCP
-library. Combining modules which comply with the terms of this
-exception with the subSDLCP library will not require these
-modules to be subject to the License. Additionally, combining
-modules that do not directly communicate with subSDLCP, and
-also do not directly communicate with code that is NOT
-compliant with the terms of this exception, will not require
-these modules to be subject to the License.
-
-Note that people who make modified versions of subSDLCP are not
-obligated to grant either of these special exceptions for their
-modified versions; it is their choice whether to do so.
-Permission is hereby granted to release a modified version
-without either of these exceptions; permission is also granted
-to release a modified version which carries forward either both
-of these exceptions, or only one of these exceptions.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-License for more details.

Added: SDLCP/trunk/queue.c
===================================================================
--- SDLCP/trunk/queue.c	                        (rev 0)
+++ SDLCP/trunk/queue.c	2011-08-25 06:25:56 UTC (rev 9)
@@ -0,0 +1,109 @@
+/*
+  SDLCP version 2
+  Copyright (C) Aug 25, 2011 Jared Maddox <abs...@gm...>
+  
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+  
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+  
+  1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+  
+  Jared Maddox
+*/
+/*
+	queue.c
+*/
+
+#include "SDL_atomic.h"
+
+#include "queue.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int SDLCP2_AtomicQueueInit( struct SDLCP2_AtomicQueue *q )
+{
+	if( q )
+	{
+		q->in = &( q->out );
+		q->out.next = 0;
+		
+		return( 1 );
+	}
+	
+	return( 0 );
+}
+int SDLCP2_AtomicQueuePop( struct SDLCP2_AtomicQueue *q, void **ret )
+{
+	if( !ret )
+	{
+		return( -1 );
+	}
+	
+	if( q )
+	{
+		struct SDLCP2_AtomicQueueEntry *p;
+		while( 1 )
+		{
+			p = (struct SDLCP2_AtomicQueueEntry*)SDL_AtomicGetPtr( &( q->out.next ) );
+			
+			if( p )
+			{
+				SDL_AtomicCASPtr( &( q->in ), p, (void*)&( q->out ) );
+				
+				if( SDL_AtomicCASPtr( &( q->out.next ), (void*)p, &( p->next ) ) == SDL_TRUE )
+				{
+					*ret = p->data;
+					free( p );
+					return( 1 );
+				}
+			} else {
+				*ret = 0;
+				return( 2 );
+			}
+		}
+	}
+	
+	return( 0 );
+}
+int SDLCP2_AtomicQueuePush( struct SDLCP2_AtomicQueue *q, void *data )
+{
+	if( q )
+	{
+		struct SDLCP2_AtomicQueueEntry *aqe = (struct SDLCP2_AtomicQueueEntry*)malloc( sizeof( struct SDLCP2_AtomicQueueEntry ) ), *p;
+		if( !aqe )
+		{
+			return( -1 );
+		}
+		
+		aqe->next = (void*)0;
+		aqe->data = data;
+		
+		while( 1 )
+		{
+			p = (struct SDLCP2_AtomicQueueEntry*)SDL_AtomicGetPtr( &( q->in ) );
+			if( SDL_AtomicCASPtr( &( p->next ), (void*)0, aqe ) == SDL_TRUE )
+			{
+				SDL_AtomicSetPtr( &( q->in ), (void*)aqe );
+				return( 1 );
+			}
+		}
+	}
+	
+	return( 0 );
+}
+
+#ifdef __cplusplus
+};
+#endif

Added: SDLCP/trunk/queue.h
===================================================================
--- SDLCP/trunk/queue.h	                        (rev 0)
+++ SDLCP/trunk/queue.h	2011-08-25 06:25:56 UTC (rev 9)
@@ -0,0 +1,55 @@
+/*
+  SDLCP version 2
+  Copyright (C) Aug 25, 2011 Jared Maddox <abs...@gm...>
+  
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+  
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+  
+  1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+  
+  Jared Maddox
+*/
+/*
+	queue.h
+*/
+
+#ifndef SDLCP2_ATOMICQUEUE
+
+#define SDLCP2_ATOMICQUEUE
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct SDLCP2_AtomicQueueEntry
+{
+	void *next;
+	
+	void *data;
+};
+struct ...
 
[truncated message content]