July 2009 - Wine-Commits - list.winehq.org

Piotr Caban : jscript: Added String_fontcolor implementation.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 1133bc7ce846478ec04c97aa54ae585684bc3c6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1133bc7ce846478ec04c97aa5… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 9 22:41:27 2009 +0200 jscript: Added String_fontcolor implementation. --- dlls/jscript/string.c | 54 +++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 13 ++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 9f2ab9b..927d95a 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -150,6 +150,54 @@ static HRESULT do_attributeless_tag_format(DispatchEx *dispex, LCID lcid, WORD f return S_OK; } +static HRESULT do_attribute_tag_format(DispatchEx *dispex, LCID lcid, WORD flags, + DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp, + const WCHAR *tagname, const WCHAR *attr) +{ + static const WCHAR tagfmtW[] + = {'<','%','s',' ','%','s','=','\"','%','s','\"','>','%','s','<','/','%','s','>',0}; + static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; + + StringInstance *string; + BSTR ret, attr_value; + HRESULT hres; + + if(!is_class(dispex, JSCLASS_STRING)) { + WARN("this is not a string object\n"); + return E_NOTIMPL; + } + + string = (StringInstance*) dispex; + + if(arg_cnt(dp)) { + hres = to_string(dispex->ctx, get_arg(dp, 0), ei, &attr_value); + if(FAILED(hres)) + return hres; + } + else { + attr_value = SysAllocString(undefinedW); + if(!attr_value) + return E_OUTOFMEMORY; + } + + if(retv) { + ret = SysAllocStringLen(NULL, string->length + 2*strlenW(tagname) + + strlenW(attr) + SysStringLen(attr_value) + 9); + if(!ret) { + SysFreeString(attr_value); + return E_OUTOFMEMORY; + } + + sprintfW(ret, tagfmtW, tagname, attr, attr_value, string->str, tagname); + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + } + + SysFreeString(attr_value); + return S_OK; +} + static HRESULT String_anchor(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -336,8 +384,10 @@ static HRESULT String_fixed(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM static HRESULT String_fontcolor(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR fontW[] = {'F','O','N','T',0}; + static const WCHAR colorW[] = {'C','O','L','O','R',0}; + + return do_attribute_tag_format(dispex, lcid, flags, dp, retv, ei, sp, fontW, colorW); } static HRESULT String_fontsize(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 79b255b..2368a4b 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -305,6 +305,19 @@ ok(tmp === "<TT>test</TT>", "'test'.fixed() = " + tmp); tmp = "test".fixed(3); ok(tmp === "<TT>test</TT>", "'test'.fixed(3) = " + tmp); +tmp = "".fontcolor(); +ok(tmp === "", "''.fontcolor() = " + tmp); +tmp = "".fontcolor(3); +ok(tmp === "", "''.fontcolor(3) = " + tmp); +tmp = "".fontcolor("red"); +ok(tmp === "", "''.fontcolor('red') = " + tmp); +tmp = "test".fontcolor(); +ok(tmp === "test", "'test'.fontcolor() = " + tmp); +tmp = "test".fontcolor(3); +ok(tmp === "test", "'test'.fontcolor(3) = " + tmp); +tmp = "test".fontcolor("green"); +ok(tmp === "test", "'test'.fontcolor('green') = " + tmp); + tmp = "".italics(); ok(tmp === "", "''.italics() = " + tmp); tmp = "".italics(3);

1 0

Piotr Caban : jscript: Added String_fontsize implementation.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 0a0731ed450e889d924c7266b7829bbb4e4aca45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a0731ed450e889d924c7266b… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 9 20:09:10 2009 +0200 jscript: Added String_fontsize implementation. --- dlls/jscript/string.c | 6 ++++-- dlls/jscript/tests/api.js | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 927d95a..efdff17 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -393,8 +393,10 @@ static HRESULT String_fontcolor(DispatchEx *dispex, LCID lcid, WORD flags, DISPP static HRESULT String_fontsize(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR fontW[] = {'F','O','N','T',0}; + static const WCHAR colorW[] = {'S','I','Z','E',0}; + + return do_attribute_tag_format(dispex, lcid, flags, dp, retv, ei, sp, fontW, colorW); } static HRESULT String_indexOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 2368a4b..fe20939 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -318,6 +318,22 @@ ok(tmp === "test", "'test'.fontcolor(3) = " + tmp); tmp = "test".fontcolor("green"); ok(tmp === "test", "'test'.fontcolor('green') = " + tmp); +tmp = "".fontsize(); +ok(tmp === "", "''.fontsize() = " + tmp); +tmp = "".fontsize(3); +ok(tmp === "", "''.fontsize(3) = " + tmp); +tmp = "".fontsize("red"); +ok(tmp === "", "''.fontsize('red') = " + tmp); +tmp = "test".fontsize(); +ok(tmp === "test", "'test'.fontsize() = " + tmp); +tmp = "test".fontsize(3); +ok(tmp === "test", "'test'.fontsize(3) = " + tmp); +tmp = "test".fontsize("green"); +ok(tmp === "test", "'test'.fontsize('green') = " + tmp); + +tmp = ("".fontcolor()).fontsize(); +ok(tmp === "", "(''.fontcolor()).fontsize() = " + tmp); + tmp = "".italics(); ok(tmp === "", "''.italics() = " + tmp); tmp = "".italics(3);

1 0

Piotr Caban : jscript: Added String_link implementation.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 3412e22eeea077782b9ea2c31a5834725b67d569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3412e22eeea077782b9ea2c31… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 9 20:09:32 2009 +0200 jscript: Added String_link implementation. --- dlls/jscript/string.c | 6 ++++-- dlls/jscript/tests/api.js | 13 +++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 4777f18..70ec50b 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -486,8 +486,10 @@ static HRESULT String_lastIndexOf(DispatchEx *dispex, LCID lcid, WORD flags, DIS static HRESULT String_link(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR fontW[] = {'A',0}; + static const WCHAR colorW[] = {'H','R','E','F',0}; + + return do_attribute_tag_format(dispex, lcid, flags, dp, retv, ei, sp, fontW, colorW); } /* ECMA-262 3rd Edition 15.5.4.10 */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 66d1280..22b5317 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -356,6 +356,19 @@ ok(tmp === "test", "'test'.italics() = " + tmp); tmp = "test".italics(3); ok(tmp === "test", "'test'.italics(3) = " + tmp); +tmp = "".link(); +ok(tmp === "<A HREF=\"undefined\"></A>", "''.link() = " + tmp); +tmp = "".link(3); +ok(tmp === "<A HREF=\"3\"></A>", "''.link(3) = " + tmp); +tmp = "".link("red"); +ok(tmp === "<A HREF=\"red\"></A>", "''.link('red') = " + tmp); +tmp = "test".link(); +ok(tmp === "<A HREF=\"undefined\">test</A>", "'test'.link() = " + tmp); +tmp = "test".link(3); +ok(tmp === "<A HREF=\"3\">test</A>", "'test'.link(3) = " + tmp); +tmp = "test".link("green"); +ok(tmp === "<A HREF=\"green\">test</A>", "'test'.link('green') = " + tmp); + tmp = "".small(); ok(tmp === "", "''.small() = " + tmp); tmp = "".small(3);

1 0

Piotr Caban : jscript: Added String_anchor implementation.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: ecfa129d669c2e77f33719f2905ae885151de6d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecfa129d669c2e77f33719f29… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 9 20:09:20 2009 +0200 jscript: Added String_anchor implementation. --- dlls/jscript/string.c | 6 ++++-- dlls/jscript/tests/api.js | 13 +++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index efdff17..4777f18 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -201,8 +201,10 @@ static HRESULT do_attribute_tag_format(DispatchEx *dispex, LCID lcid, WORD flags static HRESULT String_anchor(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR fontW[] = {'A',0}; + static const WCHAR colorW[] = {'N','A','M','E',0}; + + return do_attribute_tag_format(dispex, lcid, flags, dp, retv, ei, sp, fontW, colorW); } static HRESULT String_big(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index fe20939..66d1280 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -269,6 +269,19 @@ ok(tmp === "TEST", "''.toUpperCase() = " + tmp); tmp = "tEsT".toUpperCase(3); ok(tmp === "TEST", "''.toUpperCase(3) = " + tmp); +tmp = "".anchor(); +ok(tmp === "<A NAME=\"undefined\"></A>", "''.anchor() = " + tmp); +tmp = "".anchor(3); +ok(tmp === "<A NAME=\"3\"></A>", "''.anchor(3) = " + tmp); +tmp = "".anchor("red"); +ok(tmp === "<A NAME=\"red\"></A>", "''.anchor('red') = " + tmp); +tmp = "test".anchor(); +ok(tmp === "<A NAME=\"undefined\">test</A>", "'test'.anchor() = " + tmp); +tmp = "test".anchor(3); +ok(tmp === "<A NAME=\"3\">test</A>", "'test'.anchor(3) = " + tmp); +tmp = "test".anchor("green"); +ok(tmp === "<A NAME=\"green\">test</A>", "'test'.anchor('green') = " + tmp); + tmp = "".big(); ok(tmp === "<BIG></BIG>", "''.big() = " + tmp); tmp = "".big(3);

1 0

Juan Lang : wininet: Support IPv6 addresses in HTTP_ResolveName and HTTP_OpenConnection.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 481c9b895d4d9ce92e5db4da25317d885dd5b0a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=481c9b895d4d9ce92e5db4da2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 9 11:42:25 2009 -0700 wininet: Support IPv6 addresses in HTTP_ResolveName and HTTP_OpenConnection. --- dlls/wininet/http.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9573f6f..5832a5c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1448,9 +1448,13 @@ static BOOL HTTP_DealWithProxy( LPWININETAPPINFOW hIC, return TRUE; } +#ifndef INET6_ADDRSTRLEN +#define INET6_ADDRSTRLEN 46 +#endif + static BOOL HTTP_ResolveName(LPWININETHTTPREQW lpwhr) { - char szaddr[32]; + char szaddr[INET6_ADDRSTRLEN]; LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; const void *addr; @@ -1472,6 +1476,9 @@ static BOOL HTTP_ResolveName(LPWININETHTTPREQW lpwhr) case AF_INET: addr = &((struct sockaddr_in *)&lpwhs->socketAddress)->sin_addr; break; + case AF_INET6: + addr = &((struct sockaddr_in6 *)&lpwhs->socketAddress)->sin6_addr; + break; default: WARN("unsupported family %d\n", lpwhs->socketAddress.ss_family); INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED); @@ -4117,7 +4124,7 @@ static BOOL HTTP_OpenConnection(LPWININETHTTPREQW lpwhr) BOOL bSuccess = FALSE; LPWININETHTTPSESSIONW lpwhs; LPWININETAPPINFOW hIC = NULL; - char szaddr[32]; + char szaddr[INET6_ADDRSTRLEN]; const void *addr; TRACE("-->\n"); @@ -4144,6 +4151,9 @@ static BOOL HTTP_OpenConnection(LPWININETHTTPREQW lpwhr) case AF_INET: addr = &((struct sockaddr_in *)&lpwhs->socketAddress)->sin_addr; break; + case AF_INET6: + addr = &((struct sockaddr_in6 *)&lpwhs->socketAddress)->sin6_addr; + break; default: WARN("unsupported family %d\n", lpwhs->socketAddress.ss_family); INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED);

1 0

Juan Lang : wininet: Use struct sockaddr_storage in InternetCheckConnectionW.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 33d09e736418ba505911fa6e2e52f5108ff4830d URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d09e736418ba505911fa6e2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 9 10:58:15 2009 -0700 wininet: Use struct sockaddr_storage in InternetCheckConnectionW. --- dlls/wininet/internet.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b1def60..ed6a70f 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2749,16 +2749,16 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe if (dwFlags & FLAG_ICC_FORCE_CONNECTION) { - struct sockaddr_in sin; - socklen_t sa_len = sizeof(sin); + struct sockaddr_storage saddr; + socklen_t sa_len = sizeof(saddr); int fd; - if (!GetAddress(hostW, port, (struct sockaddr *)&sin, &sa_len)) + if (!GetAddress(hostW, port, (struct sockaddr *)&saddr, &sa_len)) goto End; - fd = socket(sin.sin_family, SOCK_STREAM, 0); + fd = socket(saddr.ss_family, SOCK_STREAM, 0); if (fd != -1) { - if (connect(fd, (struct sockaddr *)&sin, sa_len) == 0) + if (connect(fd, (struct sockaddr *)&saddr, sa_len) == 0) rc = TRUE; close(fd); }

1 0

Juan Lang : wininet: Use length reported by GetAddress in FTP_Connect.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: deabdca653b6f1c27da1addea0ef2184a682a6c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deabdca653b6f1c27da1addea… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 9 11:01:44 2009 -0700 wininet: Use length reported by GetAddress in FTP_Connect. --- dlls/wininet/ftp.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 791459e..75bf69c 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2458,9 +2458,9 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, } SendAsyncCallback(&hIC->hdr, dwContext, INTERNET_STATUS_CONNECTING_TO_SERVER, - &socketAddr, sizeof(struct sockaddr_in)); + &socketAddr, sock_namelen); - if (connect(nsocket, (struct sockaddr *)&socketAddr, sizeof(socketAddr)) < 0) + if (connect(nsocket, (struct sockaddr *)&socketAddr, sock_namelen) < 0) { ERR("Unable to connect (%s)\n", strerror(errno)); INTERNET_SetLastError(ERROR_INTERNET_CANNOT_CONNECT); @@ -2471,7 +2471,7 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, TRACE("Connected to server\n"); lpwfs->sndSocket = nsocket; SendAsyncCallback(&hIC->hdr, dwContext, INTERNET_STATUS_CONNECTED_TO_SERVER, - &socketAddr, sizeof(struct sockaddr_in)); + &socketAddr, sock_namelen); sock_namelen = sizeof(lpwfs->socketAddress); getsockname(nsocket, (struct sockaddr *) &lpwfs->socketAddress, &sock_namelen);

1 0

Juan Lang : wininet: Use address length returned by GetAddress in NETCON_connect.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: c572e1c99a49ed501e8f1618e945effb319d3ea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c572e1c99a49ed501e8f1618e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 9 11:30:59 2009 -0700 wininet: Use address length returned by GetAddress in NETCON_connect. --- dlls/wininet/http.c | 7 +++---- dlls/wininet/internet.h | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 4ff4be7..f7df3a9 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1452,16 +1452,15 @@ static BOOL HTTP_ResolveName(LPWININETHTTPREQW lpwhr) { char szaddr[32]; LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; - socklen_t sa_len; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_RESOLVING_NAME, lpwhs->lpszServerName, strlenW(lpwhs->lpszServerName)+1); - sa_len = sizeof(lpwhs->socketAddress); + lpwhs->sa_len = sizeof(lpwhs->socketAddress); if (!GetAddress(lpwhs->lpszServerName, lpwhs->nServerPort, - (struct sockaddr *)&lpwhs->socketAddress, &sa_len)) + (struct sockaddr *)&lpwhs->socketAddress, &lpwhs->sa_len)) { INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED); return FALSE; @@ -4144,7 +4143,7 @@ static BOOL HTTP_OpenConnection(LPWININETHTTPREQW lpwhr) } if (!NETCON_connect(&lpwhr->netConnection, (struct sockaddr *)&lpwhs->socketAddress, - sizeof(lpwhs->socketAddress))) + lpwhs->sa_len)) goto lend; if (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 53e9715..eae3423 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -166,6 +166,7 @@ typedef struct INTERNET_PORT nHostPort; /* the final destination port of the request */ INTERNET_PORT nServerPort; /* the port of the server we directly connect to */ struct sockaddr_in socketAddress; + socklen_t sa_len; } WININETHTTPSESSIONW, *LPWININETHTTPSESSIONW; #define HDR_ISREQUEST 0x0001

1 0

Juan Lang : wininet: Convert WININETSESSIONW' s socketAddress to a struct sockaddr_storage.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 058e918da5a520d6fd08674cea57302550e0cf05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=058e918da5a520d6fd08674ce… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 9 11:36:00 2009 -0700 wininet: Convert WININETSESSIONW's socketAddress to a struct sockaddr_storage. --- dlls/wininet/http.c | 30 +++++++++++++++++++++++++----- dlls/wininet/internet.h | 2 +- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f7df3a9..9573f6f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1452,6 +1452,7 @@ static BOOL HTTP_ResolveName(LPWININETHTTPREQW lpwhr) { char szaddr[32]; LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; + const void *addr; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_RESOLVING_NAME, @@ -1466,8 +1467,17 @@ static BOOL HTTP_ResolveName(LPWININETHTTPREQW lpwhr) return FALSE; } - inet_ntop(lpwhs->socketAddress.sin_family, &lpwhs->socketAddress.sin_addr, - szaddr, sizeof(szaddr)); + switch (lpwhs->socketAddress.ss_family) + { + case AF_INET: + addr = &((struct sockaddr_in *)&lpwhs->socketAddress)->sin_addr; + break; + default: + WARN("unsupported family %d\n", lpwhs->socketAddress.ss_family); + INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED); + return FALSE; + } + inet_ntop(lpwhs->socketAddress.ss_family, addr, szaddr, sizeof(szaddr)); INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_NAME_RESOLVED, szaddr, strlen(szaddr)+1); @@ -4108,6 +4118,7 @@ static BOOL HTTP_OpenConnection(LPWININETHTTPREQW lpwhr) LPWININETHTTPSESSIONW lpwhs; LPWININETAPPINFOW hIC = NULL; char szaddr[32]; + const void *addr; TRACE("-->\n"); @@ -4128,14 +4139,23 @@ static BOOL HTTP_OpenConnection(LPWININETHTTPREQW lpwhr) lpwhs = lpwhr->lpHttpSession; hIC = lpwhs->lpAppInfo; - inet_ntop(lpwhs->socketAddress.sin_family, &lpwhs->socketAddress.sin_addr, - szaddr, sizeof(szaddr)); + switch (lpwhs->socketAddress.ss_family) + { + case AF_INET: + addr = &((struct sockaddr_in *)&lpwhs->socketAddress)->sin_addr; + break; + default: + WARN("unsupported family %d\n", lpwhs->socketAddress.ss_family); + INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED); + return FALSE; + } + inet_ntop(lpwhs->socketAddress.ss_family, addr, szaddr, sizeof(szaddr)); INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_CONNECTING_TO_SERVER, szaddr, strlen(szaddr)+1); - if (!NETCON_create(&lpwhr->netConnection, lpwhs->socketAddress.sin_family, + if (!NETCON_create(&lpwhr->netConnection, lpwhs->socketAddress.ss_family, SOCK_STREAM, 0)) { WARN("Socket creation failed: %u\n", INTERNET_GetLastError()); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index eae3423..4cd22d6 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -165,7 +165,7 @@ typedef struct LPWSTR lpszPassword; INTERNET_PORT nHostPort; /* the final destination port of the request */ INTERNET_PORT nServerPort; /* the port of the server we directly connect to */ - struct sockaddr_in socketAddress; + struct sockaddr_storage socketAddress; socklen_t sa_len; } WININETHTTPSESSIONW, *LPWININETHTTPSESSIONW;

1 0

Juan Lang : wininet: Use sizeof(member) rather than sizeof(type) for address lengths.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 9f82d9c779b2da0e20f3bce9280a7ca1cdcfbef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f82d9c779b2da0e20f3bce92… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 9 11:04:33 2009 -0700 wininet: Use sizeof(member) rather than sizeof(type) for address lengths. --- dlls/wininet/ftp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 75bf69c..6d41ac5 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2807,7 +2807,7 @@ lend: static BOOL FTP_InitListenSocket(LPWININETFTPSESSIONW lpwfs) { BOOL bSuccess = FALSE; - socklen_t namelen = sizeof(struct sockaddr_in); + socklen_t namelen = sizeof(lpwfs->lstnSocketAddress); TRACE("\n"); @@ -2824,7 +2824,7 @@ static BOOL FTP_InitListenSocket(LPWININETFTPSESSIONW lpwfs) /* and get the system to assign us a port */ lpwfs->lstnSocketAddress.sin_port = htons(0); - if (bind(lpwfs->lstnSocket,(struct sockaddr *) &lpwfs->lstnSocketAddress, sizeof(struct sockaddr_in)) == -1) + if (bind(lpwfs->lstnSocket,(struct sockaddr *) &lpwfs->lstnSocketAddress, sizeof(lpwfs->lstnSocketAddress)) == -1) { TRACE("Unable to bind socket\n"); goto lend;

1 0