August 2006 - Wine-commits - list.winehq.org

docs/en wine-faq.sgml
by Dimi Paun 25 Aug '06

25 Aug '06

ChangeSet ID: 1156506455193357847006158 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2006/08/25 04:47:35 Modified files: en : wine-faq.sgml Log message: Mike McCormack <mike(a)codeweavers.com> Update the FAQ to reference Git. Old revision New revision Changes Path 1.18 1.19 +15 -59 docs/en/wine-faq.sgml Index: docs/en/wine-faq.sgml diff -u -p docs/en/wine-faq.sgml:1.18 docs/en/wine-faq.sgml:1.19 --- docs/en/wine-faq.sgml 25 Aug 2006 11:47:35 -0000 +++ /dev/null 25 Aug 2006 11:47:35 -0000 @@ -395,8 +395,8 @@ cvs -z3 -d:pserver:anonymous(a)wine.cvs.so you are current to the previous version, you can download and apply just the current patch file rather than the entire new distribution. The patch file names follow the same conventions as the monthly - distribution. <ulink url="http://www.winehq.org/site/cvs"> - Read-only CVS</ulink> access is also available. + distribution. <ulink url="http://www.winehq.org/site/git"> + Read-only GIT</ulink> access is also available. </para> </answer> </qandaentry> @@ -721,7 +721,7 @@ cvs -z3 -d:pserver:anonymous(a)wine.cvs.so <para> Wine is getting to be quite large, and building from scratch takes a lot of processing. As of September 2005, compile times were around 15 - minutes on a Intel 3.8GHz Laptop with 1 GB of RAM. If you have a CVS copy of wine, + minutes on a Intel 3.8GHz Laptop with 1 GB of RAM. If you have a Git copy of wine, you may not need to rebuild every thing each update. </para> </answer> @@ -919,45 +919,26 @@ cvs -z3 -d:pserver:anonymous(a)wine.cvs.so </qandaentry> <qandaentry> - <question id="Is-there-a-CVS-tree"> - <para>Is there a CVS tree?</para> + <question id="Is-there-a-Git-tree"> + <para>Is there a Git tree?</para> </question> <answer> <para> - Current Wine sources are also available via anonymous client/server - CVS. You will need CVS 1.9 or above. If you are coming from behind a - firewall, you will either need a hole in the firewall for the CVS - port (2401) or use SOCKS. + Current Wine sources are also available via Git + You will need Git 1.3.1 or above. If you are coming from behind a + firewall, use the http:// protocol. </para> <para> - To login to the CVS tree, do + To clone out the entire Wine source tree (which may be slow), use </para> <screen> -export CVSROOT=:pserver:cvs(a)cvs.winehq.org/home/wine -cvs login +git clone git://source.winehq.org/git/wine.git wine </screen> <para> - Use "cvs" as the password (without the quotes). Note that - <filename>/home/wine</filename> is a path on the server, not on your - machine. To check out the entire Wine source tree (which may be - slow), use - </para> - <screen> -cvs -z 3 checkout wine - </screen> - <para> - or if you just want a subtree, or individual file, you can do that - too with - </para> - <screen> -cvs -z 3 checkout wine/ANNOUNCE - </screen> - <para> - Be aware, though, that getting the entire Wine source tree via CVS - is pretty slow, especially compared to getting Wine from an FTP - mirror near you. For a CVS mirror list, see - <ulink url="http://www.winehq.org/site/cvs#cvsservers"> - http://www.winehq.org/site/cvs#cvsservers</ulink> + Be aware, though, that the initial clone of the entire Wine source + tree via Git is pretty slow, especially compared to getting Wine from + an FTP mirror near you. Updating to your cloned repository is + reasonably fast, however. </para> <para> Patch files are also available, so that you don't have to download, @@ -991,31 +972,6 @@ gunzip -c patch-file | patch -p1 </para> </answer> </qandaentry> - - <qandaentry> - <question id="Can-I-get-Wine-using-cvsup"> - <para>Can I get Wine using cvsup?</para> - </question> - <answer> - <para> - The CVS mirrors don't offer cvsup support yet, but the main server - does. Use a <filename>wine.sup</filename> file of: - </para> - <screen> -*default host=cvs.winehq.org -*default base=/cvs -*default prefix=/cvs/wine -*default release=wine -*default delete - -# If your network link is a T1 or faster, comment out the following line. -#*default compress - -*default use-rel-suffix -wine - </screen> - </answer> - </qandaentry> </qandadiv> <qandadiv id="Installing-And-Configuring-Wine"> @@ -1581,7 +1537,7 @@ export PATH=$PATH:/path/to/wine/binary <answer> <para> If you can program C, that's a good start. Download the sources via - (<ulink url="http://www.winehq.org/site/cvs">CVS,</ulink>) + (<ulink url="http://www.winehq.org/site/git">Git,</ulink>) subscribe to the mailing lists, look around the source, and pay attention to the comp.emulators.ms-windows.wine newsgroup and the mailing lists (<ulink

1 0

Alexandre Julliard : make_progs: Update the directory list in configure. ac too.
by Alexandre Julliard 25 Aug '06

25 Aug '06

Module: wine Branch: master Commit: 9a2df7deebceb28ba6e437c5d053d99f82c119ac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9a2df7deebceb28ba6e437c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 25 11:50:21 2006 +0200 make_progs: Update the directory list in configure.ac too. --- programs/make_progs | 72 ++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 57 insertions(+), 15 deletions(-) diff --git a/programs/make_progs b/programs/make_progs index e854ed9..01788d4 100755 --- a/programs/make_progs +++ b/programs/make_progs @@ -22,8 +22,6 @@ # use strict; -my $makefiles = `find . -name Makefile.in -print`; - my %directories = (); # Programs that we want to install in the bin directory too @@ -55,12 +53,30 @@ ( "winetest" => 1, ); +sub update_file($) +{ + my $file = shift; + if (!system "cmp $file $file.new >/dev/null") + { + unlink "$file.new"; + print "$file is unchanged\n"; + } + else + { + rename "$file.new", "$file"; + print "$file updated\n"; + } +} + +# if we are inside the programs dir, go up one level +if (! -f "configure.ac" && -f "../configure.ac") { chdir(".."); } + +my $makefiles = `find programs -name Makefile.in -print`; + foreach my $i (split(/\s/,$makefiles)) { my $module; - next if $i =~ /\/tests\/Makefile.in/; - open MAKE,$i; $module = undef; @@ -75,7 +91,7 @@ foreach my $i (split(/\s/,$makefiles)) { $module = $1; next if ($module eq "none"); - ($directories{$module} = $i) =~ s/^\.\/(.*)\/[^\/]+$/$1/; + ($directories{$module} = $i) =~ s/^programs\/(.*)\/[^\/]+$/$1/; die "invalid module $module in dir $directories{$module}\n" if "$directories{$module}.exe" ne $module; last; } @@ -93,7 +109,7 @@ foreach my $i (split(/\s/,$makefiles)) close MAKE; } -open NEWMAKE,">Makefile.in.new" or die "cannot create Makefile.in.new"; +open NEWMAKE,">programs/Makefile.in.new" or die "cannot create programs/Makefile.in.new"; ################################################################ # makefile header @@ -140,6 +156,8 @@ # output the build and install targets print NEWMAKE <<EOF; +INSTALLDIRS = \$(DESTDIR)\$(bindir) + \@MAKE_RULES\@ all: wineapploader winelauncher \$(SUBDIRS) @@ -154,8 +172,7 @@ # Rules for installation .PHONY: install-apploader install-progs install-progs.so \$(INSTALLPROGS:%=%/__installprog__) -install-apploader: wineapploader dummy - \$(MKINSTALLDIRS) \$(DESTDIR)\$(bindir) +install-apploader: wineapploader \$(INSTALLDIRS) dummy \$(INSTALL_SCRIPT) wineapploader \$(DESTDIR)\$(bindir)/wineapploader \$(INSTALLPROGS:%=%/__installprog__): install-apploader @@ -166,8 +183,7 @@ install-progs.so: \$(INSTALLPROGS:%=%/__ install-progs: # nothing to do here -install:: winelauncher install-progs\$(DLLEXT) - \$(MKINSTALLDIRS) \$(DESTDIR)\$(bindir) +install:: winelauncher install-progs\$(DLLEXT) \$(INSTALLDIRS) \$(INSTALL_SCRIPT) winelauncher \$(DESTDIR)\$(bindir)/winelauncher uninstall:: @@ -185,13 +201,12 @@ ### Dependencies: EOF close NEWMAKE; -rename "Makefile.in.new", "Makefile.in"; -printf "Successfully updated Makefile.in\n"; +update_file("programs/Makefile.in"); ################################################################ # .gitignore file -open GITIGNORE, ">.gitignore.new" or die "cannot create .gitignore.new"; +open GITIGNORE, ">programs/.gitignore.new" or die "cannot create programs/.gitignore.new"; print GITIGNORE "# Automatically generated by make_dlls; DO NOT EDIT!!\n"; my @ignores = @@ -209,5 +224,32 @@ foreach my $dir (sort keys %alldirs) print GITIGNORE join("\n", sort @ignores) . "\n"; close GITIGNORE; -rename ".gitignore.new", ".gitignore"; -printf "Successfully updated .gitignore\n"; +update_file("programs/.gitignore"); + +################################################################ +# configure.ac file + +open OLD_CONFIG, "configure.ac" or die "cannot open configure.ac"; +open NEW_CONFIG, ">configure.ac.new" or die "cannot create configure.ac.new"; + +while (<OLD_CONFIG>) +{ + print NEW_CONFIG $_; + last if /^programs\/Makefile/; +} + +foreach my $dir (sort values %directories) +{ + print NEW_CONFIG "programs/$dir/Makefile\n"; +} + +my $skip=1; +while (<OLD_CONFIG>) +{ + $skip = 0 unless /^programs\//; + print NEW_CONFIG $_ unless $skip; +} + +close OLD_CONFIG; +close NEW_CONFIG; +update_file("configure.ac");

1 0

Alexandre Julliard : winedump: Get rid of the install script.
by Alexandre Julliard 25 Aug '06

25 Aug '06

Module: wine Branch: master Commit: a7447794a57b4f0a2d2fbe7322e0d6dff1832678 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a7447794a57b4f0a2d2fbe7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 25 11:50:45 2006 +0200 winedump: Get rid of the install script. --- tools/winedump/main.c | 1 - tools/winedump/output.c | 50 --------------------------------------------- tools/winedump/winedump.h | 2 -- 3 files changed, 0 insertions(+), 53 deletions(-) diff --git a/tools/winedump/main.c b/tools/winedump/main.c index c2dd516..8d90187 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -480,7 +480,6 @@ #endif } output_makefile (); - output_install_script (); if (VERBOSE) puts ("Finished, Cleaning up..."); diff --git a/tools/winedump/output.c b/tools/winedump/output.c index 198f7e8..8690c20 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -451,56 +451,6 @@ void output_makefile (void) /******************************************************************* - * output_install_script - * - * Write a script to insert the DLL into Wine - * - * Rather than using diff/patch, several sed calls are generated - * so the script can be re-run at any time without breaking. - */ -void output_install_script (void) -{ - FILE *install_file = open_file (OUTPUT_DLL_NAME, "_install", "w"); - - if (VERBOSE) - puts ("Creating install script"); - - fprintf (install_file, - "#!/bin/bash\n" - "# Generated from %s.dll by winedump.\n\n" - "if [ $# -ne 1 ] || [ ! -d $1 ] || [ ! -f $1/AUTHORS ]; then\n" - "\t[ $# -eq 1 ] && echo \"Invalid path\"\n" - "\techo \"Usage: $0 wine-base-dir\"\n" - "\texit 1\n" - "fi\n\n" - "if [ -d $1/dlls/%s ]; then\n" - "\techo \"DLL is already present\"\n" - "\texit 1\n" - "fi\n\n" - "echo Adding DLL %s to Wine build tree...\n\n" - "mkdir $1/dlls/%s\n" - "cp %s.spec $1/dlls/%s\n" - "cp %s_main.c $1/dlls/%s\n" - "cp %s_dll.h $1/dlls/%s\n" - "cp Makefile.in $1/dlls/%s/Makefile.in\n" - "echo Copied DLL files\n\n" - "cd $1\n\n" - "sed '/dlls\\/ntdll\\/Makefile/" - "{G;s/$/dlls\\/%s\\/Makefile/;}' configure.ac >t.tmp\n" - "mv -f t.tmp configure.ac\n" - "echo Patched configure.ac\n\n" - "cd $1/dlls && ./make_dlls\n\n" - "echo Run \\'autoconf\\', \\'./configure\\' then \\'make\\' to rebuild Wine\n\n", - OUTPUT_DLL_NAME, OUTPUT_DLL_NAME, OUTPUT_DLL_NAME, OUTPUT_DLL_NAME, - OUTPUT_DLL_NAME, OUTPUT_DLL_NAME, OUTPUT_DLL_NAME, OUTPUT_DLL_NAME, - OUTPUT_DLL_NAME, OUTPUT_DLL_NAME, OUTPUT_DLL_NAME, OUTPUT_DLL_NAME); - - fchmod (fileno(install_file), 0755); - fclose (install_file); -} - - -/******************************************************************* * output_prototype * * Write a C prototype for a parsed symbol diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index d9ca8e0..93de9a8 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -205,8 +205,6 @@ void output_prototype (FILE *file, cons void output_makefile (void); -void output_install_script (void); - /* Misc functions */ char *str_create (size_t num_str, ...);

1 0

Alexandre Julliard : configure: Enable the -Wwrite-strings flag.
by Alexandre Julliard 25 Aug '06

25 Aug '06

Module: wine Branch: master Commit: d75cc5aad539b720a46632b883b57fda56b1fa18 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d75cc5aad539b720a46632b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 25 12:07:34 2006 +0200 configure: Enable the -Wwrite-strings flag. --- configure | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 8 ++++++ 2 files changed, 83 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 7356552..38320e1 100755 --- a/configure +++ b/configure @@ -14690,6 +14690,81 @@ echo "${ECHO_T}$ac_cv_c_gcc_decl_after_s EXTRACFLAGS="$EXTRACFLAGS -Wdeclaration-after-statement" fi + { echo "$as_me:$LINENO: checking for gcc -Wwrite-strings support" >&5 +echo $ECHO_N "checking for gcc -Wwrite-strings support... $ECHO_C" >&6; } +if test "${ac_cv_c_gcc_write_strings+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wwrite-strings" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_c_gcc_write_strings="yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_c_gcc_write_strings="no" +fi + +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ echo "$as_me:$LINENO: result: $ac_cv_c_gcc_write_strings" >&5 +echo "${ECHO_T}$ac_cv_c_gcc_write_strings" >&6; } + if test "$ac_cv_c_gcc_write_strings" = "yes" + then + EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings" + fi + saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wpointer-arith -Werror" { echo "$as_me:$LINENO: checking for broken string.h that generates warnings" >&5 diff --git a/configure.ac b/configure.ac index b327e0b..5d9dba7 100644 --- a/configure.ac +++ b/configure.ac @@ -949,6 +949,14 @@ int main(void) { EXTRACFLAGS="$EXTRACFLAGS -Wdeclaration-after-statement" fi + dnl Check for -Wwrite-strings + AC_CACHE_CHECK([for gcc -Wwrite-strings support], ac_cv_c_gcc_write_strings, + [WINE_TRY_CFLAGS([-Wwrite-strings],ac_cv_c_gcc_write_strings="yes", ac_cv_c_gcc_write_strings="no")]) + if test "$ac_cv_c_gcc_write_strings" = "yes" + then + EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings" + fi + dnl Check for noisy string.h saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wpointer-arith -Werror"

1 0

Alexandre Julliard : make_dlls: Update the directory list in configure. ac too.
by Alexandre Julliard 25 Aug '06

25 Aug '06

Module: wine Branch: master Commit: 39f357f873f1c51150c4a817503ef4286232cf51 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=39f357f873f1c51150c4a81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 25 11:32:42 2006 +0200 make_dlls: Update the directory list in configure.ac too. --- dlls/make_dlls | 78 +++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 63 insertions(+), 15 deletions(-) diff --git a/dlls/make_dlls b/dlls/make_dlls index 9bd3710..339e28c 100755 --- a/dlls/make_dlls +++ b/dlls/make_dlls @@ -1,7 +1,6 @@ #!/usr/bin/perl -w # # Update the dll dependencies in the dlls main Makefile.in. -# Must be run in the dlls/ directory of the Wine tree. # # Copyright 2001 Alexandre Julliard # @@ -22,9 +21,8 @@ # use strict; -my $makefiles = `find . -name Makefile.in -print`; - my %directories = (); +my %testdirs = (); my %importlibs = (); my %static_implibs = (); my %staticlib_dirs = (); @@ -46,15 +44,39 @@ sub needs_symlink($) return $mod ne $directories{$_[0]}; } -foreach my $i (split(/\s/,$makefiles)) +sub update_file($) { - my $module; + my $file = shift; + if (!system "cmp $file $file.new >/dev/null") + { + unlink "$file.new"; + print "$file is unchanged\n"; + } + else + { + rename "$file.new", "$file"; + print "$file updated\n"; + } +} - next if $i =~ /\/tests\/Makefile.in/; +# if we are inside the dlls dir, go up one level +if (! -f "configure.ac" && -f "../configure.ac") { chdir(".."); } + +my $makefiles = `find dlls -name Makefile.in -print`; + +foreach my $i (split(/\s/,$makefiles)) +{ + if ($i =~ /dlls\/(.*)\/tests\/Makefile.in/) + { + $testdirs{$1} = "$1/tests"; + next; + } open MAKE,$i; - $module = undef; + my $module = undef; + my $dir = $i; + while (<MAKE>) { chop; @@ -67,12 +89,12 @@ foreach my $i (split(/\s/,$makefiles)) $module = $1; if ($module =~ /^lib.*\.a$/) { - ($staticlib_dirs{$module} = $i) =~ s/^\.\/(.*)\/[^\/]+$/$1/; + ($staticlib_dirs{$module} = $i) =~ s/^dlls\/(.*)\/[^\/]+$/$1/; die "invalid module $module in dir $staticlib_dirs{$module}\n" if "lib$staticlib_dirs{$module}.a" ne $module; } else { - ($directories{$module} = $i) =~ s/^\.\/(.*)\/[^\/]+$/$1/; + ($directories{$module} = $i) =~ s/^dlls\/(.*)\/[^\/]+$/$1/; } next; } @@ -99,7 +121,7 @@ foreach my $i (split(/\s/,$makefiles)) close MAKE; } -open NEWMAKE,">Makefile.in.new" or die "cannot create Makefile.in.new"; +open NEWMAKE,">dlls/Makefile.in.new" or die "cannot create dlls/Makefile.in.new"; ################################################################ # makefile header @@ -349,13 +371,12 @@ ### Dependencies: EOF close NEWMAKE; -rename "Makefile.in.new", "Makefile.in"; -printf "Successfully updated Makefile.in\n"; +update_file("dlls/Makefile.in"); ################################################################ # .gitignore file -open GITIGNORE, ">.gitignore.new" or die "cannot create .gitignore.new"; +open GITIGNORE, ">dlls/.gitignore.new" or die "cannot create dlls/.gitignore.new"; print GITIGNORE "# Automatically generated by make_dlls; DO NOT EDIT!!\n"; my @ignores = @@ -387,5 +408,32 @@ foreach my $mod (sort keys %importlibs) print GITIGNORE join("\n", sort @ignores) . "\n"; close GITIGNORE; -rename ".gitignore.new", ".gitignore"; -printf "Successfully updated .gitignore\n"; +update_file("dlls/.gitignore"); + +################################################################ +# configure.ac file + +open OLD_CONFIG, "configure.ac" or die "cannot open configure.ac"; +open NEW_CONFIG, ">configure.ac.new" or die "cannot create configure.ac.new"; + +while (<OLD_CONFIG>) +{ + print NEW_CONFIG $_; + last if /^dlls\/Makefile/; +} + +foreach my $dir (sort (values %directories, values %staticlib_dirs, values %testdirs)) +{ + print NEW_CONFIG "dlls/$dir/Makefile\n"; +} + +my $skip=1; +while (<OLD_CONFIG>) +{ + $skip = 0 unless /^dlls\//; + print NEW_CONFIG $_ unless $skip; +} + +close OLD_CONFIG; +close NEW_CONFIG; +update_file("configure.ac");

1 0

Dan Hipschman : widl: Remove usage of type_t ref field for base types; simplify code.
by Alexandre Julliard 25 Aug '06

25 Aug '06

Module: wine Branch: master Commit: 94755218aca1e1597f2b1a5562e1b71cfad13259 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=94755218aca1e1597f2b1a5… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Aug 24 18:01:18 2006 -0700 widl: Remove usage of type_t ref field for base types; simplify code. --- tools/widl/header.c | 46 +----------------------- tools/widl/parser.y | 93 ++++++++++++++++++++++++++++++++++++------------ tools/widl/typelib.c | 29 +++++++++++++-- tools/widl/widl.c | 1 + tools/widl/widltypes.h | 6 +++ 5 files changed, 103 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=94755218aca1e1597f2…

1 0

Hwang YunSong(황윤성) : regedit: Updated Korean resource.
by Alexandre Julliard 25 Aug '06

25 Aug '06

Module: wine Branch: master Commit: 32e3437d973e5101d3840e62b0a79c9f4a697cf1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=32e3437d973e5101d3840e6… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Fri Aug 25 08:47:59 2006 +0900 regedit: Updated Korean resource. --- programs/regedit/Ko.rc | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/programs/regedit/Ko.rc b/programs/regedit/Ko.rc index b8a76c3..bedbd84 100644 --- a/programs/regedit/Ko.rc +++ b/programs/regedit/Ko.rc @@ -297,6 +297,24 @@ BEGIN IDS_DELETE_BOX_TEXT "�� '%s'�� ڽ��ϱ�?" IDS_NEWKEY "�� Ű #%d" IDS_NEWVALUE "�� #%d" + IDS_NOTFOUND "'%s'�� ã�� ϴ�" +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_FILEDIALOG_IMPORT_TITLE "��Ʈ �� ҷ��" + IDS_FILEDIALOG_EXPORT_TITLE "��Ʈ�� " + IDS_FILEDIALOG_FILTER "��Ʈ�� \0*.reg\0Win9x/NT4 ��Ʈ�� (REGEDIT4)\0*.reg\0�� (*.*)\0*.*\0\0" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_REGISTRY_ROOT_NAME "�� ǻ��" + IDS_REGISTRY_DEFAULT_VALUE "(�⺻)" + IDS_REGISTRY_VALUE_NOT_SET "(�� )" + IDS_REGISTRY_VALUE_CANT_DISPLAY "(�� ټ� ��)" + IDS_REGISTRY_UNKNOWN_TYPE "(�� %d)" END /*****************************************************************/

1 0

Andrew Talbot : widl: Write-strings warning fix.
by Alexandre Julliard 25 Aug '06

25 Aug '06

Module: wine Branch: master Commit: daa2f97bdcdff4ad91a68d4894130d8a83ca9891 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=daa2f97bdcdff4ad91a68d4… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Aug 24 20:50:10 2006 +0100 widl: Write-strings warning fix. --- tools/widl/parser.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 745056f..eb9b2c9 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -845,7 +845,7 @@ uniondef: tUNION t_ident '{' fields '}' m_ident '{' cases '}' { var_t *u = $7; $$ = get_typev(RPC_FC_ENCAPSULATED_UNION, $2, tsUNION); $$->kind = TKIND_UNION; - if (!u) u = make_var("tagged_union"); + if (!u) u = make_var( xstrdup("tagged_union") ); u->type = make_type(RPC_FC_NON_ENCAPSULATED_UNION, NULL); u->type->kind = TKIND_UNION; u->type->fields = $9;

1 0

Mike McCormack : msi: Reimplement msi_dup_property and msi_get_property_int .
by Alexandre Julliard 25 Aug '06

25 Aug '06

Module: wine Branch: master Commit: 8ebbc8c0d2ca2e64e075d48b8d3849d4a876958f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8ebbc8c0d2ca2e64e075d48… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Aug 25 17:58:50 2006 +0900 msi: Reimplement msi_dup_property and msi_get_property_int. --- dlls/msi/helpers.c | 29 ----------------------------- dlls/msi/package.c | 24 +++++++++++++++++++++++- 2 files changed, 23 insertions(+), 30 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 33a7fa2..45d3ebe 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -71,35 +71,6 @@ LPWSTR msi_dup_record_field( MSIRECORD * return strdupW( MSI_RecordGetString(row,index) ); } -LPWSTR msi_dup_property(MSIPACKAGE *package, LPCWSTR prop) -{ - DWORD sz = 0; - LPWSTR str; - UINT r; - - r = MSI_GetPropertyW(package, prop, NULL, &sz); - if (r != ERROR_SUCCESS && r != ERROR_MORE_DATA) - return NULL; - - sz++; - str = msi_alloc(sz*sizeof(WCHAR)); - r = MSI_GetPropertyW(package, prop, str, &sz); - if (r != ERROR_SUCCESS) - { - msi_free(str); - str = NULL; - } - return str; -} - -int msi_get_property_int( MSIPACKAGE *package, LPCWSTR prop, int def ) -{ - LPWSTR str = msi_dup_property( package, prop ); - int val = str ? atoiW( str ) : def; - msi_free( str ); - return val; -} - MSICOMPONENT* get_loaded_component( MSIPACKAGE* package, LPCWSTR Component ) { MSICOMPONENT *comp; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 13fd6ce..227be6c 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1001,7 +1001,7 @@ UINT MSI_GetPropertyW( MSIPACKAGE *packa if ( *pchValueBuf <= len ) { - TRACE("have %lu, need %lu -> ERROR_MORE_DATA\n", *pchValueBuf, len); + TRACE("have %lu, need %u -> ERROR_MORE_DATA\n", *pchValueBuf, len); r = ERROR_MORE_DATA; } else @@ -1012,6 +1012,28 @@ UINT MSI_GetPropertyW( MSIPACKAGE *packa return r; } +LPWSTR msi_dup_property( MSIPACKAGE *package, LPCWSTR szName ) +{ + msi_property *prop; + LPWSTR value = NULL; + + prop = msi_prop_find( package, szName ); + if (prop) + value = strdupW( prop->value ); + + return value; +} + +int msi_get_property_int( MSIPACKAGE *package, LPCWSTR name, int value ) +{ + msi_property *prop; + + prop = msi_prop_find( package, name ); + if (prop) + value = atoiW( prop->value ); + return value; +} + static UINT MSI_GetProperty( MSIHANDLE handle, LPCWSTR name, awstring *szValueBuf, DWORD* pchValueBuf ) {

1 0

Andrew Talbot : mshtml: Write-strings warnings fix.
by Alexandre Julliard 25 Aug '06

25 Aug '06

Module: wine Branch: master Commit: 167f9f9abaae28d1dd476ef578e2d0514f1e3d27 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=167f9f9abaae28d1dd476ef… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Aug 24 20:54:13 2006 +0100 mshtml: Write-strings warnings fix. --- dlls/mshtml/nsiface.idl | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 5de6916..8bd59c4 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -34,9 +34,9 @@ typedef REFIID nsIIDRef; typedef nsIIDRef nsCIDRef; typedef void** nsQIResult; -typedef LPSTR nsstring; +typedef LPCSTR nscstring; typedef WCHAR PRUnichar; -typedef LPWSTR nswstring; +typedef LPCWSTR nscwstring; typedef ULONG PRUint32; typedef LONG PRInt32; typedef WORD PRUint16; @@ -118,9 +118,9 @@ typedef nsISupports nsICommandParams; interface nsIServiceManager : nsISupports { nsresult GetService(nsCIDRef aClass, nsIIDRef aIID, void **result); - nsresult GetServiceByContactID(nsstring aContactID, nsIIDRef aIID, void **result); + nsresult GetServiceByContactID(nscstring aContactID, nsIIDRef aIID, void **result); nsresult IsServiceInstantiated(nsCIDRef aClass, nsIIDRef aIID, BOOL *_retval); - nsresult IsServiceInstantiatedByContractID(nsstring aContractID, nsIIDRef aIID, BOOL *_retval); + nsresult IsServiceInstantiatedByContractID(nscstring aContractID, nsIIDRef aIID, BOOL *_retval); } [ @@ -139,7 +139,7 @@ interface nsIFactory : nsISupports ] interface nsIObserver : nsISupports { - nsresult Observe(nsISupports *aSubject, nsstring aTopic, nswstring aData); + nsresult Observe(nsISupports *aSubject, nscstring aTopic, nscwstring aData); } [ @@ -149,10 +149,10 @@ interface nsIObserver : nsISupports interface nsIComponentManager : nsISupports { nsresult GetClassObject(nsCIDRef aClass, nsIIDRef aIID, nsQIResult result); - nsresult GetClassObjectByContractID(nsstring aContractID, nsIIDRef aIID, nsQIResult result); + nsresult GetClassObjectByContractID(nscstring aContractID, nsIIDRef aIID, nsQIResult result); nsresult CreateInstance(nsCIDRef aClass, nsISupports *aDelegate, nsIIDRef aIID, nsQIResult result); - nsresult CreateInstanceByContractID(nsstring aContractID, nsISupports *aDelegate, + nsresult CreateInstanceByContractID(nscstring aContractID, nsISupports *aDelegate, nsIIDRef aIID, nsQIResult result); }

1 0