Changeset 23571 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine

Timestamp:

Oct 6, 2009 6:07:06 AM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: update to wine 1.1.30

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine

Files:

• config.c (modified) (3 diffs)
• loader.c (modified) (1 diff)
• version.c (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/config.c

@@ -147 +147 @@
 }
 
-/* initialize the server directory value */
-static void init_server_dir( dev_t dev, ino_t ino )
-{
-    char *p;
-#ifdef HAVE_GETUID
-    const unsigned int uid = getuid();
-#else
-    const unsigned int uid = 0;
-#endif
-
-    server_dir = xmalloc( sizeof(server_root_prefix) + 32 + sizeof(server_dir_prefix) +
-                          2*sizeof(dev) + 2*sizeof(ino) );
-    sprintf( server_dir, "%s%u%s", server_root_prefix, uid, server_dir_prefix );
-    p = server_dir + strlen(server_dir);
-
-    if (sizeof(dev) > sizeof(unsigned long) && dev > ~0UL)
-        p += sprintf( p, "%lx%08lx-", (unsigned long)((unsigned long long)dev >> 32), (unsigned long)dev );
-    else
-        p += sprintf( p, "%lx-", (unsigned long)dev );
-
-    if (sizeof(ino) > sizeof(unsigned long) && ino > ~0UL)
-        sprintf( p, "%lx%08lx", (unsigned long)((unsigned long long)ino >> 32), (unsigned long)ino );
-    else
-        sprintf( p, "%lx", (unsigned long)ino );
-}
-
-/* retrieve the default dll dir */
-const char *get_dlldir( const char **default_dlldir )
-{
-    *default_dlldir = DLLDIR;
-    return dlldir;
-}
-
-/* initialize all the paths values */
-static void init_paths(void)
-{
-    struct stat st;
-
-    const char *home = getenv( "HOME" );
-    const char *user = NULL;
-    const char *prefix = getenv( "WINEPREFIX" );
-
-#ifdef HAVE_GETPWUID
-    char uid_str[32];
-    struct passwd *pwd = getpwuid( getuid() );
-
-    if (pwd)
-    {
-        user = pwd->pw_name;
-        if (!home) home = pwd->pw_dir;
-    }
-    if (!user)
-    {
-        sprintf( uid_str, "%lu", (unsigned long)getuid() );
-        user = uid_str;
-    }
-#else  /* HAVE_GETPWUID */
-    if (!(user = getenv( "USER" )))
-        fatal_error( "cannot determine your user name, set the USER environment variable\n" );
-#endif  /* HAVE_GETPWUID */
-    user_name = xstrdup( user );
-
-    /* build config_dir */
-
-    if (prefix)
-    {
-        config_dir = xstrdup( prefix );
-        remove_trailing_slashes( config_dir );
-        if (config_dir[0] != '/')
-            fatal_error( "invalid directory %s in WINEPREFIX: not an absolute path\n", prefix );
-        if (stat( config_dir, &st ) == -1)
-        {
-            if (errno == ENOENT) return;  /* will be created later on */
-            fatal_perror( "cannot open %s as specified in WINEPREFIX", config_dir );
-        }
-    }
-    else
-    {
-        if (!home) fatal_error( "could not determine your home directory\n" );
-        if (home[0] != '/') fatal_error( "your home directory %s is not an absolute path\n", home );
-        config_dir = xmalloc( strlen(home) + sizeof(server_config_dir) );
-        strcpy( config_dir, home );
-        remove_trailing_slashes( config_dir );
-        strcat( config_dir, server_config_dir );
-        if (stat( config_dir, &st ) == -1)
-        {
-            if (errno == ENOENT) return;  /* will be created later on */
-            fatal_perror( "cannot open %s", config_dir );
-        }
-    }
-    if (!S_ISDIR(st.st_mode)) fatal_error( "%s is not a directory\n", config_dir );
-#ifdef HAVE_GETUID
-    if (st.st_uid != getuid()) fatal_error( "%s is not owned by you\n", config_dir );
-#endif
-
-    init_server_dir( st.st_dev, st.st_ino );
-}
-
-/* check if basedir is a valid build dir by checking for wineserver and ntdll */
-/* helper for running_from_build_dir */
-static inline int is_valid_build_dir( char *basedir, int baselen )
-{
-    struct stat st;
-
-    strcpy( basedir + baselen, "/server/wineserver" );
-    if (stat( basedir, &st ) == -1) return 0;  /* no wineserver found */
-    /* check for ntdll too to make sure */
-    strcpy( basedir + baselen, "/dlls/ntdll/ntdll.dll.so" );
-    if (stat( basedir, &st ) == -1) return 0;  /* no ntdll found */
-
-    basedir[baselen] = 0;
-    return 1;
-}
-
-/* check if we are running from the build directory */
-static char *running_from_build_dir( const char *basedir, const char *bindir )
-{
-    struct stat st;
-    const char *p;
-    char *path;
-    int res;
-
-    if (!(path = build_path( bindir, "wineserver" ))) return NULL;
-    res = stat( path, &st );
-    free( path );
-    if (res != -1) return NULL;  /* the real bindir is valid */
-
-    /* remove last component from basedir */
-    p = basedir + strlen(basedir) - 1;
-    while (p > basedir && *p == '/') p--;
-    while (p > basedir && *p != '/') p--;
-    if (p == basedir) return NULL;
-    path = xmalloc( p - basedir + sizeof("/dlls/ntdll/ntdll.dll.so") );
-    memcpy( path, basedir, p - basedir );
-
-    if (!is_valid_build_dir( path, p - basedir ))
-    {
-        /* remove another component */
-        while (p > basedir && *p == '/') p--;
-        while (p > basedir && *p != '/') p--;
-        if (p == basedir || !is_valid_build_dir( path, p - basedir ))
-        {
-            free( path );
-            return NULL;
-        }
-    }
-    return path;
-}
-
-/* initialize the argv0 path */
-void wine_init_argv0_path( const char *argv0 )
-{
-    size_t size, len;
-    const char *p, *basename;
-    char *cwd, *libdir;
-
-    if (!(p = strrchr( argv0, '/' )))
-        basename = argv0;
-    else
-        basename = p + 1;
-
-    argv0_name = xstrdup( basename );
-
-    if ((libdir = get_runtime_libdir()))
-    {
-        bindir = build_path( libdir, LIB_TO_BINDIR );
-        if ((build_dir = running_from_build_dir( libdir, bindir )))
-        {
-            free( libdir );
-            goto in_build_dir;
-        }
-        dlldir = build_path( libdir, LIB_TO_DLLDIR );
-        datadir = build_path( libdir, LIB_TO_DATADIR );
-        free( libdir );
-        return;
-    }
-
-    if (!p) return;  /* if argv0 doesn't contain a path, don't store anything */
+/* return the directory that contains the main exe at run-time */
+static char *get_runtime_bindir( const char *argv0 )
+{
+    char *p, *bindir, *cwd;
+    size_t len, size;
+
+#ifdef linux
+    for (size = 256; ; size *= 2)
+    {
+        int ret;
+        if (!(bindir = malloc( size ))) break;
+        if ((ret = readlink( "/proc/self/exe", bindir, size )) == -1) break;
+        if (ret != size)
+        {
+            if (!(p = memrchr( bindir, '/', ret ))) break;
+            if (p == bindir) p++;
+            *p = 0;
+            return bindir;
+        }
+        free( bindir );
+    }
+    free( bindir );
+#endif
+
+    if (!(p = strrchr( argv0, '/' ))) return NULL;
 
     len = p - argv0;
@@ -340 +187 @@
         for (size = 256 + len; ; size *= 2)
         {
-            if (!(cwd = malloc( size ))) return;
+            if (!(cwd = malloc( size ))) return NULL;
             if (getcwd( cwd, size - len ))
             {
@@ -351 +198 @@
             }
             free( cwd );
-            if (errno != ERANGE) return;
-        }
-    }
-
-    if ((build_dir = running_from_build_dir( bindir, bindir ))) goto in_build_dir;
-
-    dlldir = build_path( bindir, BIN_TO_DLLDIR );
-    datadir = build_path( bindir, BIN_TO_DATADIR );
-    return;
-
-in_build_dir:
-    free( bindir );
-    free( argv0_name );
-    bindir = NULL;
-    argv0_name = build_path( "loader/", basename );
+            if (errno != ERANGE) return NULL;
+        }
+    }
+    return bindir;
+}
+
+/* initialize the server directory value */
+static void init_server_dir( dev_t dev, ino_t ino )
+{
+    char *p;
+#ifdef HAVE_GETUID
+    const unsigned int uid = getuid();
+#else
+    const unsigned int uid = 0;
+#endif
+
+    server_dir = xmalloc( sizeof(server_root_prefix) + 32 + sizeof(server_dir_prefix) +
+                          2*sizeof(dev) + 2*sizeof(ino) );
+    sprintf( server_dir, "%s%u%s", server_root_prefix, uid, server_dir_prefix );
+    p = server_dir + strlen(server_dir);
+
+    if (sizeof(dev) > sizeof(unsigned long) && dev > ~0UL)
+        p += sprintf( p, "%lx%08lx-", (unsigned long)((unsigned long long)dev >> 32), (unsigned long)dev );
+    else
+        p += sprintf( p, "%lx-", (unsigned long)dev );
+
+    if (sizeof(ino) > sizeof(unsigned long) && ino > ~0UL)
+        sprintf( p, "%lx%08lx", (unsigned long)((unsigned long long)ino >> 32), (unsigned long)ino );
+    else
+        sprintf( p, "%lx", (unsigned long)ino );
+}
+
+/* retrieve the default dll dir */
+const char *get_dlldir( const char **default_dlldir )
+{
+    *default_dlldir = DLLDIR;
+    return dlldir;
+}
+
+/* initialize all the paths values */
+static void init_paths(void)
+{
+    struct stat st;
+
+    const char *home = getenv( "HOME" );
+    const char *user = NULL;
+    const char *prefix = getenv( "WINEPREFIX" );
+
+#ifdef HAVE_GETPWUID
+    char uid_str[32];
+    struct passwd *pwd = getpwuid( getuid() );
+
+    if (pwd)
+    {
+        user = pwd->pw_name;
+        if (!home) home = pwd->pw_dir;
+    }
+    if (!user)
+    {
+        sprintf( uid_str, "%lu", (unsigned long)getuid() );
+        user = uid_str;
+    }
+#else  /* HAVE_GETPWUID */
+    if (!(user = getenv( "USER" )))
+        fatal_error( "cannot determine your user name, set the USER environment variable\n" );
+#endif  /* HAVE_GETPWUID */
+    user_name = xstrdup( user );
+
+    /* build config_dir */
+
+    if (prefix)
+    {
+        config_dir = xstrdup( prefix );
+        remove_trailing_slashes( config_dir );
+        if (config_dir[0] != '/')
+            fatal_error( "invalid directory %s in WINEPREFIX: not an absolute path\n", prefix );
+        if (stat( config_dir, &st ) == -1)
+        {
+            if (errno == ENOENT) return;  /* will be created later on */
+            fatal_perror( "cannot open %s as specified in WINEPREFIX", config_dir );
+        }
+    }
+    else
+    {
+        if (!home) fatal_error( "could not determine your home directory\n" );
+        if (home[0] != '/') fatal_error( "your home directory %s is not an absolute path\n", home );
+        config_dir = xmalloc( strlen(home) + sizeof(server_config_dir) );
+        strcpy( config_dir, home );
+        remove_trailing_slashes( config_dir );
+        strcat( config_dir, server_config_dir );
+        if (stat( config_dir, &st ) == -1)
+        {
+            if (errno == ENOENT) return;  /* will be created later on */
+            fatal_perror( "cannot open %s", config_dir );
+        }
+    }
+    if (!S_ISDIR(st.st_mode)) fatal_error( "%s is not a directory\n", config_dir );
+#ifdef HAVE_GETUID
+    if (st.st_uid != getuid()) fatal_error( "%s is not owned by you\n", config_dir );
+#endif
+
+    init_server_dir( st.st_dev, st.st_ino );
+}
+
+/* check if bindir is valid by checking for wineserver */
+static int is_valid_bindir( const char *bindir )
+{
+    struct stat st;
+    char *path = build_path( bindir, "wineserver" );
+    int ret = (stat( path, &st ) != -1);
+    free( path );
+    return ret;
+}
+
+/* check if basedir is a valid build dir by checking for wineserver and ntdll */
+/* helper for running_from_build_dir */
+static inline int is_valid_build_dir( char *basedir, int baselen )
+{
+    struct stat st;
+
+    strcpy( basedir + baselen, "/server/wineserver" );
+    if (stat( basedir, &st ) == -1) return 0;  /* no wineserver found */
+    /* check for ntdll too to make sure */
+    strcpy( basedir + baselen, "/dlls/ntdll/ntdll.dll.so" );
+    if (stat( basedir, &st ) == -1) return 0;  /* no ntdll found */
+
+    basedir[baselen] = 0;
+    return 1;
+}
+
+/* check if we are running from the build directory */
+static char *running_from_build_dir( const char *basedir )
+{
+    const char *p;
+    char *path;
+
+    /* remove last component from basedir */
+    p = basedir + strlen(basedir) - 1;
+    while (p > basedir && *p == '/') p--;
+    while (p > basedir && *p != '/') p--;
+    if (p == basedir) return NULL;
+    path = xmalloc( p - basedir + sizeof("/dlls/ntdll/ntdll.dll.so") );
+    memcpy( path, basedir, p - basedir );
+
+    if (!is_valid_build_dir( path, p - basedir ))
+    {
+        /* remove another component */
+        while (p > basedir && *p == '/') p--;
+        while (p > basedir && *p != '/') p--;
+        if (p == basedir || !is_valid_build_dir( path, p - basedir ))
+        {
+            free( path );
+            return NULL;
+        }
+    }
+    return path;
+}
+
+/* initialize the argv0 path */
+void wine_init_argv0_path( const char *argv0 )
+{
+    const char *basename;
+    char *libdir;
+
+    if (!(basename = strrchr( argv0, '/' ))) basename = argv0;
+    else basename++;
+
+    bindir = get_runtime_bindir( argv0 );
+    libdir = get_runtime_libdir();
+
+    if (bindir && !is_valid_bindir( bindir ))
+    {
+        build_dir = running_from_build_dir( bindir );
+        free( bindir );
+        bindir = NULL;
+    }
+    if (libdir && !bindir && !build_dir)
+    {
+        build_dir = running_from_build_dir( libdir );
+        if (!build_dir) bindir = build_path( libdir, LIB_TO_BINDIR );
+    }
+
+    if (build_dir)
+    {
+        argv0_name = build_path( "loader/", basename );
+    }
+    else
+    {
+        if (libdir) dlldir = build_path( libdir, LIB_TO_DLLDIR );
+        else if (bindir) dlldir = build_path( bindir, BIN_TO_DLLDIR );
+
+        if (bindir) datadir = build_path( bindir, BIN_TO_DATADIR );
+        argv0_name = xstrdup( basename );
+    }
+    free( libdir );
 }
 

trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/loader.c

@@ -159 +159 @@
 }
 
+/* check if the library is the correct architecture */
+/* only returns false for a valid library of the wrong arch */
+static int check_library_arch( int fd )
+{
+#ifdef __APPLE__
+    struct  /* Mach-O header */
+    {
+        unsigned int magic;
+        unsigned int cputype;
+    } header;
+
+    if (read( fd, &header, sizeof(header) ) != sizeof(header)) return 1;
+    if (header.magic != 0xfeedface) return 1;
+    if (sizeof(void *) == sizeof(int)) return !(header.cputype >> 24);
+    else return (header.cputype >> 24) == 1; /* CPU_ARCH_ABI64 */
+#else
+    struct  /* ELF header */
+    {
+        unsigned char magic[4];
+        unsigned char class;
+        unsigned char data;
+        unsigned char version;
+    } header;
+
+    if (read( fd, &header, sizeof(header) ) != sizeof(header)) return 1;
+    if (memcmp( header.magic, "\177ELF", 4 )) return 1;
+    if (header.version != 1 /* EV_CURRENT */) return 1;
+#ifdef WORDS_BIGENDIAN
+    if (header.data != 2 /* ELFDATA2MSB */) return 1;
+#else
+    if (header.data != 1 /* ELFDATA2LSB */) return 1;
+#endif
+    if (sizeof(void *) == sizeof(int)) return header.class == 1; /* ELFCLASS32 */
+    else return header.class == 2; /* ELFCLASS64 */
+#endif
+}
+
 /* check if a given file can be opened */
 static inline int file_exists( const char *name )
 {
+    int ret = 0;
     int fd = open( name, O_RDONLY );
-    if (fd != -1) close( fd );
-    return (fd != -1);
+    if (fd != -1)
+    {
+        ret = check_library_arch( fd );
+        close( fd );
+    }
+    return ret;
 }
 

trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/version.c

@@ -1 @@
-const char wine_build[] = "wine-1.1.27";
+const char wine_build[] = "wine-1.1.30";