wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

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 : 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 : 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 : 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 : 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

Nikolay Sivov : comctl32/tab: Add a test for TCM_SETITEMEXTRA.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 1b2f7517ee6f9d7b8a0f64bee8e56f6499566cf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b2f7517ee6f9d7b8a0f64bee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 28 01:40:32 2010 +0400 comctl32/tab: Add a test for TCM_SETITEMEXTRA. --- dlls/comctl32/tab.c | 9 +-------- dlls/comctl32/tests/tab.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 8807a11..0ecbb63 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -3190,15 +3190,8 @@ TAB_SetItemExtra (TAB_INFO *infoPtr, INT cbInfo) { TRACE("(%p %d)\n", infoPtr, cbInfo); - if (cbInfo <= 0) - return FALSE; + if (cbInfo < 0 || infoPtr->uNumItem) return FALSE; - if (infoPtr->uNumItem) - { - /* FIXME: MSDN says this is not allowed, but this hasn't been verified */ - return FALSE; - } - infoPtr->cbInfo = cbInfo; return TRUE; } diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 6774d51..d74155d 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -1196,6 +1196,43 @@ static void test_delete_selection(HWND parent_wnd) DestroyWindow(hTab); } +static void test_TCM_SETITEMEXTRA(HWND parent_wnd) +{ + HWND hTab; + DWORD ret; + + hTab = CreateWindowA( + WC_TABCONTROLA, + "TestTab", + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | TCS_FOCUSNEVER | TCS_FIXEDWIDTH, + 10, 10, 300, 100, + parent_wnd, NULL, NULL, 0); + + /* zero is valid size too */ + ret = SendMessageA(hTab, TCM_SETITEMEXTRA, 0, 0); + if (ret == FALSE) + { + win_skip("TCM_SETITEMEXTRA not supported\n"); + DestroyWindow(hTab); + return; + } + + ret = SendMessageA(hTab, TCM_SETITEMEXTRA, -1, 0); + ok(ret == FALSE, "got %d\n", ret); + + ret = SendMessageA(hTab, TCM_SETITEMEXTRA, 2, 0); + ok(ret == TRUE, "got %d\n", ret); + DestroyWindow(hTab); + + /* it's not possible to change extra data size for control with tabs */ + hTab = createFilledTabControl(parent_wnd, TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE, 4); + ok(hTab != NULL, "Failed to create tab control\n"); + + ret = SendMessageA(hTab, TCM_SETITEMEXTRA, 2, 0); + ok(ret == FALSE, "got %d\n", ret); + DestroyWindow(hTab); +} + START_TEST(tab) { HWND parent_wnd; @@ -1240,6 +1277,7 @@ START_TEST(tab) test_delete_focus(parent_wnd); test_delete_selection(parent_wnd); test_removeimage(parent_wnd); + test_TCM_SETITEMEXTRA(parent_wnd); DestroyWindow(parent_wnd); }

1 0

Thomas Mullaly : urlmon: Finished validation for the remaining components of a IUriBuilder.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 70843e4f34fe39a275e0da6acf7b25141ffe89ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=70843e4f34fe39a275e0da6ac… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Sep 22 19:23:37 2010 -0400 urlmon: Finished validation for the remaining components of a IUriBuilder. --- dlls/urlmon/tests/uri.c | 27 +++++++++++ dlls/urlmon/uri.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 143 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 16bb75f..3e6f5a8 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5361,6 +5361,33 @@ static const uri_builder_test uri_builder_tests[] = { {URL_SCHEME_HTTP,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"/path?query",NULL,Uri_PROPERTY_PATH,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,"/path#test",NULL,Uri_PROPERTY_PATH,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,"?path#test",NULL,Uri_PROPERTY_QUERY,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 9e20f2e..ef66186 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3713,6 +3713,106 @@ static void setup_port(const UriBuilder *builder, parse_data *data, DWORD flags) TRACE("(%p %p %x): Using %u as port for IUri.\n", builder, data, flags, data->port_value); } +static HRESULT validate_path(const UriBuilder *builder, parse_data *data, DWORD flags) { + const WCHAR *ptr = NULL; + const WCHAR **pptr; + DWORD expected_len; + + if(builder->path) { + ptr = builder->path; + expected_len = builder->path_len; + } else if(!(builder->modified_props & Uri_HAS_PATH) && + builder->uri && builder->uri->path_start > -1) { + ptr = builder->uri->canon_uri+builder->uri->path_start; + expected_len = builder->uri->path_len; + } + + if(ptr) { + BOOL valid = FALSE; + const WCHAR *component = ptr; + pptr = &ptr; + + /* How the path is validated depends on what type of + * URI it is. + */ + valid = data->is_opaque ? + parse_path_opaque(pptr, data, flags) : parse_path_hierarchical(pptr, data, flags); + + if(!valid || expected_len != data->path_len) { + TRACE("(%p %p %x): Invalid path componet %s.\n", builder, data, flags, + debugstr_wn(component, expected_len)); + return INET_E_INVALID_URL; + } + + TRACE("(%p %p %x): Valid path component %s len=%d.\n", builder, data, flags, + debugstr_wn(data->path, data->path_len), data->path_len); + } + + return S_OK; +} + +static HRESULT validate_query(const UriBuilder *builder, parse_data *data, DWORD flags) { + const WCHAR *ptr = NULL; + const WCHAR **pptr; + DWORD expected_len; + + if(builder->query) { + ptr = builder->query; + expected_len = builder->query_len; + } else if(!(builder->modified_props & Uri_HAS_QUERY) && builder->uri && + builder->uri->query_start > -1) { + ptr = builder->uri->canon_uri+builder->uri->query_start; + expected_len = builder->uri->query_len; + } + + if(ptr) { + const WCHAR *component = ptr; + pptr = &ptr; + + if(parse_query(pptr, data, flags) && expected_len == data->query_len) + TRACE("(%p %p %x): Valid query component %s len=%d.\n", builder, data, flags, + debugstr_wn(data->query, data->query_len), data->query_len); + else { + TRACE("(%p %p %x): Invalid query component %s.\n", builder, data, flags, + debugstr_wn(component, expected_len)); + return INET_E_INVALID_URL; + } + } + + return S_OK; +} + +static HRESULT validate_fragment(const UriBuilder *builder, parse_data *data, DWORD flags) { + const WCHAR *ptr = NULL; + const WCHAR **pptr; + DWORD expected_len; + + if(builder->fragment) { + ptr = builder->fragment; + expected_len = builder->fragment_len; + } else if(!(builder->modified_props & Uri_HAS_FRAGMENT) && builder->uri && + builder->uri->fragment_start > -1) { + ptr = builder->uri->canon_uri+builder->uri->fragment_start; + expected_len = builder->uri->fragment_len; + } + + if(ptr) { + const WCHAR *component = ptr; + pptr = &ptr; + + if(parse_query(pptr, data, flags) && expected_len == data->fragment_len) + TRACE("(%p %p %x): Valid fragment component %s len=%d.\n", builder, data, flags, + debugstr_wn(data->fragment, data->fragment_len), data->fragment_len); + else { + TRACE("(%p %p %x): Invalid fragment component %s.\n", builder, data, flags, + debugstr_wn(component, expected_len)); + return INET_E_INVALID_URL; + } + } + + return S_OK; +} + static HRESULT validate_components(const UriBuilder *builder, parse_data *data, DWORD flags) { HRESULT hr; @@ -3747,7 +3847,21 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data, setup_port(builder, data, flags); - return E_NOTIMPL; + hr = validate_path(builder, data, flags); + if(FAILED(hr)) + return hr; + + hr = validate_query(builder, data, flags); + if(FAILED(hr)) + return hr; + + hr = validate_fragment(builder, data, flags); + if(FAILED(hr)) + return hr; + + TRACE("(%p %p %x): Finished validating builder components.\n", builder, data, flags); + + return S_OK; } static HRESULT build_uri(const UriBuilder *builder, IUri **uri, DWORD create_flags, @@ -3790,7 +3904,7 @@ static HRESULT build_uri(const UriBuilder *builder, IUri **uri, DWORD create_fla return hr; } - return S_OK; + return E_NOTIMPL; } #define URI_THIS(iface) DEFINE_THIS(Uri, IUri, iface)

1 0

Thomas Mullaly : urlmon: Can't set the host of a IUriBuilder to NULL.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 7e292893bd02a4f127b041053e68fbe25784e677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e292893bd02a4f127b041053… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Sep 22 17:32:46 2010 -0400 urlmon: Can't set the host of a IUriBuilder to NULL. --- dlls/urlmon/tests/uri.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 19 +++++++++--- 2 files changed, 85 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index a32f889..16bb75f 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5295,6 +5295,72 @@ static const uri_builder_test uri_builder_tests[] = { {URL_SCHEME_HTTP,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + /* Can't set the host name to NULL. */ + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,NULL,"google.com",Uri_PROPERTY_HOST,E_INVALIDARG,FALSE} + }, + {FALSE}, + 0,S_OK,FALSE, + 0,S_OK,FALSE, + 0,0,0,S_OK,FALSE, + { + {"http://google.com/",S_OK}, + {"google.com",S_OK}, + {"http://google.com/",S_OK}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"/",S_OK}, + {"/",S_OK}, + {"",S_FALSE}, + {"http://google.com/",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} + } + }, + /* Can set the host name to an empty string. */ + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"",NULL,Uri_PROPERTY_HOST,S_OK,FALSE} + }, + {FALSE}, + 0,S_OK,TRUE, + 0,S_OK,TRUE, + 0,0,0,S_OK,TRUE, + { + {"http:///",S_OK}, + {"",S_OK}, + {"http:///",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_OK}, + {"",S_FALSE}, + {"/",S_OK}, + {"/",S_OK}, + {"",S_FALSE}, + {"http:///",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {80,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } }; @@ -8025,10 +8091,14 @@ static void test_IUriBuilder(void) { uri_builder_property prop = test.properties[j]; if(prop.change) { change_property(builder, &prop, i); - if(prop.property != Uri_PROPERTY_SCHEME_NAME) + if(prop.property != Uri_PROPERTY_SCHEME_NAME && + prop.property != Uri_PROPERTY_HOST) modified = TRUE; else if(prop.value && *prop.value) modified = TRUE; + else if(prop.value && !*prop.value && prop.property == Uri_PROPERTY_HOST) + /* Host name property can't be NULL, but it can be empty. */ + modified = TRUE; } } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 44e37b1..9e20f2e 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -5082,6 +5082,11 @@ static HRESULT WINAPI UriBuilder_SetHost(IUriBuilder *iface, LPCWSTR pwzNewValue { UriBuilder *This = URIBUILDER_THIS(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); + + /* Host name can't be set to NULL. */ + if(!pwzNewValue) + return E_INVALIDARG; + return set_builder_component(&This->host, &This->host_len, pwzNewValue, 0, &This->modified_props, Uri_HAS_HOST); } @@ -5127,11 +5132,11 @@ static HRESULT WINAPI UriBuilder_SetSchemeName(IUriBuilder *iface, LPCWSTR pwzNe TRACE("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); /* Only set the scheme name if it's not NULL or empty. */ - if(pwzNewValue && *pwzNewValue) - return set_builder_component(&This->scheme, &This->scheme_len, pwzNewValue, 0, - &This->modified_props, Uri_HAS_SCHEME_NAME); - else + if(!pwzNewValue || !*pwzNewValue) return E_INVALIDARG; + + return set_builder_component(&This->scheme, &This->scheme_len, pwzNewValue, 0, + &This->modified_props, Uri_HAS_SCHEME_NAME); } static HRESULT WINAPI UriBuilder_SetUserName(IUriBuilder *iface, LPCWSTR pwzNewValue) @@ -5157,8 +5162,12 @@ static HRESULT WINAPI UriBuilder_RemoveProperties(IUriBuilder *iface, DWORD dwPr if(dwPropertyMask & Uri_HAS_FRAGMENT) UriBuilder_SetFragment(iface, NULL); + /* Even though you can't set the host name to NULL or an + * empty string, you can still remove it... for some reason. + */ if(dwPropertyMask & Uri_HAS_HOST) - UriBuilder_SetHost(iface, NULL); + set_builder_component(&This->host, &This->host_len, NULL, 0, + &This->modified_props, Uri_HAS_HOST); if(dwPropertyMask & Uri_HAS_PASSWORD) UriBuilder_SetPassword(iface, NULL);

1 0

Thomas Mullaly : urlmon: Implemented support for determining what port value to use in IUriBuilder.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: cbea4e2a855a1cd442853888772fadd3376af537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbea4e2a855a1cd4428538887… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Sep 21 22:25:24 2010 -0400 urlmon: Implemented support for determining what port value to use in IUriBuilder. --- dlls/urlmon/uri.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 070ec70..44e37b1 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -160,9 +160,10 @@ typedef struct { BOOL has_ipv6; ipv6_address ipv6_address; + BOOL has_port; const WCHAR *port; DWORD port_len; - USHORT port_value; + DWORD port_value; const WCHAR *path; DWORD path_len; @@ -1435,6 +1436,7 @@ static BOOL parse_port(const WCHAR **ptr, parse_data *data, DWORD flags) { ++(*ptr); } + data->has_port = TRUE; data->port_value = port; data->port_len = *ptr - data->port; @@ -3696,6 +3698,21 @@ static HRESULT validate_host(const UriBuilder *builder, parse_data *data, DWORD return S_OK; } +static void setup_port(const UriBuilder *builder, parse_data *data, DWORD flags) { + if(builder->modified_props & Uri_HAS_PORT) { + if(builder->has_port) { + data->has_port = TRUE; + data->port_value = builder->port; + } + } else if(builder->uri && builder->uri->has_port) { + data->has_port = TRUE; + data->port_value = builder->uri->port; + } + + if(data->has_port) + TRACE("(%p %p %x): Using %u as port for IUri.\n", builder, data, flags, data->port_value); +} + static HRESULT validate_components(const UriBuilder *builder, parse_data *data, DWORD flags) { HRESULT hr; @@ -3728,6 +3745,8 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data, /* The URI is opaque if it doesn't have an authority component. */ data->is_opaque = !data->username && !data->password && !data->host; + setup_port(builder, data, flags); + 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

← Newer
1
...
10
11
12
13
14
15
16
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2010