March 2006 - Wine-Commits - list.winehq.org

Alexandre Julliard : libwine: Added support for executing wine binaries out of the build dir.
by Alexandre Julliard March 16, 2006

March 16, 2006

Module: wine Branch: refs/heads/master Commit: bf566139d721defa3ee64121274b425f3e7b0899 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bf566139d721defa3ee6412… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 16 17:35:32 2006 +0100 libwine: Added support for executing wine binaries out of the build dir. --- dlls/ntdll/server.c | 4 ++-- libs/wine/config.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index aff0b8a..b647352 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -598,7 +598,7 @@ static void start_server(void) if (pid == -1) fatal_perror( "fork" ); if (!pid) { - argv[0] = "wineserver"; + argv[0] = "server/wineserver"; argv[1] = TRACE_ON(server) ? "-d" : NULL; argv[2] = NULL; wine_exec_wine_binary( argv[0], argv, getenv("WINESERVER") ); @@ -797,7 +797,7 @@ static void create_config_dir(void) { const char *argv[6]; - argv[0] = "wineprefixcreate"; + argv[0] = "tools/wineprefixcreate"; argv[1] = "--quiet"; argv[2] = "--wait"; argv[3] = "--prefix"; diff --git a/libs/wine/config.c b/libs/wine/config.c index 1c2a325..79146d3 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -427,6 +427,18 @@ void wine_exec_wine_binary( const char * use_preloader = 1; } + if ((ptr = strrchr( name, '/' ))) + { + /* if we are in build dir and name contains a path, try that */ + if (build_dir) + { + argv[0] = build_path( build_dir, name ); + preloader_exec( argv, use_preloader ); + free( argv[0] ); + } + name = ptr + 1; /* get rid of path */ + } + /* first, bin directory from the current libdir or argv0 */ if (bindir) {

1 0

Alexandre Julliard : libwine: Added detection for Wine being run out of the build directory.
by Alexandre Julliard March 16, 2006

March 16, 2006

Module: wine Branch: refs/heads/master Commit: 77b3b92eb2cc8b684f7c72d3ba33a5cafef8a48d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=77b3b92eb2cc8b684f7c72d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 16 17:35:14 2006 +0100 libwine: Added detection for Wine being run out of the build directory. --- libs/wine/config.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 58 insertions(+), 3 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 9bafe0f..1c2a325 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -44,6 +44,7 @@ static char *dlldir; static char *datadir; static char *config_dir; static char *server_dir; +static char *build_dir; static char *user_name; static char *argv0_name; @@ -233,21 +234,66 @@ static void init_paths(void) init_server_dir( st.st_dev, st.st_ino ); } +/* 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, *end; + 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 ); + end = path + (p - basedir); + + strcpy( end, "/server/wineserver" ); + if (stat( path, &st ) == -1) + { + free( path ); + return NULL; /* no wineserver found */ + } + + /* check for ntdll too to make sure */ + strcpy( end, "/dlls/ntdll/ntdll.dll.so" ); + if (stat( path, &st ) == -1) + { + free( path ); + return NULL; /* no ntdll found */ + } + + *end = 0; + return path; +} + /* initialize the argv0 path */ void wine_init_argv0_path( const char *argv0 ) { size_t size, len; - const char *p, *libdir; + const char *p, *libdir, *basename; char *cwd; if (!(p = strrchr( argv0, '/' ))) - argv0_name = xstrdup( argv0 ); + basename = argv0; else - argv0_name = xstrdup( p + 1 ); + 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 ))) goto in_build_dir; + dlldir = build_path( libdir, LIB_TO_DLLDIR ); datadir = build_path( libdir, LIB_TO_DATADIR ); return; @@ -284,8 +330,17 @@ void wine_init_argv0_path( const char *a } } + 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 ); } /* return the configuration directory ($WINEPREFIX or $HOME/.wine) */

1 0

Alexandre Julliard : dlls: Remove the no longer needed symlinks to the static libraries.
by Alexandre Julliard March 16, 2006

March 16, 2006

Module: wine Branch: refs/heads/master Commit: 7fb2ae6ec6f844c94d8105352fea937866aeda04 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7fb2ae6ec6f844c94d81053… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 16 17:25:06 2006 +0100 dlls: Remove the no longer needed symlinks to the static libraries. --- dlls/Makefile.in | 38 +++++++------------------------------- dlls/make_dlls | 13 ++++--------- 2 files changed, 11 insertions(+), 40 deletions(-) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index b90abb7..7995d67 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -316,12 +316,6 @@ SYMLINKS_SO = \ itss.dll.so \ joystick.drv.so \ kernel32.dll.so \ - libdxerr8.a \ - libdxerr9.a \ - libdxguid.a \ - libstrmiids.a \ - libuuid.a \ - libwinecrt0.a \ lz32.dll.so \ mapi32.dll.so \ mciavi32.dll.so \ @@ -1046,24 +1040,6 @@ wsock32.dll.so: wsock32/wsock32.dll.so wtsapi32.dll.so: wtsapi32/wtsapi32.dll.so $(RM) $@ && $(LN_S) wtsapi32/wtsapi32.dll.so $@ -libdxerr8.a: dxerr8/libdxerr8.a - $(RM) $@ && $(LN_S) dxerr8/libdxerr8.a $@ - -libdxerr9.a: dxerr9/libdxerr9.a - $(RM) $@ && $(LN_S) dxerr9/libdxerr9.a $@ - -libdxguid.a: dxguid/libdxguid.a - $(RM) $@ && $(LN_S) dxguid/libdxguid.a $@ - -libstrmiids.a: strmiids/libstrmiids.a - $(RM) $@ && $(LN_S) strmiids/libstrmiids.a $@ - -libuuid.a: uuid/libuuid.a - $(RM) $@ && $(LN_S) uuid/libuuid.a $@ - -libwinecrt0.a: winecrt0/libwinecrt0.a - $(RM) $@ && $(LN_S) winecrt0/libwinecrt0.a $@ - # Import libraries @@ -1074,16 +1050,16 @@ IMPORT_SYMLINKS = \ libgdi32.$(IMPLIBEXT) \ libkernel32.$(IMPLIBEXT) \ libmsacm32.$(IMPLIBEXT) \ - libuser32.$(IMPLIBEXT) \ - libdxerr8.a \ - libdxerr9.a \ - libdxguid.a \ - libstrmiids.a \ - libuuid.a \ - libwinecrt0.a + libuser32.$(IMPLIBEXT) IMPORT_LIBS = \ $(IMPORT_SYMLINKS) \ + dxerr8/libdxerr8.a \ + dxerr9/libdxerr9.a \ + dxguid/libdxguid.a \ + strmiids/libstrmiids.a \ + uuid/libuuid.a \ + winecrt0/libwinecrt0.a \ activeds/libactiveds.$(IMPLIBEXT) \ advapi32/libadvapi32.$(IMPLIBEXT) \ advpack/libadvpack.$(IMPLIBEXT) \ diff --git a/dlls/make_dlls b/dlls/make_dlls index 0a9012b..ccc98d2 100755 --- a/dlls/make_dlls +++ b/dlls/make_dlls @@ -66,6 +66,7 @@ foreach my $i (split(/\s/,$makefiles)) if ($module =~ /^lib.*\.a$/) { ($staticlib_dirs{$module} = $i) =~ s/^\.\/(.*)\/[^\/]+$/$1/; + die "invalid module $module in dir $staticlib_dirs{$module}\n" if "lib$staticlib_dirs{$module}.a" ne $module; } else { @@ -173,7 +174,6 @@ foreach my $mod (sort keys %directories) $targets16{$i . "16"} = $mod; } } -foreach my $mod (sort keys %staticlib_dirs) { $targets{$mod} = 1; } print NEWMAKE <<EOF; @@ -236,11 +236,6 @@ foreach my $mod (sort keys %directories) printf NEWMAKE "\techo \"%s\" >\$\@\n\n", $mod; } } -foreach my $mod (sort keys %staticlib_dirs) -{ - printf NEWMAKE "%s: %s/%s\n", $mod, $staticlib_dirs{$mod}, $mod; - printf NEWMAKE "\t\$(RM) \$@ && \$(LN_S) %s/%s \$@\n\n", $staticlib_dirs{$mod}, $mod; -} ################################################################ # output the import libraries rules @@ -260,12 +255,12 @@ foreach my $mod (sort @lib_symlinks) { printf NEWMAKE " \\\n\t%s.\$(IMPLIBEXT)", $importlibs{$mod}; } + +print NEWMAKE "\n\nIMPORT_LIBS = \\\n\t\$(IMPORT_SYMLINKS)"; foreach my $mod (sort keys %staticlib_dirs) { - printf NEWMAKE " \\\n\t%s", $mod; + printf NEWMAKE " \\\n\t%s/%s", $staticlib_dirs{$mod}, $mod; } - -print NEWMAKE "\n\nIMPORT_LIBS = \\\n\t\$(IMPORT_SYMLINKS)"; foreach my $mod (sort keys %importlibs) { my $dir = $directories{$mod};

1 0

Alexandre Julliard : Remove some no longer needed library paths.
by Alexandre Julliard March 16, 2006

March 16, 2006

Module: wine Branch: refs/heads/master Commit: 5319db6332fc0c255c72259668bb185022141085 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5319db6332fc0c255c72259… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 16 16:28:43 2006 +0100 Remove some no longer needed library paths. --- dlls/Makedll.rules.in | 4 ++-- dlls/Maketest.rules.in | 3 +-- programs/Makeprog.rules.in | 5 ++--- programs/avitools/Makefile.in | 6 +++--- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index f4ece64..504ee0e 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -19,7 +19,7 @@ MAINSPEC = $(BASEMODULE).spec SPEC_DEF = lib$(BASEMODULE).def WIN16_FILES = $(SPEC_SRCS16:.spec=.spec.o) $(C_SRCS16:.c=.o) $(EXTRA_OBJS16) ALL_OBJS = @WIN16_FILES@ $(OBJS) $(RC_SRCS:.rc=.res) -ALL_LIBS = $(LIBWINE) $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS) +ALL_LIBS = -L$(LIBDIR) -lwine $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS) ALL_IMPORTS = $(DELAYIMPORTS) $(IMPORTS) IMPLIB_OBJS = $(IMPLIB_SRCS:.c=.o) STATICIMPLIB= $(IMPORTLIB:.def=.def.a) @@ -32,7 +32,7 @@ all: $(MODULE)$(DLLEXT) $(SUBDIRS) # Rules for .so files $(MODULE).so: $(MAINSPEC) $(ALL_OBJS) Makefile.in - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(SUBSYSTEM:%=-Wb,--subsystem,%) $(BASEADDRESS:%=-Wl,--image-base,%) -o $@ $(DLL_LDPATH) $(ALL_IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(SUBSYSTEM:%=-Wb,--subsystem,%) $(BASEADDRESS:%=-Wl,--image-base,%) -o $@ -L$(DLLDIR) $(ALL_IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) # Rules for .dll files diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index c746471..c97034d 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -21,7 +21,6 @@ RUNTESTFLAGS = -q -P wine -M $(TESTDLL) C_SRCS = $(CTESTS) $(TESTLIST) ALL_LIBS = $(IMPORTS:%=-l%) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -DLL_LDPATH = -L$(DLLDIR) $(IMPORTS:%=-L$(DLLDIR)/%) CROSSTEST = $(TESTDLL:%.dll=%)_crosstest.exe CROSSOBJS = $(C_SRCS:.c=.cross.o) $(RC_SRCS:.rc=.res.cross.o) @@ -35,7 +34,7 @@ all: $(TESTPROGRAM) # Rules for .so main module $(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mconsole $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(LIBPORT) $(DLL_LDPATH) -L$(LIBDIR) $(ALL_LIBS) + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mconsole $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(LIBPORT) -L$(DLLDIR) -L$(LIBDIR) $(ALL_LIBS) # Rules for .exe main module diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index 9052105..b39d1e7 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -13,8 +13,7 @@ DLLDEFS = @DLLDEFS@ DLLFLAGS = @DLLFLAGS@ DEFS = $(DLLDEFS) $(EXTRADEFS) ALL_IMPORTS = $(DELAYIMPORTS) $(IMPORTS) -ALL_LIBS = $(ALL_IMPORTS:%=-l%) $(LIBWINE) $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS) -DLL_LDPATH = -L$(DLLDIR) $(ALL_IMPORTS:%=-L$(DLLDIR)/%) +ALL_LIBS = $(ALL_IMPORTS:%=-l%) -L$(LIBDIR) -lwine $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS) BASEMODULE = $(MODULE:.exe=) RUNTESTFLAGS= -q -P wine -T $(TOPOBJDIR) @@ -25,7 +24,7 @@ all: $(MODULE)$(DLLEXT) $(BASEMODULE)$(E # Rules for .so main module $(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(DLL_LDPATH) $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%) + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ -L$(DLLDIR) $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%) $(BASEMODULE): $(WINEWRAPPER) $(RM) $@ && $(LN_S) $(WINEWRAPPER) $@ diff --git a/programs/avitools/Makefile.in b/programs/avitools/Makefile.in index 06cd46a..9a378af 100644 --- a/programs/avitools/Makefile.in +++ b/programs/avitools/Makefile.in @@ -19,13 +19,13 @@ C_SRCS = \ all: aviinfo.exe$(DLLEXT) aviplay.exe$(DLLEXT) icinfo.exe$(DLLEXT) aviinfo$(EXEEXT) aviplay$(EXEEXT) icinfo$(EXEEXT) aviinfo.exe.so: aviinfo.o - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mwindows -o $@ aviinfo.o -L$(DLLDIR)/avifil32 -L$(DLLDIR) -lavifil32 -lkernel32 $(ALL_LIBS) + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mwindows -o $@ aviinfo.o -L$(DLLDIR) -lavifil32 -lkernel32 $(ALL_LIBS) aviplay.exe.so: aviplay.o - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mwindows -o $@ aviplay.o -L$(DLLDIR)/avifil32 -L$(DLLDIR)/ddraw -L$(DLLDIR) -lavifil32 -lddraw -lkernel32 $(ALL_LIBS) + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mwindows -o $@ aviplay.o -L$(DLLDIR) -lavifil32 -lddraw -lkernel32 $(ALL_LIBS) icinfo.exe.so: icinfo.o - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mwindows -o $@ icinfo.o -L$(DLLDIR)/msvfw32 -L$(DLLDIR) -lmsvfw32 -lkernel32 $(ALL_LIBS) + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mwindows -o $@ icinfo.o -L$(DLLDIR) -lmsvfw32 -lkernel32 $(ALL_LIBS) aviinfo.exe: aviinfo.o $(CC) -o $@ aviinfo.o -lavifil32 $(ALL_LIBS)

1 0

Juan Lang : crypt32: Tighten CertDuplicateCertificateContext test.
by Alexandre Julliard March 16, 2006

March 16, 2006

Module: wine Branch: refs/heads/master Commit: b40a406dc37ea7e7188a705454fd81e89b095f87 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b40a406dc37ea7e7188a705… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Mar 15 09:58:59 2006 -0800 crypt32: Tighten CertDuplicateCertificateContext test. Test that the return from CertDuplicateCertificateContext is the same as its parameter. --- dlls/crypt32/tests/store.c | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 2ca59b8..c147afb 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -143,17 +143,11 @@ static void testDupCert(void) dupContext = CertDuplicateCertificateContext(context); ok(dupContext != NULL, "Expected valid duplicate\n"); - if (dupContext) - { - ok(dupContext->cbCertEncoded == sizeof(bigCert), - "Expected cert of %d bytes, got %ld\n", sizeof(bigCert), - dupContext->cbCertEncoded); - ok(!memcmp(dupContext->pbCertEncoded, bigCert, - sizeof(bigCert)), - "Unexpected encoded cert in context\n"); - ok(dupContext->hCertStore == store, "Unexpected store\n"); - CertFreeCertificateContext(dupContext); - } + /* Not only is it a duplicate, it's identical: the address is the + * same. + */ + ok(dupContext == context, "Expected identical context addresses\n"); + CertFreeCertificateContext(dupContext); CertFreeCertificateContext(context); } CertCloseStore(store, 0);

1 0

Kai Blin : secur32: Update ntlm_auth version detection to detect new samba4 version numbers.
by Alexandre Julliard March 16, 2006

March 16, 2006

Module: wine Branch: refs/heads/master Commit: e6351700bc0e3e412f9cccb15106e671874fbb50 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e6351700bc0e3e412f9cccb… Author: Kai Blin <kai.blin(a)gmail.com> Date: Thu Mar 16 12:45:17 2006 +0100 secur32: Update ntlm_auth version detection to detect new samba4 version numbers. Samba4 changed the versioning from 3.9.X to 4.0.0tpX-preY. --- dlls/secur32/dispatcher.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/dispatcher.c b/dlls/secur32/dispatcher.c index 66f9c6f..367aebc 100644 --- a/dlls/secur32/dispatcher.c +++ b/dlls/secur32/dispatcher.c @@ -290,11 +290,11 @@ void check_version(PNegoHelper helper) temp[len] = 0; TRACE("Exact version is %s\n", debugstr_a(temp)); - if(strncmp(temp+8, "3.9", 3) == 0) + if(strncmp(temp+8, "4", 1) == 0) { helper->version = 4; } - else if(strncmp(temp+8, "3.0", 3) == 0) + else if(strncmp(temp+8, "3", 1) == 0) { helper->version = 3; }

1 0

Alexandre Julliard : winegcc: Look for libraries in subdirs of the library path too.
by Alexandre Julliard March 16, 2006

March 16, 2006

Module: wine Branch: refs/heads/master Commit: 870d490eecdbfd6cdb945a4f387d92efdda22737 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=870d490eecdbfd6cdb945a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 16 16:28:04 2006 +0100 winegcc: Look for libraries in subdirs of the library path too. This means that -lfoo will match the library 'foo/libfoo.def' in addition to just 'libfoo.def'. This allows supporting the Wine source layout without adding a gazillion path entries. --- tools/winegcc/utils.c | 8 ++++ tools/winegcc/winegcc.c | 88 ++++++++++++++++++++++------------------------- 2 files changed, 49 insertions(+), 47 deletions(-) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index b61b076..f66d34a 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -235,6 +235,14 @@ static char* try_lib_path(const char* di char *fullname; file_type type; + /* first try a subdir named from the library we are looking for */ + fullname = strmake("%s/%s/%s%s%s", dir, library, pre, library, ext); + if (verbose > 1) fprintf(stderr, "Try %s...", fullname); + type = get_file_type(fullname); + if (verbose > 1) fprintf(stderr, type == expected_type ? "FOUND!\n" : "no\n"); + if (type == expected_type) return fullname; + free( fullname ); + fullname = strmake("%s/%s%s%s", dir, pre, library, ext); if (verbose > 1) fprintf(stderr, "Try %s...", fullname); type = get_file_type(fullname); diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index e0a810e..43a6b07 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -382,6 +382,35 @@ static char *find_static_lib( const char return NULL; } +/* add specified library to the list of files */ +static void add_library( strarray *lib_dirs, strarray *files, const char *library ) +{ + char *static_lib, *fullname = 0; + + switch(get_lib_type(lib_dirs, library, &fullname)) + { + case file_arh: + strarray_add(files, strmake("-a%s", fullname)); + break; + case file_dll: + strarray_add(files, strmake("-d%s", fullname)); + if ((static_lib = find_static_lib(fullname))) + { + strarray_add(files, strmake("-a%s",static_lib)); + free(static_lib); + } + break; + case file_so: + strarray_add(files, strmake("-s%s", fullname)); + break; + default: + /* keep it anyway, the linker may know what to do with it */ + strarray_add(files, strmake("-l%s", library)); + break; + } + free(fullname); +} + static void build(struct options* opts) { static const char *stdlibpath[] = { DLLDIR, LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; @@ -486,31 +515,7 @@ static void build(struct options* opts) } } else if (file[1] == 'l') - { - char *static_lib, *fullname = 0; - switch(get_lib_type(lib_dirs, file + 2, &fullname)) - { - case file_arh: - strarray_add(files, strmake("-a%s", fullname)); - break; - case file_dll: - strarray_add(files, strmake("-d%s", file + 2)); - if ((static_lib = find_static_lib(fullname))) - { - strarray_add(files, strmake("-a%s",static_lib)); - free(static_lib); - } - break; - case file_so: - strarray_add(files, strmake("-s%s", file + 2)); - break; - default: - /* keep it anyway, the linker may know what to do with it */ - strarray_add(files, file); - break; - } - free(fullname); - } + add_library( lib_dirs, files, file + 2 ); else if (file[1] == 'x') lang = file; } @@ -518,31 +523,23 @@ static void build(struct options* opts) error("A spec file is currently needed in shared mode"); /* add the default libraries, if needed */ - if (!opts->nostdlib) - { - if (opts->use_msvcrt) strarray_add(files, "-dmsvcrt"); - } + if (!opts->nostdlib && opts->use_msvcrt) add_library(lib_dirs, files, "msvcrt"); if (!opts->wine_mode && !opts->nodefaultlibs) { if (opts->gui_app) { - strarray_add(files, "-dshell32"); - strarray_add(files, "-dcomdlg32"); - strarray_add(files, "-dgdi32"); + add_library(lib_dirs, files, "shell32"); + add_library(lib_dirs, files, "comdlg32"); + add_library(lib_dirs, files, "gdi32"); } - strarray_add(files, "-dadvapi32"); - strarray_add(files, "-duser32"); - strarray_add(files, "-dkernel32"); + add_library(lib_dirs, files, "advapi32"); + add_library(lib_dirs, files, "user32"); + add_library(lib_dirs, files, "kernel32"); } - if (!opts->nostartfiles) - { - char *fullname = NULL; - if (get_lib_type(lib_dirs, "winecrt0", &fullname) == file_arh) - strarray_add(files, strmake("-a%s", fullname)); - free( fullname ); - } + if (!opts->nostartfiles) add_library(lib_dirs, files, "winecrt0"); + if (!opts->nostdlib) add_library(lib_dirs, files, "wine"); /* run winebuild to generate the .spec.o file */ spec_args = strarray_alloc(); @@ -588,12 +585,10 @@ static void build(struct options* opts) const char* name = files->base[j] + 2; switch(files->base[j][1]) { - case 'd': - strarray_add(spec_args, strmake("-l%s", name)); - break; case 'r': strarray_add(spec_args, files->base[j]); break; + case 'd': case 'a': case 'o': strarray_add(spec_args, name); @@ -633,9 +628,9 @@ static void build(struct options* opts) switch(files->base[j][1]) { case 'l': - case 's': strarray_add(link_args, strmake("-l%s", name)); break; + case 's': case 'a': case 'o': strarray_add(link_args, name); @@ -645,7 +640,6 @@ static void build(struct options* opts) if (!opts->nostdlib) { - strarray_add(link_args, "-lwine"); strarray_add(link_args, "-lm"); strarray_add(link_args, "-lc"); }

1 0

lostwages/ include/winehq.conf wwn/wn20060313_ ...
by WineHQ March 15, 2006

March 15, 2006

ChangeSet ID: 23587 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/03/15 16:26:56 Modified files: include : winehq.conf wwn : wn20060313_308.xml Added files: news : 2006031501.xml Log message: News about Wine 0.9.10 Patch: http://cvs.winehq.org/patch.py?id=23587 Old revision New revision Changes Path 1.33 1.34 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2006031501.xml 1.1 1.2 +1 -1 lostwages/wwn/wn20060313_308.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.33 lostwages/include/winehq.conf:1.34 --- lostwages/include/winehq.conf:1.33 15 Mar 2006 22:26:56 -0000 +++ lostwages/include/winehq.conf 15 Mar 2006 22:26:56 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.9 +snapshot_date: 0.9.10 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2006031501.xml diff -u -p /dev/null lostwages/news/2006031501.xml:1.1 --- /dev/null 15 Mar 2006 22:26:56 -0000 +++ lostwages/news/2006031501.xml 15 Mar 2006 22:26:56 -0000 @@ -0,0 +1,22 @@ +<news> + <date>March 15, 2006</date> + <title>Wine 0.9.10 Released</title> + <body> + +Wine 0.9.10 was released yesterday. In it you'll find: +<ul> + <li>Improved ESD audio driver.</li> + <li>More Web browser improvements in mshtml and wininet.</li> + <li>Direct3D fixes and preparation for ddraw code migration.</li> + <li>Explorer process now managing the desktop window.</li> +</ul> + + Binary packages are in the process of being built, but the source is + <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.10.tar.bz2">available + now</a>. You can find out more about this release in the + <a href="?announce=1.114">announcement</a>. Check out our + <a href="/site/download">download page</a> for packages for your favorite + distribution. + + </body> +</news> Index: lostwages/wwn/wn20060313_308.xml diff -u -p lostwages/wwn/wn20060313_308.xml:1.1 lostwages/wwn/wn20060313_308.xml:1.2 --- lostwages/wwn/wn20060313_308.xml:1.1 15 Mar 2006 22:26:56 -0000 +++ lostwages/wwn/wn20060313_308.xml 15 Mar 2006 22:26:56 -0000 @@ -187,7 +187,7 @@ back to Wine.) Right now that appears t with development being done behind closed doors can lead to wasteful duplication. -Even after the problem Jeremy mentioned are solved, there's likely to +Even after the problems Jeremy mentioned are solved, there's likely to be some integration issues. One problem that gets mentioned quite a bit concerns what kind of display driver to use. OSX doesn't install X Windows by default, so it would be nice to have a native Quartz display driver.

1 0

Tag wine-0.9.10 : Alexandre Julliard : Release 0.9.10
by Alexandre Julliard March 15, 2006

March 15, 2006

Module: wine Branch: refs/tags/wine-0.9.10 Tag: 2f2f57b487be47ae45c89befb347aa7775e4f9eb URL: http://source.winehq.org/git/?p=wine.git;a=tag;h=2f2f57b487be47ae45c89befb3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 15 15:46:46 2006 +0100 Release 0.9.10

1 0

Alexandre Julliard : avitools: Fixed library path for msvfw32.
by Alexandre Julliard March 15, 2006

March 15, 2006

Module: wine Branch: refs/heads/master Commit: 9af38dfbc75fe845ec49ea673a26bb932ee6757a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9af38dfbc75fe845ec49ea6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 15 15:24:05 2006 +0100 avitools: Fixed library path for msvfw32. --- programs/avitools/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/avitools/Makefile.in b/programs/avitools/Makefile.in index 0f44b4d..06cd46a 100644 --- a/programs/avitools/Makefile.in +++ b/programs/avitools/Makefile.in @@ -25,7 +25,7 @@ aviplay.exe.so: aviplay.o $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mwindows -o $@ aviplay.o -L$(DLLDIR)/avifil32 -L$(DLLDIR)/ddraw -L$(DLLDIR) -lavifil32 -lddraw -lkernel32 $(ALL_LIBS) icinfo.exe.so: icinfo.o - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mwindows -o $@ icinfo.o -L$(DLLDIR) -lmsvfw32 -lkernel32 $(ALL_LIBS) + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mwindows -o $@ icinfo.o -L$(DLLDIR)/msvfw32 -L$(DLLDIR) -lmsvfw32 -lkernel32 $(ALL_LIBS) aviinfo.exe: aviinfo.o $(CC) -o $@ aviinfo.o -lavifil32 $(ALL_LIBS)

1 0