March 2010 - Wine-commits - list.winehq.org

Alexandre Julliard : makefiles: Output all the documentation rules explicitly for each module.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: 60a05ad2d9389f43567259fa2156e3707c35573a URL: http://source.winehq.org/git/wine.git/?a=commit;h=60a05ad2d9389f43567259fa2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 12:05:44 2010 +0100 makefiles: Output all the documentation rules explicitly for each module. --- Makefile.in | 28 ---------------------------- aclocal.m4 | 8 +++----- configure | 10 +++------- dlls/Makedll.rules.in | 10 ++++------ documentation/Makefile.in | 19 +++---------------- 5 files changed, 13 insertions(+), 62 deletions(-) diff --git a/Makefile.in b/Makefile.in index 535f251..7a3bd80 100644 --- a/Makefile.in +++ b/Makefile.in @@ -28,7 +28,6 @@ LIBEXT = @LIBEXT@ MODULE = none ALL_DIRS = @ALL_DIRS@ -ALL_DLL_DIRS = @ALL_DLL_DIRS@ ALL_TOP_DIRS = @ALL_TOP_DIRS@ # Sub-directories to run make all into @@ -123,33 +122,6 @@ uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__) dummy .PHONY: $(INSTALLSUBDIRS:%=%/__install__) $(INSTALLSUBDIRS:%=%/__uninstall__) \ $(INSTALLSUBDIRS:%=%/__install-lib__) $(INSTALLSUBDIRS:%=%/__install-dev__) -# Rules for auto documentation - -DOCSUBDIRS = $(ALL_DLL_DIRS) - -$(DOCSUBDIRS:%=%/__man__): dummy - @cd `dirname $@` && $(MAKE) man - -$(DOCSUBDIRS:%=%/__doc_html__): dummy - @cd `dirname $@` && $(MAKE) doc-html - -$(DOCSUBDIRS:%=%/__doc_sgml__): dummy - @cd `dirname $@` && $(MAKE) doc-sgml - -$(DOCSUBDIRS:%=%/__doc_xml__): dummy - @cd `dirname $@` && $(MAKE) doc-xml - -man: $(DOCSUBDIRS:%=%/__man__) -doc-html: $(DOCSUBDIRS:%=%/__doc_html__) -doc-sgml: $(DOCSUBDIRS:%=%/__doc_sgml__) -doc-xml: $(DOCSUBDIRS:%=%/__doc_xml__) - -manpages htmlpages sgmlpages xmlpages: dummy - @cd documentation && $(MAKE) $@ - -.PHONY: man doc-html doc-sgml doc-xml manpages htmlpages sgmlpages xmlpages \ - $(DOCSUBDIRS:%=%/__man__) $(DOCSUBDIRS:%=%/__doc_html__) $(DOCSUBDIRS:%=%/__doc_sgml__) $(DOCSUBDIRS:%=%/__doc_xml__) - # Dependencies between directories # dependencies needed to build any dll or program diff --git a/aclocal.m4 b/aclocal.m4 index 3807ff8..253f1a4 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -148,7 +148,6 @@ AC_SUBST(ALL_MAKERULES,"") AC_SUBST(ALL_SYMLINKS,"") AC_SUBST(ALL_DIRS,"") AC_SUBST(ALL_TOP_DIRS,"") -AC_SUBST(ALL_DLL_DIRS,"") AC_SUBST(ALL_TEST_BINARIES,"") AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"") @@ -215,16 +214,15 @@ dlls/$ac_dir/Makefile dlls/$ac_dir/__depend__: dlls/$ac_dir/Makefile.in config.s AS_VAR_IF([$ac_enable],[no], dnl enable_win16 is special in that it disables import libs too [test "$ac_enable" != enable_win16 || return 0], - [wine_fn_append_file ALL_DLL_DIRS dlls/$ac_dir - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ + [wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all: dlls/$ac_dir dlls/$ac_dir: dlls/$ac_dir/Makefile __builddeps__ install:: dlls/$ac_dir/Makefile __builddeps__ @cd dlls/$ac_dir && \$(MAKE) install install-lib:: dlls/$ac_dir/Makefile __builddeps__ @cd dlls/$ac_dir && \$(MAKE) install-lib -uninstall:: dlls/$ac_dir/Makefile - @cd dlls/$ac_dir && \$(MAKE) uninstall"]) +uninstall manpages htmlpages sgmlpages xmlpages:: dlls/$ac_dir/Makefile + @cd dlls/$ac_dir && \$(MAKE) \$[@]"]) if test -n "$ac_implibsrc" then diff --git a/configure b/configure index f771fa9..ed41bb5 100755 --- a/configure +++ b/configure @@ -598,7 +598,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS ALL_PROGRAM_BIN_INSTALL_DIRS ALL_TEST_BINARIES -ALL_DLL_DIRS ALL_TOP_DIRS ALL_DIRS ALL_SYMLINKS @@ -13861,8 +13860,6 @@ ALL_DIRS="" ALL_TOP_DIRS="" -ALL_DLL_DIRS="" - ALL_TEST_BINARIES="" ALL_PROGRAM_BIN_INSTALL_DIRS="" @@ -13937,16 +13934,15 @@ dlls/$ac_dir/Makefile dlls/$ac_dir/__depend__: dlls/$ac_dir/Makefile.in config.s if test "x$as_val" = x""no; then : test "$ac_enable" != enable_win16 || return 0 else - wine_fn_append_file ALL_DLL_DIRS dlls/$ac_dir - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all: dlls/$ac_dir dlls/$ac_dir: dlls/$ac_dir/Makefile __builddeps__ install:: dlls/$ac_dir/Makefile __builddeps__ @cd dlls/$ac_dir && \$(MAKE) install install-lib:: dlls/$ac_dir/Makefile __builddeps__ @cd dlls/$ac_dir && \$(MAKE) install-lib -uninstall:: dlls/$ac_dir/Makefile - @cd dlls/$ac_dir && \$(MAKE) uninstall" +uninstall manpages htmlpages sgmlpages xmlpages:: dlls/$ac_dir/Makefile + @cd dlls/$ac_dir && \$(MAKE) \$@" fi if test -n "$ac_implibsrc" diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 2269659..fb989bd 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -52,20 +52,18 @@ $(IMPORTLIB:%=lib%.cross.a): $(MAINSPEC) $(IMPLIB_CROSSOBJS) # Rules for auto documentation -man: $(C_SRCS) dummy +manpages:: $(C_SRCS) dummy $(C2MAN) -o $(TOPOBJDIR)/documentation/man$(api_manext) -R$(TOPOBJDIR) -C$(SRCDIR) -S$(api_manext) $(INCLUDES) $(MAINSPEC:%=-w %) $(C_SRCS) -doc-html: $(C_SRCS) dummy +htmlpages:: $(C_SRCS) dummy $(C2MAN) -o $(TOPOBJDIR)/documentation/html -R$(TOPOBJDIR) -C$(SRCDIR) $(INCLUDES) -Th $(MAINSPEC:%=-w %) $(C_SRCS) -doc-sgml: $(C_SRCS) dummy +sgmlpages:: $(C_SRCS) dummy $(C2MAN) -o $(TOPOBJDIR)/documentation/api-guide -R$(TOPOBJDIR) -C$(SRCDIR) $(INCLUDES) -Ts $(MAINSPEC:%=-w %) $(C_SRCS) -doc-xml: $(C_SRCS) dummy +xmlpages:: $(C_SRCS) dummy $(C2MAN) -o $(TOPOBJDIR)/documentation/api-guide-xml -R$(TOPOBJDIR) -C$(SRCDIR) $(INCLUDES) -Tx $(MAINSPEC:%=-w %) $(C_SRCS) -.PHONY: man doc-html doc-sgml doc-xml - # Rules for installation .PHONY: install_static_implib_def install_static_implib_a diff --git a/documentation/Makefile.in b/documentation/Makefile.in index 7453927..332fefb 100644 --- a/documentation/Makefile.in +++ b/documentation/Makefile.in @@ -4,25 +4,12 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none -INSTALLDIRS = man$(api_manext) html api-guide api-guide-xml $(DESTDIR)$(mandir)/man$(api_manext) +INSTALLDIRS = $(DESTDIR)$(mandir)/man$(api_manext) @MAKE_RULES@ -manpages: man$(api_manext) dummy - @cd $(TOPOBJDIR) && $(MAKE) man - -htmlpages: html dummy - @cd $(TOPOBJDIR) && $(MAKE) doc-html - -sgmlpages: api-guide dummy - @cd $(TOPOBJDIR) && $(MAKE) doc-sgml - -xmlpages: api-guide-xml dummy - @cd $(TOPOBJDIR) && $(MAKE) doc-xml - -.PHONY: manpages htmlpages sgmlpages xmlpages install-man - -install-man:: manpages $(DESTDIR)$(mandir)/man$(api_manext) +install-man:: $(DESTDIR)$(mandir)/man$(api_manext) + @cd $(TOPOBJDIR) && $(MAKE) manpages for i in man$(api_manext)/*.$(api_manext); do $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/$$i; done clean::

1 0

Paul Vriens : msi/tests: Fix test failures on W2K with Windows Installer 2. x.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: 114aa43a5447d948a267d1d933867422a3f64b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=114aa43a5447d948a267d1d93… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Mar 25 10:47:53 2010 +0100 msi/tests: Fix test failures on W2K with Windows Installer 2.x. --- dlls/msi/tests/msi.c | 68 +++++++++++++++++++++++++++++++++++-------------- 1 files changed, 48 insertions(+), 20 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 2995adb..e4ae619 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -9352,7 +9352,9 @@ static void test_MsiEnumPatches(void) lstrcpyA(patch, "apple"); lstrcpyA(transforms, "banana"); r = MsiEnumPatchesA(prodcode, 0, patch, transforms, &size); - ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + ok(r == ERROR_NO_MORE_ITEMS || + broken(r == ERROR_FILE_NOT_FOUND), /* Windows Installer < 3.0 */ + "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); ok(!lstrcmpA(patch, "apple"), "Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch); ok(!lstrcmpA(transforms, "banana"), @@ -9369,7 +9371,8 @@ static void test_MsiEnumPatches(void) lstrcpyA(patch, "apple"); lstrcpyA(transforms, "banana"); r = MsiEnumPatchesA(prodcode, 0, patch, transforms, &size); - ok(r == ERROR_BAD_CONFIGURATION, + ok(r == ERROR_BAD_CONFIGURATION || + broken(r == ERROR_SUCCESS), /* Windows Installer < 3.0 */ "Expected ERROR_BAD_CONFIGURATION, got %d\n", r); ok(!lstrcmpA(patch, "apple"), "Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch); @@ -9405,8 +9408,11 @@ static void test_MsiEnumPatches(void) lstrcpyA(patch, "apple"); lstrcpyA(transforms, "banana"); r = MsiEnumPatchesA(prodcode, 0, patch, transforms, &size); - ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); - ok(!lstrcmpA(patch, "apple"), + ok(r == ERROR_NO_MORE_ITEMS || + broken(r == ERROR_FILE_NOT_FOUND), /* Windows Installer < 3.0 */ + "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + ok(!lstrcmpA(patch, "apple") || + broken(!lstrcmpA(patch, patchcode)), /* Windows Installer < 3.0 */ "Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch); ok(!lstrcmpA(transforms, "banana"), "Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms); @@ -9467,7 +9473,8 @@ static void test_MsiEnumPatches(void) ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); ok(!lstrcmpA(patch, patchcode), "Expected \"%s\", got \"%s\"\n", patchcode, patch); - ok(!lstrcmpA(transforms, "whate"), + ok(!lstrcmpA(transforms, "whate") || + broken(!lstrcmpA(transforms, "banana")), /* Windows Installer < 3.0 */ "Expected \"whate\", got \"%s\"\n", transforms); ok(size == 8 || size == 16, "Expected 8 or 16, got %d\n", size); @@ -9541,7 +9548,9 @@ static void test_MsiEnumPatches(void) lstrcpyA(patch, "apple"); lstrcpyA(transforms, "banana"); r = MsiEnumPatchesA(prodcode, 0, patch, transforms, &size); - ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + ok(r == ERROR_NO_MORE_ITEMS || + broken(r == ERROR_FILE_NOT_FOUND), /* Windows Installer < 3.0 */ + "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); ok(!lstrcmpA(patch, "apple"), "Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch); ok(!lstrcmpA(transforms, "banana"), @@ -9558,7 +9567,8 @@ static void test_MsiEnumPatches(void) lstrcpyA(patch, "apple"); lstrcpyA(transforms, "banana"); r = MsiEnumPatchesA(prodcode, 0, patch, transforms, &size); - ok(r == ERROR_BAD_CONFIGURATION, + ok(r == ERROR_BAD_CONFIGURATION || + broken(r == ERROR_SUCCESS), /* Windows Installer < 3.0 */ "Expected ERROR_BAD_CONFIGURATION, got %d\n", r); ok(!lstrcmpA(patch, "apple"), "Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch); @@ -9594,8 +9604,11 @@ static void test_MsiEnumPatches(void) lstrcpyA(patch, "apple"); lstrcpyA(transforms, "banana"); r = MsiEnumPatchesA(prodcode, 0, patch, transforms, &size); - ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); - ok(!lstrcmpA(patch, "apple"), + ok(r == ERROR_NO_MORE_ITEMS || + broken(r == ERROR_FILE_NOT_FOUND), /* Windows Installer < 3.0 */ + "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + ok(!lstrcmpA(patch, "apple") || + broken(!lstrcmpA(patch, patchcode)), /* Windows Installer < 3.0 */ "Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch); ok(!lstrcmpA(transforms, "banana"), "Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms); @@ -9610,10 +9623,14 @@ static void test_MsiEnumPatches(void) lstrcpyA(patch, "apple"); lstrcpyA(transforms, "banana"); r = MsiEnumPatchesA(prodcode, 0, patch, transforms, &size); - ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); - ok(!lstrcmpA(patch, "apple"), + ok(r == ERROR_NO_MORE_ITEMS || + broken(r == ERROR_SUCCESS), /* Windows Installer < 3.0 */ + "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + ok(!lstrcmpA(patch, "apple") || + broken(!lstrcmpA(patch, patchcode)), /* Windows Installer < 3.0 */ "Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch); - ok(!lstrcmpA(transforms, "banana"), + ok(!lstrcmpA(transforms, "banana") || + broken(!lstrcmpA(transforms, "whatever")), /* Windows Installer < 3.0 */ "Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms); ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); @@ -9686,7 +9703,9 @@ static void test_MsiEnumPatches(void) lstrcpyA(patch, "apple"); lstrcpyA(transforms, "banana"); r = MsiEnumPatchesA(prodcode, 0, patch, transforms, &size); - ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + ok(r == ERROR_NO_MORE_ITEMS || + broken(r == ERROR_FILE_NOT_FOUND), /* Windows Installer < 3.0 */ + "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); ok(!lstrcmpA(patch, "apple"), "Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch); ok(!lstrcmpA(transforms, "banana"), @@ -9703,7 +9722,8 @@ static void test_MsiEnumPatches(void) lstrcpyA(patch, "apple"); lstrcpyA(transforms, "banana"); r = MsiEnumPatchesA(prodcode, 0, patch, transforms, &size); - ok(r == ERROR_BAD_CONFIGURATION, + ok(r == ERROR_BAD_CONFIGURATION || + broken(r == ERROR_SUCCESS), /* Windows Installer < 3.0 */ "Expected ERROR_BAD_CONFIGURATION, got %d\n", r); ok(!lstrcmpA(patch, "apple"), "Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch); @@ -9739,8 +9759,11 @@ static void test_MsiEnumPatches(void) lstrcpyA(patch, "apple"); lstrcpyA(transforms, "banana"); r = MsiEnumPatchesA(prodcode, 0, patch, transforms, &size); - ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); - ok(!lstrcmpA(patch, "apple"), + ok(r == ERROR_NO_MORE_ITEMS || + broken(r == ERROR_FILE_NOT_FOUND), /* Windows Installer < 3.0 */ + "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + ok(!lstrcmpA(patch, "apple") || + broken(!lstrcmpA(patch, patchcode)), /* Windows Installer < 3.0 */ "Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch); ok(!lstrcmpA(transforms, "banana"), "Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms); @@ -9804,10 +9827,14 @@ static void test_MsiEnumPatches(void) lstrcpyA(patch, "apple"); lstrcpyA(transforms, "banana"); r = MsiEnumPatchesA(prodcode, 0, patch, transforms, &size); - ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); - ok(!lstrcmpA(patch, "apple"), + ok(r == ERROR_NO_MORE_ITEMS || + broken(r == ERROR_SUCCESS), /* Windows Installer < 3.0 */ + "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + ok(!lstrcmpA(patch, "apple") || + broken(!lstrcmpA(patch, patchcode)), /* Windows Installer < 3.0 */ "Expected lpPatchBuf to be unchanged, got \"%s\"\n", patch); - ok(!lstrcmpA(transforms, "banana"), + ok(!lstrcmpA(transforms, "banana") || + broken(!lstrcmpA(transforms, "whatever")), /* Windows Installer < 3.0 */ "Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms); ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); @@ -9841,7 +9868,8 @@ static void test_MsiEnumPatches(void) WideCharToMultiByte( CP_ACP, 0, transformsW, -1, transforms, MAX_PATH, NULL, NULL ); ok(!lstrcmpA(patch, patchcode), "Expected \"%s\", got \"%s\"\n", patchcode, patch); - ok(!lstrcmpA(transforms, "whate"), + ok(!lstrcmpA(transforms, "whate") || + broken(!lstrcmpA(transforms, "banana")), /* Windows Installer < 3.0 */ "Expected \"whate\", got \"%s\"\n", transforms); ok(size == 8, "Expected 8, got %d\n", size);

1 0

Paul Vriens : msi/tests: Fix test failures on W2K with Windows Installer 3. 0.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: d495fa1e688329436a8109f32eaaa9534e9e40d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d495fa1e688329436a8109f32… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Mar 25 10:52:37 2010 +0100 msi/tests: Fix test failures on W2K with Windows Installer 3.0. --- dlls/msi/tests/msi.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index e4ae619..428f4f5 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -8221,7 +8221,9 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSIPATCHSTATE_APPLIED, 0, patchcode, targetprod, &context, targetsid, &size); - ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + ok(r == ERROR_NO_MORE_ITEMS || + broken(r == ERROR_BAD_CONFIGURATION), /* Windows Installer 3.0 */ + "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); ok(!lstrcmpA(patchcode, "apple"), "Expected patchcode to be unchanged, got %s\n", patchcode); ok(!lstrcmpA(targetprod, "banana"), @@ -8245,7 +8247,9 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSIPATCHSTATE_APPLIED, 0, patchcode, targetprod, &context, targetsid, &size); - ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + ok(r == ERROR_NO_MORE_ITEMS || + broken(r == ERROR_BAD_CONFIGURATION), /* Windows Installer 3.0 */ + "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); ok(!lstrcmpA(patchcode, "apple"), "Expected patchcode to be unchanged, got %s\n", patchcode); ok(!lstrcmpA(targetprod, "banana"),

1 0

Alexandre Julliard : version: Support loading resources from both 32-bit and 64-bit PE binaries.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: 81575421a9f4220dbb85d1c6af9645b49da1dd58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81575421a9f4220dbb85d1c6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 10:54:50 2010 +0100 version: Support loading resources from both 32-bit and 64-bit PE binaries. --- dlls/version/resource.c | 33 ++++++++++++++++++++++++--------- 1 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/version/resource.c b/dlls/version/resource.c index 68cda3f..e27a967 100644 --- a/dlls/version/resource.c +++ b/dlls/version/resource.c @@ -196,7 +196,11 @@ static BOOL find_ne_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) */ static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) { - IMAGE_NT_HEADERS pehd; + union + { + IMAGE_NT_HEADERS32 nt32; + IMAGE_NT_HEADERS64 nt64; + } pehd; DWORD pehdoffset; PIMAGE_DATA_DIRECTORY resDataDir; PIMAGE_SECTION_HEADER sections; @@ -205,14 +209,27 @@ static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) const void *resDir; const IMAGE_RESOURCE_DIRECTORY *resPtr; const IMAGE_RESOURCE_DATA_ENTRY *resData; - int i, nSections; + int i, len, nSections; BOOL ret = FALSE; /* Read in PE header */ pehdoffset = LZSeek( lzfd, 0, SEEK_CUR ); - if ( sizeof(pehd) != LZRead( lzfd, (LPSTR)&pehd, sizeof(pehd) ) ) return 0; + len = LZRead( lzfd, (LPSTR)&pehd, sizeof(pehd) ); + if (len < sizeof(pehd.nt32.FileHeader)) return 0; + if (len < sizeof(pehd)) memset( (char *)&pehd + len, 0, sizeof(pehd) - len ); + + switch (pehd.nt32.OptionalHeader.Magic) + { + case IMAGE_NT_OPTIONAL_HDR32_MAGIC: + resDataDir = pehd.nt32.OptionalHeader.DataDirectory + IMAGE_DIRECTORY_ENTRY_RESOURCE; + break; + case IMAGE_NT_OPTIONAL_HDR64_MAGIC: + resDataDir = pehd.nt64.OptionalHeader.DataDirectory + IMAGE_DIRECTORY_ENTRY_RESOURCE; + break; + default: + return 0; + } - resDataDir = pehd.OptionalHeader.DataDirectory+IMAGE_DIRECTORY_ENTRY_RESOURCE; if ( !resDataDir->Size ) { TRACE("No resources in PE dll\n" ); @@ -220,15 +237,13 @@ static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) } /* Read in section table */ - nSections = pehd.FileHeader.NumberOfSections; + nSections = pehd.nt32.FileHeader.NumberOfSections; sections = HeapAlloc( GetProcessHeap(), 0, nSections * sizeof(IMAGE_SECTION_HEADER) ); if ( !sections ) return FALSE; - LZSeek( lzfd, pehdoffset + - sizeof(DWORD) + /* Signature */ - sizeof(IMAGE_FILE_HEADER) + - pehd.FileHeader.SizeOfOptionalHeader, SEEK_SET ); + len = FIELD_OFFSET( IMAGE_NT_HEADERS32, OptionalHeader ) + pehd.nt32.FileHeader.SizeOfOptionalHeader; + LZSeek( lzfd, pehdoffset + len, SEEK_SET ); if ( nSections * sizeof(IMAGE_SECTION_HEADER) != LZRead( lzfd, (LPSTR)sections, nSections * sizeof(IMAGE_SECTION_HEADER) ) )

1 0

Sébastien Ramage : user32: End scrollbar tracking if the mouse capture is lost.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: e7165b3921a38cccf6e6eebbf6d4041423493d5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7165b3921a38cccf6e6eebbf… Author: Sébastien Ramage <sebastien.ramage(a)gmail.com> Date: Thu Mar 25 09:15:37 2010 +0100 user32: End scrollbar tracking if the mouse capture is lost. --- dlls/user32/scroll.c | 2 +- dlls/user32/tests/scroll.c | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 423dea1..81d5d0b 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -1129,7 +1129,7 @@ void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) ReleaseCapture(); break; } - } while (msg.message != WM_LBUTTONUP); + } while (msg.message != WM_LBUTTONUP && GetCapture() == hwnd); } diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 0695639..e3f6938 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -42,12 +42,25 @@ static LRESULT CALLBACK MyWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lP case WM_DESTROY: PostQuitMessage(0); break; - + case WM_HSCROLL: + case WM_VSCROLL: + /* stop tracking */ + ReleaseCapture(); + return 0; default: return DefWindowProcA(hWnd, msg, wParam, lParam); } return 0; } +static void scrollbar_test_track(void) +{ + /* test that scrollbar tracking is terminated when + * the control looses mouse capture */ + SendMessage( hScroll, WM_LBUTTONDOWN, 0, MAKELPARAM( 1, 1)); + /* a normal return from the sendmessage */ + /* not normal for instance by closing the windws */ + ok( IsWindow( hScroll), "Scrollbar has gone!\n"); +} static void scrollbar_test1(void) { @@ -420,6 +433,7 @@ START_TEST ( scroll ) scrollbar_test2(); scrollbar_test3(); scrollbar_test4(); + scrollbar_test_track(); /* Some test results vary depending of theming being active or not */ hUxtheme = LoadLibraryA("uxtheme.dll");

1 0

Alexandre Julliard : makefiles: Output all the import lib dependencies explicitly for each module.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: e55ff7fea59c1bb77b2816695dbe840cf3a1a705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55ff7fea59c1bb77b2816695… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 11:02:52 2010 +0100 makefiles: Output all the import lib dependencies explicitly for each module. --- Makefile.in | 11 +---------- aclocal.m4 | 23 +++++++++++------------ configure | 27 +++++++++++---------------- 3 files changed, 23 insertions(+), 38 deletions(-) diff --git a/Makefile.in b/Makefile.in index 2768b17..4fd69e1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -183,20 +183,11 @@ manpages htmlpages sgmlpages xmlpages: dummy .PHONY: man doc-html doc-sgml doc-xml manpages htmlpages sgmlpages xmlpages \ $(DOCSUBDIRS:%=%/__man__) $(DOCSUBDIRS:%=%/__doc_html__) $(DOCSUBDIRS:%=%/__doc_sgml__) $(DOCSUBDIRS:%=%/__doc_xml__) -# Rules for import libraries - -STATIC_LIBS = @ALL_STATIC_LIBS@ -IMPORT_LIBS = @ALL_IMPORT_LIBS@ - -implib: $(ALL_STATICLIB_DIRS) $(IMPORT_LIBS) -.PHONY: implib - # Dependencies between directories # dependencies needed to build any dll or program __tooldeps__: libs/port libs/wine libs/wpp $(ALL_TOOL_DIRS) -__builddeps__: __tooldeps__ include $(ALL_STATICLIB_DIRS) $(IMPORT_LIBS) -__buildcrossdeps__: __tooldeps__ include $(STATIC_LIBS:.a=.cross.a) $(IMPORT_LIBS:.def=.cross.a) +__builddeps__ __buildcrossdeps__: __tooldeps__ include .PHONY: __tooldeps__ __builddeps__ __buildcrossdeps__ loader server: libs/port libs/wine tools diff --git a/aclocal.m4 b/aclocal.m4 index 060767a..c5521da 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -151,8 +151,6 @@ AC_SUBST(ALL_TOP_DIRS,"") AC_SUBST(ALL_DLL_DIRS,"") AC_SUBST(ALL_TOOL_DIRS,"") AC_SUBST(ALL_STATICLIB_DIRS,"") -AC_SUBST(ALL_STATIC_LIBS,"") -AC_SUBST(ALL_IMPORT_LIBS,"") AC_SUBST(ALL_INSTALL_DIRS,"") AC_SUBST(ALL_TEST_DIRS,"") AC_SUBST(ALL_TEST_BINARIES,"") @@ -190,9 +188,9 @@ wine_fn_config_lib () ac_dir=dlls/$ac_name wine_fn_append_file ALL_DIRS $ac_dir wine_fn_append_file ALL_STATICLIB_DIRS $ac_dir - wine_fn_append_file ALL_STATIC_LIBS $ac_dir/lib$ac_name.a wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/__install__ $ac_dir/__install-dev__: $ac_dir +"$ac_dir/__install__ $ac_dir/__install-dev__ __builddeps__: $ac_dir +__buildcrossdeps__: $ac_dir/lib$ac_name.cross.a $ac_dir $ac_dir/lib$ac_name.cross.a: tools/widl tools/winebuild tools/winegcc include $ac_dir/lib$ac_name.cross.a: $ac_dir/Makefile dummy @cd $ac_dir && \$(MAKE) lib$ac_name.cross.a @@ -223,27 +221,28 @@ dlls/$ac_dir/Makefile dlls/$ac_dir/__depend__: dlls/$ac_dir/Makefile.in config.s if test -n "$ac_implibsrc" then - wine_fn_append_file ALL_IMPORT_LIBS $ac_file.$IMPLIBEXT - wine_fn_append_file ALL_IMPORT_LIBS $ac_file.$STATIC_IMPLIBEXT wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps +"__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT +__buildcrossdeps__: $ac_file.cross.a +$ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps $ac_file.def: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile @cd dlls/$ac_dir && \$(MAKE) \`basename \$[@]\` $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: dlls/$ac_dir/Makefile dummy @cd dlls/$ac_dir && \$(MAKE) \`basename \$[@]\`" elif test -n "$ac_implib" then - wine_fn_append_file ALL_IMPORT_LIBS $ac_file.$IMPLIBEXT wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_file.$IMPLIBEXT $ac_file.cross.a: $ac_deps -$ac_file.$IMPLIBEXT $ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile +"__builddeps__: $ac_file.$IMPLIBEXT +__buildcrossdeps__: $ac_file.cross.a +$ac_file.$IMPLIBEXT $ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps @cd dlls/$ac_dir && \$(MAKE) \`basename \$[@]\`" if test "$ac_dir" != "$ac_implib" then - wine_fn_append_file ALL_IMPORT_LIBS dlls/lib$ac_implib.$IMPLIBEXT wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT +"__builddeps__: dlls/lib$ac_implib.$IMPLIBEXT +__buildcrossdeps__: dlls/lib$ac_implib.cross.a +dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT \$(RM) \$[@] && \$(LN_S) $ac_dir/lib$ac_implib.$IMPLIBEXT \$[@] dlls/lib$ac_implib.cross.a: $ac_file.cross.a \$(RM) \$[@] && \$(LN_S) $ac_dir/lib$ac_implib.cross.a \$[@] diff --git a/configure b/configure index 5b48965..11bc7b4 100755 --- a/configure +++ b/configure @@ -601,8 +601,6 @@ ALL_PROGRAM_DIRS ALL_TEST_BINARIES ALL_TEST_DIRS ALL_INSTALL_DIRS -ALL_IMPORT_LIBS -ALL_STATIC_LIBS ALL_STATICLIB_DIRS ALL_TOOL_DIRS ALL_DLL_DIRS @@ -13874,10 +13872,6 @@ ALL_TOOL_DIRS="" ALL_STATICLIB_DIRS="" -ALL_STATIC_LIBS="" - -ALL_IMPORT_LIBS="" - ALL_INSTALL_DIRS="" ALL_TEST_DIRS="" @@ -13925,9 +13919,9 @@ wine_fn_config_lib () ac_dir=dlls/$ac_name wine_fn_append_file ALL_DIRS $ac_dir wine_fn_append_file ALL_STATICLIB_DIRS $ac_dir - wine_fn_append_file ALL_STATIC_LIBS $ac_dir/lib$ac_name.a wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/__install__ $ac_dir/__install-dev__: $ac_dir +"$ac_dir/__install__ $ac_dir/__install-dev__ __builddeps__: $ac_dir +__buildcrossdeps__: $ac_dir/lib$ac_name.cross.a $ac_dir $ac_dir/lib$ac_name.cross.a: tools/widl tools/winebuild tools/winegcc include $ac_dir/lib$ac_name.cross.a: $ac_dir/Makefile dummy @cd $ac_dir && \$(MAKE) lib$ac_name.cross.a @@ -13960,27 +13954,28 @@ fi if test -n "$ac_implibsrc" then - wine_fn_append_file ALL_IMPORT_LIBS $ac_file.$IMPLIBEXT - wine_fn_append_file ALL_IMPORT_LIBS $ac_file.$STATIC_IMPLIBEXT wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps +"__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT +__buildcrossdeps__: $ac_file.cross.a +$ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps $ac_file.def: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile @cd dlls/$ac_dir && \$(MAKE) \`basename \$@\` $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: dlls/$ac_dir/Makefile dummy @cd dlls/$ac_dir && \$(MAKE) \`basename \$@\`" elif test -n "$ac_implib" then - wine_fn_append_file ALL_IMPORT_LIBS $ac_file.$IMPLIBEXT wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_file.$IMPLIBEXT $ac_file.cross.a: $ac_deps -$ac_file.$IMPLIBEXT $ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile +"__builddeps__: $ac_file.$IMPLIBEXT +__buildcrossdeps__: $ac_file.cross.a +$ac_file.$IMPLIBEXT $ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps @cd dlls/$ac_dir && \$(MAKE) \`basename \$@\`" if test "$ac_dir" != "$ac_implib" then - wine_fn_append_file ALL_IMPORT_LIBS dlls/lib$ac_implib.$IMPLIBEXT wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT +"__builddeps__: dlls/lib$ac_implib.$IMPLIBEXT +__buildcrossdeps__: dlls/lib$ac_implib.cross.a +dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT \$(RM) \$@ && \$(LN_S) $ac_dir/lib$ac_implib.$IMPLIBEXT \$@ dlls/lib$ac_implib.cross.a: $ac_file.cross.a \$(RM) \$@ && \$(LN_S) $ac_dir/lib$ac_implib.cross.a \$@

1 0

Alexandre Julliard : makefiles: Output all the test rules explicitly for each module.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: 44cff7e9ecbd5c26cdc1f9765802c3bfbba12694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44cff7e9ecbd5c26cdc1f9765… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 11:06:37 2010 +0100 makefiles: Output all the test rules explicitly for each module. --- Makefile.in | 21 +-------------------- aclocal.m4 | 16 +++++++++++----- configure | 18 +++++++++++------- 3 files changed, 23 insertions(+), 32 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4fd69e1..bce8b39 100644 --- a/Makefile.in +++ b/Makefile.in @@ -32,7 +32,6 @@ ALL_DLL_DIRS = @ALL_DLL_DIRS@ ALL_INSTALL_DIRS = @ALL_INSTALL_DIRS@ ALL_PROGRAM_DIRS = @ALL_PROGRAM_DIRS@ ALL_STATICLIB_DIRS = @ALL_STATICLIB_DIRS@ -ALL_TEST_DIRS = @ALL_TEST_DIRS@ ALL_TOOL_DIRS = @ALL_TOOL_DIRS@ ALL_TOP_DIRS = @ALL_TOP_DIRS@ @@ -43,8 +42,7 @@ BUILDSUBDIRS = \ $(ALL_TOP_DIRS) \ $(ALL_STATICLIB_DIRS) \ $(ALL_DLL_DIRS) \ - $(ALL_PROGRAM_DIRS) \ - $(ALL_TEST_DIRS) + $(ALL_PROGRAM_DIRS) # Sub-directories to run make install/uninstall into INSTALLSUBDIRS = \ @@ -140,22 +138,6 @@ uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__) dummy uninstall:: -rmdir $(DESTDIR)$(datadir)/wine $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir) -# Rules for testing - -$(ALL_TEST_DIRS:%=%/__test__): dummy - @cd `dirname $@` && $(MAKE) test - -$(ALL_TEST_DIRS:%=%/__crosstest__): dummy - @cd `dirname $@` && $(MAKE) crosstest - -check test:: $(ALL_TEST_DIRS:%=%/__test__) -crosstest:: $(ALL_TEST_DIRS:%=%/__crosstest__) - -testclean:: - $(RM) $(ALL_TEST_DIRS:%=%/*.ok) - -.PHONY: check test testclean crosstest $(ALL_TEST_DIRS:%=%/__test__) $(ALL_TEST_DIRS:%=%/__crosstest__) - # Rules for auto documentation DOCSUBDIRS = $(ALL_DLL_DIRS) @@ -193,7 +175,6 @@ __builddeps__ __buildcrossdeps__: __tooldeps__ include loader server: libs/port libs/wine tools fonts: tools include: tools/widl -programs/winetest: $(ALL_TEST_DIRS) libs/wine $(ALL_TOOL_DIRS): libs/port tools/wmc tools/wrc: tools tools tools/wmc tools/wrc: libs/wine diff --git a/aclocal.m4 b/aclocal.m4 index c5521da..183a81d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -152,7 +152,6 @@ AC_SUBST(ALL_DLL_DIRS,"") AC_SUBST(ALL_TOOL_DIRS,"") AC_SUBST(ALL_STATICLIB_DIRS,"") AC_SUBST(ALL_INSTALL_DIRS,"") -AC_SUBST(ALL_TEST_DIRS,"") AC_SUBST(ALL_TEST_BINARIES,"") AC_SUBST(ALL_PROGRAM_DIRS,"") AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"") @@ -284,12 +283,19 @@ $ac_name.rc: $ac_name.res: $ac_name.rc $ac_name.exe" wine_fn_append_file ALL_DIRS $ac_dir wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir: __builddeps__ -$ac_dir/__crosstest__: __buildcrossdeps__ -$ac_dir/__clean__ $ac_dir/__crosstest__ $ac_dir: $ac_dir/Makefile +"$ac_dir/__clean__: $ac_dir/Makefile $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Maketest.rules \$(MAKEDEP) @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend" - AS_VAR_IF([enable_tests],[no],,[wine_fn_append_file ALL_TEST_DIRS $ac_dir]) + + AS_VAR_IF([enable_tests],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"all programs/winetest: $ac_dir +$ac_dir: $ac_dir/Makefile __builddeps__ +crosstest:: $ac_dir/Makefile __buildcrossdeps__ + @cd $ac_dir && \$(MAKE) crosstest +test:: + @cd $ac_dir && \$(MAKE) test +testclean:: + \$(RM) $ac_dir/*.ok"]) } wine_fn_config_tool () diff --git a/configure b/configure index 11bc7b4..6dae004 100755 --- a/configure +++ b/configure @@ -599,7 +599,6 @@ LIBOBJS ALL_PROGRAM_BIN_INSTALL_DIRS ALL_PROGRAM_DIRS ALL_TEST_BINARIES -ALL_TEST_DIRS ALL_INSTALL_DIRS ALL_STATICLIB_DIRS ALL_TOOL_DIRS @@ -13874,8 +13873,6 @@ ALL_STATICLIB_DIRS="" ALL_INSTALL_DIRS="" -ALL_TEST_DIRS="" - ALL_TEST_BINARIES="" ALL_PROGRAM_DIRS="" @@ -14022,15 +14019,22 @@ $ac_name.rc: $ac_name.res: $ac_name.rc $ac_name.exe" wine_fn_append_file ALL_DIRS $ac_dir wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir: __builddeps__ -$ac_dir/__crosstest__: __buildcrossdeps__ -$ac_dir/__clean__ $ac_dir/__crosstest__ $ac_dir: $ac_dir/Makefile +"$ac_dir/__clean__: $ac_dir/Makefile $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Maketest.rules \$(MAKEDEP) @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend" + if test "x$enable_tests" = x""no; then : else - wine_fn_append_file ALL_TEST_DIRS $ac_dir + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"all programs/winetest: $ac_dir +$ac_dir: $ac_dir/Makefile __builddeps__ +crosstest:: $ac_dir/Makefile __buildcrossdeps__ + @cd $ac_dir && \$(MAKE) crosstest +test:: + @cd $ac_dir && \$(MAKE) test +testclean:: + \$(RM) $ac_dir/*.ok" fi }

1 0

Alexandre Julliard : makefiles: Output all the program rules explicitly for each module.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: d7b387d376b4460214a9378359bb8a1255118634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7b387d376b4460214a937835… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 11:11:34 2010 +0100 makefiles: Output all the program rules explicitly for each module. --- Makefile.in | 14 +++++--------- aclocal.m4 | 24 ++++++++++++++---------- configure | 28 ++++++++++++++-------------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Makefile.in b/Makefile.in index bce8b39..b3dbd5e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -29,8 +29,6 @@ MODULE = none ALL_DIRS = @ALL_DIRS@ ALL_DLL_DIRS = @ALL_DLL_DIRS@ -ALL_INSTALL_DIRS = @ALL_INSTALL_DIRS@ -ALL_PROGRAM_DIRS = @ALL_PROGRAM_DIRS@ ALL_STATICLIB_DIRS = @ALL_STATICLIB_DIRS@ ALL_TOOL_DIRS = @ALL_TOOL_DIRS@ ALL_TOP_DIRS = @ALL_TOP_DIRS@ @@ -41,8 +39,7 @@ BUILDSUBDIRS = \ $(ALL_TOOL_DIRS) \ $(ALL_TOP_DIRS) \ $(ALL_STATICLIB_DIRS) \ - $(ALL_DLL_DIRS) \ - $(ALL_PROGRAM_DIRS) + $(ALL_DLL_DIRS) # Sub-directories to run make install/uninstall into INSTALLSUBDIRS = \ @@ -50,8 +47,7 @@ INSTALLSUBDIRS = \ $(ALL_TOOL_DIRS) \ $(ALL_TOP_DIRS) \ $(ALL_STATICLIB_DIRS) \ - $(ALL_DLL_DIRS) \ - $(ALL_INSTALL_DIRS) + $(ALL_DLL_DIRS) # Sub-directories that don't have a makefile EXTRASUBDIRS = dlls libs @@ -135,9 +131,6 @@ uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__) dummy .PHONY: $(INSTALLSUBDIRS:%=%/__install__) $(INSTALLSUBDIRS:%=%/__uninstall__) \ $(INSTALLSUBDIRS:%=%/__install-lib__) $(INSTALLSUBDIRS:%=%/__install-dev__) -uninstall:: - -rmdir $(DESTDIR)$(datadir)/wine $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir) - # Rules for auto documentation DOCSUBDIRS = $(ALL_DLL_DIRS) @@ -214,3 +207,6 @@ tags ctags: .MAKEFILEDEPS: @ALL_MAKEFILE_DEPENDS@ + +uninstall:: + -rmdir $(DESTDIR)$(datadir)/wine $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir) diff --git a/aclocal.m4 b/aclocal.m4 index 183a81d..2ba382f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -151,9 +151,7 @@ AC_SUBST(ALL_TOP_DIRS,"") AC_SUBST(ALL_DLL_DIRS,"") AC_SUBST(ALL_TOOL_DIRS,"") AC_SUBST(ALL_STATICLIB_DIRS,"") -AC_SUBST(ALL_INSTALL_DIRS,"") AC_SUBST(ALL_TEST_BINARIES,"") -AC_SUBST(ALL_PROGRAM_DIRS,"") AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"") wine_fn_append_file () @@ -258,16 +256,22 @@ wine_fn_config_program () ac_install=$[3] wine_fn_append_file ALL_DIRS programs/$ac_dir wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"programs/$ac_dir programs/$ac_dir/__install__ programs/$ac_dir/__install-lib__: __builddeps__ programs/$ac_dir/Makefile -programs/$ac_dir/__clean__ programs/$ac_dir/__install-dev__ programs/$ac_dir/__uninstall__ programs/$ac_dir: programs/$ac_dir/Makefile +"programs/$ac_dir/__clean__: programs/$ac_dir/Makefile programs/$ac_dir/Makefile programs/$ac_dir/__depend__: programs/$ac_dir/Makefile.in config.status programs/Makeprog.rules \$(MAKEDEP) @./config.status --file programs/$ac_dir/Makefile && cd programs/$ac_dir && \$(MAKE) depend" - AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_file ALL_PROGRAM_DIRS programs/$ac_dir - case $ac_install in - installbin) wine_fn_append_file ALL_INSTALL_DIRS programs/$ac_dir - wine_fn_append_file ALL_PROGRAM_BIN_INSTALL_DIRS programs/$ac_dir ;; - install) wine_fn_append_file ALL_INSTALL_DIRS programs/$ac_dir ;; - esac]) + + AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"all: programs/$ac_dir +programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__" + if test -n "$ac_install" + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"install install-lib:: programs/$ac_dir/Makefile __builddeps__ + @cd programs/$ac_dir && \$(MAKE) install +uninstall:: programs/$ac_dir/Makefile + @cd programs/$ac_dir && \$(MAKE) uninstall" + test "$ac_install" != installbin || wine_fn_append_file ALL_PROGRAM_BIN_INSTALL_DIRS programs/$ac_dir + fi]) } wine_fn_config_test () diff --git a/configure b/configure index 6dae004..be8bd2c 100755 --- a/configure +++ b/configure @@ -597,9 +597,7 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS ALL_PROGRAM_BIN_INSTALL_DIRS -ALL_PROGRAM_DIRS ALL_TEST_BINARIES -ALL_INSTALL_DIRS ALL_STATICLIB_DIRS ALL_TOOL_DIRS ALL_DLL_DIRS @@ -13871,12 +13869,8 @@ ALL_TOOL_DIRS="" ALL_STATICLIB_DIRS="" -ALL_INSTALL_DIRS="" - ALL_TEST_BINARIES="" -ALL_PROGRAM_DIRS="" - ALL_PROGRAM_BIN_INSTALL_DIRS="" @@ -13989,20 +13983,26 @@ wine_fn_config_program () ac_install=$3 wine_fn_append_file ALL_DIRS programs/$ac_dir wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"programs/$ac_dir programs/$ac_dir/__install__ programs/$ac_dir/__install-lib__: __builddeps__ programs/$ac_dir/Makefile -programs/$ac_dir/__clean__ programs/$ac_dir/__install-dev__ programs/$ac_dir/__uninstall__ programs/$ac_dir: programs/$ac_dir/Makefile +"programs/$ac_dir/__clean__: programs/$ac_dir/Makefile programs/$ac_dir/Makefile programs/$ac_dir/__depend__: programs/$ac_dir/Makefile.in config.status programs/Makeprog.rules \$(MAKEDEP) @./config.status --file programs/$ac_dir/Makefile && cd programs/$ac_dir && \$(MAKE) depend" + eval as_val=\$$ac_enable if test "x$as_val" = x""no; then : else - wine_fn_append_file ALL_PROGRAM_DIRS programs/$ac_dir - case $ac_install in - installbin) wine_fn_append_file ALL_INSTALL_DIRS programs/$ac_dir - wine_fn_append_file ALL_PROGRAM_BIN_INSTALL_DIRS programs/$ac_dir ;; - install) wine_fn_append_file ALL_INSTALL_DIRS programs/$ac_dir ;; - esac + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"all: programs/$ac_dir +programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__" + if test -n "$ac_install" + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"install install-lib:: programs/$ac_dir/Makefile __builddeps__ + @cd programs/$ac_dir && \$(MAKE) install +uninstall:: programs/$ac_dir/Makefile + @cd programs/$ac_dir && \$(MAKE) uninstall" + test "$ac_install" != installbin || wine_fn_append_file ALL_PROGRAM_BIN_INSTALL_DIRS programs/$ac_dir + fi fi }

1 0

Alexandre Julliard : makefiles: Output all the static library rules explicitly for each module.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: c2c3c21078e80c6542d71b2c2c3a01082c765178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2c3c21078e80c6542d71b2c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 11:13:07 2010 +0100 makefiles: Output all the static library rules explicitly for each module. --- Makefile.in | 3 --- aclocal.m4 | 16 +++++++++------- configure | 18 +++++++++--------- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/Makefile.in b/Makefile.in index b3dbd5e..c8baf6d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -29,7 +29,6 @@ MODULE = none ALL_DIRS = @ALL_DIRS@ ALL_DLL_DIRS = @ALL_DLL_DIRS@ -ALL_STATICLIB_DIRS = @ALL_STATICLIB_DIRS@ ALL_TOOL_DIRS = @ALL_TOOL_DIRS@ ALL_TOP_DIRS = @ALL_TOP_DIRS@ @@ -38,7 +37,6 @@ BUILDSUBDIRS = \ libs/wine \ $(ALL_TOOL_DIRS) \ $(ALL_TOP_DIRS) \ - $(ALL_STATICLIB_DIRS) \ $(ALL_DLL_DIRS) # Sub-directories to run make install/uninstall into @@ -46,7 +44,6 @@ INSTALLSUBDIRS = \ libs/wine \ $(ALL_TOOL_DIRS) \ $(ALL_TOP_DIRS) \ - $(ALL_STATICLIB_DIRS) \ $(ALL_DLL_DIRS) # Sub-directories that don't have a makefile diff --git a/aclocal.m4 b/aclocal.m4 index 2ba382f..7a86834 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -150,7 +150,6 @@ AC_SUBST(ALL_DIRS,"") AC_SUBST(ALL_TOP_DIRS,"") AC_SUBST(ALL_DLL_DIRS,"") AC_SUBST(ALL_TOOL_DIRS,"") -AC_SUBST(ALL_STATICLIB_DIRS,"") AC_SUBST(ALL_TEST_BINARIES,"") AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"") @@ -184,16 +183,19 @@ wine_fn_config_lib () ac_name=$[1] ac_dir=dlls/$ac_name wine_fn_append_file ALL_DIRS $ac_dir - wine_fn_append_file ALL_STATICLIB_DIRS $ac_dir wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/__install__ $ac_dir/__install-dev__ __builddeps__: $ac_dir +"all __builddeps__: $ac_dir __buildcrossdeps__: $ac_dir/lib$ac_name.cross.a -$ac_dir $ac_dir/lib$ac_name.cross.a: tools/widl tools/winebuild tools/winegcc include -$ac_dir/lib$ac_name.cross.a: $ac_dir/Makefile dummy +$ac_dir $ac_dir/lib$ac_name.cross.a: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include +$ac_dir/lib$ac_name.cross.a: dummy @cd $ac_dir && \$(MAKE) lib$ac_name.cross.a -$ac_dir/__clean__ $ac_dir/__install-lib__ $ac_dir/__uninstall__ $ac_dir: $ac_dir/Makefile +$ac_dir/__clean__: $ac_dir/Makefile $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status dlls/Makeimplib.rules \$(MAKEDEP) - @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend" + @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend +install install-dev:: $ac_dir + @cd $ac_dir && \$(MAKE) install +uninstall:: $ac_dir/Makefile + @cd $ac_dir && \$(MAKE) uninstall" } wine_fn_config_dll () diff --git a/configure b/configure index be8bd2c..15a589e 100755 --- a/configure +++ b/configure @@ -598,7 +598,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS ALL_PROGRAM_BIN_INSTALL_DIRS ALL_TEST_BINARIES -ALL_STATICLIB_DIRS ALL_TOOL_DIRS ALL_DLL_DIRS ALL_TOP_DIRS @@ -13867,8 +13866,6 @@ ALL_DLL_DIRS="" ALL_TOOL_DIRS="" -ALL_STATICLIB_DIRS="" - ALL_TEST_BINARIES="" ALL_PROGRAM_BIN_INSTALL_DIRS="" @@ -13909,16 +13906,19 @@ wine_fn_config_lib () ac_name=$1 ac_dir=dlls/$ac_name wine_fn_append_file ALL_DIRS $ac_dir - wine_fn_append_file ALL_STATICLIB_DIRS $ac_dir wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/__install__ $ac_dir/__install-dev__ __builddeps__: $ac_dir +"all __builddeps__: $ac_dir __buildcrossdeps__: $ac_dir/lib$ac_name.cross.a -$ac_dir $ac_dir/lib$ac_name.cross.a: tools/widl tools/winebuild tools/winegcc include -$ac_dir/lib$ac_name.cross.a: $ac_dir/Makefile dummy +$ac_dir $ac_dir/lib$ac_name.cross.a: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include +$ac_dir/lib$ac_name.cross.a: dummy @cd $ac_dir && \$(MAKE) lib$ac_name.cross.a -$ac_dir/__clean__ $ac_dir/__install-lib__ $ac_dir/__uninstall__ $ac_dir: $ac_dir/Makefile +$ac_dir/__clean__: $ac_dir/Makefile $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status dlls/Makeimplib.rules \$(MAKEDEP) - @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend" + @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend +install install-dev:: $ac_dir + @cd $ac_dir && \$(MAKE) install +uninstall:: $ac_dir/Makefile + @cd $ac_dir && \$(MAKE) uninstall" } wine_fn_config_dll ()

1 0

Henri Verbeet : wined3d: Disable two-sided stencil when doing stencil clears.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: 1c4e9e6a0e09fcf6c95013bbb627fb107ffb7072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c4e9e6a0e09fcf6c95013bbb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 25 09:32:35 2010 +0100 wined3d: Disable two-sided stencil when doing stencil clears. --- dlls/wined3d/device.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d48acf2..b25c4ec 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4390,7 +4390,13 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac ENTER_GL(); /* Only set the values up once, as they are not changing */ - if (Flags & WINED3DCLEAR_STENCIL) { + if (Flags & WINED3DCLEAR_STENCIL) + { + if (context->gl_info->supported[EXT_STENCIL_TWO_SIDE]) + { + glDisable(GL_STENCIL_TEST_TWO_SIDE_EXT); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_TWOSIDEDSTENCILMODE)); + } glClearStencil(Stencil); checkGLcall("glClearStencil"); glMask = glMask | GL_STENCIL_BUFFER_BIT;

1 0