December 2006 - Wine-Commits

Alexandre Julliard : configure: Detect out of tree builds made from an unclean source tree.
by Alexandre Julliard Dec. 28, 2006

Dec. 28, 2006

Module: wine Branch: master Commit: 73b724e7e60146889768964bb77fa5d809f2b16f URL: http://source.winehq.org/git/wine.git/?a=commit;h=73b724e7e60146889768964bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 28 11:40:19 2006 +0100 configure: Detect out of tree builds made from an unclean source tree. --- configure | 11 +++++++++++ configure.ac | 9 +++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 479aa40..6e7728f 100755 --- a/configure +++ b/configure @@ -1999,6 +1999,17 @@ then WIN16_INSTALL="" fi +case "$srcdir" in + .) ;; + *) if test -f "$srcdir/Makefile" -o -f "$srcdir/include/config.h"; then + { { echo "$as_me:$LINENO: error: you are building out of the source tree, but the source tree contains object files. +You need to run 'make distclean' in the source tree first." >&5 +echo "$as_me: error: you are building out of the source tree, but the source tree contains object files. +You need to run 'make distclean' in the source tree first." >&2;} + { (exit 1); exit 1; }; } + fi ;; +esac + { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } diff --git a/configure.ac b/configure.ac index 48b5a23..037e47a 100644 --- a/configure.ac +++ b/configure.ac @@ -49,6 +49,15 @@ then WIN16_INSTALL="" fi +dnl check for out of tree build with unclean source tree +case "$srcdir" in + .) ;; + *) if test -f "$srcdir/Makefile" -o -f "$srcdir/include/config.h"; then + AC_MSG_ERROR([you are building out of the source tree, but the source tree contains object files. +You need to run 'make distclean' in the source tree first.]) + fi ;; +esac + dnl **** Check for some programs **** AC_PROG_MAKE_SET

1 0

Alexandre Julliard : make_makefiles: Generate the top-level .gitignore file .
by Alexandre Julliard Dec. 28, 2006

Dec. 28, 2006

Module: wine Branch: master Commit: 7035aa50413ef18f74a35a06c6aa258b0edb56a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7035aa50413ef18f74a35a06c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 27 21:23:36 2006 +0100 make_makefiles: Generate the top-level .gitignore file. Add a PROGRAMS variable in some makefiles to make things easier. --- .gitignore | 46 +++++++++++++++++++++++++++++++--- Makefile.in | 6 +--- dlls/.gitignore | 3 -- loader/.gitignore | 6 ---- loader/Makefile.in | 9 ++++++- programs/.gitignore | 3 -- programs/Makefile.in | 7 ++--- programs/winedbg/.gitignore | 1 - server/.gitignore | 2 - tools/.gitignore | 10 ------- tools/make_makefiles | 57 ++++++++++++++++++++++++++++++++++--------- tools/widl/.gitignore | 2 - tools/winebuild/.gitignore | 2 - tools/winedump/.gitignore | 2 - tools/winegcc/.gitignore | 4 --- tools/wmc/.gitignore | 2 - tools/wrc/.gitignore | 2 - 17 files changed, 100 insertions(+), 64 deletions(-) diff --git a/.gitignore b/.gitignore index 158446c..2439e8a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,8 +5,6 @@ *.cur *.ico *.mc.rc -*.orig -*.rej *.res *.so *.tab.[ch] @@ -14,12 +12,52 @@ *.yy.c *_[cips].c *~ -/Make.rules /TAGS /autom4te.cache /config.cache /config.log /config.status /tags -/wine Makefile +# Everything below this line is generated by make_makefiles +/Make.rules +/wine +dlls/Makedll.rules +dlls/Makeimplib.rules +dlls/Maketest.rules +loader/wine +loader/wine-glibc +loader/wine-kthread +loader/wine-preloader +loader/wine-pthread +loader/wine.man +programs/Makeprog.rules +programs/wineapploader +programs/winedbg/winedbg.man +programs/winelauncher +server/wineserver +server/wineserver.man +tools/bin2res +tools/fnt2bdf +tools/fnt2fon +tools/make_ctests +tools/makedep +tools/relpath +tools/sfnt2fnt +tools/widl/widl +tools/widl/widl.man +tools/winebuild/winebuild +tools/winebuild/winebuild.man +tools/winedump/winedump +tools/winedump/winedump.man +tools/winegcc/winecpp +tools/winegcc/wineg++ +tools/winegcc/winegcc +tools/winegcc/winegcc.man +tools/winemaker.man +tools/wineprefixcreate +tools/wineprefixcreate.man +tools/wmc/wmc +tools/wmc/wmc.man +tools/wrc/wrc +tools/wrc/wrc.man diff --git a/Makefile.in b/Makefile.in index af2c061..b988a3c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -25,6 +25,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ LIBEXT = @LIBEXT@ MODULE = none +PROGRAMS = wine FONTSSUBDIRS = @FONTSSUBDIRS@ @@ -58,7 +59,7 @@ INSTALLSUBDIRS = $(INSTALLDEVSUBDIRS) $( # Sub-directories to run make test into TESTSUBDIRS = dlls -all: Make.rules wine +all: Make.rules $(PROGRAMS) @echo "Wine build complete." WINAPI_CHECK_EXTRA_FLAGS = --global @@ -139,9 +140,6 @@ tags ctags: manpages htmlpages sgmlpages: dummy @cd documentation && $(MAKE) $@ -clean:: - $(RM) wine - distclean:: clean $(RM) config.* configure.lineno TAGS tags include/config.h include/stamp-h $(RM) -r autom4te.cache diff --git a/dlls/.gitignore b/dlls/.gitignore index 8a6627c..0a3eebc 100644 --- a/dlls/.gitignore +++ b/dlls/.gitignore @@ -1,9 +1,6 @@ # Automatically generated by make_makefiles; DO NOT EDIT!! */tests/*.ok */tests/testlist.c -/Makedll.rules -/Makeimplib.rules -/Maketest.rules /avifile.dll16 /comm.drv16 /commdlg.dll16 diff --git a/loader/.gitignore b/loader/.gitignore index 677df33..b047063 100644 --- a/loader/.gitignore +++ b/loader/.gitignore @@ -1,8 +1,2 @@ /version-stamp /version.c -/wine -/wine-glibc -/wine-kthread -/wine-preloader -/wine-pthread -/wine.man diff --git a/loader/Makefile.in b/loader/Makefile.in index 47a8629..f3e365f 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -18,6 +18,13 @@ MAIN_BINARY = @MAIN_BINARY@ EXTRA_BINARIES = @EXTRA_BINARIES@ WINE_BINARIES = $(MAIN_BINARY) $(EXTRA_BINARIES) +PROGRAMS = \ + wine \ + wine-glibc \ + wine-kthread \ + wine-preloader \ + wine-pthread\ + MANPAGES = wine.man INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) @@ -58,7 +65,7 @@ uninstall:: $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/wine.$(prog_manext) clean:: - $(RM) $(WINE_BINARIES) $(MODULE) version.c version-stamp + $(RM) version.c version-stamp version-stamp: dummy (GIT_DIR=$(TOPSRCDIR)/.git git-describe 2>/dev/null || echo "wine-(a)PACKAGE_VERSION@") | sed -e 's/$.*$/const char wine_version[] = "\1";/' >$@ || ($(RM) $@ && exit 1) diff --git a/programs/.gitignore b/programs/.gitignore index fbb5a64..08910ef 100644 --- a/programs/.gitignore +++ b/programs/.gitignore @@ -1,7 +1,4 @@ # Automatically generated by make_makefiles; DO NOT EDIT!! -/Makeprog.rules -/wineapploader -/winelauncher clock/clock cmd/cmd cmdlgtst/cmdlgtst diff --git a/programs/Makefile.in b/programs/Makefile.in index fb22ad4..8b61cde 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -99,9 +99,11 @@ INSTALLPROGS = \ INSTALLDIRS = $(DESTDIR)$(bindir) +PROGRAMS = wineapploader winelauncher + @MAKE_RULES@ -all: wineapploader winelauncher $(SUBDIRS) +all: $(PROGRAMS) $(SUBDIRS) wineapploader: wineapploader.in sed -e 's,@bindir\@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false) @@ -131,9 +133,6 @@ uninstall:: -cd $(DESTDIR)$(bindir) && $(RM) wineapploader winelauncher $(INSTALLPROGS) -rmdir $(DESTDIR)$(dlldir) -clean:: - $(RM) wineapploader winelauncher - # Rules for testing check test:: $(SUBDIRS:%=%/__test__) diff --git a/programs/winedbg/.gitignore b/programs/winedbg/.gitignore deleted file mode 100644 index e1bf13e..0000000 --- a/programs/winedbg/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/winedbg.man diff --git a/server/.gitignore b/server/.gitignore deleted file mode 100644 index fa0508c..0000000 --- a/server/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/wineserver -/wineserver.man diff --git a/tools/.gitignore b/tools/.gitignore deleted file mode 100644 index 767f5bd..0000000 --- a/tools/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -/bin2res -/fnt2bdf -/fnt2fon -/make_ctests -/makedep -/relpath -/sfnt2fnt -/winemaker.man -/wineprefixcreate -/wineprefixcreate.man diff --git a/tools/make_makefiles b/tools/make_makefiles index 1fbd104..c0bfbc6 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -77,12 +77,16 @@ sub update_file($) if (!$ret) { unlink "$file.new"; - #print "$file is unchanged\n"; } else { rename "$file.new", "$file"; print "$file updated\n"; + if ($file eq "configure.ac") + { + system "autoconf"; + print "configure updated\n"; + } } return $ret; } @@ -129,6 +133,8 @@ sub parse_makefile($) my $file = shift; my %make; + ($make{"=dir"} = $file) =~ s/[^\/]+$//; + open MAKE, "$file.in" or die "cannot open $file.in\n"; while (<MAKE>) @@ -147,7 +153,7 @@ sub parse_makefile($) $make{$1} = $2; next; } - if (/^(IDL_H_SRCS|IMPLIB_SRCS|SPEC_SRCS16)\s*=\s*(.*)/) + if (/^(IDL_H_SRCS|IMPLIB_SRCS|SPEC_SRCS16|MANPAGES|PROGRAMS)\s*=\s*(.*)/) { my @list = split(/\s+/, $2); $make{$1} = \@list; @@ -275,9 +281,6 @@ sub update_dlls(@) my @ignores = ( - "/Makedll.rules", - "/Makeimplib.rules", - "/Maketest.rules", "*/tests/testlist.c", "*/tests/*.ok", ); @@ -526,7 +529,6 @@ sub update_dlls(@) } - ################################################################ # update programs/Makefile.in and programs/.gitignore @@ -534,12 +536,7 @@ sub update_progs(@) { my (@subdirs, @install_subdirs, @install_progs); - my @ignores = - ( - "/Makeprog.rules", - "/wineapploader", - "/winelauncher", - ); + my @ignores = (); foreach my $make (@_) { @@ -568,5 +565,41 @@ sub update_progs(@) join("\n", sort @ignores), "\n" ); } + +################################################################ +# update the main .gitignore + +sub update_gitignore() +{ + my @ignores = (); + + push @ignores, values %makerules; + + foreach my $make (@makefiles) + { + my %makefile = %{$makefiles{$make}}; + my $dir = $makefile{"=dir"}; + if (defined $makefile{"MANPAGES"}) + { + push @ignores, map { $dir . $_; } @{$makefile{"MANPAGES"}}; + } + if (defined $makefile{"PROGRAMS"}) + { + push @ignores, map { s/\$$EXEEXT$//; $dir . $_; } @{$makefile{"PROGRAMS"}}; + } + } + + # prepend a slash to paths that don't have one + @ignores = map { $_ =~ s/^([^\/]+)$/\/$1/; $_; } @ignores; + + replace_in_file( ".gitignore", + '^# Everything below this line is generated by make_makefiles', + undef, + "# Everything below this line is generated by make_makefiles\n", + join("\n", sort @ignores), "\n" ); +} + + update_dlls( sort grep /^dlls\//, @makefiles ); update_progs( sort grep /^programs\/.*\/Makefile$/, @makefiles ); +update_gitignore(); diff --git a/tools/widl/.gitignore b/tools/widl/.gitignore deleted file mode 100644 index 444551b..0000000 --- a/tools/widl/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/widl -/widl.man diff --git a/tools/winebuild/.gitignore b/tools/winebuild/.gitignore deleted file mode 100644 index bfcd432..0000000 --- a/tools/winebuild/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/winebuild -/winebuild.man diff --git a/tools/winedump/.gitignore b/tools/winedump/.gitignore deleted file mode 100644 index a36a82c..0000000 --- a/tools/winedump/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/winedump -/winedump.man diff --git a/tools/winegcc/.gitignore b/tools/winegcc/.gitignore deleted file mode 100644 index e20f448..0000000 --- a/tools/winegcc/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/winecpp -/wineg++ -/winegcc -/winegcc.man diff --git a/tools/wmc/.gitignore b/tools/wmc/.gitignore deleted file mode 100644 index 4e7d73f..0000000 --- a/tools/wmc/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/wmc -/wmc.man diff --git a/tools/wrc/.gitignore b/tools/wrc/.gitignore deleted file mode 100644 index f0989d7..0000000 --- a/tools/wrc/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/wrc -/wrc.man

1 0

CVSROOT/. loginfo commitinfo
by Alexandre Julliard Dec. 28, 2006

Dec. 28, 2006

ChangeSet ID: 30839 CVSROOT: /opt/cvs-commit Module name: CVSROOT Changes by: julliard(a)winehq.org 2006/12/28 07:38:52 Modified files: . : loginfo commitinfo Log message: Don't bother to log commit info for wine, that info is available from the git repository. Patch: http://cvs.winehq.org/patch.py?id=30839 Old revision New revision Changes Path 1.51 1.52 +2 -1 CVSROOT/loginfo 1.9 1.10 +3 -0 CVSROOT/commitinfo Index: CVSROOT/loginfo diff -u -p CVSROOT/loginfo:1.51 CVSROOT/loginfo:1.52 --- CVSROOT/loginfo:1.51 28 Dec 2006 13:38:52 -0000 +++ CVSROOT/loginfo 28 Dec 2006 13:38:52 -0000 @@ -28,7 +28,8 @@ # Use this for testing ^test /usr/bin/perl $CVSROOT/CVSROOT/log_accum -m testing(a)winehq.org -f $CVSROOT/CVSROOT/commitlog -S -s %p %s -^wine /usr/bin/perl $CVSROOT/CVSROOT/log_accum -f $CVSROOT/CVSROOT/commitlog -S -s %p %s +# Ignore wine +^wine cat >/dev/null # All others go to wine-cvs DEFAULT /usr/bin/perl $CVSROOT/CVSROOT/log_accum -m wine-cvs(a)winehq.org -f $CVSROOT/CVSROOT/commitlog -P winehq -L 200 -p -c -S -s %p %s Index: CVSROOT/commitinfo diff -u -p CVSROOT/commitinfo:1.9 CVSROOT/commitinfo:1.10 --- CVSROOT/commitinfo:1.9 28 Dec 2006 13:38:52 -0000 +++ CVSROOT/commitinfo 28 Dec 2006 13:38:52 -0000 @@ -14,5 +14,8 @@ # If the name "ALL" appears as a regular expression it is always used # in addition to the first matching regex or "DEFAULT". +# Ignore wine +^wine /bin/true %n + DEFAULT /usr/bin/perl $CVSROOT/CVSROOT/commit_prep -r %r/%p %s

1 0

Rob Shearman : ole32: Marshal the ORPCTHAT structure prefixed to the server data.
by Alexandre Julliard Dec. 27, 2006

Dec. 27, 2006

Module: wine Branch: master Commit: ee99b6d7438293116024249db40074450d9ae107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee99b6d7438293116024249db… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 27 13:04:07 2006 +0000 ole32: Marshal the ORPCTHAT structure prefixed to the server data. Unmarshal the data on the client side (during ClientChannelBuffer_SendReceive) and call ClientNotify. --- dlls/ole32/compobj.c | 1 - dlls/ole32/rpc.c | 368 +++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 317 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee99b6d74382931160242…

1 0

Michael Stefaniuc : janitorial: In multiline strings there is no need for ' \' at the end of the lines.
by Alexandre Julliard Dec. 27, 2006

Dec. 27, 2006

Module: wine Branch: master Commit: c7e00c9f492b01829cb88b11e27f813be9073311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7e00c9f492b01829cb88b11e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 27 00:19:50 2006 +0100 janitorial: In multiline strings there is no need for '\' at the end of the lines. --- dlls/comdlg32/tests/printdlg.c | 6 +++--- dlls/ddraw/ddraw.c | 2 +- dlls/msvcrt/except.c | 2 +- dlls/netapi32/tests/apibuf.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 0ef12d7..227c61f 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -50,7 +50,7 @@ static void test_PrintDlgA(void) SetLastError(0xdeadbeef); res = PrintDlgA(NULL); ok( !res && (CommDlgExtendedError() == CDERR_INITIALIZATION), - "returned %d with 0x%x and 0x%x (expected '0' and " \ + "returned %d with 0x%x and 0x%x (expected '0' and " "CDERR_INITIALIZATION)\n", res, GetLastError(), CommDlgExtendedError()); ZeroMemory(pDlg, sizeof(PRINTDLGA)); @@ -58,7 +58,7 @@ static void test_PrintDlgA(void) SetLastError(0xdeadbeef); res = PrintDlgA(pDlg); ok( !res && (CommDlgExtendedError() == CDERR_STRUCTSIZE), - "returned %d with 0x%x and 0x%x (expected '0' and " \ + "returned %d with 0x%x and 0x%x (expected '0' and " "CDERR_STRUCTSIZE)\n", res, GetLastError(), CommDlgExtendedError()); @@ -68,7 +68,7 @@ static void test_PrintDlgA(void) SetLastError(0xdeadbeef); res = PrintDlgA(pDlg); ok( res || (CommDlgExtendedError() == PDERR_NODEFAULTPRN), - "returned %d with 0x%x and 0x%x (expected '!= 0' or '0' and " \ + "returned %d with 0x%x and 0x%x (expected '!= 0' or '0' and " "PDERR_NODEFAULTPRN)\n", res, GetLastError(), CommDlgExtendedError()); HeapFree(GetProcessHeap(), 0, pDlg); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 8f051d4..8b80586 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1169,7 +1169,7 @@ IDirectDrawImpl_TestCooperativeLevel(IDi case WINED3DERR_DRIVERINTERNALERROR: default: - ERR("(%p) Unexpected return value %08x from wineD3D, " \ + ERR("(%p) Unexpected return value %08x from wineD3D, " " returning DD_OK\n", This, hr); } diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index a218387..07cc61a 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -68,7 +68,7 @@ typedef struct _MSVCRT_EXCEPTION_FRAME #if defined(__GNUC__) && defined(__i386__) inline static void call_finally_block( void *code_block, void *base_ptr ) { - __asm__ __volatile__ ("movl %1,%%ebp; call *%%eax" \ + __asm__ __volatile__ ("movl %1,%%ebp; call *%%eax" : : "a" (code_block), "g" (base_ptr)); } diff --git a/dlls/netapi32/tests/apibuf.c b/dlls/netapi32/tests/apibuf.c index 4ef99c9..1ec79af 100644 --- a/dlls/netapi32/tests/apibuf.c +++ b/dlls/netapi32/tests/apibuf.c @@ -83,13 +83,13 @@ static void run_apibuf_tests(void) SetLastError(0xdeadbeef); res = pNetApiBufferAllocate(0, (LPVOID *)NULL); ok( (res == ERROR_INVALID_PARAMETER) && (GetLastError() == 0xdeadbeef), - "returned %d with 0x%x (expected ERROR_INVALID_PARAMETER with " \ + "returned %d with 0x%x (expected ERROR_INVALID_PARAMETER with " "0xdeadbeef)\n", res, GetLastError()); SetLastError(0xdeadbeef); res = pNetApiBufferAllocate(1024, (LPVOID *)NULL); ok( (res == ERROR_INVALID_PARAMETER) && (GetLastError() == 0xdeadbeef), - "returned %d with 0x%x (expected ERROR_INVALID_PARAMETER with " \ + "returned %d with 0x%x (expected ERROR_INVALID_PARAMETER with " "0xdeadbeef)\n", res, GetLastError()); }

1 0

Michael Stefaniuc : localspl/tests: In multiline strings there is no need for '\' at the end of the lines.
by Alexandre Julliard Dec. 27, 2006

Dec. 27, 2006

Module: wine Branch: master Commit: 43c94c95ce78c7fed5b6ba805da7018a9fbe94fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=43c94c95ce78c7fed5b6ba805… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 27 00:19:40 2006 +0100 localspl/tests: In multiline strings there is no need for '\' at the end of the lines. --- dlls/localspl/tests/localmon.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 5aecda6..98a4082 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -212,7 +212,7 @@ static void test_EnumPorts(void) } ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "(%d) returned %d with %d and %d, %d (expected '0' with " \ + "(%d) returned %d with %d and %d, %d (expected '0' with " "ERROR_INSUFFICIENT_BUFFER)\n", level, res, GetLastError(), cbBuf, pcReturned); @@ -239,7 +239,7 @@ static void test_EnumPorts(void) SetLastError(0xdeadbeef); res = pEnumPorts(NULL, level, buffer, cbBuf-1, &pcbNeeded, &pcReturned); ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "(%d) returned %d with %d and %d, %d (expected '0' with " \ + "(%d) returned %d with %d and %d, %d (expected '0' with " "ERROR_INSUFFICIENT_BUFFER)\n", level, res, GetLastError(), pcbNeeded, pcReturned); @@ -281,13 +281,13 @@ static void test_InitializePrintMonitor( res = pInitializePrintMonitor(NULL); /* The Parameter was unchecked before w2k */ ok( res || (GetLastError() == ERROR_INVALID_PARAMETER), - "returned %p with %d\n (expected '!= NULL' or: NULL with " \ + "returned %p with %d\n (expected '!= NULL' or: NULL with " "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); SetLastError(0xdeadbeef); res = pInitializePrintMonitor(emptyW); ok( res || (GetLastError() == ERROR_INVALID_PARAMETER), - "returned %p with %d\n (expected '!= NULL' or: NULL with " \ + "returned %p with %d\n (expected '!= NULL' or: NULL with " "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); @@ -357,7 +357,7 @@ static void test_XcvDataPort(void) SetLastError(0xdeadbeef); res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, NULL, 0, &needed); ok( (res == ERROR_INSUFFICIENT_BUFFER) && (needed <= MAX_PATH), - "returned %d with 0x%x and 0x%x (expected 'ERROR_INSUFFICIENT_BUFFER' " \ + "returned %d with 0x%x and 0x%x (expected 'ERROR_INSUFFICIENT_BUFFER' " " and '<= MAX_PATH')\n", res, GetLastError(), needed); if (needed > MAX_PATH) goto xcv_cleanup; @@ -367,7 +367,7 @@ static void test_XcvDataPort(void) needed = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); res = pXcvDataPort(hXcv, emptyW, NULL, 0, NULL, 0, &needed); - ok( res == ERROR_INVALID_PARAMETER, "returned %d with 0x%x and 0x%x " \ + ok( res == ERROR_INVALID_PARAMETER, "returned %d with 0x%x and 0x%x " "(expected 'ERROR_INVALID_PARAMETER')\n", res, GetLastError(), needed); if (0) { @@ -382,7 +382,7 @@ static void test_XcvDataPort(void) needed = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); res = pXcvDataPort(NULL, cmd_MonitorUIW, NULL, 0, buffer, len, &needed); - ok( res == ERROR_SUCCESS, "returned %d with 0x%x and 0x%x " \ + ok( res == ERROR_SUCCESS, "returned %d with 0x%x and 0x%x " "(expected 'ERROR_SUCCESS')\n", res, GetLastError(), needed); @@ -391,14 +391,14 @@ static void test_XcvDataPort(void) needed = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); res = pXcvDataPort(hXcv, cmd_MonitorUI_lcaseW, NULL, 0, buffer, len, &needed); - ok( res == ERROR_INVALID_PARAMETER, "returned %d with 0x%x and 0x%x " \ + ok( res == ERROR_INVALID_PARAMETER, "returned %d with 0x%x and 0x%x " "(expected 'ERROR_INVALID_PARAMETER')\n", res, GetLastError(), needed); /* off by one: larger */ needed = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len+1, &needed); - ok( res == ERROR_SUCCESS, "returned %d with 0x%x and 0x%x " \ + ok( res == ERROR_SUCCESS, "returned %d with 0x%x and 0x%x " "(expected 'ERROR_SUCCESS')\n", res, GetLastError(), needed); @@ -406,7 +406,7 @@ static void test_XcvDataPort(void) needed = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len-1, &needed); - ok( res == ERROR_INSUFFICIENT_BUFFER, "returned %d with 0x%x and 0x%x " \ + ok( res == ERROR_INSUFFICIENT_BUFFER, "returned %d with 0x%x and 0x%x " "(expected 'ERROR_INSUFFICIENT_BUFFER')\n", res, GetLastError(), needed); /* Normal use. The DLL-Name without a Path is returned */ @@ -414,7 +414,7 @@ static void test_XcvDataPort(void) needed = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len, &needed); - ok( res == ERROR_SUCCESS, "returned %d with 0x%x and 0x%x " \ + ok( res == ERROR_SUCCESS, "returned %d with 0x%x and 0x%x " "(expected 'ERROR_SUCCESS')\n", res, GetLastError(), needed); xcv_cleanup:

1 0

Michael Stefaniuc : winspool.drv/tests: In multiline strings there is no need for '\' at the end of the lines.
by Alexandre Julliard Dec. 27, 2006

Dec. 27, 2006

Module: wine Branch: master Commit: ee2e686ad722a7c3da992f0026f3aa4fedb817eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee2e686ad722a7c3da992f002… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 27 00:19:17 2006 +0100 winspool.drv/tests: In multiline strings there is no need for '\' at the end of the lines. --- dlls/winspool.drv/tests/info.c | 118 ++++++++++++++++++++-------------------- 1 files changed, 59 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee2e686ad722a7c3da992…

1 0

Michael Stefaniuc : kernel32/tests: In multiline strings there is no need for '\' at the end of the lines.
by Alexandre Julliard Dec. 27, 2006

Dec. 27, 2006

Module: wine Branch: master Commit: 5263b5ec243e851337dfb24fe05c800e250f5499 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5263b5ec243e851337dfb24fe… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 27 00:19:29 2006 +0100 kernel32/tests: In multiline strings there is no need for '\' at the end of the lines. --- dlls/kernel32/tests/atom.c | 2 +- dlls/kernel32/tests/codepage.c | 6 +++--- dlls/kernel32/tests/heap.c | 14 +++++++------- dlls/kernel32/tests/path.c | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/atom.c b/dlls/kernel32/tests/atom.c index 87b7afd..f21b2b1 100644 --- a/dlls/kernel32/tests/atom.c +++ b/dlls/kernel32/tests/atom.c @@ -292,7 +292,7 @@ static void test_get_atom_name(void) { /* len == 0 with ERROR_MORE_DATA is on NT3.51 */ ok(len == 1 || (len == 0 && GetLastError() == ERROR_MORE_DATA), - "0x%04x: got %u with %d (excepted '1' or '0' with " \ + "0x%04x: got %u with %d (excepted '1' or '0' with " "ERROR_MORE_DATA)\n", i, len, GetLastError()); ok(outW[1] == DOUBLE('.'), "buffer overwrite\n"); } diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index de15067..2cd0557 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -63,7 +63,7 @@ static void test_destination_buffer(void SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, buffer, needed-1, NULL, NULL); ok( !len && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "returned %d with 0x%x/%d and '%s' (expected '0' with " \ + "returned %d with 0x%x/%d and '%s' (expected '0' with " "ERROR_INSUFFICIENT_BUFFER)\n", len, GetLastError(), GetLastError(), buffer); memset(buffer, 'x', maxsize); @@ -71,7 +71,7 @@ static void test_destination_buffer(void SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, buffer, 1, NULL, NULL); ok( !len && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "returned %d with 0x%x/%d and '%s' (expected '0' with " \ + "returned %d with 0x%x/%d and '%s' (expected '0' with " "ERROR_INSUFFICIENT_BUFFER)\n", len, GetLastError(), GetLastError(), buffer); SetLastError(0xdeadbeef); @@ -82,7 +82,7 @@ static void test_destination_buffer(void SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, NULL, needed, NULL, NULL); ok( !len && (GetLastError() == ERROR_INVALID_PARAMETER), - "returned %d with 0x%x/%d (expected '0' with " \ + "returned %d with 0x%x/%d (expected '0' with " "ERROR_INVALID_PARAMETER)\n", len, GetLastError(), GetLastError()); HeapFree(GetProcessHeap(), 0, buffer); diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index d2e8608..8ddcbe8 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -115,7 +115,7 @@ START_TEST(heap) res = GlobalUnlock(gbl); /* #0 */ /* NT: ERROR_SUCCESS (documented on MSDN), 9x: untouched */ ok(!res && ((GetLastError() == ERROR_SUCCESS) || (GetLastError() == MAGIC_DEAD)), - "returned %d with %d (expected '0' with: ERROR_SUCCESS or " \ + "returned %d with %d (expected '0' with: ERROR_SUCCESS or " "MAGIC_DEAD)\n", res, GetLastError()); SetLastError(MAGIC_DEAD); flags = GlobalFlags(gbl); @@ -128,7 +128,7 @@ START_TEST(heap) /* NT: ERROR_NOT_LOCKED, 9x: untouched */ ok( !res && ((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == MAGIC_DEAD)), - "returned %d with %d (expected '0' with: ERROR_NOT_LOCKED or " \ + "returned %d with %d (expected '0' with: ERROR_NOT_LOCKED or " "MAGIC_DEAD)\n", res, GetLastError()); GlobalFree(gbl); @@ -141,7 +141,7 @@ START_TEST(heap) SetLastError(MAGIC_DEAD); flags = GlobalFlags(gbl); ok( (flags == GMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE), - "returned 0x%04x with 0x%08x (expected GMEM_INVALID_HANDLE with " \ + "returned 0x%04x with 0x%08x (expected GMEM_INVALID_HANDLE with " "ERROR_INVALID_HANDLE)\n", flags, GetLastError()); SetLastError(MAGIC_DEAD); size = GlobalSize(gbl); @@ -220,7 +220,7 @@ START_TEST(heap) res = LocalUnlock(gbl); /* #0 */ /* NT: ERROR_SUCCESS (documented on MSDN), 9x: untouched */ ok(!res && ((GetLastError() == ERROR_SUCCESS) || (GetLastError() == MAGIC_DEAD)), - "returned %d with %d (expected '0' with: ERROR_SUCCESS or " \ + "returned %d with %d (expected '0' with: ERROR_SUCCESS or " "MAGIC_DEAD)\n", res, GetLastError()); SetLastError(MAGIC_DEAD); flags = LocalFlags(gbl); @@ -233,7 +233,7 @@ START_TEST(heap) /* NT: ERROR_NOT_LOCKED, 9x: untouched */ ok( !res && ((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == MAGIC_DEAD)), - "returned %d with %d (expected '0' with: ERROR_NOT_LOCKED or " \ + "returned %d with %d (expected '0' with: ERROR_NOT_LOCKED or " "MAGIC_DEAD)\n", res, GetLastError()); LocalFree(gbl); @@ -246,7 +246,7 @@ START_TEST(heap) SetLastError(MAGIC_DEAD); flags = LocalFlags(gbl); ok( (flags == LMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE), - "returned 0x%04x with 0x%08x (expected LMEM_INVALID_HANDLE with " \ + "returned 0x%04x with 0x%08x (expected LMEM_INVALID_HANDLE with " "ERROR_INVALID_HANDLE)\n", flags, GetLastError()); SetLastError(MAGIC_DEAD); size = LocalSize(gbl); @@ -275,7 +275,7 @@ START_TEST(heap) /* NT: ERROR_DISCARDED, 9x: untouched */ ok( (mem == NULL) && ((GetLastError() == ERROR_DISCARDED) || (GetLastError() == MAGIC_DEAD)), - "returned %p with 0x%x/%d (expected 'NULL' with: ERROR_DISCARDED or " \ + "returned %p with 0x%x/%d (expected 'NULL' with: ERROR_DISCARDED or " "MAGIC_DEAD)\n", mem, GetLastError(), GetLastError()); GlobalFree(gbl); diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index ead5e75..2d90629 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -974,7 +974,7 @@ static void test_GetSystemDirectory(void /* 95+NT: total (includes the terminating Zero) 98+ME: 0 with ERROR_INVALID_PARAMETER */ ok( (res == total) || (!res && (GetLastError() == ERROR_INVALID_PARAMETER)), - "returned %d with 0x%x (expected '%d' or: '0' with " \ + "returned %d with 0x%x (expected '%d' or: '0' with " "ERROR_INVALID_PARAMETER)\n", res, GetLastError(), total); if (total > MAX_PATH) return; @@ -1034,7 +1034,7 @@ static void test_GetWindowsDirectory(voi /* 95+NT: total (includes the terminating Zero) 98+ME: 0 with ERROR_INVALID_PARAMETER */ ok( (res == total) || (!res && (GetLastError() == ERROR_INVALID_PARAMETER)), - "returned %d with 0x%x (expected '%d' or: '0' with " \ + "returned %d with 0x%x (expected '%d' or: '0' with " "ERROR_INVALID_PARAMETER)\n", res, GetLastError(), total); if (total > MAX_PATH) return;

1 0

Rob Shearman : ole32: Message filters aren' t used in the test_call_from_message test, so remove the call to CoRegisterMessageFilter.
by Alexandre Julliard Dec. 27, 2006

Dec. 27, 2006

Module: wine Branch: master Commit: 3be9cbc41abb6faf0ae4ba0da9e1ff236dfa1a04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3be9cbc41abb6faf0ae4ba0da… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 27 11:05:48 2006 +0000 ole32: Message filters aren't used in the test_call_from_message test, so remove the call to CoRegisterMessageFilter. --- dlls/ole32/tests/marshal.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index beb6597..e8e3530 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1722,8 +1722,6 @@ static void test_call_from_message(void) ok_more_than_one_lock(); - hr = CoRegisterMessageFilter(&MessageFilter, NULL); - /* start message re-entrancy test */ hr = IClassFactory_CreateInstance(proxy, NULL, &IID_IUnknown, (void **)&object); ok_ole_success(hr, IClassFactory_CreateInstance);

1 0

Vitaliy Margolen : user32: Silence tests in default debug level.
by Alexandre Julliard Dec. 27, 2006

Dec. 27, 2006

Module: wine Branch: master Commit: 1871473bb2a57ffd904f4d3ca67843a7de91821d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1871473bb2a57ffd904f4d3ca… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Dec 26 10:05:57 2006 -0700 user32: Silence tests in default debug level. --- dlls/user32/tests/input.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index bfd8c10..a09f001 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -237,11 +237,13 @@ static void do_test( HWND hwnd, int seqn assert( evtctr <= MAXKEYEVENTS ); assert( evtctr == ptr_SendInput(evtctr, &inputs[0], sizeof(INPUT))); i = 0; - trace("======== key stroke sequence #%d: %s =============\n", + if (winetest_debug > 1) + trace("======== key stroke sequence #%d: %s =============\n", seqnr + 1, buf); while( PeekMessage(&msg,hwnd,WM_KEYFIRST,WM_KEYLAST,PM_REMOVE) ) { - trace("message[%d] %-15s wParam %04x lParam %08lx time %x\n", i, - MSGNAME[msg.message - WM_KEYFIRST], msg.wParam, msg.lParam, msg.time); + if (winetest_debug > 1) + trace("message[%d] %-15s wParam %04x lParam %08lx time %x\n", i, + MSGNAME[msg.message - WM_KEYFIRST], msg.wParam, msg.lParam, msg.time); if( i < kmctr ) { ok( msg.message == expmsg[i].message && msg.wParam == expmsg[i].wParam && @@ -253,7 +255,8 @@ static void do_test( HWND hwnd, int seqn } i++; } - trace("%d messages retrieved\n", i); + if (winetest_debug > 1) + trace("%d messages retrieved\n", i); ok( i == kmctr, "message count is wrong: got %d expected: %d\n", i, kmctr); }

1 0