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

Jacek Caban : shdocvw: Pass post data as SAFEARRAY to on_before_navigate2.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 271993e279a537ac39647fcbff892680f3184192 URL: http://source.winehq.org/git/wine.git/?a=commit;h=271993e279a537ac39647fcbf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 13 16:44:08 2010 +0100 shdocvw: Pass post data as SAFEARRAY to on_before_navigate2. --- dlls/shdocvw/navigate.c | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 456cd83..b65961a 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -378,8 +378,7 @@ static BindStatusCallback *create_callback(DocHost *doc_host, LPCWSTR url, PBYTE return ret; } -static void on_before_navigate2(DocHost *This, LPCWSTR url, const BYTE *post_data, - ULONG post_data_len, LPWSTR headers, VARIANT_BOOL *cancel) +static void on_before_navigate2(DocHost *This, LPCWSTR url, SAFEARRAY *post_data, LPWSTR headers, VARIANT_BOOL *cancel) { VARIANT var_url, var_flags, var_frame_name, var_post_data, var_post_data2, var_headers; DISPPARAMS dispparams; @@ -404,18 +403,12 @@ static void on_before_navigate2(DocHost *This, LPCWSTR url, const BYTE *post_dat V_VARIANTREF(params+2) = &var_post_data2; V_VT(&var_post_data2) = (VT_BYREF|VT_VARIANT); V_VARIANTREF(&var_post_data2) = &var_post_data; - VariantInit(&var_post_data); - - if(post_data_len) { - SAFEARRAYBOUND bound = {post_data_len, 0}; - void *data; + if(post_data) { V_VT(&var_post_data) = VT_UI1|VT_ARRAY; - V_ARRAY(&var_post_data) = SafeArrayCreate(VT_UI1, 1, &bound); - - SafeArrayAccessData(V_ARRAY(&var_post_data), &data); - memcpy(data, post_data, post_data_len); - SafeArrayUnaccessData(V_ARRAY(&var_post_data)); + V_ARRAY(&var_post_data) = post_data; + }else { + V_VT(&var_post_data) = VT_EMPTY; } V_VT(params+3) = (VT_BYREF|VT_VARIANT); @@ -439,8 +432,6 @@ static void on_before_navigate2(DocHost *This, LPCWSTR url, const BYTE *post_dat call_sink(This->cps.wbe2, DISPID_BEFORENAVIGATE2, &dispparams); SysFreeString(V_BSTR(&var_url)); - if(post_data_len) - SafeArrayDestroy(V_ARRAY(&var_post_data)); } /* FIXME: urlmon should handle it */ @@ -545,13 +536,21 @@ static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCt static HRESULT navigate_bsc(DocHost *This, BindStatusCallback *bsc, IMoniker *mon) { - IBindCtx *bindctx; VARIANT_BOOL cancel = VARIANT_FALSE; + SAFEARRAY *post_data = NULL; + IBindCtx *bindctx; HRESULT hres; set_doc_state(This, READYSTATE_LOADING); - on_before_navigate2(This, bsc->url, bsc->post_data, bsc->post_data_len, bsc->headers, &cancel); + if(bsc->post_data) { + post_data = SafeArrayCreateVector(VT_UI1, 0, bsc->post_data_len); + memcpy(post_data->pvData, post_data, bsc->post_data_len); + } + + on_before_navigate2(This, bsc->url, post_data, bsc->headers, &cancel); + if(post_data) + SafeArrayDestroy(post_data); if(cancel) { FIXME("Navigation canceled\n"); return S_OK;

1 0

Jacek Caban : shdocvw: Use IHTMLPrivateWindow for navigation in navigate_hlink if available.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 94c5df06c30f151fcc8e4685dd7b7a98131f24ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=94c5df06c30f151fcc8e4685d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 13 16:44:24 2010 +0100 shdocvw: Use IHTMLPrivateWindow for navigation in navigate_hlink if available. --- dlls/shdocvw/dochost.c | 4 +- dlls/shdocvw/navigate.c | 150 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 144 insertions(+), 10 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 8756527..2196eb9 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -248,7 +248,7 @@ HRESULT dochost_object_available(DocHost *This, IUnknown *doc) if(SUCCEEDED(hres)) { if(ready_state == READYSTATE_COMPLETE) push_ready_state_task(This, READYSTATE_COMPLETE); - else + if(ready_state != READYSTATE_COMPLETE || This->doc_navigate) advise_prop_notif(This, TRUE); } @@ -752,7 +752,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D if(FAILED(hres)) return hres; - if(ready_state == READYSTATE_COMPLETE) + if(ready_state == READYSTATE_COMPLETE && !This->doc_navigate) advise_prop_notif(This, FALSE); push_ready_state_task(This, ready_state); diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index b65961a..1826a4f 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -27,6 +27,7 @@ #include "winreg.h" #include "shlwapi.h" #include "wininet.h" +#include "mshtml.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); @@ -534,6 +535,136 @@ static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCt return S_OK; } +static void html_window_navigate(DocHost *This, IHTMLPrivateWindow *window, BSTR url, BSTR headers, SAFEARRAY *post_data) +{ + VARIANT headers_var, post_data_var; + WCHAR *new_url; + BSTR empty_str; + DWORD size; + HRESULT hres; + + size = (strlenW(url)+1)*sizeof(WCHAR); + new_url = CoTaskMemAlloc(size); + if(!new_url) + return; + memcpy(new_url, url, size); + CoTaskMemFree(This->url); + This->url = new_url; + + empty_str = SysAllocStringLen(NULL, 0); + + if(headers) { + V_VT(&headers_var) = VT_BSTR; + V_BSTR(&headers_var) = headers; + }else { + V_VT(&headers_var) = VT_EMPTY; + } + + if(post_data) { + V_VT(&post_data_var) = VT_UI1|VT_ARRAY; + V_ARRAY(&post_data_var) = post_data; + }else { + V_VT(&post_data_var) = VT_EMPTY; + } + + set_doc_state(This, READYSTATE_LOADING); + hres = IHTMLPrivateWindow_SuperNavigate(window, url, empty_str, NULL, NULL, &post_data_var, &headers_var, 0); + SysFreeString(empty_str); + if(FAILED(hres)) + WARN("SuprtNavigate failed: %08x\n", hres); +} + +typedef struct { + task_header_t header; + BSTR url; + BSTR headers; + SAFEARRAY *post_data; + BOOL async_notif; +} task_doc_navigate_t; + +static HRESULT free_doc_navigate_task(task_doc_navigate_t *task, BOOL free_task) +{ + SysFreeString(task->url); + SysFreeString(task->headers); + if(task->post_data) + SafeArrayDestroy(task->post_data); + if(free_task) + heap_free(task); + return E_OUTOFMEMORY; +} + +static void doc_navigate_proc(DocHost *This, task_header_t *t) +{ + task_doc_navigate_t *task = (task_doc_navigate_t*)t; + IHTMLPrivateWindow *priv_window; + HRESULT hres; + + if(!This->doc_navigate) + return; + + if(task->async_notif) { + VARIANT_BOOL cancel = VARIANT_FALSE; + on_before_navigate2(This, task->url, task->post_data, task->headers, &cancel); + if(cancel) { + TRACE("Navigation calnceled\n"); + free_doc_navigate_task(task, FALSE); + return; + } + } + + hres = IUnknown_QueryInterface(This->doc_navigate, &IID_IHTMLPrivateWindow, (void**)&priv_window); + if(SUCCEEDED(hres)) { + html_window_navigate(This, priv_window, task->url, task->headers, task->post_data); + IHTMLPrivateWindow_Release(priv_window); + }else { + WARN("Could not get IHTMLPrivateWindow iface: %08x\n", hres); + } + + free_doc_navigate_task(task, FALSE); +} + +static HRESULT async_doc_navigate(DocHost *This, LPCWSTR url, LPCWSTR headers, PBYTE post_data, ULONG post_data_size, + BOOL async_notif) +{ + task_doc_navigate_t *task; + + task = heap_alloc_zero(sizeof(*task)); + if(!task) + return E_OUTOFMEMORY; + + task->url = SysAllocString(url); + if(!task->url) + return free_doc_navigate_task(task, TRUE); + + if(headers) { + task->headers = SysAllocString(headers); + if(!task->headers) + return free_doc_navigate_task(task, TRUE); + } + + if(task->post_data) { + task->post_data = SafeArrayCreateVector(VT_UI1, 0, post_data_size); + if(!task->post_data) + return free_doc_navigate_task(task, TRUE); + memcpy(task->post_data->pvData, post_data, post_data_size); + } + + if(!async_notif) { + VARIANT_BOOL cancel = VARIANT_FALSE; + + on_before_navigate2(This, task->url, task->post_data, task->headers, &cancel); + if(cancel) { + TRACE("Navigation calnceled\n"); + free_doc_navigate_task(task, TRUE); + return S_OK; + } + } + + task->async_notif = async_notif; + push_dochost_task(This, &task->header, doc_navigate_proc, FALSE); + return S_OK; +} + static HRESULT navigate_bsc(DocHost *This, BindStatusCallback *bsc, IMoniker *mon) { VARIANT_BOOL cancel = VARIANT_FALSE; @@ -648,6 +779,10 @@ static HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx, DWORD bindf = 0; HRESULT hres; + hres = IMoniker_GetDisplayName(mon, 0, NULL, &url); + if(FAILED(hres)) + FIXME("GetDisplayName failed: %08x\n", hres); + hres = IBindStatusCallback_QueryInterface(callback, &IID_IHttpNegotiate, (void**)&http_negotiate); if(SUCCEEDED(hres)) { @@ -669,16 +804,15 @@ static HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx, post_data = bindinfo.stgmedData.u.hGlobal; } - hres = IMoniker_GetDisplayName(mon, 0, NULL, &url); - if(FAILED(hres)) - FIXME("GetDisplayName failed: %08x\n", hres); + if(This->doc_navigate) { + hres = async_doc_navigate(This, url, headers, post_data, post_data_len, FALSE); + }else { + bsc = create_callback(This, url, post_data, post_data_len, headers); + hres = navigate_bsc(This, bsc, mon); + IBindStatusCallback_Release(BINDSC(bsc)); + } - bsc = create_callback(This, url, post_data, post_data_len, headers); CoTaskMemFree(url); - - hres = navigate_bsc(This, bsc, mon); - - IBindStatusCallback_Release(BINDSC(bsc)); CoTaskMemFree(headers); ReleaseBindInfo(&bindinfo);

1 0

Jacek Caban : shdocvw: Use IHTMLPrivateWindow for navigation in navigate_url if available.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 172f82e1a5841fcff93f7299c791625c3ffa2190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=172f82e1a5841fcff93f7299c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 13 16:44:43 2010 +0100 shdocvw: Use IHTMLPrivateWindow for navigation in navigate_url if available. --- dlls/shdocvw/navigate.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 1826a4f..8ba5f69 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -726,10 +726,10 @@ static void navigate_bsc_proc(DocHost *This, task_header_t *t) HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags, const VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers) { - task_navigate_bsc_t *task; PBYTE post_data = NULL; ULONG post_data_len = 0; LPWSTR headers = NULL; + HRESULT hres = S_OK; TRACE("navigating to %s\n", debugstr_w(url)); @@ -756,15 +756,23 @@ HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags, TRACE("Headers: %s\n", debugstr_w(headers)); } - task = heap_alloc(sizeof(*task)); - task->bsc = create_callback(This, url, post_data, post_data_len, headers); + set_doc_state(This, READYSTATE_LOADING); + This->ready_state = READYSTATE_LOADING; + + if(This->doc_navigate) { + hres = async_doc_navigate(This, url, headers, post_data, post_data_len, TRUE); + }else { + task_navigate_bsc_t *task; + + task = heap_alloc(sizeof(*task)); + task->bsc = create_callback(This, url, post_data, post_data_len, headers); + push_dochost_task(This, &task->header, navigate_bsc_proc, This->url == NULL); + } if(post_data) SafeArrayUnaccessData(V_ARRAY(PostData)); - push_dochost_task(This, &task->header, navigate_bsc_proc, This->url == NULL); - - return S_OK; + return hres; } static HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx,

1 0

Jacek Caban : shdocvw: Added more navigation tests.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: d69297c4b7b960222cdca2a1724a0f51a59b42a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d69297c4b7b960222cdca2a17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 13 16:44:58 2010 +0100 shdocvw: Added more navigation tests. --- dlls/shdocvw/tests/webbrowser.c | 293 +++++++++++++++++++++++++++++---------- 1 files changed, 218 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d69297c4b7b960222cdca…

1 0

Jacek Caban : mshtml: Ignore load event on detached documents.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 9389184d1f0bc01bfa57cd229dee2f93b2691b83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9389184d1f0bc01bfa57cd229… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 13 16:45:15 2010 +0100 mshtml: Ignore load event on detached documents. --- dlls/mshtml/nsevents.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 65bcae0..0f5b864 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -216,7 +216,7 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event TRACE("(%p)\n", doc); - if(!doc) + if(!doc || !doc->basedoc.window) return NS_ERROR_FAILURE; doc_obj = doc->basedoc.doc_obj;

1 0

Juan Lang : iphlpapi: Rename a function and variables to make it clearer they' re related to IPv4 addresses.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 00f1c3d395e0612223c3c793cf2d6971c9f8184f URL: http://source.winehq.org/git/wine.git/?a=commit;h=00f1c3d395e0612223c3c793c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 11 17:07:37 2010 -0800 iphlpapi: Rename a function and variables to make it clearer they're related to IPv4 addresses. --- dlls/iphlpapi/iphlpapi_main.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 7edff9e..aeecbc7 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -608,7 +608,7 @@ static DWORD typeFromMibType(DWORD mib_type) } } -static ULONG addressesFromIndex(DWORD index, DWORD **addrs, ULONG *num_addrs) +static ULONG v4addressesFromIndex(DWORD index, DWORD **addrs, ULONG *num_addrs) { ULONG ret, i, j; MIB_IPADDRTABLE *at; @@ -634,16 +634,16 @@ static ULONG addressesFromIndex(DWORD index, DWORD **addrs, ULONG *num_addrs) static ULONG adapterAddressesFromIndex(DWORD index, IP_ADAPTER_ADDRESSES *aa, ULONG *size) { - ULONG ret, i, num_addrs, total_size; - DWORD *addrs; + ULONG ret, i, num_v4addrs, total_size; + DWORD *v4addrs; - if ((ret = addressesFromIndex(index, &addrs, &num_addrs))) return ret; + if ((ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs))) return ret; total_size = sizeof(IP_ADAPTER_ADDRESSES); total_size += IF_NAMESIZE; total_size += IF_NAMESIZE * sizeof(WCHAR); - total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_addrs; - total_size += sizeof(struct sockaddr_in) * num_addrs; + total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v4addrs; + total_size += sizeof(struct sockaddr_in) * num_v4addrs; if (aa && *size >= total_size) { @@ -665,13 +665,13 @@ static ULONG adapterAddressesFromIndex(DWORD index, IP_ADAPTER_ADDRESSES *aa, UL *dst++ = 0; ptr = (char *)dst; - if (num_addrs) + if (num_v4addrs) { IP_ADAPTER_UNICAST_ADDRESS *ua; struct sockaddr_in *sa; ua = aa->FirstUnicastAddress = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; - for (i = 0; i < num_addrs; i++) + for (i = 0; i < num_v4addrs; i++) { memset(ua, 0, sizeof(IP_ADAPTER_UNICAST_ADDRESS)); ua->u.s.Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); @@ -680,11 +680,11 @@ static ULONG adapterAddressesFromIndex(DWORD index, IP_ADAPTER_ADDRESSES *aa, UL sa = (struct sockaddr_in *)ua->Address.lpSockaddr; sa->sin_family = AF_INET; - sa->sin_addr.s_addr = addrs[i]; + sa->sin_addr.s_addr = v4addrs[i]; sa->sin_port = 0; ptr += ua->u.s.Length + ua->Address.iSockaddrLength; - if (i < num_addrs - 1) + if (i < num_v4addrs - 1) { ua->Next = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; ua = ua->Next; @@ -705,7 +705,7 @@ static ULONG adapterAddressesFromIndex(DWORD index, IP_ADAPTER_ADDRESSES *aa, UL else aa->OperStatus = IfOperStatusUnknown; } *size = total_size; - HeapFree(GetProcessHeap(), 0, addrs); + HeapFree(GetProcessHeap(), 0, v4addrs); return ERROR_SUCCESS; }

1 0

Juan Lang : iphlpapi: Pass address family to adapterAddressesFromIndex.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 00fb356990b52691552748b89c5ae3c56455f994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00fb356990b52691552748b89… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 11 17:15:03 2010 -0800 iphlpapi: Pass address family to adapterAddressesFromIndex. --- dlls/iphlpapi/iphlpapi_main.c | 32 +++++++++++++++++++++----------- 1 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index aeecbc7..6a0a8d9 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -632,12 +632,27 @@ static ULONG v4addressesFromIndex(DWORD index, DWORD **addrs, ULONG *num_addrs) return ERROR_SUCCESS; } -static ULONG adapterAddressesFromIndex(DWORD index, IP_ADAPTER_ADDRESSES *aa, ULONG *size) +static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADDRESSES *aa, ULONG *size) { - ULONG ret, i, num_v4addrs, total_size; - DWORD *v4addrs; + ULONG ret, i, num_v4addrs = 0, total_size; + DWORD *v4addrs = NULL; - if ((ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs))) return ret; + if (family == AF_INET) + ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + else if (family == AF_UNSPEC) + { + WARN("no support for IPv6 addresses\n"); + ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + } + else + { + if (family == AF_INET6) + FIXME("no support for IPv6 addresses\n"); + else + FIXME("address family %u unsupported\n", family); + ret = ERROR_NO_DATA; + } + if (ret) return ret; total_size = sizeof(IP_ADAPTER_ADDRESSES); total_size += IF_NAMESIZE; @@ -717,11 +732,6 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, if (!buflen) return ERROR_INVALID_PARAMETER; - if (family == AF_INET6 || family == AF_UNSPEC) - FIXME("no support for IPv6 addresses\n"); - - if (family != AF_INET && family != AF_UNSPEC) return ERROR_NO_DATA; - table = getInterfaceIndexTable(); if (!table || !table->numIndexes) { @@ -732,7 +742,7 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, for (i = 0; i < table->numIndexes; i++) { size = 0; - if ((ret = adapterAddressesFromIndex(table->indexes[i], NULL, &size))) + if ((ret = adapterAddressesFromIndex(family, table->indexes[i], NULL, &size))) { HeapFree(GetProcessHeap(), 0, table); return ret; @@ -744,7 +754,7 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, ULONG bytes_left = size = total_size; for (i = 0; i < table->numIndexes; i++) { - if ((ret = adapterAddressesFromIndex(table->indexes[i], aa, &size))) + if ((ret = adapterAddressesFromIndex(family, table->indexes[i], aa, &size))) { HeapFree(GetProcessHeap(), 0, table); return ret;

1 0

Juan Lang : iphlpapi: Implement GetAdaptersAddresses for IPv6 addresses.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: e3c0e30db10622ddd7093db0f499f6d453fa7e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3c0e30db10622ddd7093db0f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 11 18:36:46 2010 -0800 iphlpapi: Implement GetAdaptersAddresses for IPv6 addresses. --- configure | 14 ++++++++ configure.ac | 2 + dlls/iphlpapi/ifenum.c | 75 +++++++++++++++++++++++++++++++++++++++++ dlls/iphlpapi/ifenum.h | 7 ++++ dlls/iphlpapi/iphlpapi_main.c | 50 ++++++++++++++++++++++++--- include/config.h.in | 3 ++ 6 files changed, 145 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 110c350..9247160 100755 --- a/configure +++ b/configure @@ -6064,6 +6064,20 @@ fi done +for ac_header in ifaddrs.h +do : + ac_fn_c_check_header_compile "$LINENO" "ifaddrs.h" "ac_cv_header_ifaddrs_h" "#include <sys/types.h> +" +if test "x$ac_cv_header_ifaddrs_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_IFADDRS_H 1 +_ACEOF + +fi + +done + + for ac_header in ucontext.h do : ac_fn_c_check_header_compile "$LINENO" "ucontext.h" "ac_cv_header_ucontext_h" "#include <signal.h> diff --git a/configure.ac b/configure.ac index b077e2d..3d2711e 100644 --- a/configure.ac +++ b/configure.ac @@ -556,6 +556,8 @@ AC_CHECK_HEADERS([resolv.h],,, # include <arpa/nameser.h> #endif]) +AC_CHECK_HEADERS([ifaddrs.h],,,[#include <sys/types.h>]) + AC_CHECK_HEADERS(ucontext.h,,,[#include <signal.h>]) AC_CHECK_HEADERS([sys/thr.h],,, diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 02c6a9d..8653454 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -87,7 +87,12 @@ #include <net/if_types.h> #endif +#ifdef HAVE_IFADDRS_H +#include <ifaddrs.h> +#endif + #include "ifenum.h" +#include "ws2ipdef.h" #ifdef HAVE_STRUCT_SOCKADDR_SA_LEN #define ifreq_len(ifr) \ @@ -788,6 +793,76 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) return ret; } +#ifdef HAVE_IFADDRS_H +ULONG v6addressesFromIndex(DWORD index, SOCKET_ADDRESS **addrs, ULONG *num_addrs) +{ + struct ifaddrs *ifa; + ULONG ret; + + if (!getifaddrs(&ifa)) + { + struct ifaddrs *p; + ULONG n; + char name[IFNAMSIZ]; + + getInterfaceNameByIndex(index, name); + for (p = ifa, n = 0; p; p = p->ifa_next) + if (p->ifa_addr->sa_family == AF_INET6 && !strcmp(name, p->ifa_name)) + n++; + if (n) + { + *addrs = HeapAlloc(GetProcessHeap(), 0, n * (sizeof(SOCKET_ADDRESS) + + sizeof(struct WS_sockaddr_in6))); + if (*addrs) + { + struct WS_sockaddr_in6 *next_addr = (struct WS_sockaddr_in6 *)( + (BYTE *)*addrs + n * sizeof(SOCKET_ADDRESS)); + + for (p = ifa, n = 0; p; p = p->ifa_next) + { + if (p->ifa_addr->sa_family == AF_INET6 && !strcmp(name, p->ifa_name)) + { + struct sockaddr_in6 *addr = (struct sockaddr_in6 *)p->ifa_addr; + + next_addr->sin6_family = WS_AF_INET6; + next_addr->sin6_port = addr->sin6_port; + next_addr->sin6_flowinfo = addr->sin6_flowinfo; + memcpy(&next_addr->sin6_addr, &addr->sin6_addr, + sizeof(next_addr->sin6_addr)); + next_addr->sin6_scope_id = addr->sin6_scope_id; + (*addrs)[n].lpSockaddr = (LPSOCKADDR)next_addr; + (*addrs)[n].iSockaddrLength = sizeof(struct WS_sockaddr_in6); + next_addr++; + n++; + } + } + *num_addrs = n; + ret = ERROR_SUCCESS; + } + else + ret = ERROR_OUTOFMEMORY; + } + else + { + *addrs = NULL; + *num_addrs = 0; + ret = ERROR_SUCCESS; + } + freeifaddrs(ifa); + } + else + ret = ERROR_NO_DATA; + return ret; +} +#else +ULONG v6addressesFromIndex(DWORD index, SOCKET_ADDRESS **addrs, ULONG *num_addrs) +{ + *addrs = NULL; + *num_addrs = 0; + return ERROR_SUCCESS; +} +#endif + char *toIPAddressString(unsigned int addr, char string[16]) { if (string) { diff --git a/dlls/iphlpapi/ifenum.h b/dlls/iphlpapi/ifenum.h index c348191..79e484b 100644 --- a/dlls/iphlpapi/ifenum.h +++ b/dlls/iphlpapi/ifenum.h @@ -38,6 +38,8 @@ #include "windef.h" #include "winbase.h" #include "iprtrmib.h" +#define USE_WS_PREFIX +#include "winsock2.h" #define MAX_INTERFACE_PHYSADDR 8 #define MAX_INTERFACE_DESCRIPTION 256 @@ -105,6 +107,11 @@ DWORD getNumIPAddresses(void); */ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags); +/* Returns the IPv6 addresses for a particular interface index. + * Returns NO_ERROR on success, something else on failure. + */ +ULONG v6addressesFromIndex(DWORD index, SOCKET_ADDRESS **addrs, ULONG *num_addrs); + /* Converts the network-order bytes in addr to a printable string. Returns * string. */ diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6a0a8d9..8600849 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -49,6 +49,7 @@ #include "winreg.h" #define USE_WS_PREFIX #include "winsock2.h" +#include "ws2ipdef.h" #include "iphlpapi.h" #include "ifenum.h" #include "ipstats.h" @@ -634,22 +635,23 @@ static ULONG v4addressesFromIndex(DWORD index, DWORD **addrs, ULONG *num_addrs) static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADDRESSES *aa, ULONG *size) { - ULONG ret, i, num_v4addrs = 0, total_size; + ULONG ret, i, num_v4addrs = 0, num_v6addrs = 0, total_size; DWORD *v4addrs = NULL; + SOCKET_ADDRESS *v6addrs = NULL; if (family == AF_INET) ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + else if (family == AF_INET6) + ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); else if (family == AF_UNSPEC) { - WARN("no support for IPv6 addresses\n"); ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + if (!ret) + ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); } else { - if (family == AF_INET6) - FIXME("no support for IPv6 addresses\n"); - else - FIXME("address family %u unsupported\n", family); + FIXME("address family %u unsupported\n", family); ret = ERROR_NO_DATA; } if (ret) return ret; @@ -659,6 +661,10 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD total_size += IF_NAMESIZE * sizeof(WCHAR); total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v4addrs; total_size += sizeof(struct sockaddr_in) * num_v4addrs; + total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v6addrs; + total_size += sizeof(SOCKET_ADDRESS) * num_v6addrs; + for (i = 0; i < num_v6addrs; i++) + total_size += v6addrs[i].iSockaddrLength; if (aa && *size >= total_size) { @@ -706,6 +712,37 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD } } } + if (num_v6addrs) + { + IP_ADAPTER_UNICAST_ADDRESS *ua; + struct WS_sockaddr_in6 *sa; + + if (aa->FirstUnicastAddress) + { + for (ua = aa->FirstUnicastAddress; ua->Next; ua = ua->Next) + ; + ua->Next = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; + } + else + ua = aa->FirstUnicastAddress = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; + for (i = 0; i < num_v6addrs; i++) + { + memset(ua, 0, sizeof(IP_ADAPTER_UNICAST_ADDRESS)); + ua->u.s.Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); + ua->Address.iSockaddrLength = v6addrs[i].iSockaddrLength; + ua->Address.lpSockaddr = (SOCKADDR *)((char *)ua + ua->u.s.Length); + + sa = (struct WS_sockaddr_in6 *)ua->Address.lpSockaddr; + memcpy(sa, v6addrs[i].lpSockaddr, sizeof(*sa)); + + ptr += ua->u.s.Length + ua->Address.iSockaddrLength; + if (i < num_v6addrs - 1) + { + ua->Next = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; + ua = ua->Next; + } + } + } buflen = MAX_INTERFACE_PHYSADDR; getInterfacePhysicalByIndex(index, &buflen, aa->PhysicalAddress, &type); @@ -720,6 +757,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD else aa->OperStatus = IfOperStatusUnknown; } *size = total_size; + HeapFree(GetProcessHeap(), 0, v6addrs); HeapFree(GetProcessHeap(), 0, v4addrs); return ERROR_SUCCESS; } diff --git a/include/config.h.in b/include/config.h.in index fb8a79b..0cdfb3f 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -255,6 +255,9 @@ /* Define to 1 if you have the <ieeefp.h> header file. */ #undef HAVE_IEEEFP_H +/* Define to 1 if you have the <ifaddrs.h> header file. */ +#undef HAVE_IFADDRS_H + /* Define to 1 if you have the <inet/mib2.h> header file. */ #undef HAVE_INET_MIB2_H

1 0

Paul Chitescu : qedit: In SampleGrabber ReceiveConnection check early the format type, return VFW_E_INVALIDMEDIATYPE like native.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 5650a9eb8b095fe2e170d5a6dec3f12c544fba3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5650a9eb8b095fe2e170d5a6d… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Fri Mar 12 11:33:14 2010 +0200 qedit: In SampleGrabber ReceiveConnection check early the format type, return VFW_E_INVALIDMEDIATYPE like native. --- dlls/qedit/samplegrabber.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index d09d554..c766cfa 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -1048,6 +1048,10 @@ SampleGrabber_In_IPin_ReceiveConnection(IPin *iface, IPin *connector, const AM_M debugstr_guid(&type->majortype), debugstr_guid(&type->subtype), type->lSampleSize, debugstr_guid(&type->formattype), type->cbFormat); + if (!IsEqualGUID(&type->formattype, &FORMAT_None) && + !IsEqualGUID(&type->formattype, &GUID_NULL) && + !type->pbFormat) + return VFW_E_INVALIDMEDIATYPE; if (!IsEqualGUID(&This->sg->mtype.majortype,&GUID_NULL) && !IsEqualGUID(&This->sg->mtype.majortype,&type->majortype)) return VFW_E_TYPE_NOT_ACCEPTED; @@ -1058,10 +1062,6 @@ SampleGrabber_In_IPin_ReceiveConnection(IPin *iface, IPin *connector, const AM_M !IsEqualGUID(&This->sg->mtype.formattype,&FORMAT_None) && !IsEqualGUID(&This->sg->mtype.formattype,&type->formattype)) return VFW_E_TYPE_NOT_ACCEPTED; - if (!IsEqualGUID(&type->formattype, &FORMAT_None) && - !IsEqualGUID(&type->formattype, &GUID_NULL) && - !type->pbFormat) - return VFW_E_TYPE_NOT_ACCEPTED; if (This->sg->mtype.pbFormat) CoTaskMemFree(This->sg->mtype.pbFormat); This->sg->mtype = *type;

1 0

Paul Chitescu : qedit: SampleGrabber pins should enumerate a preferred format only after the input pin is connected and a fully defined format is known .
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 2ad03b9b7479c00e9a64a36d7fa1623ddb2c82f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ad03b9b7479c00e9a64a36d7… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Fri Mar 12 11:35:27 2010 +0200 qedit: SampleGrabber pins should enumerate a preferred format only after the input pin is connected and a fully defined format is known. --- dlls/qedit/samplegrabber.c | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index c766cfa..327004e 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -37,7 +37,7 @@ static WCHAR const pin_in_name[] = { 'I', 'n', 0 }; static WCHAR const pin_out_name[] = { 'O', 'u', 't', 0 }; IEnumPins *pinsenum_create(IBaseFilter *filter, IPin **pins, ULONG pinCount); -IEnumMediaTypes *mediaenum_create(AM_MEDIA_TYPE *mtype); +IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype); /* Fixed pins enumerator, holds filter referenced */ typedef struct _PE_Impl { @@ -258,7 +258,7 @@ Single_IEnumMediaTypes_Next(IEnumMediaTypes *iface, ULONG nTypes, AM_MEDIA_TYPE return E_INVALIDARG; if (!types || ((nTypes != 1) && !fetched)) return E_POINTER; - if (!This->past) { + if (!This->past && !IsEqualGUID(&This->mtype.majortype,&GUID_NULL)) { AM_MEDIA_TYPE *mtype = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); *mtype = This->mtype; if (mtype->cbFormat) { @@ -324,7 +324,7 @@ static const IEnumMediaTypesVtbl IEnumMediaTypes_VTable = Single_IEnumMediaTypes_Clone, }; -IEnumMediaTypes *mediaenum_create(AM_MEDIA_TYPE *mtype) +IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype) { ME_Impl *obj = CoTaskMemAlloc(sizeof(ME_Impl)); if (obj) { @@ -332,14 +332,18 @@ IEnumMediaTypes *mediaenum_create(AM_MEDIA_TYPE *mtype) obj->me.lpVtbl = &IEnumMediaTypes_VTable; obj->refCount = 1; obj->past = FALSE; - obj->mtype = *mtype; - obj->mtype.pUnk = NULL; - if (mtype->cbFormat) { - obj->mtype.pbFormat = CoTaskMemAlloc(mtype->cbFormat); - CopyMemory(obj->mtype.pbFormat, mtype->pbFormat, mtype->cbFormat); + if (mtype) { + obj->mtype = *mtype; + obj->mtype.pUnk = NULL; + if (mtype->cbFormat) { + obj->mtype.pbFormat = CoTaskMemAlloc(mtype->cbFormat); + CopyMemory(obj->mtype.pbFormat, mtype->pbFormat, mtype->cbFormat); + } + else + obj->mtype.pbFormat = NULL; } else - obj->mtype.pbFormat = NULL; + obj->mtype.majortype = GUID_NULL; } return &obj->me; } @@ -1212,7 +1216,7 @@ SampleGrabber_IPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **mtypes) TRACE("(%p)->(%p)\n", This, mtypes); if (!mtypes) return E_POINTER; - *mtypes = mediaenum_create(&This->sg->mtype); + *mtypes = mediaenum_create(This->sg->pin_in.pair ? &This->sg->mtype : (const AM_MEDIA_TYPE *)NULL); return *mtypes ? S_OK : E_OUTOFMEMORY; }

1 0