kc3-lang/dlfcn-win32

diff --git a/dlfcn.c b/dlfcn.c
index 993808d..ec60423 100644
--- a/dlfcn.c
+++ b/dlfcn.c
@@ -72,34 +72,36 @@ static local_object *local_search( HMODULE hModule )
     return NULL;
 }
 
-static void local_add( HMODULE hModule )
+static BOOL local_add( HMODULE hModule )
 {
     local_object *pobject;
     local_object *nobject;
 
     if( hModule == NULL )
-        return;
+        return TRUE;
 
     pobject = local_search( hModule );
 
     /* Do not add object again if it's already on the list */
     if( pobject )
-        return;
+        return TRUE;
 
     for( pobject = &first_object; pobject->next; pobject = pobject->next );
 
     nobject = (local_object*) malloc( sizeof( local_object ) );
 
-    /* Should this be enough to fail local_add, and therefore also fail
-     * dlopen?
-     */
     if( !nobject )
-        return;
+    {
+        SetLastError( ERROR_NOT_ENOUGH_MEMORY );
+        return FALSE;
+    }
 
     pobject->next = nobject;
     nobject->next = NULL;
     nobject->previous = pobject;
     nobject->hModule = hModule;
+
+    return TRUE;
 }
 
 static void local_rem( HMODULE hModule )
@@ -240,51 +242,73 @@ void *dlopen( const char *file, int mode )
         HANDLE hCurrentProc;
         DWORD dwProcModsBefore, dwProcModsAfter;
         char lpFileName[MAX_PATH];
-        size_t i;
+        size_t i, len;
 
-        /* MSDN says backslashes *must* be used instead of forward slashes. */
-        for( i = 0 ; i < sizeof(lpFileName) - 1 ; i ++ )
+        len = strlen( file );
+
+        if( len >= sizeof( lpFileName ) )
         {
-            if( !file[i] )
-                break;
-            else if( file[i] == '/' )
-                lpFileName[i] = '\\';
-            else
-                lpFileName[i] = file[i];
+            SetLastError( ERROR_FILENAME_EXCED_RANGE );
+            save_err_str( file );
+            hModule = NULL;
         }
-        lpFileName[i] = '\0';
+        else
+        {
+            /* MSDN says backslashes *must* be used instead of forward slashes. */
+            for( i = 0; i < len; i++ )
+            {
+                if( file[i] == '/' )
+                    lpFileName[i] = '\\';
+                else
+                    lpFileName[i] = file[i];
+            }
+            lpFileName[len] = '\0';
 
-        hCurrentProc = GetCurrentProcess( );
+            hCurrentProc = GetCurrentProcess( );
 
-        if( MyEnumProcessModules( hCurrentProc, NULL, 0, &dwProcModsBefore ) == 0 )
-            dwProcModsBefore = 0;
+            if( MyEnumProcessModules( hCurrentProc, NULL, 0, &dwProcModsBefore ) == 0 )
+                dwProcModsBefore = 0;
 
-        /* POSIX says the search path is implementation-defined.
-         * LOAD_WITH_ALTERED_SEARCH_PATH is used to make it behave more closely
-         * to UNIX's search paths (start with system folders instead of current
-         * folder).
-         */
-        hModule = LoadLibraryExA(lpFileName, NULL, 
-                                LOAD_WITH_ALTERED_SEARCH_PATH );
-
-        if( MyEnumProcessModules( hCurrentProc, NULL, 0, &dwProcModsAfter ) == 0 )
-            dwProcModsAfter = 0;
-
-        /* If the object was loaded with RTLD_LOCAL, add it to list of local
-         * objects, so that its symbols cannot be retrieved even if the handle for
-         * the original program file is passed. POSIX says that if the same
-         * file is specified in multiple invocations, and any of them are
-         * RTLD_GLOBAL, even if any further invocations use RTLD_LOCAL, the
-         * symbols will remain global. If number of loaded modules was not
-         * changed after calling LoadLibraryEx(), it means that library was
-         * already loaded.
-         */
-        if( !hModule )
-            save_err_str( lpFileName );
-        else if( (mode & RTLD_LOCAL) && dwProcModsBefore != dwProcModsAfter )
-            local_add( hModule );
-        else if( !(mode & RTLD_LOCAL) && dwProcModsBefore == dwProcModsAfter )
-            local_rem( hModule );
+            /* POSIX says the search path is implementation-defined.
+             * LOAD_WITH_ALTERED_SEARCH_PATH is used to make it behave more closely
+             * to UNIX's search paths (start with system folders instead of current
+             * folder).
+             */
+            hModule = LoadLibraryExA( lpFileName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH );
+
+            if( !hModule )
+            {
+                save_err_str( lpFileName );
+            }
+            else
+            {
+                if( MyEnumProcessModules( hCurrentProc, NULL, 0, &dwProcModsAfter ) == 0 )
+                    dwProcModsAfter = 0;
+
+                /* If the object was loaded with RTLD_LOCAL, add it to list of local
+                 * objects, so that its symbols cannot be retrieved even if the handle for
+                 * the original program file is passed. POSIX says that if the same
+                 * file is specified in multiple invocations, and any of them are
+                 * RTLD_GLOBAL, even if any further invocations use RTLD_LOCAL, the
+                 * symbols will remain global. If number of loaded modules was not
+                 * changed after calling LoadLibraryEx(), it means that library was
+                 * already loaded.
+                 */
+                if( (mode & RTLD_LOCAL) && dwProcModsBefore != dwProcModsAfter )
+                {
+                    if( !local_add( hModule ) )
+                    {
+                        save_err_str( lpFileName );
+                        FreeLibrary( hModule );
+                        hModule = NULL;
+                    }
+                }
+                else if( !(mode & RTLD_LOCAL) && dwProcModsBefore == dwProcModsAfter )
+                {
+                    local_rem( hModule );
+                }
+            }
+        }
     }
 
     /* Return to previous state of the error-mode bit flags. */
@@ -353,10 +377,17 @@ void *dlsym( void *handle, const char *name )
         size_t sLen;
         sLen = VirtualQueryEx( hCurrentProc, _ReturnAddress(), &info, sizeof( info ) );
         if( sLen != sizeof( info ) )
+        {
+            if( sLen != 0 )
+                SetLastError( ERROR_INVALID_PARAMETER );
             goto end;
+        }
         hCaller = (HMODULE) info.AllocationBase;
-        if(!hCaller)
+        if( !hCaller )
+        {
+            SetLastError( ERROR_INVALID_PARAMETER );
             goto end;
+        }
     }
 
     if( handle != RTLD_NEXT )
@@ -414,6 +445,8 @@ void *dlsym( void *handle, const char *name )
 end:
     if( symbol == NULL )
     {
+        if( GetLastError() == 0 )
+            SetLastError( ERROR_PROC_NOT_FOUND );
         save_err_str( name );
     }
 
diff --git a/test.c b/test.c
index 814aca1..0070f8c 100644
--- a/test.c
+++ b/test.c
@@ -83,6 +83,11 @@ int main()
     int (*nonexistentfunction)( void );
     int ret;
     HMODULE library3;
+    char toolongfile[32767];
+    DWORD code;
+    char nonlibraryfile[MAX_PATH];
+    HANDLE tempfile;
+    DWORD dummy;
 
 #ifdef _DEBUG
     _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
@@ -93,6 +98,112 @@ int main()
     _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDOUT);
 #endif
 
+    ret = GetTempPathA( sizeof( nonlibraryfile ) - sizeof( "temp.dll" ), nonlibraryfile );
+    if( ret == 0 || ret > sizeof( nonlibraryfile ) - sizeof( "temp.dll" ) )
+    {
+        printf( "ERROR\tGetTempPath failed\n" );
+        RETURN_ERROR;
+    }
+
+    memcpy( nonlibraryfile + ret, "temp.dll", sizeof( "temp.dll" ) );
+
+    tempfile = CreateFileA( (LPCSTR) nonlibraryfile, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL );
+    if( tempfile == INVALID_HANDLE_VALUE )
+    {
+        printf( "ERROR\tCannot create temporary file %s: %lu\n", nonlibraryfile, (unsigned long)GetLastError( ) );
+        RETURN_ERROR;
+    }
+
+    WriteFile( tempfile, "test content", 12, &dummy, NULL );
+
+    CloseHandle( tempfile );
+
+    library3 = LoadLibraryA( nonlibraryfile );
+    code = GetLastError( );
+    if( library3 )
+    {
+        printf( "ERROR\tNon-library file %s was opened via WINAPI\n", nonlibraryfile );
+        CloseHandle( library3 );
+        DeleteFileA( nonlibraryfile );
+        RETURN_ERROR;
+    }
+    else if( code != ERROR_BAD_EXE_FORMAT )
+    {
+        printf( "ERROR\tNon-library file %s was processed via WINAPI: %lu\n", nonlibraryfile, (unsigned long)code );
+        DeleteFileA( nonlibraryfile );
+        RETURN_ERROR;
+    }
+    else
+        printf( "SUCCESS\tCould not open non-library file %s via WINAPI: %lu\n", nonlibraryfile, (unsigned long)code );
+
+    library = dlopen( nonlibraryfile, RTLD_GLOBAL );
+    if( library )
+    {
+        printf( "ERROR\tNon-library file %s was opened via dlopen\n", nonlibraryfile );
+        dlclose( library );
+        DeleteFileA( nonlibraryfile );
+        RETURN_ERROR;
+    }
+    error = dlerror( );
+    if( !error )
+    {
+        printf( "ERROR\tNo error from dlopen for non-library file\n" );
+        DeleteFileA( nonlibraryfile );
+        RETURN_ERROR;
+    }
+    else
+        printf( "SUCCESS\tCould not open non-library file %s: %s\n", nonlibraryfile, error );
+
+    DeleteFileA( nonlibraryfile );
+
+    library = dlopen( "nonexistentfile.dll", RTLD_GLOBAL );
+    if( library )
+    {
+        printf( "ERROR\tNon-existent file nonexistentfile.dll was opened via dlopen\n" );
+        RETURN_ERROR;
+    }
+    error = dlerror( );
+    if( !error )
+    {
+        printf( "ERROR\tNo error from dlopen for non-existent file\n" );
+        RETURN_ERROR;
+    }
+    else
+        printf( "SUCCESS\tCould not open non-existent file nonexistentfile.dll: %s\n", error );
+
+    memset( toolongfile, 'X', sizeof( toolongfile ) - 5 );
+    memcpy( toolongfile + sizeof( toolongfile ) - 5, ".dll", 5 );
+
+    library = dlopen( toolongfile, RTLD_GLOBAL );
+    if( library )
+    {
+        printf( "ERROR\tFile with too long file name was opened via dlopen\n" );
+        RETURN_ERROR;
+    }
+    error = dlerror( );
+    if( !error )
+    {
+        printf( "ERROR\tNo error from dlopen for file with too long file name\n" );
+        RETURN_ERROR;
+    }
+    else
+        printf( "SUCCESS\tCould not open file with too long file name: %s\n", error );
+
+    library3 = LoadLibraryA( toolongfile );
+    code = GetLastError( );
+    if( library3 )
+    {
+        printf( "ERROR\tFile with too long file name was opened via WINAPI\n" );
+        RETURN_ERROR;
+    }
+    else if( code != ERROR_FILENAME_EXCED_RANGE )
+    {
+        printf( "ERROR\tFile with too long file name was processed via WINAPI: %lu\n", (unsigned long)code );
+        RETURN_ERROR;
+    }
+    else
+        printf( "SUCCESS\tCould not open file with too long file name via WINAPI: %lu\n", (unsigned long)code );
+
     library2 = dlopen( "testdll2.dll", RTLD_GLOBAL );
     if( !library2 )
     {
@@ -201,11 +312,14 @@ int main()
         CLOSE_GLOBAL;
         RETURN_ERROR;
     }
-    else {
-        error = dlerror( );
-        printf( "SUCCESS\tCould not get nonexistent symbol from library handle: %s\n",
-                error ? error : "" );
+    error = dlerror( );
+    if( !error )
+    {
+        printf( "ERROR\tNo error from dlsym for nonexistent symbol\n" );
+        RETURN_ERROR;
     }
+    else
+        printf( "SUCCESS\tCould not get nonexistent symbol from library handle: %s\n", error );
 
     function = dlsym( global, "function" );
     if( !function )
@@ -231,11 +345,14 @@ int main()
         CLOSE_GLOBAL;
         RETURN_ERROR;
     }
-    else {
-        error = dlerror( );
-        printf( "SUCCESS\tCould not get nonexistent symbol from global handle: %s\n",
-                error ? error : "" );
+    error = dlerror( );
+    if( !error )
+    {
+        printf( "ERROR\tNo error from dlsym for nonexistent symbol\n" );
+        RETURN_ERROR;
     }
+    else
+        printf( "SUCCESS\tCould not get nonexistent symbol from global handle: %s\n", error );
 
     ret = dlclose( library );
     if( ret )
@@ -293,11 +410,14 @@ int main()
         CLOSE_GLOBAL;
         RETURN_ERROR;
     }
-    else {
-        error = dlerror( );
-        printf( "SUCCESS\tCould not get nonexistent symbol from library handle: %s\n",
-                error ? error : "" );
+    error = dlerror( );
+    if( !error )
+    {
+        printf( "ERROR\tNo error from dlsym for nonexistent symbol\n" );
+        RETURN_ERROR;
     }
+    else
+        printf( "SUCCESS\tCould not get nonexistent symbol from library handle: %s\n", error );
 
     function = dlsym( global, "function" );
     if( function )
@@ -321,11 +441,14 @@ int main()
         CLOSE_GLOBAL;
         RETURN_ERROR;
     }
-    else {
-        error = dlerror( );
-        printf( "SUCCESS\tDid not get nonexistent local symbol from global handle: %s\n",
-                error ? error : "" );
+    error = dlerror( );
+    if( !error )
+    {
+        printf( "ERROR\tNo error from dlsym for nonexistent symbol\n" );
+        RETURN_ERROR;
     }
+    else
+        printf( "SUCCESS\tDid not get nonexistent local symbol from global handle: %s\n", error );
 
     library = dlopen( "testdll.dll", RTLD_GLOBAL );
     if( !library )
@@ -363,10 +486,15 @@ int main()
         CLOSE_GLOBAL;
         RETURN_ERROR;
     }
-    else {
-        error = dlerror( );
-        printf( "SUCCESS\tCould not get nonexistent symbol from global handle: %s\n",
-                error ? error : "" );
+    error = dlerror( );
+    if( !error )
+    {
+        printf( "ERROR\tNo error from dlsym for nonexistent symbol\n" );
+        RETURN_ERROR;
+    }
+    else
+    {
+        printf( "SUCCESS\tCould not get nonexistent symbol from global handle: %s\n", error );
                 
         /* Test that the second call to dlerror() returns null as in the specs 
            See https://github.com/dlfcn-win32/dlfcn-win32/issues/34 */