June 2008 - Wine-commits - list.winehq.org

Jacek Caban : urlmon: Make file protocol invalid URL handling behave like IE7.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: c42d937402214d4d7a744ba36f18898e0b3a78ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=c42d937402214d4d7a744ba36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 25 19:34:59 2008 -0500 urlmon: Make file protocol invalid URL handling behave like IE7. --- dlls/urlmon/file.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index d3004ac..dda1dd0 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -109,6 +109,10 @@ static HRESULT WINAPI FileProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); + if(!szUrl || lstrlenW(szUrl) < sizeof(wszFile)/sizeof(WCHAR) + || memcmp(szUrl, wszFile, sizeof(wszFile))) + return E_INVALIDARG; + memset(&bindinfo, 0, sizeof(bindinfo)); bindinfo.cbSize = sizeof(BINDINFO); hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &grfBINDF, &bindinfo); @@ -119,13 +123,6 @@ static HRESULT WINAPI FileProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl ReleaseBindInfo(&bindinfo); - if(!szUrl || !*szUrl) - return E_INVALIDARG; - - if(lstrlenW(szUrl) < sizeof(wszFile)/sizeof(WCHAR) - || memcmp(szUrl, wszFile, sizeof(wszFile))) - return MK_E_SYNTAX; - len = lstrlenW(szUrl)+16; url = heap_alloc(len*sizeof(WCHAR)); hres = CoInternetParseUrl(szUrl, PARSE_ENCODE, 0, url, len, &len, 0);

1 0

Hwang YunSong(황윤성) : shell32: Updated Korean resource.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: ed8d95b888741bb49f10b4c191b14adb49931193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed8d95b888741bb49f10b4c19… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Thu Jun 26 09:51:54 2008 +0900 shell32: Updated Korean resource. --- dlls/shell32/shell32_Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_Ko.rc b/dlls/shell32/shell32_Ko.rc index 4c1ce60..0379926 100644 --- a/dlls/shell32/shell32_Ko.rc +++ b/dlls/shell32/shell32_Ko.rc @@ -188,7 +188,7 @@ IDS_SHV_COLUMN_DELDATE " IDS_DESKTOP "��ũž" IDS_MYCOMPUTER "�� ǻ��" IDS_RECYCLEBIN_FOLDER_NAME "��" -IDS_CONTROLPANEL "Control Panel" +IDS_CONTROLPANEL "��" /* context menus */ IDS_VIEW_LARGE "ū ��(&G)"

1 0

Maarten Lankhorst : quartz: Downgrade a fixme to a warn in dsoundrender.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: 3bda54bb04cd898d6f9e508a525d8758c1dfcc8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bda54bb04cd898d6f9e508a5… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Jun 23 20:10:19 2008 -0700 quartz: Downgrade a fixme to a warn in dsoundrender. --- dlls/quartz/dsoundrender.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 915f8b4..1bdf390 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -261,7 +261,7 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) ERR("Cannot get sample time (%x)\n", hr); if (This->rtLastStop != tStart && (IMediaSample_IsDiscontinuity(pSample) == S_FALSE)) - FIXME("Unexpected discontinuity: Last: %u.%03u, tStart: %u.%03u\n", + WARN("Unexpected discontinuity: Last: %u.%03u, tStart: %u.%03u\n", (DWORD)(This->rtLastStop / 10000000), (DWORD)((This->rtLastStop / 10000)%1000), (DWORD)(tStart / 10000000), (DWORD)((tStart / 10000)%1000)); This->rtLastStop = tStop;

1 0

Rob Shearman : rpcrt4/rpcss: Remove old named pipe code for communicating with RPCSS process.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: 45a3462c32dd474ba729b5b9f32b2a9bcc1c1307 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a3462c32dd474ba729b5b9f… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Jun 25 18:27:03 2008 +0100 rpcrt4/rpcss: Remove old named pipe code for communicating with RPCSS process. --- dlls/rpcrt4/Makefile.in | 3 +- dlls/rpcrt4/rpc_binding.h | 3 - dlls/rpcrt4/rpcrt4_main.c | 108 --------- dlls/rpcrt4/rpcss_np_client.c | 152 ------------ dlls/rpcrt4/rpcss_np_client.h | 26 -- programs/rpcss/Makefile.in | 6 +- programs/rpcss/epmap_server.c | 210 ---------------- programs/rpcss/np_server.c | 527 ----------------------------------------- programs/rpcss/rpcss.h | 22 -- programs/rpcss/rpcss_main.c | 48 +---- 10 files changed, 6 insertions(+), 1099 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45a3462c32dd474ba729b…

1 0

Rob Shearman : rpcrt4: Add tests for endpoint mapper functions.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: 1a978cb460194e7f3db4c8d8bf6405411b2f9bcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a978cb460194e7f3db4c8d8b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Jun 25 18:27:08 2008 +0100 rpcrt4: Add tests for endpoint mapper functions. --- dlls/rpcrt4/tests/rpc.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 4b34d12..490a151 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -676,6 +676,52 @@ static void test_I_RpcExceptionFilter(void) } } +static void test_endpoint_mapper(void) +{ + static unsigned char annotation[] = "Test annotation string."; + static unsigned char ncacn_ip_tcp[] = "ncacn_np"; + static unsigned char address[] = "."; + static unsigned char endpoint[] = "\\pipe\\wine_rpc_test"; + RPC_STATUS status; + RPC_BINDING_VECTOR *binding_vector; + handle_t handle; + unsigned char *binding; + + status = RpcServerUseProtseqEp(ncacn_ip_tcp, 20, endpoint, NULL); + ok(status == RPC_S_OK, "RpcServerUseProtseqEp failed (%lu)\n", status); + + status = RpcServerRegisterIf(IFoo_v0_0_s_ifspec, NULL, NULL); + ok(status == RPC_S_OK, "RpcServerRegisterIf failed (%lu)\n", status); + + status = RpcServerInqBindings(&binding_vector); + ok(status == RPC_S_OK, "RpcServerInqBindings failed with error %lu\n", status); + + status = RpcEpRegisterA(IFoo_v0_0_s_ifspec, binding_vector, NULL, annotation); + ok(status == RPC_S_OK, "RpcEpRegisterA failed with error %lu\n", status); + + status = RpcStringBindingCompose(NULL, ncacn_ip_tcp, address, + NULL, NULL, &binding); + ok(status == RPC_S_OK, "RpcStringBindingCompose failed (%lu)\n", status); + + status = RpcBindingFromStringBinding(binding, &handle); + ok(status == RPC_S_OK, "RpcBindingFromStringBinding failed (%lu)\n", status); + + status = RpcEpResolveBinding(handle, IFoo_v0_0_s_ifspec); + ok(status == RPC_S_OK, "RpcEpResolveBinding failed with error %lu\n", status); + + status = RpcBindingFree(&handle); + ok(status == RPC_S_OK, "RpcBindingFree failed with error %lu\n", status); + + status = RpcServerUnregisterIf(NULL, NULL, FALSE); + ok(status == RPC_S_OK, "RpcServerUnregisterIf failed (%lu)\n", status); + + status = RpcEpUnregister(IFoo_v0_0_s_ifspec, binding_vector, NULL); + ok(status == RPC_S_OK, "RpcEpUnregisterA failed with error %lu\n", status); + + status = RpcBindingVectorFree(&binding_vector); + ok(status == RPC_S_OK, "RpcBindingVectorFree failed with error %lu\n", status); +} + START_TEST( rpc ) { trace ( " ** Uuid Conversion and Comparison Tests **\n" ); @@ -687,4 +733,5 @@ START_TEST( rpc ) test_I_RpcMapWin32Status(); test_RpcStringBindingParseA(); test_I_RpcExceptionFilter(); + test_endpoint_mapper(); }

1 0

Jacek Caban : mshtml: Added DOCUMENT_NODE type support.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: 44a314945bacb36db0d7923f20138c78e3764b88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44a314945bacb36db0d7923f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 25 19:28:53 2008 -0500 mshtml: Added DOCUMENT_NODE type support. --- dlls/mshtml/htmlnode.c | 3 +++ dlls/mshtml/tests/dom.c | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index b802e90..ae2bff0 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -370,6 +370,9 @@ static HRESULT WINAPI HTMLDOMNode_get_nodeType(IHTMLDOMNode *iface, long *p) case COMMENT_NODE: *p = 8; break; + case DOCUMENT_NODE: + *p = 9; + break; default: /* * FIXME: diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 0748c89..d06ad4c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2068,6 +2068,8 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLDOMNode_Release(node2); ok(node != NULL, "node == NULL\n"); test_node_name((IUnknown*)node, "#document"); + type = get_node_type((IUnknown*)node); + ok(type == 9, "type=%ld, expected 9\n", type); node2 = test_node_get_parent((IUnknown*)node); IHTMLDOMNode_Release(node); ok(node2 == NULL, "node != NULL\n");

1 0

Rob Shearman : rpcss: Implement endpoint-mapper server using DCE/RPC.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: 16849ceba9f5943fa19cd4443e4c7ccdca91ce69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16849ceba9f5943fa19cd4443… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Jun 25 18:26:48 2008 +0100 rpcss: Implement endpoint-mapper server using DCE/RPC. --- .gitignore | 4 + include/Makefile.in | 2 + include/wine/dcetypes.idl | 88 +++++++++++++ include/wine/epm.idl | 122 +++++++++++++++++++ programs/rpcss/Makefile.in | 2 + programs/rpcss/epm.idl | 19 +++ programs/rpcss/epmp.c | 283 +++++++++++++++++++++++++++++++++++++++++++ programs/rpcss/rpcss_main.c | 54 +++++--- 8 files changed, 554 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16849ceba9f5943fa19cd…

1 0

Rob Shearman : rpcrt4: Use DCE/RPC to contact the endpoint-mapper server.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: 9e1c7a30c72f0c3a76926561a5254fb29e111fa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e1c7a30c72f0c3a76926561a… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Jun 25 18:26:56 2008 +0100 rpcrt4: Use DCE/RPC to contact the endpoint-mapper server. --- .gitignore | 2 + dlls/rpcrt4/Makefile.in | 3 + dlls/rpcrt4/epm.idl | 19 ++ dlls/rpcrt4/epm_towers.h | 6 +- dlls/rpcrt4/rpc_epmap.c | 453 +++++++++++++++++++++++++++++++++------------- 5 files changed, 353 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e1c7a30c72f0c3a76926…

1 0

Eric Durbin : iphlpapi: Implement getArpTable on FreeBSD.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: 61201984a6cf180f660d9ae7c6d238a4acc3db36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61201984a6cf180f660d9ae7c… Author: Eric Durbin <eadurbin(a)freebsd.org> Date: Tue Jun 24 22:49:49 2008 -0500 iphlpapi: Implement getArpTable on FreeBSD. --- dlls/iphlpapi/ipstats.c | 78 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 69 insertions(+), 9 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 89ffa04..d6d8ab4 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1285,13 +1285,7 @@ DWORD getNumArpEntries(void) DWORD getArpTable(PMIB_IPNETTABLE *ppIpNetTable, HANDLE heap, DWORD flags) { - DWORD ret; - -#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) - ERR ("unimplemented!\n"); - return ERROR_NOT_SUPPORTED; -#endif - + DWORD ret = NO_ERROR; if (!ppIpNetTable) ret = ERROR_INVALID_PARAMETER; else { @@ -1302,10 +1296,76 @@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpNetTable, HANDLE heap, DWORD flags) if (numEntries > 1) size += (numEntries - 1) * sizeof(MIB_IPNETROW); table = HeapAlloc(heap, flags, size); +#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) + if (table) + { + int mib[] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_FLAGS, RTF_LLINFO}; +#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) + size_t needed; + char *buf, *lim, *next; + struct rt_msghdr *rtm; + struct sockaddr_inarp *sinarp; + struct sockaddr_dl *sdl; + + *ppIpNetTable = table; + table->dwNumEntries = 0; + + if (sysctl (mib, MIB_LEN, NULL, &needed, NULL, 0) == -1) + { + ERR ("failed to get size of arp table\n"); + return ERROR_NOT_SUPPORTED; + } + + buf = HeapAlloc (GetProcessHeap (), 0, needed); + if (!buf) return ERROR_OUTOFMEMORY; + + if (sysctl (mib, MIB_LEN, buf, &needed, NULL, 0) == -1) + { + ERR ("failed to get arp table\n"); + HeapFree (GetProcessHeap (), 0, buf); + return ERROR_NOT_SUPPORTED; + } + + lim = buf + needed; + next = buf; + while(next < lim) + { + rtm = (struct rt_msghdr *)next; + sinarp=(struct sockaddr_inarp *)(rtm + 1); + sdl = (struct sockaddr_dl *)((char *)sinarp + ROUNDUP(sinarp->sin_len)); + if(sdl->sdl_alen) /* arp entry */ + { + DWORD byte = strtoul(&sdl->sdl_data[sdl->sdl_alen], NULL, 16); + memset(&table->table[table->dwNumEntries], 0, sizeof(MIB_IPNETROW)); + table->table[table->dwNumEntries].dwAddr = sinarp->sin_addr.s_addr; + table->table[table->dwNumEntries].dwIndex = sdl->sdl_index; + table->table[table->dwNumEntries].dwPhysAddrLen = sdl->sdl_alen; + + table->table[table->dwNumEntries].bPhysAddr[ + table->table[table->dwNumEntries].dwPhysAddrLen++] = + byte & 0x0ff; + if(rtm->rtm_rmx.rmx_expire == 0) + table->table[table->dwNumEntries].dwType = MIB_IPNET_TYPE_STATIC; + else if(sinarp->sin_other & SIN_PROXY) + table->table[table->dwNumEntries].dwType = MIB_IPNET_TYPE_OTHER; + else if(rtm->rtm_rmx.rmx_expire != 0) + table->table[table->dwNumEntries].dwType = MIB_IPNET_TYPE_DYNAMIC; + else + table->table[table->dwNumEntries].dwType = MIB_IPNET_TYPE_INVALID; + + table->dwNumEntries++; + } + next += rtm->rtm_msglen; + } + HeapFree (GetProcessHeap (), 0, buf); + } + else + ret = ERROR_OUTOFMEMORY; + return ret; +#endif + if (table) { FILE *fp; - - ret = NO_ERROR; *ppIpNetTable = table; table->dwNumEntries = 0; /* get from /proc/net/arp, no error if can't */

1 0

Jacek Caban : mshtml: Added IHTMLElement::get_offsetTop implementation.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: f2617512f022f9c38f77ae4697e9ee43c1e0ecd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2617512f022f9c38f77ae469… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 25 19:28:05 2008 -0500 mshtml: Added IHTMLElement::get_offsetTop implementation. --- dlls/mshtml/htmlelem.c | 24 ++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 14 ++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 9be2964..7c20c2c 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -712,8 +712,27 @@ static HRESULT WINAPI HTMLElement_get_offsetLeft(IHTMLElement *iface, long *p) static HRESULT WINAPI HTMLElement_get_offsetTop(IHTMLElement *iface, long *p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNSHTMLElement *nselem; + PRInt32 top = 0; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMNSHTMLElement: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMNSHTMLElement_GetOffsetTop(nselem, &top); + nsIDOMNSHTMLElement_Release(nselem); + if(NS_FAILED(nsres)) { + ERR("GetOffsetTop failed: %08x\n", nsres); + return E_FAIL; + } + + *p = top; + return S_OK; } static HRESULT WINAPI HTMLElement_get_offsetWidth(IHTMLElement *iface, long *p) @@ -1414,6 +1433,7 @@ static const tid_t HTMLElement_iface_tids[] = { IHTMLElement2_tid, 0 }; + static dispex_static_data_t HTMLElement_dispex = { NULL, DispHTMLUnknownElement_tid, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5a3101b..a1b2e66 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -475,6 +475,19 @@ static void _test_elem_attr(unsigned line, IHTMLElement *elem, LPCWSTR name, LPC VariantClear(&value); } +#define test_elem_offset(u) _test_elem_offset(__LINE__,u) +static void _test_elem_offset(unsigned line, IUnknown *unk) +{ + IHTMLElement *elem = _get_elem_iface(line, unk); + long l; + HRESULT hres; + + hres = IHTMLElement_get_offsetTop(elem, &l); + ok_(__FILE__,line) (hres == S_OK, "get_offsetTop failed: %08x\n", hres); + + IHTMLElement_Release(elem); +} + static void test_doc_elem(IHTMLDocument2 *doc) { IHTMLElement *elem; @@ -2044,6 +2057,7 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_title((IUnknown*)select, NULL); test_elem_set_title((IUnknown*)select, "Title"); test_elem_title((IUnknown*)select, "Title"); + test_elem_offset((IUnknown*)select); node = get_first_child((IUnknown*)select); ok(node != NULL, "node == NULL\n");

1 0