Added remaining Win32 Visual C++ projects. Moved flmUTF8ToColText from xflaim to ftk. Modified a few sql source files - still a lot to do there.

git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@1069 0109f412-320b-0410-ab79-c3e0c5ffbbe6

sql/src/fdllmain.cpp

@@ -28,9 +28,9 @@
 static F_DbSystem *			gv_pDbSystem = NULL;
 static FLMATOMIC				gv_lockCount = 0;
 
-FLMEXTC RCODE DllCanUnloadNow( void);
-FLMEXTC RCODE DllStart( void);
-FLMEXTC RCODE DllStop( void);
+FLMEXTC RCODE FLMAPI DllCanUnloadNow( void);
+FLMEXTC RCODE FLMAPI DllStart( void);
+FLMEXTC RCODE FLMAPI DllStop( void);
 
 #if defined( FLM_UNIX)
 
@@ -68,7 +68,7 @@ void UnlockModule(void)
 Desc:	Returns 0 if it's okay to unload, or a non-zero status
 		code if not.
 ******************************************************************************/
-FLMEXTC RCODE DllCanUnloadNow( void)
+FLMEXTC RCODE FLMAPI DllCanUnloadNow( void)
 {
 	RCODE		rc = NE_SFLM_OK;
 
@@ -111,7 +111,7 @@ FLMEXTC RCODE DllCanUnloadNow( void)
 Desc:	Called by PSA when it loads the library.  Must return 0 for
 		success, or a non-zero error code.
 ******************************************************************************/
-FLMEXTC RCODE DllStart( void)
+FLMEXTC RCODE FLMAPI DllStart( void)
 {
 	RCODE		rc = NE_SFLM_OK;
 	
@@ -144,7 +144,7 @@ Exit:
 Desc:	Called by PSA when it unloads the library.  The return value
 		is ignored.
 ******************************************************************************/
-FLMEXTC RCODE DllStop( void)
+FLMEXTC RCODE FLMAPI DllStop( void)
 {
 	if( gv_pDbSystem)
 	{
@@ -161,7 +161,7 @@ FLMEXTC RCODE DllStop( void)
 /******************************************************************************
 Desc:
 ******************************************************************************/
-FLMEXTC RCODE DllRegisterServer(
+FLMEXTC RCODE FLMAPI DllRegisterServer(
 	const char *)
 {
 	return( NE_SFLM_OK);
@@ -170,7 +170,7 @@ FLMEXTC RCODE DllRegisterServer(
 /******************************************************************************
 Desc:
 ******************************************************************************/
-FLMEXTC RCODE DllUnregisterServer( void) 
+FLMEXTC RCODE FLMAPI DllUnregisterServer( void) 
 {
 	return( NE_SFLM_OK);
 }

sql/src/fsysdata.cpp

@@ -3258,6 +3258,17 @@ FLMUINT FLMAPI F_SuperFileClient::getFileOffset(
 	return( FSGetFileOffset( uiBlockAddr));
 }
 
+/****************************************************************************
+Desc:
+****************************************************************************/
+FLMUINT FLMAPI F_SuperFileClient::getBlockAddress(
+	FLMUINT					uiFileNumber,
+	FLMUINT					uiFileOffset)
+{
+	// JMC - FIXME: Don't know if this is the correct implementation for this
+   return( FSBlkAddress( uiFileNumber, uiFileOffset));
+}
+
 /****************************************************************************
 Desc:
 ****************************************************************************/

sql/src/kyqsort.cpp

@@ -335,9 +335,9 @@ RCODE ixKeyCompare(
 	F_DataVector *		pSearchKey1,
 	F_Row *				pRow1,
 	const void *		pvKey1,
+   FLMUINT           uiKeyLen1,
 	F_DataVector *		pSearchKey2,
 	F_Row *				pRow2,
-	FLMUINT				uiKeyLen1,
 	const void *		pvKey2,
 	FLMUINT				uiKeyLen2,
 	FLMINT *				piCompare)

sql/src/sqloptimize.cpp

@@ -1023,6 +1023,50 @@ FSTATIC SQL_NODE * sqlClipNotNode(
 	return( pKeepNode);
 }
 
+//-------------------------------------------------------------------------
+// Desc:	
+//-------------------------------------------------------------------------
+RCODE SQLQuery::getNext(
+	F_Row **	ppRow)
+{
+	RCODE			rc = NE_SFLM_OK;
+   // JMC - FIXME: Implement this!
+   return ( rc);
+}
+
+//-------------------------------------------------------------------------
+// Desc:	
+//-------------------------------------------------------------------------
+RCODE SQLQuery::getPrev(
+	F_Row **	ppRow)
+{
+	RCODE			rc = NE_SFLM_OK;
+   // JMC - FIXME: Implement this!
+   return ( rc);
+}
+	
+//-------------------------------------------------------------------------
+// Desc:	
+//-------------------------------------------------------------------------
+RCODE SQLQuery::getFirst(
+	F_Row **	ppRow)
+{
+	RCODE			rc = NE_SFLM_OK;
+   // JMC - FIXME: Implement this!
+   return ( rc);
+}
+	
+//-------------------------------------------------------------------------
+// Desc:	
+//-------------------------------------------------------------------------
+RCODE SQLQuery::getLast(
+	F_Row **	ppRow)
+{
+	RCODE			rc = NE_SFLM_OK;
+   // JMC - FIXME: Implement this!
+   return ( rc);
+}
+
 //-------------------------------------------------------------------------
 // Desc:	Reduce the query tree.  This will strip out NOT nodes and
 //			resolve constant expressions to a single node.  It also weeds