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

Jacek Caban : jscript: Added JSGlobal typelib.
by Alexandre Julliard Aug. 26, 2008

Aug. 26, 2008

Module: wine Branch: master Commit: 7d367d9260f0e07ec3321abd5ac069edfd9d7c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d367d9260f0e07ec3321abd5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 25 12:02:57 2008 +0200 jscript: Added JSGlobal typelib. --- .gitignore | 1 + dlls/jscript/Makefile.in | 2 + dlls/jscript/jsglobal.idl | 1051 ++++++++++++++++++++++++++++++++++++++++ dlls/jscript/jsglobal_dispid.h | 273 +++++++++++ dlls/jscript/rsrc.rc | 3 + 5 files changed, 1330 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d367d9260f0e07ec3321…

1 0

Alexandre Julliard : dnsapi: Fix compile without the resolv library.
by Alexandre Julliard Aug. 26, 2008

Aug. 26, 2008

Module: wine Branch: master Commit: 348b3b3af030712d6a939c611d8b2fe671153d27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=348b3b3af030712d6a939c611… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 25 16:14:51 2008 +0200 dnsapi: Fix compile without the resolv library. --- dlls/dnsapi/dnsapi.h | 5 +++++ dlls/dnsapi/ns_name.c | 4 ++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index e617012..aa15174 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef __WINE_CONFIG_H +# error You must include config.h to use this header +#endif static inline void *heap_alloc( SIZE_T size ) { @@ -140,7 +143,9 @@ static inline LPSTR dns_strdup_ua( const char *src ) const char *dns_type_to_str( unsigned short ); +#ifdef HAVE_RESOLV int dns_ns_initparse( const u_char *, int, ns_msg * ); int dns_ns_parserr( ns_msg *, ns_sect, int, ns_rr * ); int dns_ns_name_skip( const u_char **, const u_char * ); int dns_ns_name_uncompress( const u_char *, const u_char *, const u_char *, char *, size_t ); +#endif diff --git a/dlls/dnsapi/ns_name.c b/dlls/dnsapi/ns_name.c index a108c56..4bb3e4a 100644 --- a/dlls/dnsapi/ns_name.c +++ b/dlls/dnsapi/ns_name.c @@ -17,6 +17,8 @@ #include "config.h" +#ifdef HAVE_RESOLV + #include <sys/types.h> #ifdef HAVE_NETINET_IN_H @@ -441,3 +443,5 @@ static int printable(int ch) { return (ch > 0x20 && ch < 0x7f); } + +#endif /* HAVE_RESOLV */

1 0

Alexandre Julliard : winhttp: Add support for building on Windows.
by Alexandre Julliard Aug. 26, 2008

Aug. 26, 2008

Module: wine Branch: master Commit: fb17ae0b833ab42fa6da8c72f70adb8bb3a5438a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb17ae0b833ab42fa6da8c72f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 25 15:56:50 2008 +0200 winhttp: Add support for building on Windows. --- dlls/winhttp/winhttp_private.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index b971e66..b67a46b 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -32,6 +32,9 @@ #ifdef HAVE_NETDB_H # include <netdb.h> #endif +#if defined(__MINGW32__) || defined (_MSC_VER) +# include <ws2tcpip.h> +#endif typedef struct _object_header_t object_header_t;

1 0

Alexandre Julliard : gdi32: Add missing WineEngRealizationInfo function for the non-freetype case.
by Alexandre Julliard Aug. 26, 2008

Aug. 26, 2008

Module: wine Branch: master Commit: e84bc545c3580dc896dc680f833004844f49bdd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e84bc545c3580dc896dc680f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 25 15:38:27 2008 +0200 gdi32: Add missing WineEngRealizationInfo function for the non-freetype case. --- dlls/gdi32/freetype.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8bd75cb..cb351db 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6175,4 +6175,10 @@ DWORD WineEngGetKerningPairs(GdiFont *font, DWORD cPairs, KERNINGPAIR *kern_pair return 0; } +BOOL WineEngRealizationInfo(GdiFont *font, realization_info_t *info) +{ + ERR("called but we don't have FreeType\n"); + return FALSE; +} + #endif /* HAVE_FREETYPE */

1 0

Alexandre Julliard : winhttp: Fix WinHttpSetDefaultProxyConfiguration spec entry.
by Alexandre Julliard Aug. 26, 2008

Aug. 26, 2008

Module: wine Branch: master Commit: 911ce51daf865cd8bd76d7441d237b9354591b24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=911ce51daf865cd8bd76d7441… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 25 15:56:41 2008 +0200 winhttp: Fix WinHttpSetDefaultProxyConfiguration spec entry. --- dlls/winhttp/winhttp.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index eadc07e..4144364 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -22,7 +22,7 @@ @ stdcall WinHttpReceiveResponse(ptr ptr) @ stdcall WinHttpSendRequest(ptr wstr long ptr long long ptr) @ stub WinHttpSetCredentials -@ stdcall WinHttpSetDefaultProxyConfiguration(ptr long long wstr ptr ptr) +@ stdcall WinHttpSetDefaultProxyConfiguration(ptr) @ stdcall WinHttpSetOption(ptr long ptr long) @ stdcall WinHttpSetStatusCallback(ptr ptr long ptr) @ stdcall WinHttpSetTimeouts(ptr long long long long)

1 0

Alexandre Julliard : makefiles: Recurse into all directories for install-lib and install-dev too.
by Alexandre Julliard Aug. 26, 2008

Aug. 26, 2008

Module: wine Branch: master Commit: b3ec2e5f95e36aa94785fb398775742ae6a14515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3ec2e5f95e36aa94785fb398… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 25 14:27:03 2008 +0200 makefiles: Recurse into all directories for install-lib and install-dev too. --- Make.rules.in | 3 +- Makefile.in | 40 ++++++++++++++------------------- dlls/Makefile.in | 4 --- dlls/Makeimplib.rules.in | 2 - documentation/Makefile.in | 4 +- fonts/Makefile.in | 2 +- include/Makefile.in | 2 +- libs/Makefile.in | 3 -- loader/Makefile.in | 2 +- programs/Makefile.in | 2 +- programs/Makeprog.rules.in | 2 +- programs/winedbg/Makefile.in | 2 +- programs/winemenubuilder/Makefile.in | 2 +- server/Makefile.in | 2 +- tools/Makefile.in | 2 +- tools/widl/Makefile.in | 2 +- tools/winebuild/Makefile.in | 2 +- tools/winedump/Makefile.in | 2 +- tools/winegcc/Makefile.in | 2 +- tools/wmc/Makefile.in | 2 +- tools/wrc/Makefile.in | 2 +- 21 files changed, 36 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3ec2e5f95e36aa94785f…

1 0

Alexandre Julliard : configure: Generate the list of top-level directories to install.
by Alexandre Julliard Aug. 26, 2008

Aug. 26, 2008

Module: wine Branch: master Commit: 6de0af1eac80c84a8b58c9aa0771e116bc8c0aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=6de0af1eac80c84a8b58c9aa0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 25 14:41:03 2008 +0200 configure: Generate the list of top-level directories to install. --- Makefile.in | 12 +----------- configure | 36 +++++++++++++++++++++++------------- configure.ac | 21 +++++++++++---------- tools/make_makefiles | 1 + 4 files changed, 36 insertions(+), 34 deletions(-) diff --git a/Makefile.in b/Makefile.in index ed30f1b..0b2c6c0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,8 +27,6 @@ LIBEXT = @LIBEXT@ MODULE = none PROGRAMS = wine -FONTSSUBDIRS = @FONTSSUBDIRS@ - # Sub-directories to run make depend/clean into SUBDIRS = \ dlls \ @@ -42,15 +40,7 @@ SUBDIRS = \ tools # Sub-directories to run make install/uninstall into -INSTALLSUBDIRS = \ - $(FONTSSUBDIRS) \ - dlls \ - include \ - libs \ - loader \ - programs \ - server \ - tools +INSTALLSUBDIRS = @ALL_TOP_DIRS@ # Sub-directories to run make test into TESTSUBDIRS = dlls diff --git a/configure b/configure index 3519811..b8bffa4 100755 --- a/configure +++ b/configure @@ -753,7 +753,6 @@ LCMSLIBS ft_devel FREETYPELIBS FREETYPEINCL -FONTSSUBDIRS ESDCONFIG ESDINCL ESDLIBS @@ -775,6 +774,7 @@ DEPENDENCIES ALL_MAKERULES ALL_MAKEFILES ALL_MAKEFILE_DEPENDS +ALL_TOP_DIRS ALL_DLL_DIRS ALL_IMPLIB_DIRS ALL_TEST_DIRS @@ -14163,8 +14163,6 @@ _ACEOF FREETYPEINCL="$ac_freetype_incl" - FONTSSUBDIRS="fonts" - fi fi fi @@ -14181,6 +14179,7 @@ Use the --without-freetype option if you really want this." >&2;} esac fi +test "x$FREETYPELIBS" = "x" && enable_fonts=${enable_fonts:-no} { echo "$as_me:$LINENO: checking for parport header/ppdev.h" >&5 echo $ECHO_N "checking for parport header/ppdev.h... $ECHO_C" >&6; } @@ -22173,6 +22172,8 @@ ALL_MAKEFILES="" ALL_MAKEFILE_DEPENDS="# Makefile dependencies" +ALL_TOP_DIRS="" + ALL_DLL_DIRS="" ALL_IMPLIB_DIRS="" @@ -22249,7 +22250,8 @@ ac_config_files="$ac_config_files Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/Makefile" - +test "x$enable_dlls" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ + dlls" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/Makefile: dlls/Makefile.in Make.rules" ac_config_files="$ac_config_files dlls/Makefile" @@ -25104,28 +25106,32 @@ ac_config_files="$ac_config_files dlls/wtsapi32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ documentation/Makefile" - +test "x$enable_documentation" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ + documentation" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS documentation/Makefile: documentation/Makefile.in Make.rules" ac_config_files="$ac_config_files documentation/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ fonts/Makefile" - +test "x$enable_fonts" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ + fonts" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS fonts/Makefile: fonts/Makefile.in Make.rules" ac_config_files="$ac_config_files fonts/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ include/Makefile" - +test "x$enable_include" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ + include" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS include/Makefile: include/Makefile.in Make.rules" ac_config_files="$ac_config_files include/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ libs/Makefile" - +test "x$enable_libs" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ + libs" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS libs/Makefile: libs/Makefile.in Make.rules" ac_config_files="$ac_config_files libs/Makefile" @@ -25153,14 +25159,16 @@ ac_config_files="$ac_config_files libs/wpp/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ loader/Makefile" - +test "x$enable_loader" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ + loader" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS loader/Makefile: loader/Makefile.in Make.rules" ac_config_files="$ac_config_files loader/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/Makefile" - +test "x$enable_programs" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ + programs" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/Makefile: programs/Makefile.in Make.rules" ac_config_files="$ac_config_files programs/Makefile" @@ -25583,14 +25591,16 @@ ac_config_files="$ac_config_files programs/xcopy/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ server/Makefile" - +test "x$enable_server" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ + server" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS server/Makefile: server/Makefile.in Make.rules" ac_config_files="$ac_config_files server/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ tools/Makefile" - +test "x$enable_tools" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ + tools" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS tools/Makefile: tools/Makefile.in Make.rules" ac_config_files="$ac_config_files tools/Makefile" @@ -26894,7 +26904,6 @@ LCMSLIBS!$LCMSLIBS$ac_delim ft_devel!$ft_devel$ac_delim FREETYPELIBS!$FREETYPELIBS$ac_delim FREETYPEINCL!$FREETYPEINCL$ac_delim -FONTSSUBDIRS!$FONTSSUBDIRS$ac_delim ESDCONFIG!$ESDCONFIG$ac_delim ESDINCL!$ESDINCL$ac_delim ESDLIBS!$ESDLIBS$ac_delim @@ -26916,6 +26925,7 @@ DEPENDENCIES!$DEPENDENCIES$ac_delim ALL_MAKERULES!$ALL_MAKERULES$ac_delim ALL_MAKEFILES!$ALL_MAKEFILES$ac_delim ALL_MAKEFILE_DEPENDS!$ALL_MAKEFILE_DEPENDS$ac_delim +ALL_TOP_DIRS!$ALL_TOP_DIRS$ac_delim ALL_DLL_DIRS!$ALL_DLL_DIRS$ac_delim ALL_IMPLIB_DIRS!$ALL_IMPLIB_DIRS$ac_delim ALL_TEST_DIRS!$ALL_TEST_DIRS$ac_delim diff --git a/configure.ac b/configure.ac index 22741be..8877ded 100644 --- a/configure.ac +++ b/configure.ac @@ -1020,12 +1020,12 @@ then AC_DEFINE(HAVE_FREETYPE, 1, [Define if FreeType 2 is installed]) AC_SUBST(FREETYPELIBS,"$ac_freetype_libs") AC_SUBST(FREETYPEINCL,"$ac_freetype_incl") - AC_SUBST(FONTSSUBDIRS,"fonts") fi fi fi WINE_ERROR_WITH(freetype,[test "x$FREETYPELIBS" = "x"],[FreeType development files not found. Fonts will not be built. Dialog text may be invisible or unaligned.]) +test "x$FREETYPELIBS" = "x" && enable_fonts=${enable_fonts:-no} dnl **** Check for parport (currently Linux only) **** AC_CACHE_CHECK([for parport header/ppdev.h], ac_cv_c_ppdev, @@ -1675,6 +1675,7 @@ AC_SUBST(ALL_MAKERULES,"") AC_SUBST(ALL_MAKEFILES,"") AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"]) +AC_SUBST(ALL_TOP_DIRS,"") AC_SUBST(ALL_DLL_DIRS,"") AC_SUBST(ALL_IMPLIB_DIRS,"") AC_SUBST(ALL_TEST_DIRS,"") @@ -1700,7 +1701,7 @@ WINE_CONFIG_MAKERULES([dlls/Maketest.rules],[MAKE_TEST_RULES],[Make.rules]) WINE_CONFIG_MAKERULES([programs/Makeprog.rules],[MAKE_PROG_RULES],[Make.rules]) WINE_CONFIG_MAKEFILE([Makefile],[Make.rules]) -WINE_CONFIG_MAKEFILE([dlls/Makefile],[Make.rules]) +WINE_CONFIG_MAKEFILE([dlls/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([dlls/acledit/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/activeds/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/actxprxy/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) @@ -2057,15 +2058,15 @@ WINE_CONFIG_MAKEFILE([dlls/ws2_32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL WINE_CONFIG_MAKEFILE([dlls/ws2_32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wsock32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wtsapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) -WINE_CONFIG_MAKEFILE([documentation/Makefile],[Make.rules]) -WINE_CONFIG_MAKEFILE([fonts/Makefile],[Make.rules]) -WINE_CONFIG_MAKEFILE([include/Makefile],[Make.rules]) -WINE_CONFIG_MAKEFILE([libs/Makefile],[Make.rules]) +WINE_CONFIG_MAKEFILE([documentation/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) +WINE_CONFIG_MAKEFILE([fonts/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) +WINE_CONFIG_MAKEFILE([include/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) +WINE_CONFIG_MAKEFILE([libs/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([libs/port/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([libs/wine/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([libs/wpp/Makefile],[Make.rules]) -WINE_CONFIG_MAKEFILE([loader/Makefile],[Make.rules]) -WINE_CONFIG_MAKEFILE([programs/Makefile],[Make.rules]) +WINE_CONFIG_MAKEFILE([loader/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) +WINE_CONFIG_MAKEFILE([programs/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([programs/clock/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/cmd/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/cmdlgtst/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS]) @@ -2111,8 +2112,8 @@ WINE_CONFIG_MAKEFILE([programs/winver/Makefile],[programs/Makeprog.rules],[progr WINE_CONFIG_MAKEFILE([programs/wordpad/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/write/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/xcopy/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) -WINE_CONFIG_MAKEFILE([server/Makefile],[Make.rules]) -WINE_CONFIG_MAKEFILE([tools/Makefile],[Make.rules]) +WINE_CONFIG_MAKEFILE([server/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) +WINE_CONFIG_MAKEFILE([tools/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([tools/widl/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([tools/winebuild/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([tools/winedump/Makefile],[Make.rules]) diff --git a/tools/make_makefiles b/tools/make_makefiles index 6358103..53ed0ba 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -281,6 +281,7 @@ sub update_makefiles(@) $args .= ",ALL_PROGRAM_BIN_INSTALL_DIRS" if $bin_install{$name}; $args .= "]"; } + elsif ($file =~ /^[^\/]*\/Makefile$/) { $args = ",[],[ALL_TOP_DIRS]"; } push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules]$args)\n"; }

1 0

Alexandre Julliard : d3dxof: Don't make local variables static.
by Alexandre Julliard Aug. 25, 2008

Aug. 25, 2008

Module: wine Branch: master Commit: 9ce31cf80b8ccd0f2ee5fff7d9c944c0a6a8301f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce31cf80b8ccd0f2ee5fff7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 25 12:37:12 2008 +0200 d3dxof: Don't make local variables static. --- dlls/d3dxof/d3dxof.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 2df7d66..1281346 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -367,7 +367,7 @@ static WORD get_keyword_token(parse_buffer* buf) static BOOL is_guid(parse_buffer* buf) { - static char tmp[50]; + char tmp[50]; DWORD pos = 1; GUID class_id; DWORD tab[10]; @@ -417,7 +417,7 @@ static BOOL is_guid(parse_buffer* buf) static BOOL is_name(parse_buffer* buf) { - static char tmp[50]; + char tmp[50]; DWORD pos = 0; char c; BOOL error = 0; @@ -446,7 +446,7 @@ static BOOL is_name(parse_buffer* buf) static BOOL is_integer(parse_buffer* buf) { - static char tmp[50]; + char tmp[50]; DWORD pos = 0; char c; DWORD integer; @@ -666,7 +666,7 @@ static inline BOOL is_primitive_type(WORD token) static BOOL parse_name(parse_buffer * buf) { DWORD count; - static char strname[100]; + char strname[100]; if (parse_TOKEN(buf) != TOKEN_NAME) return FALSE;

1 0

Christian Costa : d3dxof: Implement storage of parsed information.
by Alexandre Julliard Aug. 25, 2008

Aug. 25, 2008

Module: wine Branch: master Commit: 2f98206111af1f387047dfd9616b11e1d52f7fbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f98206111af1f387047dfd96… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Aug 22 13:16:58 2008 +0200 d3dxof: Implement storage of parsed information. --- dlls/d3dxof/d3dxof.c | 313 ++++++++++++++++++++++++++++++------------ dlls/d3dxof/d3dxof_private.h | 29 ++++- 2 files changed, 250 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f98206111af1f387047d…

1 0

Damjan Jovanovic : oleaut32: Fix negative number handling in VarFormat.
by Alexandre Julliard Aug. 25, 2008

Aug. 25, 2008

Module: wine Branch: master Commit: 05a2c566223c9d723d84c4bc5abc910c331c9da6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a2c566223c9d723d84c4bc5… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Aug 22 12:37:57 2008 +0200 oleaut32: Fix negative number handling in VarFormat. --- dlls/oleaut32/tests/varformat.c | 4 ++-- dlls/oleaut32/varformat.c | 26 +++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 2895408..4098927 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -369,9 +369,9 @@ static void test_VarFormat(void) VARFMT(VT_R8,V_R8,47.11,".0000E+0",S_OK,".4711E+2"); VARFMT(VT_R8,V_R8,3.0401e-13,"#####.####e-0%",S_OK,"30401.e-15%"); VARFMT(VT_R8,V_R8,1.57,"0.00",S_OK,"1.57"); - todo_wine { VARFMT(VT_R8,V_R8,-1.57,"0.00",S_OK,"-1.57"); - } + VARFMT(VT_R8,V_R8,-1.57,"#.##",S_OK,"-1.57"); + VARFMT(VT_R8,V_R8,-0.1,".#",S_OK,"-.1"); /* 'out' is not cleared */ diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 83f075f..887525c 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1,6 +1,7 @@ /* * Variant formatting functions * + * Copyright 2008 Damjan Jovanovic * Copyright 2003 Jon Griffiths * * This library is free software; you can redistribute it and/or @@ -1181,6 +1182,7 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok, /* Number formatting state flags */ #define NUM_WROTE_DEC 0x01 /* Written the decimal separator */ #define NUM_WRITE_ON 0x02 /* Started to write the number */ +#define NUM_WROTE_SIGN 0x04 /* Written the negative sign */ /* Format a variant using a number format */ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat, @@ -1320,6 +1322,7 @@ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat, { WCHAR defaultChar = '?'; DWORD boolFlag, localeValue = 0; + BOOL shouldAdvance = TRUE; if (pToken - rgbTok > header->size) { @@ -1377,6 +1380,16 @@ VARIANT_FormatNumber_Bool: break; case FMT_NUM_DECIMAL: + if ((np.dwOutFlags & NUMPRS_NEG) && !(dwState & NUM_WROTE_SIGN)) + { + /* last chance for a negative sign in the .# case */ + TRACE("write negative sign\n"); + localeValue = LOCALE_SNEGATIVESIGN; + defaultChar = '-'; + dwState |= NUM_WROTE_SIGN; + shouldAdvance = FALSE; + break; + } TRACE("write decimal separator\n"); localeValue = LOCALE_SDECIMAL; defaultChar = '.'; @@ -1452,6 +1465,16 @@ VARIANT_FormatNumber_Bool: { int count, count_max; + if ((np.dwOutFlags & NUMPRS_NEG) && !(dwState & NUM_WROTE_SIGN)) + { + TRACE("write negative sign\n"); + localeValue = LOCALE_SNEGATIVESIGN; + defaultChar = '-'; + dwState |= NUM_WROTE_SIGN; + shouldAdvance = FALSE; + break; + } + need_int -= pToken[1]; count_max = have_int + pad - need_int; if (count_max < 0) @@ -1504,7 +1527,8 @@ VARIANT_FormatNumber_Bool: *pBuff++ = defaultChar; } } - pToken++; + if (shouldAdvance) + pToken++; } VARIANT_FormatNumber_Exit:

1 0