Let LOAD_LIBRARY_AS_DATAFILE load the builtin dll if loading a native

loader/module.c

@@ -1255,26 +1255,25 @@ HMODULE WINAPI LoadLibraryExA(LPCSTR libname, HANDLE hfile, DWORD flags)
         if (flags & LOAD_LIBRARY_AS_DATAFILE)
         {
             char filename[256];
-            HANDLE hFile;
             HMODULE hmod = 0;
 
             /* This method allows searching for the 'native' libraries only */
-            if (!SearchPathA( NULL, libname, ".dll", sizeof(filename), filename, NULL ))
+            if (SearchPathA( NULL, libname, ".dll", sizeof(filename), filename, NULL ))
             {
-                flags |= DONT_RESOLVE_DLL_REFERENCES; /* Just in case */
-                goto try_builtin; /* Fallback to normal behaviour */
-            }
                 /* FIXME: maybe we should use the hfile parameter instead */
-            hFile = CreateFileA( filename, GENERIC_READ, FILE_SHARE_READ,
+                HANDLE hFile = CreateFileA( filename, GENERIC_READ, FILE_SHARE_READ,
                                             NULL, OPEN_EXISTING, 0, 0 );
                 if (hFile != INVALID_HANDLE_VALUE)
                 {
                     hmod = PE_LoadImage( hFile, filename, flags );
                     CloseHandle( hFile );
                 }
-            return hmod;
+                if (hmod) return hmod;
             }
- try_builtin:
+            flags |= DONT_RESOLVE_DLL_REFERENCES; /* Just in case */
+            /* Fallback to normal behaviour */
+        }
+
         RtlAcquirePebLock();
 
 	wm = MODULE_LoadLibraryExA( libname, hfile, flags );