February 2006 - Wine-Commits

Alexandre Julliard : configure: Default to building wine-pthread on non-x86 platforms.
by Alexandre Julliard Feb. 17, 2006

Feb. 17, 2006

Module: wine Branch: refs/heads/master Commit: 266391744dc933e0083efbf9f1b7adea5d8ea44c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=266391744dc933e0083efbf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 17 14:12:29 2006 +0100 configure: Default to building wine-pthread on non-x86 platforms. --- configure | 32 +++++++++++--------------------- configure.ac | 20 ++++++-------------- loader/Makefile.in | 5 +++-- 3 files changed, 20 insertions(+), 37 deletions(-) diff --git a/configure b/configure index 99ead32..b966c82 100755 --- a/configure +++ b/configure @@ -311,7 +311,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DLLDEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os WIN16_FILES WIN16_INSTALL SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN EGREP LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS FONTFORGE PKG_CONFIG PRELINK LIBPTHREAD XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS XML2LIBS XML2INCL XSLTLIBS XSLTINCL CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS LCMSLIBS LDAPLIBS FREETYPELIBS FREETYPEINCL ft_devel ft_devel2 FONTSSUBDIRS ARTSCCONFIG ARTSLIBS ARTSINCL ESDCONFIG ESDLIBS ESDINCL ALSALIBS AUDIOIOLIBS EXTRACFLAGS BUILTINFLAG DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS COREFOUNDATIONLIB IOKITLIB CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS SOCKETLIBS WINE_BINARIES MAIN_BINARY LDD LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DLLDEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os WIN16_FILES WIN16_INSTALL SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN EGREP LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS FONTFORGE PKG_CONFIG PRELINK LIBPTHREAD XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS XML2LIBS XML2INCL XSLTLIBS XSLTINCL CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS LCMSLIBS LDAPLIBS FREETYPELIBS FREETYPEINCL ft_devel ft_devel2 FONTSSUBDIRS ARTSCCONFIG ARTSLIBS ARTSINCL ESDCONFIG ESDLIBS ESDINCL ALSALIBS AUDIOIOLIBS EXTRACFLAGS BUILTINFLAG DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS COREFOUNDATIONLIB IOKITLIB CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS SOCKETLIBS MAIN_BINARY EXTRA_BINARIES LDD LIBOBJS LTLIBOBJS' ac_subst_files='MAKE_RULES MAKE_DLL_RULES MAKE_IMPLIB_RULES MAKE_TEST_RULES MAKE_LIB_RULES MAKE_PROG_RULES' # Initialize some variables set by options. @@ -13115,29 +13115,19 @@ case $host_os in ;; esac -case $host_os in - linux* | k*bsd*-gnu) - case $host_cpu in - *i[3456789]86*) WINE_BINARIES="wine-glibc wine-kthread wine-pthread wine-preloader" - ;; - *) WINE_BINARIES="wine-glibc wine-kthread wine-pthread" - ;; - esac +case $host in + *i[3456789]86*-linux* | *i[3456789]86*-k*bsd*-gnu) MAIN_BINARY="wine-glibc" - ;; - darwin*) - WINE_BINARIES="wine-pthread" - - MAIN_BINARY="wine-pthread" - - ;; - *) - WINE_BINARIES="wine-kthread" - - MAIN_BINARY="wine-kthread" + EXTRA_BINARIES="wine-kthread wine-pthread wine-preloader" ;; + darwin*) MAIN_BINARY="wine-pthread" + ;; + *i[3456789]86*) MAIN_BINARY="wine-kthread" + ;; + *) MAIN_BINARY="wine-pthread" + ;; esac @@ -19863,8 +19853,8 @@ s,@CROSSWINDRES@,$CROSSWINDRES,;t t s,@LDPATH@,$LDPATH,;t t s,@CRTLIBS@,$CRTLIBS,;t t s,@SOCKETLIBS@,$SOCKETLIBS,;t t -s,@WINE_BINARIES@,$WINE_BINARIES,;t t s,@MAIN_BINARY@,$MAIN_BINARY,;t t +s,@EXTRA_BINARIES@,$EXTRA_BINARIES,;t t s,@LDD@,$LDD,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t diff --git a/configure.ac b/configure.ac index de05da6..582df4d 100644 --- a/configure.ac +++ b/configure.ac @@ -1081,22 +1081,14 @@ case $host_os in ;; esac -case $host_os in - linux* | k*bsd*-gnu) - case $host_cpu in - *i[[3456789]]86*) AC_SUBST(WINE_BINARIES,"wine-glibc wine-kthread wine-pthread wine-preloader") ;; - *) AC_SUBST(WINE_BINARIES,"wine-glibc wine-kthread wine-pthread") ;; - esac +case $host in + *i[[3456789]]86*-linux* | *i[[3456789]]86*-k*bsd*-gnu) AC_SUBST(MAIN_BINARY,"wine-glibc") + AC_SUBST(EXTRA_BINARIES,"wine-kthread wine-pthread wine-preloader") ;; - darwin*) - AC_SUBST(WINE_BINARIES,"wine-pthread") - AC_SUBST(MAIN_BINARY,"wine-pthread") - ;; - *) - AC_SUBST(WINE_BINARIES,"wine-kthread") - AC_SUBST(MAIN_BINARY,"wine-kthread") - ;; + darwin*) AC_SUBST(MAIN_BINARY,"wine-pthread") ;; + *i[[3456789]]86*) AC_SUBST(MAIN_BINARY,"wine-kthread") ;; + *) AC_SUBST(MAIN_BINARY,"wine-pthread") ;; esac dnl **** Get the soname for libraries that we load dynamically **** diff --git a/loader/Makefile.in b/loader/Makefile.in index 30c9c0e..741fa65 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -14,8 +14,9 @@ C_SRCS = \ KTHREAD_OBJS = kthread.o main.o PTHREAD_OBJS = pthread.o main.o -WINE_BINARIES = @WINE_BINARIES@ -MAIN_BINARY = @MAIN_BINARY@ +MAIN_BINARY = @MAIN_BINARY@ +EXTRA_BINARIES = @EXTRA_BINARIES@ +WINE_BINARIES = $(MAIN_BINARY) $(EXTRA_BINARIES) MANPAGES = wine.man

1 0

Eric Pouech : dbghelp: Packing for minidump structures is 4 bytes.
by Alexandre Julliard Feb. 17, 2006

Feb. 17, 2006

Module: wine Branch: refs/heads/master Commit: cc98942bffc6a1307612f95b5ef15edae2a2c12a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cc98942bffc6a1307612f95… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Feb 17 14:08:54 2006 +0100 dbghelp: Packing for minidump structures is 4 bytes. --- include/dbghelp.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/dbghelp.h b/include/dbghelp.h index e529e42..09ce14f 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -362,6 +362,7 @@ typedef struct _DBGHELP_MODLOAD_DATA * MiniDUMP * *************************/ +#include <pshpack4.h> /* DebugHelp */ #define MINIDUMP_SIGNATURE 0x504D444D /* 'MDMP' */ @@ -722,6 +723,7 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE, DW BOOL WINAPI MiniDumpReadDumpStream(PVOID, ULONG, PMINIDUMP_DIRECTORY*, PVOID*, ULONG*); +#include <poppack.h> /************************* * MODULE handling *

1 0

Alexandre Julliard : Fixed a couple of function prototypes.
by Alexandre Julliard Feb. 17, 2006

Feb. 17, 2006

Module: wine Branch: refs/heads/master Commit: 29aea6e1c7f12458d092af5db17d268921a5e459 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=29aea6e1c7f12458d092af5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 17 14:08:38 2006 +0100 Fixed a couple of function prototypes. --- dlls/dbghelp/elf_module.c | 2 +- dlls/msacm/wineacm.h | 2 +- dlls/wldap32/winldap_private.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 1c8a983..6331b57 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1394,7 +1394,7 @@ static BOOL elf_load_cb(const char* name * Also, find module real name and load address from * the real loaded modules list in pcs address space */ -struct module* elf_load_module(struct process* pcs, const char* name, DWORD addr) +struct module* elf_load_module(struct process* pcs, const char* name, unsigned long addr) { struct elf_load el; diff --git a/dlls/msacm/wineacm.h b/dlls/msacm/wineacm.h index abbb4f8..e28c948 100644 --- a/dlls/msacm/wineacm.h +++ b/dlls/msacm/wineacm.h @@ -405,7 +405,7 @@ extern PWINE_ACMLOCALDRIVER MSACM_GetLoc extern HINSTANCE MSACM_hInstance32; /* From pcmcnvtr.c */ -LRESULT CALLBACK PCM_DriverProc(DWORD dwDevID, HDRVR hDriv, UINT wMsg, +LRESULT CALLBACK PCM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2); /* Dialog box templates */ diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index ad71c0c..730a8d2 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -375,8 +375,8 @@ ULONG ldap_parse_resultA(WLDAP32_LDAP*,W ULONG ldap_parse_resultW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,ULONG*,PWCHAR*,PWCHAR*,PWCHAR**,PLDAPControlW**,BOOLEAN); ULONG ldap_parse_sort_controlA(WLDAP32_LDAP*,PLDAPControlA*,ULONG*,PCHAR*); ULONG ldap_parse_sort_controlW(WLDAP32_LDAP*,PLDAPControlW*,ULONG*,PWCHAR*); -int ldap_parse_vlv_controlA(WLDAP32_LDAP*,LDAPControlA**,unsigned long*,unsigned long*,struct WLDAP32_berval**,int*); -int ldap_parse_vlv_controlW(WLDAP32_LDAP*,LDAPControlW**,unsigned long*,unsigned long*,struct WLDAP32_berval**,int*); +int ldap_parse_vlv_controlA(WLDAP32_LDAP*,LDAPControlA**,ULONG*,ULONG*,struct WLDAP32_berval**,INT*); +int ldap_parse_vlv_controlW(WLDAP32_LDAP*,LDAPControlW**,ULONG*,ULONG*,struct WLDAP32_berval**,INT*); void WLDAP32_ldap_perror(WLDAP32_LDAP*,const PCHAR); ULONG ldap_rename_extA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,INT,PLDAPControlA*,PLDAPControlA*,ULONG*); ULONG ldap_rename_extW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,INT,PLDAPControlW*,PLDAPControlW*,ULONG*);

1 0

Alexandre Julliard : libwine: Set the default bindir and dlldir from argv0 if dladdr is not available.
by Alexandre Julliard Feb. 17, 2006

Feb. 17, 2006

Module: wine Branch: refs/heads/master Commit: e95a2c2111add8d40d486846fae844715577ef56 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e95a2c2111add8d40d48684… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 17 14:08:19 2006 +0100 libwine: Set the default bindir and dlldir from argv0 if dladdr is not available. Added dependency on $(RELPATH). --- libs/wine/Makefile.in | 12 +++- libs/wine/config.c | 133 ++++++++++++++++++++++--------------------------- 2 files changed, 69 insertions(+), 76 deletions(-) diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index fb33189..9304175 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -21,10 +21,14 @@ C_SRCS = \ CONFIGDIRS = \ -DBINDIR='"$(bindir)"' \ -DDLLDIR='"$(dlldir)"' \ - -DBINDIR_REL=\"`$(RELPATH) $(libdir) $(bindir)`\" \ - -DDLLDIR_REL=\"`$(RELPATH) $(libdir) $(dlldir)`\" + -DLIB_TO_BINDIR=\"`$(RELPATH) $(libdir) $(bindir)`\" \ + -DLIB_TO_DLLDIR=\"`$(RELPATH) $(libdir) $(dlldir)`\" \ + -DBIN_TO_DLLDIR=\"`$(RELPATH) $(bindir) $(dlldir)`\" -config.o: config.c - $(CC) -c $(ALLCFLAGS) -o $@ config.c $(CONFIGDIRS) +config.o: config.c $(RELPATH) + $(CC) -c $(ALLCFLAGS) -o $@ $(SRCDIR)/config.c $(CONFIGDIRS) + +$(RELPATH): + @cd $(TOOLSDIR)/tools && $(MAKE) relpath ### Dependencies: diff --git a/libs/wine/config.c b/libs/wine/config.c index 4f057bb..65f2857 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -39,10 +39,11 @@ static const char server_config_dir[] = static const char server_root_prefix[] = "/tmp/.wine-"; /* prefix for server root dir */ static const char server_dir_prefix[] = "/server-"; /* prefix for server dir */ +static char *bindir; +static char *dlldir; static char *config_dir; static char *server_dir; static char *user_name; -static char *argv0_path; static char *argv0_name; #ifdef __GNUC__ @@ -101,15 +102,26 @@ inline static void remove_trailing_slash while (len > 1 && path[len-1] == '/') path[--len] = 0; } +/* build a path from the specified dir and name */ +static char *build_path( const char *dir, const char *name ) +{ + size_t len = strlen(dir); + char *ret = xmalloc( len + strlen(name) + 2 ); + + memcpy( ret, dir, len ); + if (len && ret[len-1] != '/') ret[len++] = '/'; + strcpy( ret + len, name ); + return ret; +} + /* return the directory that contains the library at run-time */ static const char *get_runtime_libdir(void) { - static char *libdir; - #ifdef HAVE_DLADDR Dl_info info; + char *libdir; - if (!libdir && dladdr( get_runtime_libdir, &info ) && info.dli_fname[0] == '/') + if (dladdr( get_runtime_libdir, &info ) && info.dli_fname[0] == '/') { const char *p = strrchr( info.dli_fname, '/' ); unsigned int len = p - info.dli_fname; @@ -117,42 +129,10 @@ static const char *get_runtime_libdir(vo libdir = xmalloc( len + 1 ); memcpy( libdir, info.dli_fname, len ); libdir[len] = 0; + return libdir; } #endif /* HAVE_DLADDR */ - return libdir; -} - -/* determine the proper location of the given path based on the current libdir */ -static char *get_path_from_libdir( const char *path, const char *fallback, const char *filename ) -{ - char *p, *ret; - const char *libdir = get_runtime_libdir(); - - /* retrieve the library load path */ - - if (path[0] && libdir) - { - ret = xmalloc( strlen(libdir) + strlen(path) + strlen(filename) + 3 ); - strcpy( ret, libdir ); - p = ret + strlen(libdir); - if (p[-1] != '/') *p++ = '/'; - } - else - { - if (fallback) path = fallback; - ret = p = xmalloc( strlen(path) + strlen(filename) + 2 ); - } - - strcpy( p, path ); - p += strlen(p); - - if (*filename) - { - if (p > ret && p[-1] != '/') *p++ = '/'; - strcpy( p, filename ); - } - else if (p > ret && p[-1] == '/') p[-1] = 0; - return ret; + return NULL; } /* initialize the server directory value */ @@ -184,10 +164,7 @@ static void init_server_dir( dev_t dev, /* retrieve the default dll dir */ const char *get_default_dlldir(void) { - static const char *dlldir; - - if (!dlldir) dlldir = get_path_from_libdir( DLLDIR_REL, DLLDIR, "" ); - return dlldir; + return dlldir ? dlldir : DLLDIR; } /* initialize all the paths values */ @@ -258,41 +235,53 @@ static void init_paths(void) void wine_init_argv0_path( const char *argv0 ) { size_t size, len; - const char *p; + const char *p, *libdir; char *cwd; if (!(p = strrchr( argv0, '/' ))) - { argv0_name = xstrdup( argv0 ); - return; /* if argv0 doesn't contain a path, don't store any path */ - } - else argv0_name = xstrdup( p + 1 ); + else + argv0_name = xstrdup( p + 1 ); - len = p - argv0 + 1; - if (argv0[0] == '/') /* absolute path */ + if ((libdir = get_runtime_libdir())) { - argv0_path = xmalloc( len + 1 ); - memcpy( argv0_path, argv0, len ); - argv0_path[len] = 0; + bindir = build_path( libdir, LIB_TO_BINDIR ); + dlldir = build_path( libdir, LIB_TO_DLLDIR ); return; } - /* relative path, make it absolute */ - for (size = 256 + len; ; size *= 2) + if (!p) return; /* if argv0 doesn't contain a path, don't store anything */ + + len = p - argv0; + if (!len) len++; /* include leading slash */ + + if (argv0[0] == '/') /* absolute path */ + { + bindir = xmalloc( len + 1 ); + memcpy( bindir, argv0, len ); + bindir[len] = 0; + } + else { - if (!(cwd = malloc( size ))) break; - if (getcwd( cwd, size - len )) + /* relative path, make it absolute */ + for (size = 256 + len; ; size *= 2) { - argv0_path = cwd; - cwd += strlen(cwd); - *cwd++ = '/'; - memcpy( cwd, argv0, len ); - cwd[len] = 0; - return; + if (!(cwd = malloc( size ))) return; + if (getcwd( cwd, size - len )) + { + bindir = cwd; + cwd += strlen(cwd); + *cwd++ = '/'; + memcpy( cwd, argv0, len ); + cwd[len] = 0; + break; + } + free( cwd ); + if (errno != ERANGE) return; } - free( cwd ); - if (errno != ERANGE) break; } + + dlldir = build_path( bindir, BIN_TO_DLLDIR ); } /* return the configuration directory ($WINEPREFIX or $HOME/.wine) */ @@ -364,7 +353,6 @@ static void preloader_exec( char **argv, /* exec a wine internal binary (either the wine loader or the wine server) */ void wine_exec_wine_binary( const char *name, char **argv, const char *env_var ) { - static const char bindir[] = BINDIR; const char *path, *pos, *ptr; int use_preloader = 0; @@ -375,9 +363,12 @@ void wine_exec_wine_binary( const char * } /* first, bin directory from the current libdir or argv0 */ - argv[0] = get_path_from_libdir( BINDIR_REL, argv0_path, name ); - preloader_exec( argv, use_preloader ); - free( argv[0] ); + if (bindir) + { + argv[0] = build_path( bindir, name ); + preloader_exec( argv, use_preloader ); + free( argv[0] ); + } /* then specified environment variable */ if (env_var) @@ -406,9 +397,7 @@ void wine_exec_wine_binary( const char * } /* and finally try BINDIR */ - argv[0] = xmalloc( sizeof(bindir) + 1 + strlen(name) ); - strcpy( argv[0], bindir ); - strcat( argv[0], "/" ); - strcat( argv[0], name ); + argv[0] = build_path( BINDIR, name ); preloader_exec( argv, use_preloader ); + free( argv[0] ); }

1 0

Alexandre Julliard : libwine: Compute relative paths for bin and dll directories at compile time.
by Alexandre Julliard Feb. 17, 2006

Feb. 17, 2006

Module: wine Branch: refs/heads/master Commit: 8b5e11c341c11b3a417d5845d8ff11aca77b339d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8b5e11c341c11b3a417d584… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 17 11:43:10 2006 +0100 libwine: Compute relative paths for bin and dll directories at compile time. --- libs/wine/Makefile.in | 11 ++++++++ libs/wine/config.c | 64 ++++++++----------------------------------------- 2 files changed, 20 insertions(+), 55 deletions(-) diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 3e77cb7..fb33189 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ LIBRARY = wine SOVERSION = 1 VERSCRIPT = $(SRCDIR)/wine.map -EXTRADEFS = -D__WINESRC__ -DBINDIR="\"$(bindir)\"" -DLIBDIR="\"$(libdir)\"" -DDLLDIR="\"$(dlldir)\"" +EXTRADEFS = -D__WINESRC__ EXTRALIBS = $(LIBPORT) @DLLIBS@ @CRTLIBS@ C_SRCS = \ @@ -18,4 +18,13 @@ C_SRCS = \ @MAKE_LIB_RULES@ +CONFIGDIRS = \ + -DBINDIR='"$(bindir)"' \ + -DDLLDIR='"$(dlldir)"' \ + -DBINDIR_REL=\"`$(RELPATH) $(libdir) $(bindir)`\" \ + -DDLLDIR_REL=\"`$(RELPATH) $(libdir) $(dlldir)`\" + +config.o: config.c + $(CC) -c $(ALLCFLAGS) -o $@ config.c $(CONFIGDIRS) + ### Dependencies: diff --git a/libs/wine/config.c b/libs/wine/config.c index 77dbb5d..4f057bb 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -101,37 +101,6 @@ inline static void remove_trailing_slash while (len > 1 && path[len-1] == '/') path[--len] = 0; } -/* determine where the destination path is located relative to the 'from' path */ -inline static const char *get_relative_path( const char *from, const char *dest, unsigned int *dotdots ) -{ -#define DIR_END(p) (*(p) == 0 || *(p) == '/') - const char *start; - - *dotdots = 0; - for (;;) - { - while (*from == '/') from++; - while (*dest == '/') dest++; - start = dest; /* save start of next path element */ - if (!*from) break; - - while (!DIR_END(from) && *from == *dest) { from++; dest++; } - if (DIR_END(from) && DIR_END(dest)) continue; - - /* count remaining elements in 'from' */ - do - { - (*dotdots)++; - while (!DIR_END(from)) from++; - while (*from == '/') from++; - } - while (*from); - break; - } - return start; -#undef DIR_END -} - /* return the directory that contains the library at run-time */ static const char *get_runtime_libdir(void) { @@ -161,41 +130,28 @@ static char *get_path_from_libdir( const /* retrieve the library load path */ - if (libdir) + if (path[0] && libdir) { - unsigned int dotdots = 0; - const char *start = get_relative_path( LIBDIR, path, &dotdots ); - - ret = xmalloc( strlen(libdir) + 3 * dotdots + strlen(start) + strlen(filename) + 3 ); + ret = xmalloc( strlen(libdir) + strlen(path) + strlen(filename) + 3 ); strcpy( ret, libdir ); p = ret + strlen(libdir); if (p[-1] != '/') *p++ = '/'; - - while (dotdots--) - { - p[0] = '.'; - p[1] = '.'; - p[2] = '/'; - p += 3; - } - - strcpy( p, start ); - p += strlen(p); } else { if (fallback) path = fallback; - ret = xmalloc( strlen(path) + strlen(filename) + 2 ); - strcpy( ret, path ); - p = ret + strlen(ret); + ret = p = xmalloc( strlen(path) + strlen(filename) + 2 ); } + strcpy( p, path ); + p += strlen(p); + if (*filename) { - if (p[-1] != '/') *p++ = '/'; + if (p > ret && p[-1] != '/') *p++ = '/'; strcpy( p, filename ); } - else if (p[-1] == '/') p[-1] = 0; + else if (p > ret && p[-1] == '/') p[-1] = 0; return ret; } @@ -230,7 +186,7 @@ const char *get_default_dlldir(void) { static const char *dlldir; - if (!dlldir) dlldir = get_path_from_libdir( DLLDIR, NULL, "" ); + if (!dlldir) dlldir = get_path_from_libdir( DLLDIR_REL, DLLDIR, "" ); return dlldir; } @@ -419,7 +375,7 @@ void wine_exec_wine_binary( const char * } /* first, bin directory from the current libdir or argv0 */ - argv[0] = get_path_from_libdir( bindir, argv0_path, name ); + argv[0] = get_path_from_libdir( BINDIR_REL, argv0_path, name ); preloader_exec( argv, use_preloader ); free( argv[0] );

1 0

Alexandre Julliard : tools: Added 'relpath' tool to compute relative Unix paths.
by Alexandre Julliard Feb. 17, 2006

Feb. 17, 2006

Module: wine Branch: refs/heads/master Commit: 35842ca71763682dbae233115a1ab7004bf8cf8d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=35842ca71763682dbae2331… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 17 11:42:17 2006 +0100 tools: Added 'relpath' tool to compute relative Unix paths. --- Make.rules.in | 1 + tools/.gitignore | 1 + tools/Makefile.in | 5 +++ tools/relpath.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+), 0 deletions(-) create mode 100644 tools/relpath.c diff --git a/Make.rules.in b/Make.rules.in index ddc9274..9deee72 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -72,6 +72,7 @@ BIN2RES = $(TOOLSDIR)/tools/bin2res WMC = $(TOOLSDIR)/tools/wmc/wmc WIDL = $(TOOLSDIR)/tools/widl/widl WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc +RELPATH = $(TOOLSDIR)/tools/relpath SFNT2FNT = $(TOOLSDIR)/tools/sfnt2fnt FNT2FON = $(TOOLSDIR)/tools/fnt2fon RC = $(WRC) diff --git a/tools/.gitignore b/tools/.gitignore index d811816..e9581d0 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -4,6 +4,7 @@ fnt2bdf fnt2fon make_ctests makedep +relpath sfnt2fnt winemaker.man wineprefixcreate diff --git a/tools/Makefile.in b/tools/Makefile.in index 78afd6a..c44525d 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -14,6 +14,7 @@ PROGRAMS = \ fnt2fon$(EXEEXT) \ make_ctests$(EXEEXT) \ makedep$(EXEEXT) \ + relpath$(EXEEXT) \ sfnt2fnt$(EXEEXT) \ wineprefixcreate @@ -26,6 +27,7 @@ C_SRCS = \ fnt2fon.c \ make_ctests.c \ makedep.c \ + relpath.c \ sfnt2fnt.c \ INSTALLSUBDIRS = \ @@ -58,6 +60,9 @@ fnt2bdf$(EXEEXT): fnt2bdf.o fnt2fon$(EXEEXT): fnt2fon.o $(CC) $(CFLAGS) -o $@ fnt2fon.o $(LIBPORT) +relpath$(EXEEXT): relpath.o + $(CC) $(CFLAGS) -o $@ relpath.o $(LIBPORT) + sfnt2fnt$(EXEEXT): sfnt2fnt.o $(CC) $(CFLAGS) -o $@ sfnt2fnt.o $(LIBUNICODE) $(LIBPORT) $(FREETYPELIBS) diff --git a/tools/relpath.c b/tools/relpath.c new file mode 100644 index 0000000..e261dbd --- /dev/null +++ b/tools/relpath.c @@ -0,0 +1,83 @@ +/* + * Compute the relative path needed to go from one Unix dir to another + * + * Copyright 2006 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +/* determine where the destination path is located relative to the 'from' path */ +static const char *get_relative_path( const char *from, const char *dest, unsigned int *dotdots ) +{ +#define DIR_END(p) (*(p) == 0 || *(p) == '/') + const char *start; + + *dotdots = 0; + for (;;) + { + while (*from == '/') from++; + while (*dest == '/') dest++; + start = dest; /* save start of next path element */ + if (!*from) break; + + while (!DIR_END(from) && *from == *dest) { from++; dest++; } + if (DIR_END(from) && DIR_END(dest)) continue; + + /* count remaining elements in 'from' */ + do + { + (*dotdots)++; + while (!DIR_END(from)) from++; + while (*from == '/') from++; + } + while (*from); + break; + } + return start; +#undef DIR_END +} + + +int main( int argc, char *argv[] ) +{ + const char *start; + unsigned int dotdots = 0; + + if (argc != 3) + { + fprintf( stderr, "Usage: %s fromdir todir\n", argv[0] ); + exit(1); + } + start = get_relative_path( argv[1], argv[2], &dotdots ); + + if (!start[0] && !dotdots) printf( ".\n" ); + else + { + while (dotdots) + { + printf( ".." ); + dotdots--; + if (dotdots || start[0]) printf( "/" ); + } + printf( "%s\n", start ); + } + exit(0); +}

1 0

Alexandre Julliard : ntdll: Remove no longer used oldcwd in start_server.
by Alexandre Julliard Feb. 17, 2006

Feb. 17, 2006

Module: wine Branch: refs/heads/master Commit: dcdb0d0b34a4f4d545bd307d0ff041eec3555220 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dcdb0d0b34a4f4d545bd307… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 17 11:41:57 2006 +0100 ntdll: Remove no longer used oldcwd in start_server. --- dlls/ntdll/server.c | 44 +++++++++++++++++--------------------------- 1 files changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index dd9baeb..aff0b8a 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -586,7 +586,7 @@ void wine_server_release_fd( obj_handle_ * * Start a new wine server. */ -static void start_server( const char *oldcwd ) +static void start_server(void) { static int started; /* we only try once */ char *argv[3]; @@ -652,17 +652,21 @@ static void server_connect_error( const * Attempt to connect to an existing server socket. * We need to be in the server directory already. */ -static int server_connect( const char *oldcwd, const char *serverdir ) +static int server_connect( const char *serverdir ) { struct sockaddr_un addr; struct stat st; - int s, slen, retry; + int s, slen, retry, fd_cwd; + + /* retrieve the current directory */ + fd_cwd = open( ".", O_RDONLY ); + if (fd_cwd != -1) fcntl( fd_cwd, F_SETFD, 1 ); /* set close on exec flag */ /* chdir to the server directory */ if (chdir( serverdir ) == -1) { if (errno != ENOENT) fatal_perror( "chdir to %s", serverdir ); - start_server( "." ); + start_server(); if (chdir( serverdir ) == -1) fatal_perror( "chdir to %s", serverdir ); } @@ -677,13 +681,13 @@ static int server_connect( const char *o if (retry) { usleep( 100000 * retry * retry ); - start_server( oldcwd ); + start_server(); if (lstat( SOCKETNAME, &st ) == -1) continue; /* still no socket, wait a bit more */ } else if (lstat( SOCKETNAME, &st ) == -1) /* check for an already existing socket */ { if (errno != ENOENT) fatal_perror( "lstat %s/%s", serverdir, SOCKETNAME ); - start_server( oldcwd ); + start_server(); if (lstat( SOCKETNAME, &st ) == -1) continue; /* still no socket, wait a bit more */ } @@ -703,6 +707,12 @@ static int server_connect( const char *o if ((s = socket( AF_UNIX, SOCK_STREAM, 0 )) == -1) fatal_perror( "socket" ); if (connect( s, (struct sockaddr *)&addr, slen ) != -1) { + /* switch back to the starting directory */ + if (fd_cwd != -1) + { + fchdir( fd_cwd ); + close( fd_cwd ); + } fcntl( s, F_SETFD, 1 ); /* set close on exec flag */ return s; } @@ -830,8 +840,6 @@ static void create_config_dir(void) */ void server_init_process(void) { - int size; - char *oldcwd; obj_handle_t dummy_handle; const char *server_dir = wine_get_server_dir(); @@ -841,26 +849,8 @@ void server_init_process(void) server_dir = wine_get_server_dir(); } - /* retrieve the current directory */ - for (size = 512; ; size *= 2) - { - if (!(oldcwd = malloc( size ))) break; - if (getcwd( oldcwd, size )) break; - free( oldcwd ); - if (errno == ERANGE) continue; - oldcwd = NULL; - break; - } - /* connect to the server */ - fd_socket = server_connect( oldcwd, server_dir ); - - /* switch back to the starting directory */ - if (oldcwd) - { - chdir( oldcwd ); - free( oldcwd ); - } + fd_socket = server_connect( server_dir ); /* setup the signal mask */ sigemptyset( &block_set );

1 0

Mike McCormack : server: Use a single inotify watch, as it scales better with a large
by Alexandre Julliard Feb. 17, 2006

Feb. 17, 2006

Module: wine Branch: refs/heads/master Commit: fbc00db3f6cc2cf2434aa7063039df95329c64f2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fbc00db3f6cc2cf2434aa70… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Feb 17 11:40:38 2006 +0100 server: Use a single inotify watch, as it scales better with a large number of directories. --- server/change.c | 312 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 266 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=fbc00db3f6cc2cf2434…

1 0

Phil Krylov : wordpad: Russian translation.
by Alexandre Julliard Feb. 17, 2006

Feb. 17, 2006

Module: wine Branch: refs/heads/master Commit: 38e1b85324188ef2b19bf360284361f72de8d571 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=38e1b85324188ef2b19bf36… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Fri Feb 17 11:37:51 2006 +0100 wordpad: Russian translation. --- programs/wordpad/Ru.rc | 66 ++++++++++++++++++++++++++++++++++++++++++++++ programs/wordpad/rsrc.rc | 1 + 2 files changed, 67 insertions(+), 0 deletions(-) create mode 100644 programs/wordpad/Ru.rc diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc new file mode 100644 index 0000000..6f8f187 --- /dev/null +++ b/programs/wordpad/Ru.rc @@ -0,0 +1,66 @@ +/* + * Copyright 2006 by Phil Krylov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&��" + BEGIN + MENUITEM "��&��", ID_FILE_NEW + MENUITEM "&��", ID_FILE_OPEN + MENUITEM "&��", ID_FILE_SAVE + MENUITEM SEPARATOR + MENUITEM "�&��", ID_FILE_EXIT + END + POPUP "&��" + BEGIN + MENUITEM "&��\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "&��\tCtrl+Y", ID_EDIT_REDO + MENUITEM "�� &��\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&��\tCtrl+X", ID_EDIT_CUT + MENUITEM "&��\tCtrl+C", ID_EDIT_COPY + MENUITEM SEPARATOR + MENUITEM "&�� ", ID_EDIT_READONLY + MENUITEM "&��", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "&��" + BEGIN + MENUITEM "&�� ", ID_EDIT_SELECTIONINFO + MENUITEM "&�� ", ID_EDIT_CHARFORMAT + MENUITEM "�� &�� ", ID_EDIT_DEFCHARFORMAT + MENUITEM "�� &��", ID_EDIT_PARAFORMAT + MENUITEM "�&�� ", ID_EDIT_GETTEXT + END + END + POPUP "��&��" + BEGIN + POPUP "&��" + BEGIN + MENUITEM "&��\tCtrl+1", ID_BACK_1 + MENUITEM "&�� PostThat\tCtrl+2", ID_BACK_2 + END + POPUP "&��" + BEGIN + MENUITEM "�&��\tCtrl+L", ID_ALIGN_LEFT + MENUITEM "�� &��\tCtrl+E", ID_ALIGN_CENTER + MENUITEM "�&��\tCtrl+R", ID_ALIGN_RIGHT + END + END +END diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc index fa79a65..c2e2347 100644 --- a/programs/wordpad/rsrc.rc +++ b/programs/wordpad/rsrc.rc @@ -80,3 +80,4 @@ IDB_TOOLBAR BITMAP "toolbar.bmp" #include "En.rc" #include "Fr.rc" #include "Nl.rc" +#include "Ru.rc"

1 0

Hans Leidekker : wordpad: Dutch localization.
by Alexandre Julliard Feb. 17, 2006

Feb. 17, 2006

Module: wine Branch: refs/heads/master Commit: 34a34c7b6e0ff85dff9bd542ee7b1521b137c6a8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=34a34c7b6e0ff85dff9bd54… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Feb 17 11:37:21 2006 +0100 wordpad: Dutch localization. --- programs/wordpad/Nl.rc | 66 ++++++++++++++++++++++++++++++++++++++++++++++ programs/wordpad/rsrc.rc | 1 + 2 files changed, 67 insertions(+), 0 deletions(-) create mode 100644 programs/wordpad/Nl.rc diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc new file mode 100644 index 0000000..c36a805 --- /dev/null +++ b/programs/wordpad/Nl.rc @@ -0,0 +1,66 @@ +/* + * Copyright 2006 by Hans Leidekker + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT + +MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Bestand" + BEGIN + MENUITEM "&Nieuw" ID_FILE_NEW + MENUITEM "&Openen", ID_FILE_OPEN + MENUITEM "O&pslaan", ID_FILE_SAVE + MENUITEM SEPARATOR + MENUITEM "&Afsluiten", ID_FILE_EXIT + END + POPUP "Be&werken" + BEGIN + MENUITEM "&Ongedaan maken\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "O&pnieuw\tCtrl+Y", ID_EDIT_REDO + MENUITEM "&Alles selecteren\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "K&nippen\tCtrl+X", ID_EDIT_CUT + MENUITEM "&Kopieren\tCtrl+C", ID_EDIT_COPY + MENUITEM SEPARATOR + MENUITEM "Alleen &lezen", ID_EDIT_READONLY + MENUITEM "&Gewijzigd", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "&Extra's" + BEGIN + MENUITEM "Selectie&informatie", ID_EDIT_SELECTIONINFO + MENUITEM "&Karakterformaat", ID_EDIT_CHARFORMAT + MENUITEM "&Standaard karakterformaat", ID_EDIT_DEFCHARFORMAT + MENUITEM "&Paragraafformaat", ID_EDIT_PARAFORMAT + MENUITEM "&Haal tekst", ID_EDIT_GETTEXT + END + END + POPUP "&Opmaak" + BEGIN + POPUP "&Achtergrond" + BEGIN + MENUITEM "&Systeem\tCtrl+1", ID_BACK_1 + MENUITEM "&Geeltje\tCtrl+2", ID_BACK_2 + END + POPUP "&Uitlijning" + BEGIN + MENUITEM "&Links\tCtrl+L", ID_ALIGN_LEFT + MENUITEM "&Gecentreerd\tCtrl+E", ID_ALIGN_CENTER + MENUITEM "&Rechts\tCtrl+R", ID_ALIGN_RIGHT + END + END +END diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc index 669954c..fa79a65 100644 --- a/programs/wordpad/rsrc.rc +++ b/programs/wordpad/rsrc.rc @@ -79,3 +79,4 @@ IDB_TOOLBAR BITMAP "toolbar.bmp" #include "De.rc" #include "En.rc" #include "Fr.rc" +#include "Nl.rc"

1 0