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

Thomas Mullaly : urlmon: Added parser for IPvFuture addresses.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 48e155ba7079993f5b7a05377be13ef9cd6710ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=48e155ba7079993f5b7a05377… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Jun 30 21:10:13 2010 -0400 urlmon: Added parser for IPvFuture addresses. --- dlls/urlmon/tests/uri.c | 29 +++++++++++++++++++++++++ dlls/urlmon/uri.c | 53 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 77 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 5c32fec..11734c8 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -1516,6 +1516,35 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_HTTP,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } + }, + { "http://[v2.34]/", 0, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_AUTHORITY|Uri_HAS_DISPLAY_URI|Uri_HAS_HOST| + Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY|Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME| + Uri_HAS_HOST_TYPE|Uri_HAS_PORT|Uri_HAS_SCHEME, + TRUE, + { + {"http://[v2.34]/",S_OK,TRUE}, + {"[v2.34]",S_OK,TRUE}, + {"http://[v2.34]/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"[v2.34]",S_OK,TRUE}, + {"",S_FALSE,FALSE}, + {"/",S_OK,TRUE}, + {"/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"http://[v2.34]/",S_OK,FALSE}, + {"http",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,TRUE}, + {80,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index b5e9561..82f44bf 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -878,6 +878,49 @@ static BOOL parse_ipv6address(const WCHAR **ptr, parse_data *data, DWORD flags) return TRUE; } +/* IPvFuture = "v" 1*HEXDIG "." 1*( unreserved / sub-delims / ":" ) */ +static BOOL parse_ipvfuture(const WCHAR **ptr, parse_data *data, DWORD flags) { + const WCHAR *start = *ptr; + + /* IPvFuture has to start with a 'v' or 'V'. */ + if(**ptr != 'v' && **ptr != 'V') + return FALSE; + + /* Following the v their must be atleast 1 hexdigit. */ + ++(*ptr); + if(!is_hexdigit(**ptr)) { + *ptr = start; + return FALSE; + } + + ++(*ptr); + while(is_hexdigit(**ptr)) + ++(*ptr); + + /* End of the hexdigit sequence must be a '.' */ + if(**ptr != '.') { + *ptr = start; + return FALSE; + } + + ++(*ptr); + if(!is_unreserved(**ptr) && !is_subdelim(**ptr) && **ptr != ':') { + *ptr = start; + return FALSE; + } + + ++(*ptr); + while(is_unreserved(**ptr) || is_subdelim(**ptr) || **ptr == ':') + ++(*ptr); + + data->host_type = Uri_HOST_UNKNOWN; + + TRACE("(%p %p %x): Parsed IPvFuture address %s len=%d\n", ptr, data, flags, + debugstr_wn(start, *ptr-start), *ptr-start); + + return TRUE; +} + /* IP-literal = "[" ( IPv6address / IPvFuture ) "]" */ static BOOL parse_ip_literal(const WCHAR **ptr, parse_data *data, DWORD flags) { data->host = *ptr; @@ -889,11 +932,11 @@ static BOOL parse_ip_literal(const WCHAR **ptr, parse_data *data, DWORD flags) { ++(*ptr); if(!parse_ipv6address(ptr, data, flags)) { - WARN("(%p %p %x): IPvFuture addresses are not supported yet.\n", - ptr, data, flags); - *ptr = data->host; - data->host = NULL; - return FALSE; + if(!parse_ipvfuture(ptr, data, flags)) { + *ptr = data->host; + data->host = NULL; + return FALSE; + } } if(**ptr != ']') {

1 0

Thomas Mullaly : urlmon: Added parser for registered host names.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 4c01ff1fa1519c5a6c2214dcf9a37a8a7046981c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c01ff1fa1519c5a6c2214dcf… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Jun 30 21:27:28 2010 -0400 urlmon: Added parser for registered host names. --- dlls/urlmon/uri.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 82f44bf..da1d379 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -714,6 +714,91 @@ static BOOL parse_ipv4address(const WCHAR **ptr, parse_data *data, DWORD flags) return TRUE; } +/* Attempts to parse the reg-name from the URI. + * + * reg-name = *( unreserved / pct-encoded / sub-delims ) + * + * NOTE: + * Windows allows everything, but, the characters in "auth_delims" and ':' + * to appear in a reg-name. + * + * Windows doesn't like host names which start with '[' and end with ']' + * and don't contain a valid IP literal address in between them. + * + * On Windows if an '[' is encountered in the host name the ':' no longer + * counts as a delimiter until you reach the next ']' or an "authority delimeter". + * + * A reg-name CAN be empty. + */ +static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags) { + const BOOL has_start_bracket = **ptr == '['; + const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; + BOOL inside_brackets = has_start_bracket; + + /* We have to be careful with file schemes. */ + if(data->scheme_type == URL_SCHEME_FILE) { + /* This is because an implicit file scheme could be "C:\\test" and it + * would trick this function into thinking the host is "C", when after + * canonicalization the host would end up being an empty string. + */ + if(is_alpha(**ptr) && *(*ptr+1) == ':') { + /* Regular old drive paths don't have a host type (or host name). */ + data->host_type = Uri_HOST_UNKNOWN; + data->host = *ptr; + data->host_len = 0; + return TRUE; + } else if(**ptr == '\\' && *(*ptr+1) == '\\') + /* Skip past the "\\" of a UNC path. */ + *ptr += 2; + } + + data->host = *ptr; + + while(!is_auth_delim(**ptr, known_scheme)) { + if(**ptr == ':') { + /* We can ignore ':' if were inside brackets.*/ + if(!inside_brackets) + break; + } else if(**ptr == '%' && known_scheme) { + /* Has to be a legit % encoded value. */ + if(!check_pct_encoded(ptr)) { + *ptr = data->host; + data->host = NULL; + return FALSE; + } else + continue; + } else if(**ptr == ']') + inside_brackets = FALSE; + else if(**ptr == '[') + inside_brackets = TRUE; + + ++(*ptr); + } + + if(has_start_bracket) { + /* Make sure the last character of the host wasn't a ']'. */ + if(*(*ptr-1) == ']') { + TRACE("(%p %p %x): Expected an IP literal inside of the host\n", + ptr, data, flags); + *ptr = data->host; + data->host = NULL; + return FALSE; + } + } + + data->host_len = *ptr - data->host; + + /* If the host is empty, then it's an unknown host type. */ + if(data->host_len == 0) + data->host_type = Uri_HOST_UNKNOWN; + else + data->host_type = Uri_HOST_DNS; + + TRACE("(%p %p %x): Parsed reg-name. host=%s len=%d\n", ptr, data, flags, + debugstr_wn(data->host, data->host_len), data->host_len); + return TRUE; +} + /* Attempts to parse an IPv6 address out of the URI. * * IPv6address = 6( h16 ":" ) ls32 @@ -958,8 +1043,11 @@ static BOOL parse_ip_literal(const WCHAR **ptr, parse_data *data, DWORD flags) { static BOOL parse_host(const WCHAR **ptr, parse_data *data, DWORD flags) { if(!parse_ip_literal(ptr, data, flags)) { if(!parse_ipv4address(ptr, data, flags)) { - WARN("(%p %p %x): reg-name parsing is not supported yet.\n", - ptr, data, flags); + if(!parse_reg_name(ptr, data, flags)) { + TRACE("(%p %p %x): Malformed URI, Unknown host type.\n", + ptr, data, flags); + return FALSE; + } } }

1 0

Thomas Mullaly : urlmon/tests: Added more URI test cases.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 30824611b521eda98432906e07b2aeaf6b07e74e URL: http://source.winehq.org/git/wine.git/?a=commit;h=30824611b521eda98432906e0… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Jun 30 21:31:22 2010 -0400 urlmon/tests: Added more URI test cases. --- dlls/urlmon/tests/uri.c | 498 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 498 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=30824611b521eda984329…

1 0

Paul Vriens : winecfg: Add the Serbian (Latin) translation.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 4b48480340391ba7102b7538bb559bc86fe5d4a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b48480340391ba7102b7538b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Jul 25 19:13:20 2010 +0200 winecfg: Add the Serbian (Latin) translation. Translation by Nenad Vujic <nesa24casa(a)gmail.com> --- programs/winecfg/Makefile.in | 1 + programs/winecfg/Sr.rc | 335 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 336 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b48480340391ba7102b7…

1 0

Alexandre Julliard : winegcc: Don' t import winecrt0 by default when building with -nodefaultlibs.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: f195c1eb5a151ceaf8163d56b01a8230b3a5bdd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f195c1eb5a151ceaf8163d56b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 26 09:57:37 2010 +0200 winegcc: Don't import winecrt0 by default when building with -nodefaultlibs. --- dlls/kernel32/Makefile.in | 2 +- dlls/krnl386.exe16/Makefile.in | 2 +- dlls/ntdll/Makefile.in | 1 + tools/winegcc/winegcc.c | 20 +++++++------------- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 1056174..c55c910 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = kernel32.dll IMPORTLIB = kernel32 -IMPORTS = ntdll +IMPORTS = winecrt0 ntdll EXTRALIBS = @COREFOUNDATIONLIB@ @LIBPOLL@ EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000 diff --git a/dlls/krnl386.exe16/Makefile.in b/dlls/krnl386.exe16/Makefile.in index 0798e54..893232e 100644 --- a/dlls/krnl386.exe16/Makefile.in +++ b/dlls/krnl386.exe16/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = krnl386.exe16 IMPORTLIB = kernel -IMPORTS = kernel32 ntdll +IMPORTS = winecrt0 kernel32 ntdll DELAYIMPORTS = ddraw dsound user32 EXTRAIMPLIBFLAGS = -m16 EXTRADLLFLAGS = -m16 -nodefaultlibs -Wb,--dll-name,kernel diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 885036e..8c14708 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -5,6 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = ntdll.dll IMPORTLIB = ntdll +IMPORTS = winecrt0 EXTRALIBS = @IOKITLIB@ @LIBPTHREAD@ EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000 diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 1e02f1a..51bbead 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -745,14 +745,11 @@ static void build(struct options* opts) for ( j = 0; j < lib_dirs->size; j++ ) strarray_add(link_args, strmake("-L%s", lib_dirs->base[j])); - if (!opts->nostartfiles) + if (!opts->nodefaultlibs) { add_library(opts, lib_dirs, files, "winecrt0"); - if (!opts->nodefaultlibs) - { - add_library(opts, lib_dirs, files, "kernel32"); - add_library(opts, lib_dirs, files, "ntdll"); - } + add_library(opts, lib_dirs, files, "kernel32"); + add_library(opts, lib_dirs, files, "ntdll"); } if (opts->shared && !opts->nostdlib) add_library(opts, lib_dirs, files, "wine"); if (!opts->shared && opts->use_msvcrt && opts->target_platform == PLATFORM_CYGWIN) @@ -833,15 +830,12 @@ static void build(struct options* opts) add_library(opts, lib_dirs, files, "user32"); } - if (!opts->nostartfiles) + if (!opts->nodefaultlibs) { add_library(opts, lib_dirs, files, "winecrt0"); - if (!opts->nodefaultlibs) - { - if (opts->win16_app) add_library(opts, lib_dirs, files, "kernel"); - add_library(opts, lib_dirs, files, "kernel32"); - add_library(opts, lib_dirs, files, "ntdll"); - } + if (opts->win16_app) add_library(opts, lib_dirs, files, "kernel"); + add_library(opts, lib_dirs, files, "kernel32"); + add_library(opts, lib_dirs, files, "ntdll"); } if (!opts->nostdlib) add_library(opts, lib_dirs, files, "wine");

1 0

Alexandre Julliard : makefiles: Always build the static cross libraries if crosstest is supported.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 7d2e7726e744ba3141fec697ba065a3c2864834b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2e7726e744ba3141fec697b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 26 12:13:47 2010 +0200 makefiles: Always build the static cross libraries if crosstest is supported. --- Maketest.rules.in | 2 +- aclocal.m4 | 6 +----- configure | 15 ++++++--------- configure.ac | 5 +++-- dlls/Makeimplib.rules.in | 2 +- 5 files changed, 12 insertions(+), 18 deletions(-) diff --git a/Maketest.rules.in b/Maketest.rules.in index f04dc24..c7d0df0 100644 --- a/Maketest.rules.in +++ b/Maketest.rules.in @@ -47,7 +47,7 @@ $(TESTRESULTS): $(MODULE)$(DLLEXT) ../$(TESTDLL)$(DLLEXT) # Rules for cross-compiling tests -crosstest: @CROSSTEST@ +crosstest: @CROSSTEST_DISABLE@ $(CROSSTEST) $(CROSSTEST): $(CROSSOBJS) Makefile.in $(CROSSWINEGCC) $(CROSSOBJS) -o $@ $(ALL_LIBS) diff --git a/aclocal.m4 b/aclocal.m4 index a77f15e..085b703 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -208,12 +208,8 @@ wine_fn_config_lib () wine_fn_all_dir_rules $ac_dir "dlls/Makeimplib.rules \$(MAKEDEP)" wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all __builddeps__: $ac_dir -__buildcrossdeps__: $ac_dir/lib$ac_name.cross.a -$ac_dir $ac_dir/lib$ac_name.cross.a: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include -$ac_dir: dummy +$ac_dir: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include dummy @cd $ac_dir && \$(MAKE) -$ac_dir/lib$ac_name.cross.a: dummy - @cd $ac_dir && \$(MAKE) lib$ac_name.cross.a install install-dev:: $ac_dir @cd $ac_dir && \$(MAKE) install uninstall:: $ac_dir/Makefile diff --git a/configure b/configure index 437fb20..4e20726 100755 --- a/configure +++ b/configure @@ -646,8 +646,8 @@ X_CFLAGS XMKMF LIBPTHREAD CROSSTARGET -CROSSTEST CROSSCC +CROSSTEST_DISABLE CARBONLIB FRAMEWORK_OPENAL COREAUDIO @@ -6997,7 +6997,9 @@ If you are using Linux, you will need a newer binutils. " "$LINENO" 5 fi -if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll" +CROSSTEST_DISABLE=\# + +if test "$cross_compiling" = "no" -a "x$enable_tests" != xno -a "$LIBEXT" != "dll" then case "$host_cpu" in i[3456789]86*) @@ -7052,8 +7054,7 @@ test -n "$CROSSCC" || CROSSCC="false" if test "$CROSSCC" != "false" then - CROSSTEST="\$(CROSSTEST)" - + CROSSTEST_DISABLE="" set x $CROSSCC shift target="" @@ -14074,12 +14075,8 @@ wine_fn_config_lib () wine_fn_all_dir_rules $ac_dir "dlls/Makeimplib.rules \$(MAKEDEP)" wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all __builddeps__: $ac_dir -__buildcrossdeps__: $ac_dir/lib$ac_name.cross.a -$ac_dir $ac_dir/lib$ac_name.cross.a: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include -$ac_dir: dummy +$ac_dir: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include dummy @cd $ac_dir && \$(MAKE) -$ac_dir/lib$ac_name.cross.a: dummy - @cd $ac_dir && \$(MAKE) lib$ac_name.cross.a install install-dev:: $ac_dir @cd $ac_dir && \$(MAKE) install uninstall:: $ac_dir/Makefile diff --git a/configure.ac b/configure.ac index 0c3a212..68c151f 100644 --- a/configure.ac +++ b/configure.ac @@ -832,12 +832,13 @@ If you are using Linux, you will need a newer binutils.] fi dnl Check for cross compiler to build test programs -if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll" +AC_SUBST([CROSSTEST_DISABLE],[\#]) +if test "$cross_compiling" = "no" -a "x$enable_tests" != xno -a "$LIBEXT" != "dll" then WINE_CHECK_MINGW_PROG(CROSSCC,gcc,false) if test "$CROSSCC" != "false" then - AC_SUBST(CROSSTEST,"\$(CROSSTEST)") + CROSSTEST_DISABLE="" set x $CROSSCC shift target="" diff --git a/dlls/Makeimplib.rules.in b/dlls/Makeimplib.rules.in index da36eee..1f9287d 100644 --- a/dlls/Makeimplib.rules.in +++ b/dlls/Makeimplib.rules.in @@ -12,7 +12,7 @@ INSTALLDIRS = $(DESTDIR)$(dlldir) @MAKE_RULES@ -all: $(MODULE:%=lib%.a) +all: $(MODULE:%=lib%.a) @CROSSTEST_DISABLE@ $(MODULE:%=lib%.cross.a) # Rules for .a library

1 0

Alexandre Julliard : makefiles: Always build the cross import libraries if crosstest is supported.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: faa7eae8c41f67f30e55a60eb6d99f10bd6d669a URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa7eae8c41f67f30e55a60eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 26 12:38:11 2010 +0200 makefiles: Always build the cross import libraries if crosstest is supported. --- Makefile.in | 4 +- aclocal.m4 | 56 +++++++++++++++++++++++++++++++++++------------- configure | 54 +++++++++++++++++++++++++++++++++++------------ dlls/Makedll.rules.in | 2 +- 4 files changed, 84 insertions(+), 32 deletions(-) diff --git a/Makefile.in b/Makefile.in index 67507a1..45a3ed4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -67,8 +67,8 @@ distclean:: clean # dependencies needed to build any dll or program __tooldeps__: libs/port libs/wine libs/wpp -__builddeps__ __buildcrossdeps__: __tooldeps__ include -.PHONY: test crosstest __tooldeps__ __builddeps__ __buildcrossdeps__ +__builddeps__: __tooldeps__ include +.PHONY: test crosstest __tooldeps__ __builddeps__ loader server: libs/port libs/wine tools fonts: tools diff --git a/aclocal.m4 b/aclocal.m4 index 085b703..67c7997 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -246,35 +246,52 @@ uninstall manpages htmlpages sgmlpages xmlpages:: dlls/$ac_dir/Makefile then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "__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 \$[@]\` + @cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.def +$ac_file.$STATIC_IMPLIBEXT: dlls/$ac_dir/Makefile dummy + @cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT install-dev:: dlls/$ac_dir/Makefile __builddeps__ @cd dlls/$ac_dir && \$(MAKE) install-dev" + if test "x$CROSSTEST_DISABLE" = x + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"__builddeps__: $ac_file.cross.a +$ac_file.cross.a: dlls/$ac_dir/Makefile dummy + @cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.cross.a" + fi + elif test -n "$ac_implib" then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "__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 \$[@]\` +$ac_file.$IMPLIBEXT: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps + @cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.$IMPLIBEXT install-dev:: dlls/$ac_dir/Makefile __builddeps__ @cd dlls/$ac_dir && \$(MAKE) install-dev" + if test "x$CROSSTEST_DISABLE" = x + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"__builddeps__: $ac_file.cross.a +$ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps + @cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.cross.a" + fi if test "$ac_dir" != "$ac_implib" then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "__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 \$[@] clean:: \$(RM) dlls/lib$ac_implib.$IMPLIBEXT" + if test "x$CROSSTEST_DISABLE" = x + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"__builddeps__: dlls/lib$ac_implib.cross.a +dlls/lib$ac_implib.cross.a: $ac_file.cross.a + \$(RM) \$[@] && \$(LN_S) $ac_dir/lib$ac_implib.cross.a \$[@]" + fi fi fi } @@ -326,16 +343,25 @@ $ac_name.res: $ac_name.rc $ac_name.exe" .PHONY: $ac_dir $ac_dir: $ac_dir/Makefile __builddeps__ dummy @cd $ac_dir && \$(MAKE) -crosstest: $ac_dir/__crosstest__ -.PHONY: $ac_dir/__crosstest__ -$ac_dir/__crosstest__: $ac_dir/Makefile __buildcrossdeps__ dummy - @cd $ac_dir && \$(MAKE) crosstest test: $ac_dir/__test__ .PHONY: $ac_dir/__test__ $ac_dir/__test__: dummy @cd $ac_dir && \$(MAKE) test testclean:: - \$(RM) $ac_dir/*.ok"]) + \$(RM) $ac_dir/*.ok" + + if test "x$CROSSTEST_DISABLE" = x + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"crosstest: $ac_dir/__crosstest__ +.PHONY: $ac_dir/__crosstest__ +$ac_dir/__crosstest__: $ac_dir/Makefile __builddeps__ dummy + @cd $ac_dir && \$(MAKE) crosstest" + else + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"crosstest: + @echo \"crosstest is not supported (mingw not installed?)\" && false" + fi]) } wine_fn_config_tool () diff --git a/configure b/configure index 4e20726..e6fa900 100755 --- a/configure +++ b/configure @@ -14115,35 +14115,52 @@ fi then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "__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 \$@\` + @cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.def +$ac_file.$STATIC_IMPLIBEXT: dlls/$ac_dir/Makefile dummy + @cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT install-dev:: dlls/$ac_dir/Makefile __builddeps__ @cd dlls/$ac_dir && \$(MAKE) install-dev" + if test "x$CROSSTEST_DISABLE" = x + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"__builddeps__: $ac_file.cross.a +$ac_file.cross.a: dlls/$ac_dir/Makefile dummy + @cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.cross.a" + fi + elif test -n "$ac_implib" then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "__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 \$@\` +$ac_file.$IMPLIBEXT: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps + @cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.$IMPLIBEXT install-dev:: dlls/$ac_dir/Makefile __builddeps__ @cd dlls/$ac_dir && \$(MAKE) install-dev" + if test "x$CROSSTEST_DISABLE" = x + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"__builddeps__: $ac_file.cross.a +$ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps + @cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.cross.a" + fi if test "$ac_dir" != "$ac_implib" then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "__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 \$@ clean:: \$(RM) dlls/lib$ac_implib.$IMPLIBEXT" + if test "x$CROSSTEST_DISABLE" = x + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"__builddeps__: dlls/lib$ac_implib.cross.a +dlls/lib$ac_implib.cross.a: $ac_file.cross.a + \$(RM) \$@ && \$(LN_S) $ac_dir/lib$ac_implib.cross.a \$@" + fi fi fi } @@ -14203,16 +14220,25 @@ else .PHONY: $ac_dir $ac_dir: $ac_dir/Makefile __builddeps__ dummy @cd $ac_dir && \$(MAKE) -crosstest: $ac_dir/__crosstest__ -.PHONY: $ac_dir/__crosstest__ -$ac_dir/__crosstest__: $ac_dir/Makefile __buildcrossdeps__ dummy - @cd $ac_dir && \$(MAKE) crosstest test: $ac_dir/__test__ .PHONY: $ac_dir/__test__ $ac_dir/__test__: dummy @cd $ac_dir && \$(MAKE) test testclean:: \$(RM) $ac_dir/*.ok" + + if test "x$CROSSTEST_DISABLE" = x + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"crosstest: $ac_dir/__crosstest__ +.PHONY: $ac_dir/__crosstest__ +$ac_dir/__crosstest__: $ac_dir/Makefile __builddeps__ dummy + @cd $ac_dir && \$(MAKE) crosstest" + else + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"crosstest: + @echo \"crosstest is not supported (mingw not installed?)\" && false" + fi fi } diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index fa8cf91..6e9419a 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -31,7 +31,7 @@ IMPLIB_CROSSOBJS = $(IMPLIB_OBJS:.o=.cross.o) .PHONY: $(IMPLIB_SRCS:%=__static_implib__%) -all: $(IMPORTLIBFILE) $(IMPLIB_SRCS:%=__static_implib__%) +all: $(IMPORTLIBFILE) $(IMPLIB_SRCS:%=__static_implib__%) @CROSSTEST_DISABLE@ $(IMPORTLIB:%=lib%.cross.a) $(IMPLIB_SRCS:%=__static_implib__%): $(STATICIMPLIB)

1 0

Piotr Caban : msvcp90: Correctly declare pointers to delete/new functions.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: cb432866d24928651b0a959c5db6870a98ca0163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb432866d24928651b0a959c5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jul 25 12:23:22 2010 +0200 msvcp90: Correctly declare pointers to delete/new functions. --- dlls/msvcp90/msvcp90.h | 4 ++-- dlls/msvcp90/msvcp90_main.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index fe14e07..c70f1c9 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -23,8 +23,8 @@ typedef unsigned char MSVCP_BOOL; void __cdecl _invalid_parameter(const wchar_t*, const wchar_t*, const wchar_t*, unsigned int, uintptr_t); -void* (__cdecl *MSVCRT_operator_new)(size_t); -void (__cdecl *MSVCRT_operator_delete)(void*); +extern void* (__cdecl *MSVCRT_operator_new)(size_t); +extern void (__cdecl *MSVCRT_operator_delete)(void*); /* Copied from dlls/msvcrt/cpp.c */ #ifdef __i386__ /* thiscall functions are i386-specific */ diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index fcf2d24..dd542fc 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -28,6 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +void* (__cdecl *MSVCRT_operator_new)(size_t); +void (__cdecl *MSVCRT_operator_delete)(void*); void init_cxx_funcs(void) { HMODULE hmod = GetModuleHandleA("msvcrt.dll");

1 0

Matteo Bruni : windowscodecs: Reset the stream pointer when initializing JPEG decoder.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 23e173109dd4ee2fa6c7a5a600233825289bf57a URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e173109dd4ee2fa6c7a5a60… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Mon May 24 23:40:58 2010 +0200 windowscodecs: Reset the stream pointer when initializing JPEG decoder. --- dlls/windowscodecs/jpegformat.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index b5676ea..41abe24 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -226,6 +226,7 @@ static HRESULT WINAPI JpegDecoder_Initialize(IWICBitmapDecoder *iface, IStream * { JpegDecoder *This = (JpegDecoder*)iface; int ret; + LARGE_INTEGER seek; TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOptions); EnterCriticalSection(&This->lock); @@ -245,6 +246,9 @@ static HRESULT WINAPI JpegDecoder_Initialize(IWICBitmapDecoder *iface, IStream * This->stream = pIStream; IStream_AddRef(pIStream); + seek.QuadPart = 0; + IStream_Seek(This->stream, seek, STREAM_SEEK_SET, NULL); + This->source_mgr.bytes_in_buffer = 0; This->source_mgr.init_source = source_mgr_init_source; This->source_mgr.fill_input_buffer = source_mgr_fill_input_buffer;

1 0

Paul Vriens : shell32: Fix the Serbian (Latin) translation.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 653a64e60b1844ca947d2656f3264a7ce8bd9568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=653a64e60b1844ca947d2656f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Jul 25 10:34:38 2010 +0200 shell32: Fix the Serbian (Latin) translation. --- dlls/shell32/shell32_Sr.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32_Sr.rc b/dlls/shell32/shell32_Sr.rc index 11bd799..0c9bb2b 100644 --- a/dlls/shell32/shell32_Sr.rc +++ b/dlls/shell32/shell32_Sr.rc @@ -38,7 +38,7 @@ MENU_002 MENU BEGIN POPUP "" BEGIN - POPUP "Nov" + POPUP "&Pregled" BEGIN MENUITEM "Velik&e Ikone", FCIDM_SHVIEW_BIGICON MENUITEM "M&ale ikone", FCIDM_SHVIEW_SMALLICON @@ -46,7 +46,7 @@ BEGIN MENUITEM "&Detalji", FCIDM_SHVIEW_REPORTVIEW END MENUITEM SEPARATOR - POPUP "Nov" + POPUP "Sredi &Ikone" BEGIN MENUITEM "po &Imenu", 0x30 /* column 0 */ MENUITEM "po &Tipu", 0x32 /* column 2 */ @@ -97,13 +97,13 @@ END MENU_CPANEL MENU BEGIN - POPUP "&Pomoć" + POPUP "&Fajl" BEGIN MENUITEM SEPARATOR MENUITEM "I&zlaz", IDM_CPANEL_EXIT END - POPUP "&Pomoć" + POPUP "&Pregled" BEGIN MENUITEM "Veli&ke Ikone", FCIDM_SHVIEW_BIGICON MENUITEM "Ma&le Ikone", FCIDM_SHVIEW_SMALLICON

1 0