[Cppunit-cvs] cppunit/src/cppunit Win32DynamicLibraryManager.cpp, 1.6, 1.7

[Steven R. <sm...@us...>]

Update of /cvsroot/cppunit/cppunit/src/cppunit
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv28896/src/cppunit

Modified Files:
	Win32DynamicLibraryManager.cpp 
Log Message:
Apply patch to fix [ 1293903 ] UNICODE Builds not supported


Index: Win32DynamicLibraryManager.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit/src/cppunit/Win32DynamicLibraryManager.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Win32DynamicLibraryManager.cpp	19 Nov 2004 20:07:41 -0000	1.6
--- Win32DynamicLibraryManager.cpp	27 Jan 2007 06:29:17 -0000	1.7
***************
*** 20,24 ****
  DynamicLibraryManager::doLoadLibrary( const std::string &libraryName )
  {
!   return ::LoadLibrary( libraryName.c_str() );
  }
  
--- 20,24 ----
  DynamicLibraryManager::doLoadLibrary( const std::string &libraryName )
  {
!   return ::LoadLibraryA( libraryName.c_str() );
  }
  
***************
*** 44,48 ****
  {
    LPVOID lpMsgBuf;
!   ::FormatMessage( 
        FORMAT_MESSAGE_ALLOCATE_BUFFER | 
        FORMAT_MESSAGE_FROM_SYSTEM | 
--- 44,48 ----
  {
    LPVOID lpMsgBuf;
!   ::FormatMessageA( 
        FORMAT_MESSAGE_ALLOCATE_BUFFER | 
        FORMAT_MESSAGE_FROM_SYSTEM | 
***************
*** 51,63 ****
        GetLastError(),
        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
!       (LPTSTR) &lpMsgBuf,
        0,
        NULL 
    );
  
!   std::string message = (LPCTSTR)lpMsgBuf;
  
    // Display the string.
! //  ::MessageBox( NULL, (LPCTSTR)lpMsgBuf, "Error", MB_OK | MB_ICONINFORMATION );
  
    // Free the buffer.
--- 51,63 ----
        GetLastError(),
        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
!       (LPSTR) &lpMsgBuf,
        0,
        NULL 
    );
  
!   std::string message = (LPCSTR)lpMsgBuf;
  
    // Display the string.
! //  ::MessageBoxA( NULL, (LPCSTR)lpMsgBuf, "Error", MB_OK | MB_ICONINFORMATION );
  
    // Free the buffer.