[aaf-commits] AAF/ref-impl/aaflib aaflib.cpp, 1.41, 1.42 aaflib.h, 1.20, 1.21

[Tim B. <tbi...@us...>]

Update of /cvsroot/aaf/AAF/ref-impl/aaflib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15545/ref-impl/aaflib

Modified Files:
	aaflib.cpp aaflib.h 
Log Message:
Stubbed implementation of AAFResultToText() and AAFResultToTextBufLen() in the dynamic library.

Index: aaflib.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/aaflib/aaflib.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** aaflib.cpp	8 Jun 2006 14:55:05 -0000	1.41
--- aaflib.cpp	8 Jun 2006 20:31:35 -0000	1.42
***************
*** 917,932 ****
  
  STDAPI AAFResultToTextBufLen (
!     AAFRESULT  /* result */,
!     aafUInt32 *   /* pResultTextSize */)
  {
!   return AAFRESULT_NOT_IMPLEMENTED;
  }
  
  STDAPI AAFResultToText (
!     AAFRESULT  /* result */,
!     aafCharacter *  /* pResultText */,
!     aafUInt32  /* resultTextSize */)
  {
!   return AAFRESULT_NOT_IMPLEMENTED;
  }
  
--- 917,977 ----
  
  STDAPI AAFResultToTextBufLen (
!     AAFRESULT  result,
!     aafUInt32 *   pResultTextSize)
  {
!   HRESULT hr = S_OK;
!   AAFDLL *pAAFDLL = NULL;
! 
!   // Get the dll wrapper
!   hr = LoadIfNecessary(&pAAFDLL);
!   if (FAILED(hr))
!     return hr;
!   
!   try
!   {
!     // Attempt to call the dll's exported function...
!     hr = pAAFDLL->ResultToTextBufLen
! 	  (result,
!            pResultTextSize);
!   }
!   catch (...)
!   {
!     // Return a reasonable exception code.
!     //
!     hr = AAFRESULT_UNEXPECTED_EXCEPTION;
!   }
! 
!   return hr;
  }
  
  STDAPI AAFResultToText (
!     AAFRESULT  result,
!     aafCharacter *  pResultText,
!     aafUInt32  resultTextSize)
  {
!   HRESULT hr = S_OK;
!   AAFDLL *pAAFDLL = NULL;
! 
!   // Get the dll wrapper
!   hr = LoadIfNecessary(&pAAFDLL);
!   if (FAILED(hr))
!     return hr;
!   
!   try
!   {
!     // Attempt to call the dll's exported function...
!     hr = pAAFDLL->ResultToText
! 	  (result,
!            pResultText,
!            resultTextSize);
!   }
!   catch (...)
!   {
!     // Return a reasonable exception code.
!     //
!     hr = AAFRESULT_UNEXPECTED_EXCEPTION;
!   }
! 
!   return hr;
  }
  
***************
*** 1099,1102 ****
--- 1144,1154 ----
    					   (AAFSymbolAddr *)&_pfnGetLibraryPathName);
  
+   rc = ::AAFFindSymbol(_libHandle,
+ 					   "AAFResultToTextBufLen",
+   					   (AAFSymbolAddr *)&_pfnResultToTextBufLen);
+   rc = ::AAFFindSymbol(_libHandle,
+ 					   "AAFResultToText",
+   					   (AAFSymbolAddr *)&_pfnResultToText);
+ 
    return AAFRESULT_SUCCESS;
  }
***************
*** 1153,1156 ****
--- 1205,1210 ----
    _pfnGetLibraryPathNameBufLen = 0;
    _pfnGetLibraryPathName = 0;
+   _pfnResultToTextBufLen = 0;
+   _pfnResultToText = 0;
  }
  
***************
*** 1443,1446 ****
--- 1497,1528 ----
  }
  
+ HRESULT AAFDLL::ResultToTextBufLen (
+     AAFRESULT  result,
+     aafUInt32 *   pResultTextSize)
+ {
+   printf("AAFDLL::ResultToTextBufLen\n");
+ 
+   // This function did not exist earlier toolkits.
+   if (NULL == _pfnResultToTextBufLen)
+     return AAFRESULT_DLL_SYMBOL_NOT_FOUND;
+ 
+ 
+   return _pfnResultToTextBufLen(result, pResultTextSize);
+ }
+ 
+ HRESULT AAFDLL::ResultToText (
+     AAFRESULT  result,
+     aafCharacter *  pResultText,
+     aafUInt32  resultTextSize)
+ {
+   printf("AAFDLL::ResultToText\n");
+ 
+   // This function did not exist earlier toolkits.
+   if (NULL == _pfnResultToText)
+     return AAFRESULT_DLL_SYMBOL_NOT_FOUND;
+     
+   return _pfnResultToText(result, pResultText, resultTextSize);
+ }
+ 
  #else
  

Index: aaflib.h
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/aaflib/aaflib.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** aaflib.h	7 Sep 2005 17:51:48 -0000	1.20
--- aaflib.h	8 Jun 2006 20:31:35 -0000	1.21
***************
*** 150,153 ****
--- 150,162 ----
      aafUInt32  bufSize);
  
+ typedef STDAPICALLTYPE HRESULT (* LPAAFRESULTTOTEXTBUFLEN) (
+     AAFRESULT  result,
+     aafUInt32 *   pResultTextSize);
+ 
+ typedef STDAPICALLTYPE HRESULT (* LPAAFRESULTTOTEXT) (
+     AAFRESULT  result,
+     aafCharacter *  pResultText,
+     aafUInt32  resultTextSize);
+ 
  #else
  //
***************
*** 415,418 ****
--- 424,436 ----
      aafUInt32  bufSize);
  
+   HRESULT ResultToTextBufLen (
+     AAFRESULT  result,
+     aafUInt32 *   pResultTextSize);
+ 
+   HRESULT ResultToText (
+     AAFRESULT  result,
+     aafCharacter *  pResultText,
+     aafUInt32  resultTextSize);
+ 
  protected:
    //
***************
*** 451,454 ****
--- 469,474 ----
    LPFNAAFGETLIBRARYPATHNAMEBUFLEN  _pfnGetLibraryPathNameBufLen;
    LPFNAAFGETLIBRARYPATHNAME        _pfnGetLibraryPathName;
+   LPAAFRESULTTOTEXTBUFLEN          _pfnResultToTextBufLen;
+   LPAAFRESULTTOTEXT                _pfnResultToText;
  };