January 2010 - Wine-Commits

Jacek Caban : shdocvw: Moved DocHost client site releasing to separated function and release more interfaces in SetClientSite .
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: 8112b59c9e2f134eaee90653631b7e987f8ec312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8112b59c9e2f134eaee906536… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 22 17:12:26 2010 +0100 shdocvw: Moved DocHost client site releasing to separated function and release more interfaces in SetClientSite. --- dlls/shdocvw/dochost.c | 29 ++++++++++++++++++++++++----- dlls/shdocvw/oleobject.c | 11 ++--------- dlls/shdocvw/shdocvw.h | 1 + 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 5d661fd..6c9d05c 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -362,6 +362,29 @@ void deactivate_document(DocHost *This) This->document = NULL; } +void release_dochost_client(DocHost *This) +{ + if(This->hwnd) { + DestroyWindow(This->hwnd); + This->hwnd = NULL; + } + + if(This->hostui) { + IDocHostUIHandler_Release(This->hostui); + This->hostui = NULL; + } + + if(This->client_disp) { + IDispatch_Release(This->client_disp); + This->client_disp = NULL; + } + + if(This->frame) { + IOleInPlaceFrame_Release(This->frame); + This->frame = NULL; + } +} + #define OLECMD_THIS(iface) DEFINE_THIS(DocHost, OleCommandTarget, iface) static HRESULT WINAPI ClOleCommandTarget_QueryInterface(IOleCommandTarget *iface, @@ -744,11 +767,7 @@ void DocHost_Init(DocHost *This, IDispatch *disp) void DocHost_Release(DocHost *This) { - if(This->client_disp) - IDispatch_Release(This->client_disp); - if(This->frame) - IOleInPlaceFrame_Release(This->frame); - + release_dochost_client(This); DocHost_ClientSite_Release(This); ConnectionPointContainer_Destroy(&This->cps); diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index dde850f..573e60d 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -292,10 +292,8 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE if(This->client == pClientSite) return S_OK; - if(This->doc_host.hwnd) { - DestroyWindow(This->doc_host.hwnd); - This->doc_host.hwnd = NULL; - } + release_dochost_client(&This->doc_host); + if(This->shell_embedding_hwnd) { DestroyWindow(This->shell_embedding_hwnd); This->shell_embedding_hwnd = NULL; @@ -306,11 +304,6 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE This->inplace = NULL; } - if(This->doc_host.hostui) { - IDocHostUIHandler_Release(This->doc_host.hostui); - This->doc_host.hostui = NULL; - } - if(This->client) IOleClientSite_Release(This->client); diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 8d0861f..c5b9c9a 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -205,6 +205,7 @@ void WebBrowser_OleObject_Destroy(WebBrowser*); void DocHost_Init(DocHost*,IDispatch*); void DocHost_ClientSite_Init(DocHost*); void DocHost_Frame_Init(DocHost*); +void release_dochost_client(DocHost*); void DocHost_Release(DocHost*); void DocHost_ClientSite_Release(DocHost*);

1 0

Alexandre Julliard : makefiles: Add rules for cross-compiling static libraries.
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: 1f254216d109f7a1c74e5cc79fbc7869f46722ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f254216d109f7a1c74e5cc79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 23 20:26:49 2010 +0100 makefiles: Add rules for cross-compiling static libraries. --- Make.rules.in | 3 +++ configure | 4 ++-- configure.ac | 2 +- dlls/Makedll.rules.in | 7 ++++++- dlls/Makeimplib.rules.in | 5 +++++ 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 05e82bd..057d9b8 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -53,6 +53,9 @@ FONTFORGE = @FONTFORGE@ RSVG = @RSVG@ ICOTOOL = @ICOTOOL@ CROSSCC = @CROSSCC@ +CROSSTARGET = @CROSSTARGET@ +CROSSAR = $(CROSSTARGET)-ar +CROSSRANLIB = $(CROSSTARGET)-ranlib FAKEEXT = $(DLLEXT:.so=.fake) INCLUDES = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include $(EXTRAINCL) EXTRACFLAGS = @EXTRACFLAGS@ diff --git a/configure b/configure index f856b23..9eabf3c 100755 --- a/configure +++ b/configure @@ -653,7 +653,7 @@ X_PRE_LIBS X_CFLAGS XMKMF LIBPTHREAD -CROSSTARGETFLAGS +CROSSTARGET CROSSTEST CROSSCC CARBONLIB @@ -6950,7 +6950,7 @@ test -n "$CROSSCC" || CROSSCC="false" done if test -n "$target" then - CROSSTARGETFLAGS="-b $target" + CROSSTARGET="$target" fi fi diff --git a/configure.ac b/configure.ac index ef95fe7..4e9d263 100644 --- a/configure.ac +++ b/configure.ac @@ -772,7 +772,7 @@ then done if test -n "$target" then - AC_SUBST(CROSSTARGETFLAGS,"-b $target") + AC_SUBST(CROSSTARGET,"$target") fi fi fi diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 044d336..c3c8c67 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -28,6 +28,8 @@ $(MODULE) $(MODULE).so $(MODULE).fake: $(MAINSPEC) $(OBJS) Makefile.in # Rules for import libraries +IMPLIB_CROSSOBJS = $(IMPLIB_OBJS:.o=.cross.o) + .PHONY: implib $(IMPLIB_SRCS:%=__static_implib__%) all implib: $(IMPORTLIBFILE) $(IMPLIB_SRCS:%=__static_implib__%) @@ -43,7 +45,10 @@ $(IMPORTLIB:%=lib%.def.a): $(IMPLIB_OBJS) $(RANLIB) $@ $(IMPORTLIB:%=lib%.a): $(MAINSPEC) $(IMPLIB_OBJS) - $(WINEBUILD) $(IMPLIBFLAGS) @CROSSTARGETFLAGS@ -w --implib -o $@ --export $(SRCDIR)/$(MAINSPEC) $(IMPLIB_OBJS) + $(WINEBUILD) $(IMPLIBFLAGS) -w --implib -o $@ --export $(SRCDIR)/$(MAINSPEC) $(IMPLIB_OBJS) + +$(IMPORTLIB:%=lib%.cross.a): $(MAINSPEC) $(IMPLIB_CROSSOBJS) + $(WINEBUILD) $(IMPLIBFLAGS) $(CROSSTARGET:%=-b %) -w --implib -o $@ --export $(SRCDIR)/$(MAINSPEC) $(IMPLIB_CROSSOBJS) $(SUBDIRS): implib diff --git a/dlls/Makeimplib.rules.in b/dlls/Makeimplib.rules.in index 380101f..da36eee 100644 --- a/dlls/Makeimplib.rules.in +++ b/dlls/Makeimplib.rules.in @@ -21,6 +21,11 @@ $(MODULE:%=lib%.a): $(OBJS) Makefile.in $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ +$(MODULE:%=lib%.cross.a): $(CROSSOBJS) Makefile.in + $(RM) $@ + $(CROSSAR) $(ARFLAGS) $@ $(CROSSOBJS) + $(CROSSRANLIB) $@ + # Rules for installation install install-dev:: $(MODULE:%=lib%.a) $(DESTDIR)$(dlldir)

1 0

Alexandre Julliard : makefiles: Cross-compile all static libraries and import libs to .cross. a files to avoid conflicts.
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: 4945a136dc8701b33023bcd1e34c7ee96066fe1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4945a136dc8701b33023bcd1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 23 20:33:37 2010 +0100 makefiles: Cross-compile all static libraries and import libs to .cross.a files to avoid conflicts. --- Make.rules.in | 2 +- dlls/Makefile.in | 610 +++++++++++++++++++++++++++----------------------- tools/make_makefiles | 19 ++- 3 files changed, 340 insertions(+), 291 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4945a136dc8701b33023b…

1 0

Jacek Caban : shdocvw: Moved WebBrowser client site realizing to separated function and release more interfaces in SetClientSite .
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: ff06efd1eb54f4a3f7b2f29e9b2c81f002b8e33f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff06efd1eb54f4a3f7b2f29e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 22 17:12:57 2010 +0100 shdocvw: Moved WebBrowser client site realizing to separated function and release more interfaces in SetClientSite. --- dlls/shdocvw/oleobject.c | 55 +++++++++++++++++++++++++++------------------ 1 files changed, 33 insertions(+), 22 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 573e60d..f67edb7 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -255,6 +255,36 @@ static HRESULT on_silent_change(WebBrowser *This) return S_OK; } +static void release_client_site(WebBrowser *This) +{ + release_dochost_client(&This->doc_host); + + if(This->shell_embedding_hwnd) { + DestroyWindow(This->shell_embedding_hwnd); + This->shell_embedding_hwnd = NULL; + } + + if(This->inplace) { + IOleInPlaceSite_Release(This->inplace); + This->inplace = NULL; + } + + if(This->container) { + IOleContainer_Release(This->container); + This->container = NULL; + } + + if(This->uiwindow) { + IOleInPlaceUIWindow_Release(This->uiwindow); + This->uiwindow = NULL; + } + + if(This->client) { + IOleClientSite_Release(This->client); + This->client = NULL; + } +} + /********************************************************************** * Implement the IOleObject interface for the WebBrowser control */ @@ -292,22 +322,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE if(This->client == pClientSite) return S_OK; - release_dochost_client(&This->doc_host); - - if(This->shell_embedding_hwnd) { - DestroyWindow(This->shell_embedding_hwnd); - This->shell_embedding_hwnd = NULL; - } - - if(This->inplace) { - IOleInPlaceSite_Release(This->inplace); - This->inplace = NULL; - } - - if(This->client) - IOleClientSite_Release(This->client); - - This->client = pClientSite; + release_client_site(This); if(!pClientSite) { if(This->doc_host.document) @@ -316,6 +331,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE } IOleClientSite_AddRef(pClientSite); + This->client = pClientSite; hres = IOleClientSite_QueryInterface(This->client, &IID_IDispatch, (void**)&disp); @@ -962,10 +978,5 @@ void WebBrowser_OleObject_Init(WebBrowser *This) void WebBrowser_OleObject_Destroy(WebBrowser *This) { - if(This->client) - IOleObject_SetClientSite(OLEOBJ(This), NULL); - if(This->container) - IOleContainer_Release(This->container); - if(This->uiwindow) - IOleInPlaceUIWindow_Release(This->uiwindow); + release_client_site(This); }

1 0

Alexandre Julliard : Avoid using wine/port.h in static libraries.
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: 62e0de5f738a2eb695dffcd5d98eea54b459eff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e0de5f738a2eb695dffcd5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 23 20:51:27 2010 +0100 Avoid using wine/port.h in static libraries. --- dlls/dxerr8/dxerr8.c | 1 - dlls/dxerr9/dxerr9.c | 1 - dlls/winecrt0/stub.c | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/dxerr8/dxerr8.c b/dlls/dxerr8/dxerr8.c index 534f632..e42ee00 100644 --- a/dlls/dxerr8/dxerr8.c +++ b/dlls/dxerr8/dxerr8.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <stdarg.h> #include <stdio.h> diff --git a/dlls/dxerr9/dxerr9.c b/dlls/dxerr9/dxerr9.c index 7eabff1..c65f48e 100644 --- a/dlls/dxerr9/dxerr9.c +++ b/dlls/dxerr9/dxerr9.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <stdarg.h> #include <stdio.h> diff --git a/dlls/winecrt0/stub.c b/dlls/winecrt0/stub.c index 5f52d46..913181a 100644 --- a/dlls/winecrt0/stub.c +++ b/dlls/winecrt0/stub.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : makefiles: Disable 16-bit specific modules from make_makefiles.
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: 8e9050ba058a1d100be2ce24f59305feb7c623fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9050ba058a1d100be2ce24f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 23 14:24:06 2010 +0100 makefiles: Disable 16-bit specific modules from make_makefiles. --- configure | 13 +++---------- configure.ac | 13 +++---------- tools/make_makefiles | 22 ++++++++++++++++++++-- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/configure b/configure index 3a3a6de..f856b23 100755 --- a/configure +++ b/configure @@ -4099,13 +4099,6 @@ esac enable_win16=${enable_win16:-no} -if test "x$enable_win16" != "xyes" -then - enable_w32skrnl=${enable_w32skrnl:-no} - enable_winevdm=${enable_winevdm:-no} - enable_wow32=${enable_wow32:-no} -fi - if test -n "$with_wine64" then if test "x$enable_win64" = "xyes" @@ -16906,7 +16899,7 @@ ac_config_files="$ac_config_files dlls/vwin32.vxd/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/w32skrnl/Makefile" -test "x$enable_w32skrnl" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ +test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ w32skrnl" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/w32skrnl/Makefile: dlls/w32skrnl/Makefile.in dlls/Makedll.rules" @@ -17306,7 +17299,7 @@ ac_config_files="$ac_config_files dlls/wnaspi32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/wow32/Makefile" -test "x$enable_wow32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ +test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ wow32" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/wow32/Makefile: dlls/wow32/Makefile.in dlls/Makedll.rules" @@ -17909,7 +17902,7 @@ ac_config_files="$ac_config_files programs/winetest/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/winevdm/Makefile" -test "x$enable_winevdm" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ +test "x$enable_win16" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ winevdm" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ winevdm" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS diff --git a/configure.ac b/configure.ac index 7d5a29a..ef95fe7 100644 --- a/configure.ac +++ b/configure.ac @@ -169,13 +169,6 @@ esac dnl enable_win16 defaults to yes on x86, to no on other CPUs enable_win16=${enable_win16:-no} -if test "x$enable_win16" != "xyes" -then - enable_w32skrnl=${enable_w32skrnl:-no} - enable_winevdm=${enable_winevdm:-no} - enable_wow32=${enable_wow32:-no} -fi - dnl Some special cases for the wow64 build if test -n "$with_wine64" then @@ -2524,7 +2517,7 @@ WINE_CONFIG_DLL(vnbt.vxd,enable_win16) WINE_CONFIG_DLL(vnetbios.vxd,enable_win16) WINE_CONFIG_DLL(vtdapi.vxd,enable_win16) WINE_CONFIG_DLL(vwin32.vxd,enable_win16) -WINE_CONFIG_DLL(w32skrnl) +WINE_CONFIG_DLL(w32skrnl,enable_win16) WINE_CONFIG_DLL(w32sys.dll16,enable_win16) WINE_CONFIG_DLL(wbemprox) WINE_CONFIG_DLL(wiaservc) @@ -2574,7 +2567,7 @@ WINE_CONFIG_TEST(dlls/wldap32/tests) WINE_CONFIG_DLL(wmi) WINE_CONFIG_DLL(wmiutils) WINE_CONFIG_DLL(wnaspi32) -WINE_CONFIG_DLL(wow32) +WINE_CONFIG_DLL(wow32,enable_win16) WINE_CONFIG_DLL(ws2_32) WINE_CONFIG_TEST(dlls/ws2_32/tests) WINE_CONFIG_DLL(wsock32) @@ -2643,7 +2636,7 @@ WINE_CONFIG_PROGRAM(winemenubuilder,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(winemine,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(winepath,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(winetest,[ALL_PROGRAM_DIRS]) -WINE_CONFIG_PROGRAM(winevdm,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_PROGRAM(winevdm,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS],enable_win16) WINE_CONFIG_PROGRAM(winhelp.exe16,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS],enable_win16) WINE_CONFIG_PROGRAM(winhlp32,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(winoldap.mod16,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS],enable_win16) diff --git a/tools/make_makefiles b/tools/make_makefiles index 3abedf7..711466b 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -55,6 +55,23 @@ my %dont_install = "winetest" => 1, ); +# Dlls and programs that are 16-bit specific +my %modules16 = +( + "ifsmgr.vxd" => 1, + "mmdevldr.vxd" => 1, + "monodebg.vxd" => 1, + "vdhcp.vxd" => 1, + "vmm.vxd" => 1, + "vnbt.vxd" => 1, + "vnetbios.vxd" => 1, + "vtdapi.vxd" => 1, + "vwin32.vxd" => 1, + "w32skrnl.dll" => 1, + "winevdm.exe" => 1, + "wow32.dll" => 1, +); + # Default patterns for top-level .gitignore my @ignores = ( "*.[oa]", @@ -339,10 +356,11 @@ sub update_makefiles(@) my %make = %{$makefiles{$file}}; my $rules = $make{"=rules"}; my $args = ""; + my $is_win16 = $make{"MODULE"} && ($make{"MODULE"} =~ /16$/ || $modules16{$make{"MODULE"}}); if ($rules eq $makerules{"MAKE_DLL_RULES"}) { (my $name = $file) =~ s/^dlls\/(.*)\/Makefile/$1/; - $args .= ",enable_win16" if $make{"MODULE"} =~ /(16|\.vxd)$/; + $args .= ",enable_win16" if $is_win16; push @lines, "WINE_CONFIG_DLL($name$args)\n"; } elsif ($rules eq $makerules{"MAKE_PROG_RULES"}) @@ -352,7 +370,7 @@ sub update_makefiles(@) $args .= ",ALL_PROGRAM_INSTALL_DIRS" unless $dont_install{$name}; $args .= ",ALL_PROGRAM_BIN_INSTALL_DIRS" if $bin_install{$name}; $args .= "]"; - $args .= ",enable_win16" if $make{"MODULE"} =~ /16$/; + $args .= ",enable_win16" if $is_win16; push @lines, "WINE_CONFIG_PROGRAM($name$args)\n"; } elsif ($rules eq $makerules{"MAKE_TEST_RULES"})

1 0

Alexandre Julliard : makefiles: Move some of the cross-compile rules to the main rules file.
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: cce4387193f34f4528bd21ca95b0614cd4687f04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cce4387193f34f4528bd21ca9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 23 18:00:54 2010 +0100 makefiles: Move some of the cross-compile rules to the main rules file. --- Make.rules.in | 8 +++++++- dlls/Maketest.rules.in | 9 --------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 1a279f8..05e82bd 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -52,6 +52,7 @@ LINTFLAGS = @LINTFLAGS@ FONTFORGE = @FONTFORGE@ RSVG = @RSVG@ ICOTOOL = @ICOTOOL@ +CROSSCC = @CROSSCC@ FAKEEXT = $(DLLEXT:.so=.fake) INCLUDES = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include $(EXTRAINCL) EXTRACFLAGS = @EXTRACFLAGS@ @@ -72,6 +73,7 @@ WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT) WMC = $(TOOLSDIR)/tools/wmc/wmc$(TOOLSEXT) WIDL = $(TOOLSDIR)/tools/widl/widl$(TOOLSEXT) WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(TARGETFLAGS) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(TOPOBJDIR) +CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc @CROSSTARGETFLAGS@ -B$(TOOLSDIR)/tools/winebuild --sysroot=$(TOPOBJDIR) RELPATH = $(TOOLSDIR)/tools/relpath$(TOOLSEXT) SFNT2FNT = $(TOOLSDIR)/tools/sfnt2fnt$(TOOLSEXT) RC = $(WRC) @@ -120,6 +122,7 @@ CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $ OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) \ $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.mc.res) $(EXTRA_OBJS) +CROSSOBJS = $(OBJS:.o=.cross.o) LINTS = $(C_SRCS:.c=.ln) # 'all' target first in case the enclosing Makefile didn't define any target @@ -133,11 +136,14 @@ filter: dummy # Implicit rules -.SUFFIXES: .mc .rc .mc.rc .res .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c @MAINTAINER_MODE@ .sfd .ttf .svg .ico +.SUFFIXES: .mc .rc .mc.rc .res .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c .cross.o @MAINTAINER_MODE@ .sfd .ttf .svg .ico .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< +.c.cross.o: + $(CROSSCC) -c $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) -o $@ $< + .y.tab.c: $(BISON) $(BISONFLAGS) -p $*_ -o $@ $< diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index 95f5c2b..446ae72 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -22,8 +22,6 @@ ALL_LIBS = $(IMPORTS:%=-l%) $(EXTRALIBS) $(LDFLAGS) $(LIBS) EXTRA_OBJS = testlist.o CROSSTEST = $(TESTDLL:%.dll=%)_crosstest.exe -CROSSCC = @CROSSCC@ -CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc @CROSSTARGETFLAGS@ -B$(TOOLSDIR)/tools/winebuild --sysroot=$(TOPOBJDIR) MAKEDEPFLAGS = -xo -xcross.o @MAKE_RULES@ @@ -48,13 +46,6 @@ $(TESTRESULTS): $(MODULE)$(DLLEXT) ../$(TESTDLL)$(DLLEXT) # Rules for cross-compiling tests -CROSSOBJS = $(OBJS:.o=.cross.o) - -.SUFFIXES: .cross.o - -.c.cross.o: - $(CROSSCC) -c $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) -o $@ $< - crosstest:: @CROSSTEST@ $(CROSSTEST): $(CROSSOBJS) Makefile.in

1 0

Alexandre Julliard : winegcc: Add support for specifying a custom static library suffix.
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: 07af19f3abd4869597b09d05cde94beb97073947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07af19f3abd4869597b09d05c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 23 20:25:14 2010 +0100 winegcc: Add support for specifying a custom static library suffix. --- tools/winegcc/utils.c | 10 ++++++---- tools/winegcc/utils.h | 3 ++- tools/winegcc/winegcc.c | 9 ++++++++- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index 66c7e41..2a6a249 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -259,7 +259,7 @@ static char* try_lib_path(const char* dir, const char* pre, } static file_type guess_lib_type(enum target_platform platform, const char* dir, - const char* library, char** file) + const char* library, const char *suffix, char** file) { if (platform != PLATFORM_WINDOWS) { @@ -277,19 +277,21 @@ static file_type guess_lib_type(enum target_platform platform, const char* dir, } /* static archives */ - if ((*file = try_lib_path(dir, "lib", library, ".a", file_arh))) + if ((*file = try_lib_path(dir, "lib", library, suffix, file_arh))) return file_arh; return file_na; } -file_type get_lib_type(enum target_platform platform, strarray* path, const char* library, char** file) +file_type get_lib_type(enum target_platform platform, strarray* path, const char *library, + const char *suffix, char** file) { unsigned int i; + if (!suffix) suffix = ".a"; for (i = 0; i < path->size; i++) { - file_type type = guess_lib_type(platform, path->base[i], library, file); + file_type type = guess_lib_type(platform, path->base[i], library, suffix, file); if (type != file_na) return type; } return file_na; diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index 35afedd..f526c16 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -72,7 +72,8 @@ typedef enum { char* get_basename(const char* file); void create_file(const char* name, int mode, const char* fmt, ...); file_type get_file_type(const char* filename); -file_type get_lib_type(enum target_platform platform, strarray* path, const char* library, char** file); +file_type get_lib_type(enum target_platform platform, strarray* path, const char *library, + const char *suffix, char** file); void spawn(const strarray* prefix, const strarray* arr, int ignore_errors); extern int verbose; diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index b3e58e0..852f105 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -199,6 +199,7 @@ struct options const char* output_name; const char* image_base; const char* section_align; + const char* lib_suffix; strarray* prefix; strarray* lib_dirs; strarray* linker_args; @@ -520,7 +521,7 @@ static void add_library( struct options *opts, strarray *lib_dirs, strarray *fil { char *static_lib, *fullname = 0; - switch(get_lib_type(opts->target_platform, lib_dirs, library, &fullname)) + switch(get_lib_type(opts->target_platform, lib_dirs, library, opts->lib_suffix, &fullname)) { case file_arh: strarray_add(files, strmake("-a%s", fullname)); @@ -1333,6 +1334,12 @@ int main(int argc, char **argv) else opts.wine_objdir = argv[++i]; raw_compiler_arg = raw_linker_arg = 0; } + else if (!strncmp("--lib-suffix", argv[i], 12) && opts.wine_objdir) + { + if (argv[i][12] == '=') opts.lib_suffix = argv[i] + 13; + else opts.lib_suffix = argv[++i]; + raw_compiler_arg = raw_linker_arg = 0; + } break; }

1 0

Alexandre Julliard : makefiles: Remove the obsolete rule for .spec.o files.
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: 79cac381cb76e9c5bd2d742478c63fc843894893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79cac381cb76e9c5bd2d74247… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 23 14:24:23 2010 +0100 makefiles: Remove the obsolete rule for .spec.o files. --- Make.rules.in | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 2bb9408..1a279f8 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -133,7 +133,7 @@ filter: dummy # Implicit rules -.SUFFIXES: .mc .rc .mc.rc .res .spec .spec.o .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c @MAINTAINER_MODE@ .sfd .ttf .svg .ico +.SUFFIXES: .mc .rc .mc.rc .res .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c @MAINTAINER_MODE@ .sfd .ttf .svg .ico .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< @@ -153,9 +153,6 @@ filter: dummy .rc.res: $(LDPATH) $(RC) $(RCFLAGS) -fo$@ $< -.spec.spec.o: - $(WINEBUILD) $(WINEBUILDFLAGS) --dll -o $@ --main-module $(MODULE) --export $< - .idl.h: $(WIDL) $(IDLFLAGS) -h -H $@ $<

1 0

Alexandre Julliard : configure: Add specific creation macros for the various types of makefiles.
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: aa6c4d4e92cdb944e53a0c36819621a6875f1e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa6c4d4e92cdb944e53a0c368… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 23 14:15:43 2010 +0100 configure: Add specific creation macros for the various types of makefiles. --- aclocal.m4 | 28 ++ configure.ac | 1040 +++++++++++++++++++++++++------------------------- tools/make_makefiles | 32 ++- 3 files changed, 572 insertions(+), 528 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa6c4d4e92cdb944e53a0…

1 0