September 2010 - Wine-commits

Luca Bennati : ipconfig: Update Italian translation.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 9320551f5959683d45d6dcbcbf7d02532a112772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9320551f5959683d45d6dcbcb… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Sep 27 14:55:01 2010 +0200 ipconfig: Update Italian translation. --- programs/ipconfig/It.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/It.rc b/programs/ipconfig/It.rc index 1784026..bab5ef5 100644 --- a/programs/ipconfig/It.rc +++ b/programs/ipconfig/It.rc @@ -48,4 +48,5 @@ STRINGTABLE STRING_DHCP_ENABLED, "DHCP abilitato" STRING_YES, "Sì" STRING_NO, "No" + STRING_DEFAULT_GATEWAY, "Gateway predefinito" }

1 0

Luca Bennati : inetcpl.cpl: Update Italian translation.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 8e63377eb506d97ec2e22d1c2d17ef099bfbf3c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e63377eb506d97ec2e22d1c2… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Sep 27 15:02:44 2010 +0200 inetcpl.cpl: Update Italian translation. --- dlls/inetcpl.cpl/cpl_It.rc | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_It.rc b/dlls/inetcpl.cpl/cpl_It.rc index 81e3044..629a1e3 100644 --- a/dlls/inetcpl.cpl/cpl_It.rc +++ b/dlls/inetcpl.cpl/cpl_It.rc @@ -1,5 +1,5 @@ /* - * Internet control panel applet + * Italian resources for the Internet control panel applet * * Copyright 2010 Luca Bennati <lucak3(a)gmail.com * @@ -22,12 +22,27 @@ #include "inetcpl.h" /* UTF-8 */ -#pragma codepage(65001) +#pragma code_page(65001) LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN IDS_CPL_NAME "Impostazioni di Internet" - IDS_CPL_INFO "Configura il browser Internet di Wine e le relative impostazioni" + IDS_CPL_INFO "Configura il browser Internet di Wine e le relative impostazioni" +END + +/* "Content" propsheet */ +IDD_CONTENT DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Contenuto" +BEGIN + + GROUPBOX " Certificati ", IDC_STATIC, 4, 4, 312, 50 + LTEXT "I certificati sono usati per la tua identificazione personale e per identificare le autorità e gli editori dei certificati.", + IDC_STATIC, 58, 14, 252, 18 + PUSHBUTTON "Certificati...", IDC_CERT, 146, 34, 80, 14 + PUSHBUTTON "Editori... ", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + END

1 0

Luca Bennati : msrle32: Update Italian translation.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 20cb6ea3f15f7ba1cf94101ae97d0904143dba4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=20cb6ea3f15f7ba1cf94101ae… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Sep 27 15:31:44 2010 +0200 msrle32: Update Italian translation. --- dlls/msrle32/msrle_It.rc | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msrle32/msrle_It.rc b/dlls/msrle32/msrle_It.rc index 002ba7d..b2cf210 100644 --- a/dlls/msrle32/msrle_It.rc +++ b/dlls/msrle32/msrle_It.rc @@ -1,7 +1,7 @@ /* * Italian resource file for MS-RLE * - * Copyright 2002 Michael G�nnewig + * Copyright 2002 Michael Günnewig * Copyright 2003 Ivan Leo Puoti * * This library is free software; you can redistribute it and/or @@ -21,11 +21,14 @@ #include "msrle_private.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE { IDS_NAME "WINE-MS-RLE" IDS_DESCRIPTION "Codec video MS-RLE di Wine" - IDS_ABOUT "Codec video MS-RLE di Wine\nCopyright 2002 Michael G�nnewig" + IDS_ABOUT "Codec video MS-RLE di Wine\nCopyright 2002 Michael Günnewig" }

1 0

Luca Bennati : oleaut32: Update Italian translation.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 0cbc51d6816e65f3749ae8e91f74b08584a82ded URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cbc51d6816e65f3749ae8e91… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Sep 27 15:33:47 2010 +0200 oleaut32: Update Italian translation. --- dlls/oleaut32/oleaut32_It.rc | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/oleaut32_It.rc b/dlls/oleaut32/oleaut32_It.rc index 561675c..753614a 100644 --- a/dlls/oleaut32/oleaut32_It.rc +++ b/dlls/oleaut32/oleaut32_It.rc @@ -20,13 +20,16 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE { IDS_TRUE "Vero" IDS_FALSE "Falso" - IDS_YES "Si" + IDS_YES "Sì" IDS_NO "No" IDS_ON "On" IDS_OFF "Off"

1 0

Luca Bennati : browseui: Convert Italian translation to UTF-8.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: e0eb3ccf83eff03db7a7e52053a7f113cf05002f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0eb3ccf83eff03db7a7e5205… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Sep 27 15:36:02 2010 +0200 browseui: Convert Italian translation to UTF-8. --- dlls/browseui/rsrc_It.rc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/browseui/rsrc_It.rc b/dlls/browseui/rsrc_It.rc index 3da2fa9..5323aa1 100644 --- a/dlls/browseui/rsrc_It.rc +++ b/dlls/browseui/rsrc_It.rc @@ -18,6 +18,9 @@ #include "resids.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE

1 0

Luca Bennati : serialui: Update Italian translation.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: fba4c2f66173c034bc1c4e1f5a9164e3e2c9274a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fba4c2f66173c034bc1c4e1f5… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Sep 27 15:52:30 2010 +0200 serialui: Update Italian translation. --- dlls/serialui/It.rc | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/serialui/It.rc b/dlls/serialui/It.rc index 3d2b65d..7b4c4a5 100644 --- a/dlls/serialui/It.rc +++ b/dlls/serialui/It.rc @@ -1,4 +1,6 @@ /* + * Serialui Italian language support + * * Copyright 2000 Mike McCormack * Copyright 2003 Ivan Leo Puoti * @@ -19,16 +21,19 @@ #include "serialui.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL IDD_SERIALUICONFIG DIALOG 0, 0, 160, 159 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propriet� per " +CAPTION "Proprietà per " FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Bit per secondo", -1,5,20,55,10 + LTEXT "Bit per secondo (baud)", -1,5,20,55,10 COMBOBOX IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Parit�", -1,5,40,55,10 + LTEXT "Parità", -1,5,40,55,10 COMBOBOX IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP LTEXT "Controllo di flusso", -1,5,60,55,10 COMBOBOX IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP

1 0

Aurimas Fišeras : ipconfig: Update Lithuanian translation.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: bca78f5f86f73e176e6ea9e03510c9ab2532c628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bca78f5f86f73e176e6ea9e03… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Sep 27 20:13:04 2010 +0300 ipconfig: Update Lithuanian translation. --- programs/ipconfig/Lt.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Lt.rc b/programs/ipconfig/Lt.rc index 3afefa1..03e4e31 100644 --- a/programs/ipconfig/Lt.rc +++ b/programs/ipconfig/Lt.rc @@ -47,4 +47,5 @@ STRINGTABLE STRING_DHCP_ENABLED, "DHCP įjungta" STRING_YES, "Taip" STRING_NO, "Ne" + STRING_DEFAULT_GATEWAY, "Numatytasis šliuzas" }

1 0

Aurimas Fišeras : inetcpl.cpl: Update Lithuanian translation.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: fb161e216f7aa2bc1727a773330e9430e0ea4fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb161e216f7aa2bc1727a7733… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Sep 27 20:20:25 2010 +0300 inetcpl.cpl: Update Lithuanian translation. --- dlls/inetcpl.cpl/cpl_Lt.rc | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Lt.rc b/dlls/inetcpl.cpl/cpl_Lt.rc index bce5403..f180133 100644 --- a/dlls/inetcpl.cpl/cpl_Lt.rc +++ b/dlls/inetcpl.cpl/cpl_Lt.rc @@ -31,3 +31,18 @@ BEGIN IDS_CPL_NAME "Interneto nuostatos" IDS_CPL_INFO "Konfigūruokite Wine interneto naršyklės ir susijusias nuostatas" END + +/* "Content" propsheet */ +IDD_CONTENT DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Turinys" +BEGIN + + GROUPBOX " Liudijimai ", IDC_STATIC, 4, 4, 312, 50 + LTEXT "Liudijimai yra naudojami jūsų tapatumo nustatymui ir liudijimo įstaigų bei publikuotojų tapatumui nustatyti.", + IDC_STATIC, 58, 14, 252, 18 + PUSHBUTTON "Liudijimai...", IDC_CERT, 146, 34, 80, 14 + PUSHBUTTON "Publikuotojai... ", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + +END

1 0

Thomas Mullaly : urlmon: Implemented validation of the host name component of a IUriBuilder.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 63723845c4529b12b4c161450937212c92cb33cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=63723845c4529b12b4c161450… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Sep 20 22:45:57 2010 -0400 urlmon: Implemented validation of the host name component of a IUriBuilder. --- dlls/urlmon/tests/uri.c | 61 +++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 89 ++++++++++++++++++++++++++++++++++++----------- 2 files changed, 128 insertions(+), 22 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index b2e265e..a32f889 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4823,7 +4823,6 @@ static const uri_builder_test uri_builder_tests[] = { { {FALSE}, }, - {TRUE,TRUE,999999,S_OK,FALSE}, 0,S_OK,TRUE, 0,S_OK,TRUE, @@ -5236,6 +5235,66 @@ static const uri_builder_test uri_builder_tests[] = { 0,INET_E_INVALID_URL,FALSE, 0,INET_E_INVALID_URL,FALSE, 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"winehq.org/test",NULL,Uri_PROPERTY_HOST,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"winehq.org?test",NULL,Uri_PROPERTY_HOST,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"winehq.org#test",NULL,Uri_PROPERTY_HOST,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + /* Hostname is allowed to contain a ':' (even for known scheme types). */ + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"winehq.org:test",NULL,Uri_PROPERTY_HOST,S_OK,FALSE}, + }, + {FALSE}, + 0,S_OK,TRUE, + 0,S_OK,TRUE, + 0,0,0,S_OK,TRUE, + { + {"http://winehq.org:test/",S_OK}, + {"winehq.org:test",S_OK}, + {"http://winehq.org:test/",S_OK}, + {"winehq.org:test",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"winehq.org:test",S_OK}, + {"",S_FALSE}, + {"/",S_OK}, + {"/",S_OK}, + {"",S_FALSE}, + {"http://winehq.org:test/",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {80,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index eaf8c83..c6570d6 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -26,9 +26,12 @@ #define UINT_MAX 0xffffffff #define USHORT_MAX 0xffff -#define ALLOW_NULL_TERM_SCHEME 0x1 -#define ALLOW_NULL_TERM_USER_NAME 0x2 -#define ALLOW_NULL_TERM_PASSWORD 0x4 +#define ALLOW_NULL_TERM_SCHEME 0x01 +#define ALLOW_NULL_TERM_USER_NAME 0x02 +#define ALLOW_NULL_TERM_PASSWORD 0x04 +#define ALLOW_BRACKETLESS_IP_LITERAL 0x08 +#define SKIP_IP_FUTURE_CHECK 0x10 +#define IGNORE_PORT_DELIMITER 0x20 WINE_DEFAULT_DEBUG_CHANNEL(urlmon); @@ -1516,11 +1519,11 @@ static BOOL parse_ipv4address(const WCHAR **ptr, parse_data *data, DWORD flags) * * A reg-name CAN be empty. */ -static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags) { +static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags, DWORD extras) { const BOOL has_start_bracket = **ptr == '['; const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; BOOL inside_brackets = has_start_bracket; - BOOL ignore_col = FALSE; + BOOL ignore_col = extras & IGNORE_PORT_DELIMITER; /* We have to be careful with file schemes. */ if(data->scheme_type == URL_SCHEME_FILE) { @@ -1554,7 +1557,7 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags) { if(data->scheme_type != URL_SCHEME_UNKNOWN) { *ptr = data->host; data->host = NULL; - TRACE("(%p %p %x): Expected valid port\n", ptr, data, flags); + TRACE("(%p %p %x %x): Expected valid port\n", ptr, data, flags, extras); return FALSE; } else /* Windows gives up on trying to parse a port when it @@ -1585,8 +1588,8 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags) { 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); + TRACE("(%p %p %x %x): Expected an IP literal inside of the host\n", + ptr, data, flags, extras); *ptr = data->host; data->host = NULL; return FALSE; @@ -1603,7 +1606,7 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags) { else data->host_type = Uri_HOST_DNS; - TRACE("(%p %p %x): Parsed reg-name. host=%s len=%d\n", ptr, data, flags, + TRACE("(%p %p %x %x): Parsed reg-name. host=%s len=%d\n", ptr, data, flags, extras, debugstr_wn(data->host, data->host_len), data->host_len); return TRUE; } @@ -1816,27 +1819,33 @@ static BOOL parse_ipvfuture(const WCHAR **ptr, parse_data *data, DWORD flags) { } /* IP-literal = "[" ( IPv6address / IPvFuture ) "]" */ -static BOOL parse_ip_literal(const WCHAR **ptr, parse_data *data, DWORD flags) { +static BOOL parse_ip_literal(const WCHAR **ptr, parse_data *data, DWORD flags, DWORD extras) { data->host = *ptr; - if(**ptr != '[') { + if(**ptr != '[' && !(extras & ALLOW_BRACKETLESS_IP_LITERAL)) { data->host = NULL; return FALSE; - } + } else if(**ptr == '[') + ++(*ptr); - ++(*ptr); if(!parse_ipv6address(ptr, data, flags)) { - if(!parse_ipvfuture(ptr, data, flags)) { + if(extras & SKIP_IP_FUTURE_CHECK || !parse_ipvfuture(ptr, data, flags)) { *ptr = data->host; data->host = NULL; return FALSE; } } - if(**ptr != ']') { + if(**ptr != ']' && !(extras & ALLOW_BRACKETLESS_IP_LITERAL)) { *ptr = data->host; data->host = NULL; return FALSE; + } else if(!**ptr && extras & ALLOW_BRACKETLESS_IP_LITERAL) { + /* The IP literal didn't contain brackets and was followed by + * a NULL terminator, so no reason to even check the port. + */ + data->host_len = *ptr - data->host; + return TRUE; } ++(*ptr); @@ -1860,12 +1869,12 @@ static BOOL parse_ip_literal(const WCHAR **ptr, parse_data *data, DWORD flags) { * * host = IP-literal / IPv4address / reg-name */ -static BOOL parse_host(const WCHAR **ptr, parse_data *data, DWORD flags) { - if(!parse_ip_literal(ptr, data, flags)) { +static BOOL parse_host(const WCHAR **ptr, parse_data *data, DWORD flags, DWORD extras) { + if(!parse_ip_literal(ptr, data, flags, extras)) { if(!parse_ipv4address(ptr, data, flags)) { - if(!parse_reg_name(ptr, data, flags)) { - TRACE("(%p %p %x): Malformed URI, Unknown host type.\n", - ptr, data, flags); + if(!parse_reg_name(ptr, data, flags, extras)) { + TRACE("(%p %p %x %x): Malformed URI, Unknown host type.\n", + ptr, data, flags, extras); return FALSE; } } @@ -1884,7 +1893,7 @@ static BOOL parse_authority(const WCHAR **ptr, parse_data *data, DWORD flags) { /* Parsing the port will happen during one of the host parsing * routines (if the URI has a port). */ - if(!parse_host(ptr, data, flags)) + if(!parse_host(ptr, data, flags, 0)) return FALSE; return TRUE; @@ -3651,6 +3660,37 @@ static HRESULT validate_userinfo(const UriBuilder *builder, parse_data *data, DW return S_OK; } +static HRESULT validate_host(const UriBuilder *builder, parse_data *data, DWORD flags) { + const WCHAR *ptr; + const WCHAR **pptr; + DWORD expected_len; + + if(builder->host) { + ptr = builder->host; + expected_len = builder->host_len; + } else if(!(builder->modified_props & Uri_HAS_HOST) && builder->uri && builder->uri->host_start > -1) { + ptr = builder->uri->canon_uri + builder->uri->host_start; + expected_len = builder->uri->host_len; + } else + ptr = NULL; + + if(ptr) { + DWORD extras = ALLOW_BRACKETLESS_IP_LITERAL|IGNORE_PORT_DELIMITER|SKIP_IP_FUTURE_CHECK; + pptr = &ptr; + + if(parse_host(pptr, data, flags, extras) && data->host_len == expected_len) + TRACE("(%p %p %x): Found valid host name %s len=%d type=%d.\n", builder, data, flags, + debugstr_wn(data->host, data->host_len), data->host_len, data->host_type); + else { + TRACE("(%p %p %x): Invalid host name found %s expected_len=%d.\n", builder, data, flags, + debugstr_wn(ptr, expected_len), expected_len); + return INET_E_INVALID_URL; + } + } + + return S_OK; +} + static HRESULT validate_components(const UriBuilder *builder, parse_data *data, DWORD flags) { HRESULT hr; @@ -3676,6 +3716,13 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data, if(FAILED(hr)) return hr; + hr = validate_host(builder, data, flags); + if(FAILED(hr)) + return hr; + + /* The URI is opaque if it doesn't have an authority component. */ + data->is_opaque = !data->username && !data->password && !data->host; + return E_NOTIMPL; }

1 0

Thomas Mullaly : urlmon: Fixed TRACE's which sometimes output garbage.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: bf82564b5ab4903d8aebc24a2c5ed8d90ec0eae6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf82564b5ab4903d8aebc24a2… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Sep 21 18:03:07 2010 -0400 urlmon: Fixed TRACE's which sometimes output garbage. --- dlls/urlmon/uri.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index c6570d6..070ec70 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3545,6 +3545,7 @@ static void reset_builder(UriBuilder *builder) { } static HRESULT validate_scheme_name(const UriBuilder *builder, parse_data *data, DWORD flags) { + const WCHAR *component; const WCHAR *ptr; const WCHAR **pptr; DWORD expected_len; @@ -3561,15 +3562,16 @@ static HRESULT validate_scheme_name(const UriBuilder *builder, parse_data *data, expected_len = 0; } + component = ptr; pptr = &ptr; if(parse_scheme(pptr, data, flags, ALLOW_NULL_TERM_SCHEME) && data->scheme_len == expected_len) { if(data->scheme) - TRACE("(%p %p %x): Found valid scheme component %s.\n", builder, data, flags, - debugstr_wn(data->scheme, data->scheme_len)); + TRACE("(%p %p %x): Found valid scheme component %s len=%d.\n", builder, data, flags, + debugstr_wn(data->scheme, data->scheme_len), data->scheme_len); } else { TRACE("(%p %p %x): Invalid scheme component found %s.\n", builder, data, flags, - debugstr_wn(ptr, expected_len)); + debugstr_wn(component, expected_len)); return INET_E_INVALID_URL; } @@ -3597,14 +3599,15 @@ static HRESULT validate_username(const UriBuilder *builder, parse_data *data, DW } if(ptr) { + const WCHAR *component = ptr; pptr = &ptr; if(parse_username(pptr, data, flags, ALLOW_NULL_TERM_USER_NAME) && data->username_len == expected_len) - TRACE("(%p %p %x): Found valid username component %s.\n", builder, data, flags, - debugstr_wn(data->username, data->username_len)); + TRACE("(%p %p %x): Found valid username component %s len=%d.\n", builder, data, flags, + debugstr_wn(data->username, data->username_len), data->username_len); else { TRACE("(%p %p %x): Invalid username component found %s.\n", builder, data, flags, - debugstr_wn(ptr, expected_len)); + debugstr_wn(component, expected_len)); return INET_E_INVALID_URL; } } @@ -3631,14 +3634,15 @@ static HRESULT validate_password(const UriBuilder *builder, parse_data *data, DW } if(ptr) { + const WCHAR *component = ptr; pptr = &ptr; if(parse_password(pptr, data, flags, ALLOW_NULL_TERM_PASSWORD) && data->password_len == expected_len) - TRACE("(%p %p %x): Found valid password component %s.\n", builder, data, flags, - debugstr_wn(data->password, data->password_len)); + TRACE("(%p %p %x): Found valid password component %s len=%d.\n", builder, data, flags, + debugstr_wn(data->password, data->password_len), data->password_len); else { TRACE("(%p %p %x): Invalid password component found %s.\n", builder, data, flags, - debugstr_wn(ptr, expected_len)); + debugstr_wn(component, expected_len)); return INET_E_INVALID_URL; } } @@ -3675,6 +3679,7 @@ static HRESULT validate_host(const UriBuilder *builder, parse_data *data, DWORD ptr = NULL; if(ptr) { + const WCHAR *component = ptr; DWORD extras = ALLOW_BRACKETLESS_IP_LITERAL|IGNORE_PORT_DELIMITER|SKIP_IP_FUTURE_CHECK; pptr = &ptr; @@ -3682,8 +3687,8 @@ static HRESULT validate_host(const UriBuilder *builder, parse_data *data, DWORD TRACE("(%p %p %x): Found valid host name %s len=%d type=%d.\n", builder, data, flags, debugstr_wn(data->host, data->host_len), data->host_len, data->host_type); else { - TRACE("(%p %p %x): Invalid host name found %s expected_len=%d.\n", builder, data, flags, - debugstr_wn(ptr, expected_len), expected_len); + TRACE("(%p %p %x): Invalid host name found %s.\n", builder, data, flags, + debugstr_wn(component, expected_len)); return INET_E_INVALID_URL; } }

1 0