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

Rob Shearman : makefiles: Split AR into AR and ARFLAGS.
by Alexandre Julliard March 4, 2008

March 4, 2008

Module: wine Branch: master Commit: 0c694d710e40ffeedfe307df659dbddd29df495f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c694d710e40ffeedfe307df6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Mar 4 15:53:41 2008 +0000 makefiles: Split AR into AR and ARFLAGS. --- Make.rules.in | 3 ++- configure | 8 ++++++-- configure.ac | 1 + dlls/Makedll.rules.in | 2 +- dlls/Makeimplib.rules.in | 2 +- libs/port/Makefile.in | 2 +- libs/wpp/Makefile.in | 2 +- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 9178904..d4b6aaf 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -36,7 +36,8 @@ IMPLIBEXT = @IMPLIBEXT@ LDSHARED = @LDSHARED@ DLLTOOL = @DLLTOOL@ DLLWRAP = @DLLWRAP@ -AR = @AR@ rc +AR = @AR@ +ARFLAGS = @ARFLAGS@ RANLIB = @RANLIB@ STRIP = @STRIP@ WINDRES = @WINDRES@ diff --git a/configure b/configure index 1389645..efd7008 100755 --- a/configure +++ b/configure @@ -687,6 +687,7 @@ AS ac_ct_AS LD AR +ARFLAGS RANLIB STRIP WINDRES @@ -5600,6 +5601,8 @@ else AR="$ac_cv_prog_AR" fi +ARFLAGS=rc + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 @@ -23079,6 +23082,7 @@ AS!$AS$ac_delim ac_ct_AS!$ac_ct_AS$ac_delim LD!$LD$ac_delim AR!$AR$ac_delim +ARFLAGS!$ARFLAGS$ac_delim RANLIB!$RANLIB$ac_delim STRIP!$STRIP$ac_delim WINDRES!$WINDRES$ac_delim @@ -23088,7 +23092,6 @@ GREP!$GREP$ac_delim EGREP!$EGREP$ac_delim LDCONFIG!$LDCONFIG$ac_delim INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then @@ -23150,6 +23153,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim INSTALL_DATA!$INSTALL_DATA$ac_delim LINT!$LINT$ac_delim LINTFLAGS!$LINTFLAGS$ac_delim @@ -23224,7 +23228,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 72; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index 5d06e6f..b23a586 100644 --- a/configure.ac +++ b/configure.ac @@ -158,6 +158,7 @@ fi AC_CHECK_TOOLS(AS,[gas as],as) AC_CHECK_TOOL(LD,ld,ld) AC_CHECK_TOOL(AR,ar,ar) +AC_SUBST(ARFLAGS,rc) AC_PROG_RANLIB AC_CHECK_TOOL(STRIP,strip,strip) AC_CHECK_TOOL(WINDRES,windres,false) diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index fde11e4..241fc52 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -52,7 +52,7 @@ lib$(BASEMODULE).def: $(MAINSPEC) lib$(BASEMODULE).def.a: $(IMPLIB_OBJS) $(RM) $@ - $(AR) $@ $(IMPLIB_OBJS) + $(AR) $(ARFLAGS) $@ $(IMPLIB_OBJS) $(RANLIB) $@ lib$(BASEMODULE).a: $(SPEC_DEF) $(IMPLIB_OBJS) diff --git a/dlls/Makeimplib.rules.in b/dlls/Makeimplib.rules.in index 19011c1..88814fc 100644 --- a/dlls/Makeimplib.rules.in +++ b/dlls/Makeimplib.rules.in @@ -18,7 +18,7 @@ all: $(MODULE) $(MODULE): $(OBJS) Makefile.in $(RM) $@ - $(AR) $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ # Rules for installation diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 2504620..b7adc12 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -36,7 +36,7 @@ all: $(MODULE) $(MODULE): $(OBJS) Makefile.in $(RM) $@ - $(AR) $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/libs/wpp/Makefile.in b/libs/wpp/Makefile.in index 5d818b7..713ee4d 100644 --- a/libs/wpp/Makefile.in +++ b/libs/wpp/Makefile.in @@ -17,7 +17,7 @@ all: $(MODULE) $(MODULE): $(OBJS) $(RM) $@ - $(AR) $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ ppy.tab.c: ppy.tab.h # for parallel makes

1 0

Steven Edwards : winnt.h: Fix dllimport and visibility attributes on cygwin .
by Alexandre Julliard March 4, 2008

March 4, 2008

Module: wine Branch: master Commit: b9a0b1b479b46cf273050f643514cd80c36db48f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9a0b1b479b46cf273050f643… Author: Steven Edwards <winehacker(a)gmail.com> Date: Mon Mar 3 21:49:02 2008 -0500 winnt.h: Fix dllimport and visibility attributes on cygwin. --- include/winnt.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index cfd1cac..78c44a5 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -46,7 +46,7 @@ extern "C" { #ifndef MIDL_PASS # if defined(_MSC_VER) # define DECLSPEC_IMPORT __declspec(dllimport) -# elif defined(__MINGW32__) +# elif defined(__MINGW32__) || defined(__CYGWIN__) # define DECLSPEC_IMPORT __attribute__((dllimport)) # else # define DECLSPEC_IMPORT DECLSPEC_HIDDEN @@ -154,7 +154,9 @@ extern "C" { # define DECLSPEC_EXPORT #endif -#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) +#if defined(__MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__) +# define DECLSPEC_HIDDEN +#elif defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) # define DECLSPEC_HIDDEN __attribute__((visibility ("hidden"))) #else # define DECLSPEC_HIDDEN

1 0

Rob Shearman : makefiles: Simplify the use of the IMPORTLIB variable in the DLL makefiles.
by Alexandre Julliard March 4, 2008

March 4, 2008

1 0

Dmitry Timoshkov : fonts: Add the bitmap sets for cyrillic glyphs to tahoma .sfd.
by Alexandre Julliard March 4, 2008

March 4, 2008

Module: wine Branch: master Commit: 9d50e909781ecd5db83502c30650320fa49b3ba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d50e909781ecd5db83502c30… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 4 23:07:39 2008 +0800 fonts: Add the bitmap sets for cyrillic glyphs to tahoma.sfd. --- fonts/tahoma.sfd | 1078 +++++++++++++++++++++++++++--------------------------- 1 files changed, 547 insertions(+), 531 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d50e909781ecd5db8350…

1 0

Tony Wasserka : d3dx9_36: Create d3dx9 importlib.
by Alexandre Julliard March 4, 2008

March 4, 2008

Module: wine Branch: master Commit: 0b5ae280618c58f014e0cde40799cb4ed5b9f790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b5ae280618c58f014e0cde40… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Tue Mar 4 15:20:33 2008 +0100 d3dx9_36: Create d3dx9 importlib. --- .gitignore | 2 ++ dlls/Makefile.in | 8 ++++++++ dlls/d3dx9_36/Makefile.in | 11 ++++++++++- 3 files changed, 20 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index a8ec784..483b391 100644 --- a/.gitignore +++ b/.gitignore @@ -109,6 +109,7 @@ dlls/d3dx8/libd3dx8.def dlls/d3dx8/tests/*.ok dlls/d3dx8/tests/d3dx8_crosstest.exe dlls/d3dx8/tests/testlist.c +dlls/d3dx9_36/libd3dx9.def dlls/d3dxof/libd3dxof.def dlls/d3dxof/version.res dlls/dbghelp/libdbghelp.def @@ -222,6 +223,7 @@ dlls/kernel32/tests/testlist.c dlls/kernel32/version16.res dlls/keyboard.drv16 dlls/krnl386.exe16 +dlls/libd3dx9.def dlls/libwinspool.def dlls/localspl/localspl.res dlls/localspl/tests/*.ok diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 96e3a85..d294a19 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -518,6 +518,7 @@ winsock.dll16: STATIC_IMPLIBEXT = $(IMPLIBEXT:def=def.a) IMPORT_SYMLINKS = \ + libd3dx9.$(IMPLIBEXT) \ libwinspool.$(IMPLIBEXT) IMPORT_LIBS = \ @@ -553,6 +554,7 @@ IMPORT_LIBS = \ d3dim/libd3dim.$(IMPLIBEXT) \ d3drm/libd3drm.$(IMPLIBEXT) \ d3dx8/libd3dx8.$(IMPLIBEXT) \ + d3dx9_36/libd3dx9.$(IMPLIBEXT) \ d3dxof/libd3dxof.$(IMPLIBEXT) \ dbghelp/libdbghelp.$(IMPLIBEXT) \ dciman32/libdciman32.$(IMPLIBEXT) \ @@ -739,6 +741,9 @@ d3drm/libd3drm.$(IMPLIBEXT): d3drm/d3drm.spec $(WINEBUILD) d3dx8/libd3dx8.$(IMPLIBEXT): d3dx8/d3dx8.spec $(WINEBUILD) @cd d3dx8 && $(MAKE) libd3dx8.$(IMPLIBEXT) +d3dx9_36/libd3dx9.$(IMPLIBEXT): d3dx9_36/d3dx9_36.spec $(WINEBUILD) + @cd d3dx9_36 && $(MAKE) libd3dx9.$(IMPLIBEXT) + d3dxof/libd3dxof.$(IMPLIBEXT): d3dxof/d3dxof.spec $(WINEBUILD) @cd d3dxof && $(MAKE) libd3dxof.$(IMPLIBEXT) @@ -1057,6 +1062,9 @@ wsock32/libwsock32.$(IMPLIBEXT): wsock32/wsock32.spec $(WINEBUILD) wtsapi32/libwtsapi32.$(IMPLIBEXT): wtsapi32/wtsapi32.spec $(WINEBUILD) @cd wtsapi32 && $(MAKE) libwtsapi32.$(IMPLIBEXT) +libd3dx9.$(IMPLIBEXT): d3dx9_36/libd3dx9.$(IMPLIBEXT) + $(RM) $@ && $(LN_S) d3dx9_36/libd3dx9.$(IMPLIBEXT) $@ + libwinspool.$(IMPLIBEXT): winspool.drv/libwinspool.$(IMPLIBEXT) $(RM) $@ && $(LN_S) winspool.drv/libwinspool.$(IMPLIBEXT) $@ diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index b2a4f4c..9c3e080 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -3,12 +3,21 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = d3dx9_36.dll +IMPORTLIB = libd3dx9.$(IMPLIBEXT) IMPORTS = d3d9 d3dx8 kernel32 -EXTRALIBS = -ldxguid -luuid C_SRCS = \ d3dx9_36_main.c @MAKE_DLL_RULES@ +libd3dx9.def: $(MAINSPEC) + $(WINEBUILD) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC) + +libd3dx9.a: $(SPEC_DEF) + $(DLLTOOL) -k -l $@ -d $(SPEC_DEF) + +clean:: + $(RM) $(IMPORTLIB) + @DEPENDENCIES@ # everything below this line is overwritten by make depend

1 0

Tony Wasserka : make_makefiles: Fix importlib handling.
by Alexandre Julliard March 4, 2008

March 4, 2008

Module: wine Branch: master Commit: 9b7ca823d3038a21fd2d2983328aa770e166c3ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b7ca823d3038a21fd2d29833… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Tue Mar 4 15:08:57 2008 +0100 make_makefiles: Fix importlib handling. --- tools/make_makefiles | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index 98700db..aa10cb3 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -526,12 +526,9 @@ sub update_dlls(@) } foreach my $mod (sort keys %importlibs) { - my $dir = $directories{$mod}; - my $def = $mod; - $def =~ s/\.(dll|drv)$//; - $text .= sprintf " \\\n\t%s/lib%s.\$(IMPLIBEXT)", $dir, $def; + $text .= " \\\n\t$directories{$mod}/$importlibs{$mod}.\$(IMPLIBEXT)"; next unless defined $static_implibs{$mod}; - $text .= sprintf " \\\n\t%s/lib%s.\$(STATIC_IMPLIBEXT)", $dir, $def + $text .= " \\\n\t$directories{$mod}/$importlibs{$mod}.\$(STATIC_IMPLIBEXT)"; } $text .= "\n\n"; $text .= "implib: \$(IMPORT_LIBS)\n\n"; @@ -588,10 +585,7 @@ sub update_dlls(@) } foreach my $mod (sort keys %importlibs) { - my $dir = $directories{$mod}; - my $def = $mod; - $def =~ s/\.(dll|drv)$//; - push @ignores, "dlls/$dir/lib$def.def"; + push @ignores, "dlls/$directories{$mod}/$importlibs{$mod}.def"; } return @ignores;

1 0

Tony Wasserka : d3dx9: Implement D3DXCheckVersion.
by Alexandre Julliard March 4, 2008

March 4, 2008

Module: wine Branch: master Commit: 4f148c28a1e695817673b7e99fa6e4aa363558a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f148c28a1e695817673b7e99… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Tue Feb 19 19:46:30 2008 +0100 d3dx9: Implement D3DXCheckVersion. --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_24/d3dx9_24_main.c | 12 ++++++++++++ dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_25/d3dx9_25_main.c | 12 ++++++++++++ dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_26/d3dx9_26_main.c | 12 ++++++++++++ dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_27/d3dx9_27_main.c | 12 ++++++++++++ dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_28/d3dx9_28_main.c | 12 ++++++++++++ dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_29/d3dx9_29_main.c | 12 ++++++++++++ dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_30/d3dx9_30_main.c | 12 ++++++++++++ dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_31/d3dx9_31_main.c | 12 ++++++++++++ dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_32/d3dx9_32_main.c | 13 +++++++++++++ dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_33/d3dx9_33_main.c | 13 +++++++++++++ dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_34/d3dx9_34_main.c | 12 ++++++++++++ dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_35/d3dx9_35_main.c | 12 ++++++++++++ dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/d3dx9_36_main.c | 12 ++++++++++++ 26 files changed, 171 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f148c28a1e695817673b…

1 0

Alexandre Julliard : user32: Store the window placement information directly in the main window structure .
by Alexandre Julliard March 4, 2008

March 4, 2008

Module: wine Branch: master Commit: e6a3d8082836518f18e0d81440c201bbad407acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6a3d8082836518f18e0d8144… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 4 20:45:40 2008 +0100 user32: Store the window placement information directly in the main window structure. --- dlls/user32/win.c | 5 +- dlls/user32/win.h | 5 +- dlls/user32/winpos.c | 203 ++++++++++++++++++++------------------------------ 3 files changed, 88 insertions(+), 125 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6a3d8082836518f18e0d…

1 0

Alexandre Julliard : user32: Fix a couple of message test failures.
by Alexandre Julliard March 4, 2008

March 4, 2008

Module: wine Branch: master Commit: accfce21d3e042638a5eac8a8379eda2964fcd0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=accfce21d3e042638a5eac8a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 4 20:01:41 2008 +0100 user32: Fix a couple of message test failures. --- dlls/user32/tests/msg.c | 4 ++-- dlls/user32/winpos.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 1ab5a0f..7d5dffa 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9346,8 +9346,8 @@ static void test_ShowWindow(void) /* 31 */ { SW_RESTORE, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, /* 32 */ { SW_HIDE, TRUE, 0, WmHide_3, TRUE }, /* 33 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE }, -/* 34 */ { SW_NORMALNA, FALSE, 0, WmEmptySeq, TRUE }, /* what does this mean?! */ -/* 35 */ { SW_NORMALNA, FALSE, 0, WmEmptySeq, TRUE }, +/* 34 */ { SW_NORMALNA, FALSE, 0, WmEmptySeq, FALSE }, /* what does this mean?! */ +/* 35 */ { SW_NORMALNA, FALSE, 0, WmEmptySeq, FALSE }, /* 36 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE }, /* 37 */ { SW_RESTORE, FALSE, WS_VISIBLE, WmRestore_2, FALSE }, /* 38 */ { SW_RESTORE, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index c60e75d..d61fe01 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1052,8 +1052,7 @@ static BOOL show_window( HWND hwnd, INT cmd ) if (!wasVisible) return FALSE; showFlag = FALSE; swp |= SWP_HIDEWINDOW | SWP_NOSIZE | SWP_NOMOVE; - if (hwnd != GetActiveWindow()) - swp |= SWP_NOACTIVATE | SWP_NOZORDER; + if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER; break; case SW_SHOWMINNOACTIVE: @@ -1106,6 +1105,8 @@ static BOOL show_window( HWND hwnd, INT cmd ) } if (style & WS_CHILD && !(swp & SWP_STATECHANGED)) swp |= SWP_NOACTIVATE | SWP_NOZORDER; break; + default: + return wasVisible; } if ((showFlag != wasVisible || cmd == SW_SHOWNA) && cmd != SW_SHOWMAXIMIZED && !(swp & SWP_STATECHANGED))

1 0

Alexandre Julliard : user32/tests: Fix most message tests to pass on Vista.
by Alexandre Julliard March 4, 2008

March 4, 2008

Module: wine Branch: master Commit: 8ac29dd4a896bfd1ad3568f5d1ecfbc5ea95fbd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ac29dd4a896bfd1ad3568f5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 4 20:00:13 2008 +0100 user32/tests: Fix most message tests to pass on Vista. --- dlls/user32/tests/msg.c | 109 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 106 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ac29dd4a896bfd1ad356…

1 0