winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
October 2010
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
1174 discussions
Start a n
N
ew thread
Thomas Mullaly : urlmon: Implemented functionality for generating raw URI string of a IUriBuilder.
by Alexandre Julliard
04 Oct '10
04 Oct '10
Module: wine Branch: master Commit: a057153c2e86dcae16b55e19ae924ac8cc11bb41 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a057153c2e86dcae16b55e19a…
Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Sep 29 16:59:30 2010 -0400 urlmon: Implemented functionality for generating raw URI string of a IUriBuilder. --- dlls/urlmon/uri.c | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 168 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 1707429..c34c418 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -933,6 +933,19 @@ static DWORD ui2ipv4(WCHAR *dest, UINT address) { return ret; } +static DWORD ui2str(WCHAR *dest, UINT value) { + static const WCHAR formatW[] = {'%','u',0}; + DWORD ret = 0; + + if(!dest) { + WCHAR tmp[11]; + ret = sprintfW(tmp, formatW, value); + } else + ret = sprintfW(dest, formatW, value); + + return ret; +} + /* Converts an h16 component (from an IPv6 address) into it's * numerical value. * @@ -3847,11 +3860,14 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data, 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; - setup_port(builder, data, flags); + /* The URI is opaque if it doesn't have an authority component. */ + if(!data->is_relative) + data->is_opaque = !data->username && !data->password && !data->host && !data->has_port; + else + data->is_opaque = !data->host && !data->has_port; + hr = validate_path(builder, data, flags); if(FAILED(hr)) return hr; @@ -3869,11 +3885,144 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data, return S_OK; } +/* Generates a raw uri string using the parse_data. */ +static DWORD generate_raw_uri(const parse_data *data, BSTR uri) { + DWORD length = 0; + + if(data->scheme) { + if(uri) { + memcpy(uri, data->scheme, data->scheme_len*sizeof(WCHAR)); + uri[data->scheme_len] = ':'; + } + length += data->scheme_len+1; + } + + if(!data->is_opaque) { + /* For the "//" which appears before the authority component. */ + if(uri) { + uri[length] = '/'; + uri[length+1] = '/'; + } + length += 2; + } + + if(data->username) { + if(uri) + memcpy(uri+length, data->username, data->username_len*sizeof(WCHAR)); + length += data->username_len; + } + + if(data->password) { + if(uri) { + uri[length] = ':'; + memcpy(uri+length+1, data->password, data->password_len*sizeof(WCHAR)); + } + length += data->password_len+1; + } + + if(data->password || data->username) { + if(uri) + uri[length] = '@'; + ++length; + } + + if(data->host) { + /* IPv6 addresses get the brackets added around them if they don't already + * have them. + */ + const BOOL add_brackets = data->host_type == Uri_HOST_IPV6 && *(data->host) != '['; + if(add_brackets) { + if(uri) + uri[length] = '['; + ++length; + } + + if(uri) + memcpy(uri+length, data->host, data->host_len*sizeof(WCHAR)); + length += data->host_len; + + if(add_brackets) { + if(uri) + uri[length] = ']'; + length++; + } + } + + if(data->has_port) { + /* The port isn't included in the raw uri if it's the default + * port for the scheme type. + */ + DWORD i; + BOOL is_default = FALSE; + + for(i = 0; i < sizeof(default_ports)/sizeof(default_ports[0]); ++i) { + if(data->scheme_type == default_ports[i].scheme && + data->port_value == default_ports[i].port) + is_default = TRUE; + } + + if(!is_default) { + if(uri) + uri[length] = ':'; + ++length; + + if(uri) + length += ui2str(uri+length, data->port_value); + else + length += ui2str(NULL, data->port_value); + } + } + + /* Check if a '/' should be added before the path for hierarchical URIs. */ + if(!data->is_opaque && data->path && *(data->path) != '/') { + if(uri) + uri[length] = '/'; + ++length; + } + + if(data->path) { + if(uri) + memcpy(uri+length, data->path, data->path_len*sizeof(WCHAR)); + length += data->path_len; + } + + if(data->query) { + if(uri) + memcpy(uri+length, data->query, data->query_len*sizeof(WCHAR)); + length += data->query_len; + } + + if(data->fragment) { + if(uri) + memcpy(uri+length, data->fragment, data->fragment_len*sizeof(WCHAR)); + length += data->fragment_len; + } + + if(uri) + TRACE("(%p %p): Generated raw uri=%s len=%d\n", data, uri, debugstr_wn(uri, length), length); + else + TRACE("(%p %p): Computed raw uri len=%d\n", data, uri, length); + + return length; +} + +static HRESULT generate_uri(const UriBuilder *builder, const parse_data *data, Uri *uri, DWORD flags) { + DWORD length = generate_raw_uri(data, NULL); + uri->raw_uri = SysAllocStringLen(NULL, length); + if(!uri->raw_uri) + return E_OUTOFMEMORY; + + generate_raw_uri(data, uri->raw_uri); + + return E_NOTIMPL; +} + static HRESULT build_uri(const UriBuilder *builder, IUri **uri, DWORD create_flags, DWORD use_orig_flags, DWORD encoding_mask) { HRESULT hr; parse_data data; + Uri *ret; if(!uri) return E_POINTER; @@ -3909,7 +4058,22 @@ static HRESULT build_uri(const UriBuilder *builder, IUri **uri, DWORD create_fla return hr; } - return E_NOTIMPL; + ret = heap_alloc_zero(sizeof(Uri)); + if(!ret) { + *uri = NULL; + return E_OUTOFMEMORY; + } + + hr = generate_uri(builder, &data, ret, create_flags); + if(FAILED(hr)) { + SysFreeString(ret->raw_uri); + heap_free(ret->canon_uri); + heap_free(ret); + *uri = NULL; + return hr; + } + + return S_OK; } #define URI_THIS(iface) DEFINE_THIS(Uri, IUri, iface)
1
0
0
0
Thomas Mullaly : urlmon: validate_fragment works better if it actually calls parse_fragment instead of parse_query .
by Alexandre Julliard
04 Oct '10
04 Oct '10
Module: wine Branch: master Commit: 1674bdd9320896241ba4787bb2a6409e5893b3f8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1674bdd9320896241ba4787bb…
Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Sep 29 17:43:52 2010 -0400 urlmon: validate_fragment works better if it actually calls parse_fragment instead of parse_query. --- dlls/urlmon/uri.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 2aee38a..1707429 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3805,7 +3805,7 @@ static HRESULT validate_fragment(const UriBuilder *builder, parse_data *data, DW const WCHAR *component = ptr; pptr = &ptr; - if(parse_query(pptr, data, flags) && expected_len == data->fragment_len) + if(parse_fragment(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 {
1
0
0
0
Andrew Talbot : gdi.exe16: Constify a variable.
by Alexandre Julliard
04 Oct '10
04 Oct '10
Module: wine Branch: master Commit: 73efb62fc36de8889c80705f86d743cb78f81079 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=73efb62fc36de8889c80705f8…
Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Oct 3 10:13:41 2010 +0100 gdi.exe16: Constify a variable. --- dlls/gdi.exe16/printdrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi.exe16/printdrv.c b/dlls/gdi.exe16/printdrv.c index aee0e65..2060d9f 100644 --- a/dlls/gdi.exe16/printdrv.c +++ b/dlls/gdi.exe16/printdrv.c @@ -514,7 +514,7 @@ DWORD WINAPI GetSpoolJob16(int nOption, LONG param) * * Helper for DrvGetPrinterData */ -static DWORD DrvGetPrinterDataInternal(LPSTR RegStr_Printer, +static DWORD DrvGetPrinterDataInternal(LPCSTR RegStr_Printer, LPBYTE lpPrinterData, int cbData, int what) { DWORD res = -1;
1
0
0
0
Andrew Talbot : fusion: Constify some variables.
by Alexandre Julliard
04 Oct '10
04 Oct '10
Module: wine Branch: master Commit: ea1ec880910ed363697bbdc1025f80fe153f0d91 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ea1ec880910ed363697bbdc10…
Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Oct 2 23:25:52 2010 +0100 fusion: Constify some variables. --- dlls/fusion/asmname.c | 4 ++-- dlls/fusion/assembly.c | 8 ++++---- dlls/fusion/fusionpriv.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 54be4e8..8100e61 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -450,7 +450,7 @@ static HRESULT parse_version(IAssemblyNameImpl *name, LPWSTR version) return S_OK; } -static HRESULT parse_culture(IAssemblyNameImpl *name, LPWSTR culture) +static HRESULT parse_culture(IAssemblyNameImpl *name, LPCWSTR culture) { static const WCHAR empty[] = {0}; @@ -480,7 +480,7 @@ static BYTE hextobyte(WCHAR c) return 0; } -static HRESULT parse_pubkey(IAssemblyNameImpl *name, LPWSTR pubkey) +static HRESULT parse_pubkey(IAssemblyNameImpl *name, LPCWSTR pubkey) { int i; BYTE val; diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index 328b279..a3abc4e 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -146,7 +146,7 @@ static VOID *assembly_data_offset(ASSEMBLY *assembly, ULONG offset) #define MAX_TABLES_3BIT_ENCODE 8191 #define MAX_TABLES_5BIT_ENCODE 2047 -static inline ULONG get_table_size(ASSEMBLY *assembly, DWORD index) +static inline ULONG get_table_size(const ASSEMBLY *assembly, DWORD index) { DWORD size; INT tables; @@ -731,11 +731,11 @@ HRESULT assembly_release(ASSEMBLY *assembly) return S_OK; } -static LPWSTR assembly_dup_str(ASSEMBLY *assembly, DWORD index) +static LPWSTR assembly_dup_str(const ASSEMBLY *assembly, DWORD index) { int len; LPWSTR cpy; - LPSTR str = (LPSTR)&assembly->strings[index]; + LPCSTR str = (LPCSTR)&assembly->strings[index]; len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); @@ -772,7 +772,7 @@ HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name) return S_OK; } -HRESULT assembly_get_path(ASSEMBLY *assembly, LPWSTR *path) +HRESULT assembly_get_path(const ASSEMBLY *assembly, LPWSTR *path) { LPWSTR cpy = HeapAlloc(GetProcessHeap(), 0, (strlenW(assembly->path) + 1) * sizeof(WCHAR)); *path = cpy; diff --git a/dlls/fusion/fusionpriv.h b/dlls/fusion/fusionpriv.h index 6f4b28d..f717f14 100644 --- a/dlls/fusion/fusionpriv.h +++ b/dlls/fusion/fusionpriv.h @@ -431,7 +431,7 @@ typedef struct tagASSEMBLY ASSEMBLY; HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file); HRESULT assembly_release(ASSEMBLY *assembly); HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name); -HRESULT assembly_get_path(ASSEMBLY *assembly, LPWSTR *path); +HRESULT assembly_get_path(const ASSEMBLY *assembly, LPWSTR *path); HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version); BYTE assembly_get_architecture(ASSEMBLY *assembly); HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token);
1
0
0
0
Andrew Talbot : explorerframe: Constify some variables.
by Alexandre Julliard
04 Oct '10
04 Oct '10
Module: wine Branch: master Commit: 49e993c64165fb283f6a637102e21f0b28196fb7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=49e993c64165fb283f6a63710…
Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Oct 2 19:41:04 2010 +0100 explorerframe: Constify some variables. --- dlls/explorerframe/explorerframe_main.c | 2 +- dlls/explorerframe/nstc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/explorerframe/explorerframe_main.c b/dlls/explorerframe/explorerframe_main.c index dd3c0cf..cc535e7 100644 --- a/dlls/explorerframe/explorerframe_main.c +++ b/dlls/explorerframe/explorerframe_main.c @@ -211,7 +211,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) /************************************************************************* * Register/Unregister DLL, based on shdocvw/factory.c */ -static HRESULT reg_install(LPCSTR section, STRTABLEA *strtable) +static HRESULT reg_install(LPCSTR section, const STRTABLEA *strtable) { HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); HMODULE hadvpack; diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 02633b0..6ae1458 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -422,7 +422,7 @@ static void collapse_all(NSTC2Impl *This, HTREEITEM node) if(next) collapse_all(This, next); } -static HTREEITEM treeitem_from_point(NSTC2Impl *This, POINT *pt, UINT *hitflag) +static HTREEITEM treeitem_from_point(NSTC2Impl *This, const POINT *pt, UINT *hitflag) { TVHITTESTINFO tviht; tviht.pt.x = pt->x;
1
0
0
0
Luca Bennati : inetcpl.cpl: Update Italian translation.
by Alexandre Julliard
04 Oct '10
04 Oct '10
Module: wine Branch: master Commit: 7cc3a6774cdedb4a75210b7b7826260ef93dd3df URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7cc3a6774cdedb4a75210b7b7…
Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Oct 2 09:02:15 2010 +0200 inetcpl.cpl: Update Italian translation. --- dlls/inetcpl.cpl/cpl_It.rc | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_It.rc b/dlls/inetcpl.cpl/cpl_It.rc index 6be9341..8e0f5f8 100644 --- a/dlls/inetcpl.cpl/cpl_It.rc +++ b/dlls/inetcpl.cpl/cpl_It.rc @@ -32,6 +32,23 @@ BEGIN IDS_CPL_INFO "Configura il browser Internet di Wine e le relative impostazioni" END +/* "General" propsheet */ +IDD_GENERAL DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Generale" +BEGIN + + GROUPBOX " Pagina iniziale ", IDC_STATIC, 4, 4, 312, 52 + LTEXT "Puoi scegliere l'indirizzo che sarà usato come tua pagina iniziale.", + IDC_STATIC, 58, 10, 252, 10 + EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL + PUSHBUTTON "Pagina &attuale", IDC_HOME_CURRENT, 58, 36, 80, 14 + PUSHBUTTON "Pagina &predefinita", IDC_HOME_DEFAULT, 144, 36, 80, 14 + PUSHBUTTON "Pagina &vuota", IDC_HOME_BLANK, 230, 36, 80, 14 + +END + /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
1
0
0
0
Aurimas Fišeras : inetcpl.cpl: Update Lithuanian translation.
by Alexandre Julliard
04 Oct '10
04 Oct '10
Module: wine Branch: master Commit: b664fc836984331357b49f798cb0bd5a324a8954 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b664fc836984331357b49f798…
Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat Oct 2 10:06:14 2010 +0300 inetcpl.cpl: Update Lithuanian translation. --- dlls/inetcpl.cpl/cpl_Lt.rc | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Lt.rc b/dlls/inetcpl.cpl/cpl_Lt.rc index 0eda833..92d2ac5 100644 --- a/dlls/inetcpl.cpl/cpl_Lt.rc +++ b/dlls/inetcpl.cpl/cpl_Lt.rc @@ -32,6 +32,23 @@ BEGIN IDS_CPL_INFO "Konfigūruokite Wine interneto naršyklės ir susijusias nuostatas" END +/* "General" propsheet */ +IDD_GENERAL DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Bendrosios" +BEGIN + + GROUPBOX " Pradžios tinklalapis ", IDC_STATIC, 4, 4, 312, 56 + LTEXT "Galite pasirinkti adresą, kuris bus naudojamas kaip jūsų pradžios tinklalapis.", + IDC_STATIC, 58, 14, 252, 10 + EDITTEXT IDC_HOME_EDIT, 58, 26, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL + PUSHBUTTON "&Dabartinis puslapis", IDC_HOME_CURRENT, 58, 40, 80, 14 + PUSHBUTTON "&Numatytasis puslapis", IDC_HOME_DEFAULT, 144, 40, 80, 14 + PUSHBUTTON "&Tuščias puslapis", IDC_HOME_BLANK, 230, 40, 80, 14 + +END + /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
1
0
0
0
Gerald Pfeifer : msxml3: Use the existing READYSTATE type instead of creating our own enum READYSTATE (and mixing the two).
by Alexandre Julliard
04 Oct '10
04 Oct '10
Module: wine Branch: master Commit: 632a6c7904f00e10b6b0dd7fe7fa20dfe2d7d9e0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=632a6c7904f00e10b6b0dd7fe…
Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Oct 2 01:05:23 2010 +0200 msxml3: Use the existing READYSTATE type instead of creating our own enum READYSTATE (and mixing the two). --- dlls/msxml3/httprequest.c | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index dfc8dae..8820e68 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -50,15 +50,6 @@ struct reqheader BSTR value; }; -enum READYSTATE -{ - STATE_UNINITIALIZED = 0, - STATE_LOADING = 1, - STATE_LOADED = 2, - STATE_INTERACTIVE = 3, - STATE_COMPLETED = 4 -}; - typedef struct { const struct IXMLHTTPRequestVtbl *lpVtbl; @@ -571,7 +562,7 @@ static HRESULT WINAPI httprequest_open(IXMLHTTPRequest *iface, BSTR method, BSTR if (hr == S_OK) This->password = V_BSTR(&str); - httprequest_setreadystate(This, STATE_LOADING); + httprequest_setreadystate(This, READYSTATE_LOADING); return S_OK; } @@ -584,7 +575,7 @@ static HRESULT WINAPI httprequest_setRequestHeader(IXMLHTTPRequest *iface, BSTR TRACE("(%p)->(%s %s)\n", This, debugstr_w(header), debugstr_w(value)); if (!header || !*header) return E_INVALIDARG; - if (This->state != STATE_LOADING) return E_FAIL; + if (This->state != READYSTATE_LOADING) return E_FAIL; if (!value) return E_INVALIDARG; /* replace existing header value if already added */ @@ -634,7 +625,7 @@ static HRESULT WINAPI httprequest_send(IXMLHTTPRequest *iface, VARIANT varBody) TRACE("(%p)\n", This); - if (This->state != STATE_LOADING) return E_FAIL; + if (This->state != READYSTATE_LOADING) return E_FAIL; hr = BindStatusCallback_create(This, &bsc); if (FAILED(hr)) return hr; @@ -771,7 +762,7 @@ HRESULT XMLHTTPRequest_create(IUnknown *pUnkOuter, void **ppObj) req->async = FALSE; req->verb = -1; req->url = req->user = req->password = NULL; - req->state = STATE_UNINITIALIZED; + req->state = READYSTATE_UNINITIALIZED; req->bsc = NULL; list_init(&req->reqheaders);
1
0
0
0
Frédéric Delanoy : inetcpl.cpl: Update French translation.
by Alexandre Julliard
04 Oct '10
04 Oct '10
Module: wine Branch: master Commit: 5c676679fd00ffd45d15a8821b6921de0e9fa752 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5c676679fd00ffd45d15a8821…
Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 2 00:59:35 2010 +0200 inetcpl.cpl: Update French translation. --- dlls/inetcpl.cpl/cpl_Fr.rc | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Fr.rc b/dlls/inetcpl.cpl/cpl_Fr.rc index 5772321..9f9591e 100644 --- a/dlls/inetcpl.cpl/cpl_Fr.rc +++ b/dlls/inetcpl.cpl/cpl_Fr.rc @@ -33,11 +33,28 @@ BEGIN IDS_CPL_INFO "Configurer le navigateur internet de Wine et d'autres paramètres associés" END +/* "General" propsheet */ +IDD_GENERAL DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Général" +BEGIN + + GROUPBOX " Page d'accueil ", IDC_STATIC, 4, 4, 312, 52 + LTEXT "Vous pouvez spécifier une adresse à utiliser comme page d'accueil :", + IDC_STATIC, 68, 10, 242, 10 + EDITTEXT IDC_HOME_EDIT, 68, 22, 242, 12, WS_VISIBLE | ES_AUTOHSCROLL + PUSHBUTTON "Page &courante", IDC_HOME_CURRENT, 68, 36, 77, 14 + PUSHBUTTON "Page par &défaut", IDC_HOME_DEFAULT, 151, 36, 77, 14 + PUSHBUTTON "Page &blanche", IDC_HOME_BLANK, 233, 36, 77, 14 + +END + /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" -CAPTION "Content" +CAPTION "Contenu" BEGIN GROUPBOX " Certificats ", IDC_STATIC, 4, 4, 312, 50
1
0
0
0
Nikolay Sivov : msxml3: Add basic bind callback for moniker binding.
by Alexandre Julliard
04 Oct '10
04 Oct '10
Module: wine Branch: master Commit: d69a7165be5ed6222eca815911b4ed70890c3319 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d69a7165be5ed6222eca81591…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 30 19:32:08 2010 +0400 msxml3: Add basic bind callback for moniker binding. --- dlls/msxml3/httprequest.c | 337 ++++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 34 ++++- 2 files changed, 361 insertions(+), 10 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=d69a7165be5ed6222eca8…
1
0
0
0
← Newer
1
...
107
108
109
110
111
112
113
...
118
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
Results per page:
10
25
50
100
200