wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Hans Leidekker : wmiutils: Implement IWbemPath::RemoveNamespaceAt.
by Alexandre Julliard 17 Jan '13

17 Jan '13

Module: wine Branch: master Commit: 9548eb79ad87782cf04a2d3bd86d1c4b0eecdb32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9548eb79ad87782cf04a2d3bd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 17 15:30:44 2013 +0100 wmiutils: Implement IWbemPath::RemoveNamespaceAt. --- dlls/wmiutils/path.c | 18 +++++++- dlls/wmiutils/tests/path.c | 88 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 97 insertions(+), 9 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 3f74389..73c1c62 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -525,10 +525,22 @@ static HRESULT WINAPI path_GetNamespaceAt( static HRESULT WINAPI path_RemoveNamespaceAt( IWbemPath *iface, - ULONG uIndex) + ULONG idx) { - FIXME("%p, %u\n", iface, uIndex); - return E_NOTIMPL; + struct path *path = impl_from_IWbemPath( iface ); + + TRACE("%p, %u\n", iface, idx); + + if (idx >= path->num_namespaces) return WBEM_E_INVALID_PARAMETER; + heap_free( path->namespaces[idx] ); + while (idx < path->num_namespaces - 1) + { + path->namespaces[idx] = path->namespaces[idx + 1]; + path->len_namespaces[idx] = path->len_namespaces[idx + 1]; + idx++; + } + path->num_namespaces--; + return S_OK; } static HRESULT WINAPI path_RemoveAllNamespaces( diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index 8441d86..049d9b3 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -586,6 +586,10 @@ static void test_IWbemPath_GetNamespaceAt(void) static void test_IWbemPath_RemoveAllNamespaces(void) { + static const ULONGLONG expected_flags = + WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_INST_REF | + WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | + WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_PATH_HAD_SERVER; IWbemPath *path; WCHAR buf[16]; ULONG len; @@ -603,9 +607,7 @@ static void test_IWbemPath_RemoveAllNamespaces(void) flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); - ok( flags == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_INST_REF | - WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | - WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_PATH_HAD_SERVER), + ok( flags == expected_flags, "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); hr = IWbemPath_RemoveAllNamespaces( path ); @@ -614,9 +616,7 @@ static void test_IWbemPath_RemoveAllNamespaces(void) flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); - ok( flags == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_INST_REF | - WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | - WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_PATH_HAD_SERVER), + ok( flags == expected_flags, "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); buf[0] = 0; @@ -627,6 +627,81 @@ static void test_IWbemPath_RemoveAllNamespaces(void) IWbemPath_Release( path ); } +static void test_IWbemPath_RemoveNamespaceAt(void) +{ + static const ULONGLONG expected_flags = + WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_INST_REF | + WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | + WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_PATH_HAD_SERVER; + static const WCHAR cimv2W[] = {'c','i','m','v','2',0}; + IWbemPath *path; + WCHAR buf[16]; + ULONG len, count; + ULONGLONG flags; + HRESULT hr; + + if (!(path = create_path())) return; + + hr = IWbemPath_RemoveNamespaceAt( path, 0 ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); + ok( hr == S_OK, "got %08x\n", hr ); + + flags = 0; + hr = IWbemPath_GetInfo( path, 0, &flags ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( flags == expected_flags, + "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + + count = 0xdeadbeef; + hr = IWbemPath_GetNamespaceCount( path, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count == 2, "got %u\n", count ); + + hr = IWbemPath_RemoveNamespaceAt( path, 0 ); + ok( hr == S_OK, "got %08x\n", hr ); + + flags = 0; + hr = IWbemPath_GetInfo( path, 0, &flags ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( flags == expected_flags, + "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + + count = 0xdeadbeef; + hr = IWbemPath_GetNamespaceCount( path, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count == 1, "got %u\n", count ); + + buf[0] = 0; + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( buf, cimv2W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( cimv2W ) + 1, "unexpected length %u\n", len ); + + hr = IWbemPath_RemoveNamespaceAt( path, 0 ); + ok( hr == S_OK, "got %08x\n", hr ); + + flags = 0; + hr = IWbemPath_GetInfo( path, 0, &flags ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( flags == expected_flags, + "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + + count = 0xdeadbeef; + hr = IWbemPath_GetNamespaceCount( path, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %u\n", count ); + + buf[0] = 0; + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + IWbemPath_Release( path ); +} + START_TEST (path) { CoInitialize( NULL ); @@ -640,6 +715,7 @@ START_TEST (path) test_IWbemPath_SetServer(); test_IWbemPath_GetNamespaceAt(); test_IWbemPath_RemoveAllNamespaces(); + test_IWbemPath_RemoveNamespaceAt(); CoUninitialize(); }

1 0

Hans Leidekker : wmiutils: Implement IWbemPath::RemoveAllNamespaces.
by Alexandre Julliard 17 Jan '13

17 Jan '13

Module: wine Branch: master Commit: 5391929491366d4cd3f7938848dd40a00d8c3ded URL: http://source.winehq.org/git/wine.git/?a=commit;h=5391929491366d4cd3f793884… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 17 15:30:17 2013 +0100 wmiutils: Implement IWbemPath::RemoveAllNamespaces. --- dlls/wmiutils/path.c | 14 ++++++++++++-- dlls/wmiutils/tests/path.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 4e5cd64..3f74389 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -534,8 +534,18 @@ static HRESULT WINAPI path_RemoveNamespaceAt( static HRESULT WINAPI path_RemoveAllNamespaces( IWbemPath *iface) { - FIXME("%p\n", iface); - return E_NOTIMPL; + struct path *path = impl_from_IWbemPath( iface ); + int i; + + TRACE("%p\n", iface); + + for (i = 0; i < path->num_namespaces; i++) heap_free( path->namespaces[i] ); + path->num_namespaces = 0; + heap_free( path->namespaces ); + path->namespaces = NULL; + heap_free( path->len_namespaces ); + path->len_namespaces = NULL; + return S_OK; } static HRESULT WINAPI path_GetScopeCount( diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index 9911318..8441d86 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -584,6 +584,49 @@ static void test_IWbemPath_GetNamespaceAt(void) IWbemPath_Release( path ); } +static void test_IWbemPath_RemoveAllNamespaces(void) +{ + IWbemPath *path; + WCHAR buf[16]; + ULONG len; + ULONGLONG flags; + HRESULT hr; + + if (!(path = create_path())) return; + + hr = IWbemPath_RemoveAllNamespaces( path ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); + ok( hr == S_OK, "got %08x\n", hr ); + + flags = 0; + hr = IWbemPath_GetInfo( path, 0, &flags ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( flags == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_INST_REF | + WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | + WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_PATH_HAD_SERVER), + "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + + hr = IWbemPath_RemoveAllNamespaces( path ); + ok( hr == S_OK, "got %08x\n", hr ); + + flags = 0; + hr = IWbemPath_GetInfo( path, 0, &flags ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( flags == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_INST_REF | + WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | + WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_PATH_HAD_SERVER), + "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + + buf[0] = 0; + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + IWbemPath_Release( path ); +} + START_TEST (path) { CoInitialize( NULL ); @@ -596,6 +639,7 @@ START_TEST (path) test_IWbemPath_GetInfo(); test_IWbemPath_SetServer(); test_IWbemPath_GetNamespaceAt(); + test_IWbemPath_RemoveAllNamespaces(); CoUninitialize(); }

1 0

Hans Leidekker : wmiutils: Implement IWbemPath::GetNamespaceAt.
by Alexandre Julliard 17 Jan '13

17 Jan '13

Module: wine Branch: master Commit: af84c4c7a9a53caccf337fe6071777bfd360fd85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af84c4c7a9a53caccf337fe60… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 17 15:29:48 2013 +0100 wmiutils: Implement IWbemPath::GetNamespaceAt. --- dlls/wmiutils/path.c | 16 ++++++++---- dlls/wmiutils/tests/path.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 5 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 6e63e26..4e5cd64 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -509,12 +509,18 @@ static HRESULT WINAPI path_SetNamespaceAt( static HRESULT WINAPI path_GetNamespaceAt( IWbemPath *iface, - ULONG uIndex, - ULONG *puNameBufLength, - LPWSTR pName) + ULONG idx, + ULONG *len, + LPWSTR name) { - FIXME("%p, %u, %p, %p\n", iface, uIndex, puNameBufLength, pName); - return E_NOTIMPL; + struct path *path = impl_from_IWbemPath( iface ); + + TRACE("%p, %u, %p, %p\n", iface, idx, len, name); + + if (!len || (*len && !name) || idx >= path->num_namespaces) return WBEM_E_INVALID_PARAMETER; + if (*len > path->len_namespaces[idx]) strcpyW( name, path->namespaces[idx] ); + *len = path->len_namespaces[idx] + 1; + return S_OK; } static HRESULT WINAPI path_RemoveNamespaceAt( diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index e21593d..9911318 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -528,6 +528,62 @@ static void test_IWbemPath_SetServer(void) IWbemPath_Release( path ); } +static void test_IWbemPath_GetNamespaceAt(void) +{ + static const WCHAR rootW[] = {'r','o','o','t',0}; + static const WCHAR cimv2W[] = {'c','i','m','v','2',0}; + IWbemPath *path; + HRESULT hr; + WCHAR buf[32]; + ULONG len; + + if (!(path = create_path())) return; + + hr = IWbemPath_GetNamespaceAt( path, 0, NULL, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + len = 0; + hr = IWbemPath_GetNamespaceAt( path, 0, &len, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetNamespaceAt( path, 0, &len, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( len == sizeof(buf) / sizeof(buf[0]), "unexpected length %u\n", len ); + + hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); + ok( hr == S_OK, "got %08x\n", hr ); + + len = 0; + hr = IWbemPath_GetNamespaceAt( path, 2, &len, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetNamespaceAt( path, 0, &len, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( len == sizeof(buf) / sizeof(buf[0]), "unexpected length %u\n", len ); + + buf[0] = 0; + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( buf, rootW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( rootW ) + 1, "unexpected length %u\n", len ); + + buf[0] = 0; + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetNamespaceAt( path, 1, &len, buf ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( buf, cimv2W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( cimv2W ) + 1, "unexpected length %u\n", len ); + + IWbemPath_Release( path ); +} + START_TEST (path) { CoInitialize( NULL ); @@ -539,6 +595,7 @@ START_TEST (path) test_IWbemPath_GetServer(); test_IWbemPath_GetInfo(); test_IWbemPath_SetServer(); + test_IWbemPath_GetNamespaceAt(); CoUninitialize(); }

1 0

Hans Leidekker : wmiutils: Implement IWbemPath::SetClassName.
by Alexandre Julliard 17 Jan '13

17 Jan '13

Module: wine Branch: master Commit: ae6468c9a9d9fbd9b51296bb4edfece8d8632255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae6468c9a9d9fbd9b51296bb4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 17 15:29:12 2013 +0100 wmiutils: Implement IWbemPath::SetClassName. --- dlls/wmiutils/path.c | 24 +++++++++++++++++++----- dlls/wmiutils/tests/path.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 5 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index e706372..6e63e26 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -447,18 +447,21 @@ static HRESULT WINAPI path_SetServer( static const ULONGLONG flags = WBEMPATH_INFO_PATH_HAD_SERVER | WBEMPATH_INFO_V1_COMPLIANT | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT; + WCHAR *server; TRACE("%p, %s\n", iface, debugstr_w(name)); - heap_free( path->server ); if (name) { - if (!(path->server = strdupW( name ))) return WBEM_E_OUT_OF_MEMORY; + if (!(server = strdupW( name ))) return WBEM_E_OUT_OF_MEMORY; + heap_free( path->server ); + path->server = server; path->len_server = strlenW( path->server ); path->flags |= flags; } else { + heap_free( path->server ); path->server = NULL; path->len_server = 0; path->flags &= ~flags; @@ -593,10 +596,21 @@ static HRESULT WINAPI path_RemoveAllScopes( static HRESULT WINAPI path_SetClassName( IWbemPath *iface, - LPCWSTR Name) + LPCWSTR name) { - FIXME("%p, %s\n", iface, debugstr_w(Name)); - return E_NOTIMPL; + struct path *path = impl_from_IWbemPath( iface ); + WCHAR *class; + + TRACE("%p, %s\n", iface, debugstr_w(name)); + + if (!name) return WBEM_E_INVALID_PARAMETER; + + if (!(class = strdupW( name ))) return WBEM_E_OUT_OF_MEMORY; + heap_free( path->class ); + path->class = class; + path->len_class = strlenW( path->class ); + path->flags |= WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT; + return S_OK; } static HRESULT WINAPI path_GetClassName( diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index 947defa..e21593d 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -324,6 +324,44 @@ static void test_IWbemPath_GetClassName(void) IWbemPath_Release( path ); } +static void test_IWbemPath_SetClassName(void) +{ + static const WCHAR classW[] = {'c','l','a','s','s',0}; + static const WCHAR emptyW[] = {0}; + IWbemPath *path; + WCHAR buf[16]; + ULONG len; + ULONGLONG flags; + HRESULT hr; + + if (!(path = create_path())) return; + + hr = IWbemPath_SetClassName( path, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + hr = IWbemPath_SetClassName( path, emptyW ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWbemPath_SetClassName( path, classW ); + ok( hr == S_OK, "got %08x\n", hr ); + + buf[0] = 0; + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetClassName( path, &len, buf ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( buf, classW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + + flags = 0; + hr = IWbemPath_GetInfo( path, 0, &flags ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( flags == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_CLASS_REF | + WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | + WBEMPATH_INFO_CIM_COMPLIANT), + "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + + IWbemPath_Release( path ); +} + static void test_IWbemPath_GetServer(void) { static const WCHAR dotW[] = {'.',0}; @@ -438,6 +476,7 @@ static void test_IWbemPath_GetInfo(void) static void test_IWbemPath_SetServer(void) { static const WCHAR serverW[] = {'s','e','r','v','e','r',0}; + static const WCHAR emptyW[] = {0}; IWbemPath *path; WCHAR buf[16]; ULONG len; @@ -453,6 +492,9 @@ static void test_IWbemPath_SetServer(void) hr = IWbemPath_GetServer( path, &len, buf ); ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); + hr = IWbemPath_SetServer( path, emptyW ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IWbemPath_SetServer( path, serverW ); ok( hr == S_OK, "got %08x\n", hr ); @@ -493,6 +535,7 @@ START_TEST (path) test_IWbemPath_SetText(); test_IWbemPath_GetText(); test_IWbemPath_GetClassName(); + test_IWbemPath_SetClassName(); test_IWbemPath_GetServer(); test_IWbemPath_GetInfo(); test_IWbemPath_SetServer();

1 0

Jacek Caban : mshtml: Treat doctype nodes as comment nodes.
by Alexandre Julliard 17 Jan '13

17 Jan '13

Module: wine Branch: master Commit: 23ae6e4ec4627043fd3227d0bde080b60232790c URL: http://source.winehq.org/git/wine.git/?a=commit;h=23ae6e4ec4627043fd3227d0b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 17 15:24:38 2013 +0100 mshtml: Treat doctype nodes as comment nodes. --- dlls/mshtml/htmlnode.c | 3 +++ dlls/mshtml/tests/dom.c | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index cf22838..4269f6c 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -387,6 +387,7 @@ static HRESULT WINAPI HTMLDOMNode_get_nodeType(IHTMLDOMNode *iface, LONG *p) *p = 3; break; case COMMENT_NODE: + case DOCUMENT_TYPE_NODE: *p = 8; break; case DOCUMENT_NODE: @@ -1103,6 +1104,8 @@ static HRESULT create_node(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDOMNod if(FAILED(hres)) return hres; break; + /* doctype nodes are represented as comment nodes (at least in quirks mode) */ + case DOCUMENT_TYPE_NODE: case COMMENT_NODE: { HTMLElement *comment; hres = HTMLCommentElement_Create(doc, nsnode, &comment); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d45a1fe..5ee0261 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -85,6 +85,10 @@ static const char emptydiv_str[] = static const char noscript_str[] = "<html><head><title>noscript test</title><noscript><style>.body { margin-right: 0px; }</style></noscript></head>" "<body><noscript><div>test</div></noscript></body></html>"; +static const char doctype_str[] = + "<!DOCTYPE html>" + "<html><head><title>emptydiv test</title></head>" + "<body><div id=\"divid\"></div></body></html>"; static WCHAR characterW[] = {'c','h','a','r','a','c','t','e','r',0}; static WCHAR texteditW[] = {'t','e','x','t','e','d','i','t',0}; @@ -6558,6 +6562,24 @@ static void test_noscript(IHTMLDocument2 *doc) IHTMLElement_Release(body); } +static void test_doctype(IHTMLDocument2 *doc) +{ + IHTMLDocument2 *doc_node; + IHTMLDOMNode *doctype; + int type; + + doc_node = get_doc_node(doc); + doctype = get_first_child((IUnknown*)doc_node); + IHTMLDocument2_Release(doc_node); + + type = get_node_type((IUnknown*)doctype); + ok(type == 8, "type = %d\n", type); + + test_comment_text((IUnknown*)doctype, "<!DOCTYPE html>"); + test_elem_type((IUnknown*)doctype, ET_COMMENT); + IHTMLDOMNode_Release(doctype); +} + static void test_null_write(IHTMLDocument2 *doc) { HRESULT hres; @@ -7106,6 +7128,7 @@ START_TEST(dom) run_domtest(frameset_str, test_frameset); run_domtest(emptydiv_str, test_docfrag); run_domtest(doc_blank, test_replacechild_elems); + run_domtest(doctype_str, test_doctype); CoUninitialize(); }

1 0

Jacek Caban : mshtml: Added support for DOCUMENT_TYPE_NODE in nsnode_to_nsstring_rec.
by Alexandre Julliard 17 Jan '13

17 Jan '13

Module: wine Branch: master Commit: 292e2359bbdfd3259dee82f3f85ce099d8e764ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=292e2359bbdfd3259dee82f3f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 17 15:24:24 2013 +0100 mshtml: Added support for DOCUMENT_TYPE_NODE in nsnode_to_nsstring_rec. --- dlls/mshtml/nsembed.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 109b6ad..fdb11ed 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -951,7 +951,7 @@ static HRESULT nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNo break; } case DOCUMENT_TYPE_NODE: - WARN("Ignoring DOCUMENT_TYPE_NODE\n"); + nsIContentSerializer_AppendDoctype(serializer, nscontent, str); break; case DOCUMENT_FRAGMENT_NODE: break;

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 17 Jan '13

17 Jan '13

Module: wine Branch: master Commit: f3b133db6ee6a901bd7de1d0ae7c561b18e6216c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3b133db6ee6a901bd7de1d0a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jan 17 21:55:09 2013 +0900 po: Update Japanese translation. --- po/ja.po | 91 ++++++++++++++++++++----------------------------------------- 1 files changed, 30 insertions(+), 61 deletions(-) diff --git a/po/ja.po b/po/ja.po index 5c7c934..1fb9db6 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-09-04 23:19+0900\n" +"PO-Revision-Date: 2013-01-17 20:12+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: none\n" "Language: Japanese\n" @@ -3532,7 +3532,7 @@ msgstr "文字列定数が終端していません" #: jscript.rc:39 msgid "'return' statement outside of function" -msgstr "" +msgstr "return 文が関数外にあります" #: jscript.rc:40 msgid "Can't have 'break' outside of loop" @@ -8252,44 +8252,37 @@ msgid "Security Warning" msgstr "セキュリティ警告" #: urlmon.rc:32 -#, fuzzy -#| msgid "Do you want to continue anyway?" msgid "Do you want to install this software?" -msgstr "とにかく続行してしまいますか?" +msgstr "このソフトウェアをインストールしますか?" #: urlmon.rc:34 explorer.rc:29 msgid "Location:" msgstr "場所:" #: urlmon.rc:36 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Don't install" -msgstr "インストールとアンインストール" +msgstr "インストールしない" #: urlmon.rc:40 msgid "" "When installed, an ActiveX component has full access to your computer. Do " "not click install unless you have absolute trust in the above source." msgstr "" +"万一インストールすると、ActiveX コンポーネントはコンピュータへのフルアクセス" +"を得ます。上記の出所を完全に信頼しない場合は、インストールをクリックしないで" +"ください。" #: urlmon.rc:48 -#, fuzzy -#| msgid "Installation transform failed to apply.\n" msgid "Installation of component failed: %08x" -msgstr "インストールトランスフォームの適用に失敗しました。\n" +msgstr "コンポーネントのインストールは失敗しました: %08x" #: urlmon.rc:49 -#, fuzzy -#| msgid "&Install" msgid "Install (%d)" -msgstr "インストール(&I)" +msgstr "インストール (%d)" #: urlmon.rc:50 -#, fuzzy -#| msgid "&Install" msgid "Install" -msgstr "インストール(&I)" +msgstr "インストール" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 msgctxt "window" @@ -10088,10 +10081,8 @@ msgid "Wine Command Prompt" msgstr "Wine コマンドプロンプト" #: cmd.rc:349 -#, fuzzy -#| msgid "CMD Version %1!S!\n" msgid "Wine CMD Version %1!S!\n" -msgstr "CMD バージョン %1!S!\n" +msgstr "" #: cmd.rc:350 msgid "More? " @@ -10120,31 +10111,31 @@ msgstr " (Yes|No|All)" #: cmd.rc:356 msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" -msgstr "" +msgstr "%1 を内部または外部コマンド、バッチスクリプトとして認識できません。\n" #: cmd.rc:357 msgid "Division by zero error.\n" -msgstr "" +msgstr "0 による除算エラー。\n" #: cmd.rc:358 msgid "Expected an operand.\n" -msgstr "" +msgstr "被演算子がありません。\n" #: cmd.rc:359 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Expected an operator.\n" -msgstr "予期しないネットワークエラーです。\n" +msgstr "演算子がありません。\n" #: cmd.rc:360 msgid "Mismatch in parentheses.\n" -msgstr "" +msgstr "括弧が対応していません。\n" #: cmd.rc:361 msgid "" "Badly formed number - must be one of decimal (12),\n" " hexadecimal (0x34) or octal (056).\n" msgstr "" +"数値の形式に誤りがあります - 10 進数 (12)、16 進数 (0x34)、\n" +"8 進数 (056) のいずれかとしてください。\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" @@ -10194,10 +10185,8 @@ msgid "Connection-specific DNS suffix" msgstr "接続固有の DNS サフィックス" #: ipconfig.rc:33 -#, fuzzy -#| msgid "IP address" msgid "IPv4 address" -msgstr "IP アドレス" +msgstr "IPv4 アドレス" #: ipconfig.rc:34 msgid "Hostname" @@ -10240,10 +10229,8 @@ msgid "Default gateway" msgstr "デフォルトゲートウェイ" #: ipconfig.rc:47 -#, fuzzy -#| msgid "IP address" msgid "IPv6 address" -msgstr "IP アドレス" +msgstr "IPv6 アドレス" #: net.rc:27 msgid "" @@ -10376,78 +10363,60 @@ msgid "The following services are running:\n" msgstr "以下のサービスが実行中です:\n" #: netstat.rc:27 -#, fuzzy -#| msgid "LAN Connection" msgid "Active Connections" -msgstr "LAN 接続" +msgstr "アクティブな接続" #: netstat.rc:28 msgid "Proto" msgstr "" #: netstat.rc:29 -#, fuzzy -#| msgid "Email Address" msgid "Local Address" -msgstr "電子メールアドレス" +msgstr "内部アドレス" #: netstat.rc:30 -#, fuzzy -#| msgid "Street Address" msgid "Foreign Address" -msgstr "番地" +msgstr "外部アドレス" #: netstat.rc:31 -#, fuzzy -#| msgid "Status" msgid "State" msgstr "状態" #: netstat.rc:32 -#, fuzzy -#| msgid "Interfaces" msgid "Interface Statistics" -msgstr "インターフェイス" +msgstr "インターフェイスの統計" #: netstat.rc:33 msgid "Sent" -msgstr "" +msgstr "送信" #: netstat.rc:34 msgid "Received" -msgstr "" +msgstr "受信" #: netstat.rc:35 -#, fuzzy -#| msgid "bytes" msgid "Bytes" msgstr "バイト" #: netstat.rc:36 msgid "Unicast packets" -msgstr "" +msgstr "ユニキャストパケット" #: netstat.rc:37 msgid "Non-unicast packets" -msgstr "" +msgstr "非ユニキャストパケット" #: netstat.rc:38 -#, fuzzy -#| msgid "Disclaimer" msgid "Discards" -msgstr "免責条項" +msgstr "破棄" #: netstat.rc:39 -#, fuzzy -#| msgid "Error" msgid "Errors" msgstr "エラー" #: netstat.rc:40 -#, fuzzy -#| msgid "Unknown port.\n" msgid "Unknown protocols" -msgstr "認識できないポートです。\n" +msgstr "不明なプロトコル" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

Alexandre Julliard : winex11: Fallback to the standard cursor font when XCursor is missing.
by Alexandre Julliard 17 Jan '13

17 Jan '13

Module: wine Branch: master Commit: 77af9035d8165604dad7613e6d3e512506819860 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77af9035d8165604dad7613e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 17 15:33:09 2013 +0100 winex11: Fallback to the standard cursor font when XCursor is missing. --- dlls/winex11.drv/mouse.c | 121 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 115 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 8870665..790c532 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -772,6 +772,8 @@ cleanup: return cursor; } +#endif /* SONAME_LIBXCURSOR */ + struct system_cursors { @@ -843,6 +845,111 @@ static const struct { riched20_cursors, {'r','i','c','h','e','d','2','0','.','d','l','l',0} } }; +struct cursor_font_fallback +{ + const char *name; + unsigned int shape; +}; + +static const struct cursor_font_fallback fallbacks[] = +{ + { "X_cursor", XC_X_cursor }, + { "arrow", XC_arrow }, + { "based_arrow_down", XC_based_arrow_down }, + { "based_arrow_up", XC_based_arrow_up }, + { "boat", XC_boat }, + { "bogosity", XC_bogosity }, + { "bottom_left_corner", XC_bottom_left_corner }, + { "bottom_right_corner", XC_bottom_right_corner }, + { "bottom_side", XC_bottom_side }, + { "bottom_tee", XC_bottom_tee }, + { "box_spiral", XC_box_spiral }, + { "center_ptr", XC_center_ptr }, + { "circle", XC_circle }, + { "clock", XC_clock }, + { "coffee_mug", XC_coffee_mug }, + { "col-resize", XC_sb_v_double_arrow }, + { "cross", XC_cross }, + { "cross_reverse", XC_cross_reverse }, + { "crosshair", XC_crosshair }, + { "diamond_cross", XC_diamond_cross }, + { "dot", XC_dot }, + { "dotbox", XC_dotbox }, + { "double_arrow", XC_double_arrow }, + { "draft_large", XC_draft_large }, + { "draft_small", XC_draft_small }, + { "draped_box", XC_draped_box }, + { "exchange", XC_exchange }, + { "fleur", XC_fleur }, + { "gobbler", XC_gobbler }, + { "gumby", XC_gumby }, + { "hand1", XC_hand1 }, + { "hand2", XC_hand2 }, + { "heart", XC_heart }, + { "icon", XC_icon }, + { "iron_cross", XC_iron_cross }, + { "left_ptr", XC_left_ptr }, + { "left_side", XC_left_side }, + { "left_tee", XC_left_tee }, + { "leftbutton", XC_leftbutton }, + { "ll_angle", XC_ll_angle }, + { "lr_angle", XC_lr_angle }, + { "man", XC_man }, + { "middlebutton", XC_middlebutton }, + { "mouse", XC_mouse }, + { "pencil", XC_pencil }, + { "pirate", XC_pirate }, + { "plus", XC_plus }, + { "question_arrow", XC_question_arrow }, + { "right_ptr", XC_right_ptr }, + { "right_side", XC_right_side }, + { "right_tee", XC_right_tee }, + { "rightbutton", XC_rightbutton }, + { "row-resize", XC_sb_h_double_arrow }, + { "rtl_logo", XC_rtl_logo }, + { "sailboat", XC_sailboat }, + { "sb_down_arrow", XC_sb_down_arrow }, + { "sb_h_double_arrow", XC_sb_h_double_arrow }, + { "sb_left_arrow", XC_sb_left_arrow }, + { "sb_right_arrow", XC_sb_right_arrow }, + { "sb_up_arrow", XC_sb_up_arrow }, + { "sb_v_double_arrow", XC_sb_v_double_arrow }, + { "shuttle", XC_shuttle }, + { "sizing", XC_sizing }, + { "spider", XC_spider }, + { "spraycan", XC_spraycan }, + { "star", XC_star }, + { "target", XC_target }, + { "tcross", XC_tcross }, + { "top_left_arrow", XC_top_left_arrow }, + { "top_left_corner", XC_top_left_corner }, + { "top_right_corner", XC_top_right_corner }, + { "top_side", XC_top_side }, + { "top_tee", XC_top_tee }, + { "trek", XC_trek }, + { "ul_angle", XC_ul_angle }, + { "umbrella", XC_umbrella }, + { "ur_angle", XC_ur_angle }, + { "watch", XC_watch }, + { "xterm", XC_xterm } +}; + +static int fallback_cmp( const void *key, const void *member ) +{ + const struct cursor_font_fallback *fallback = member; + return strcmp( key, fallback->name ); +} + +static int find_fallback_shape( const char *name ) +{ + struct cursor_font_fallback *fallback; + + if ((fallback = bsearch( name, fallbacks, sizeof(fallbacks) / sizeof(fallbacks[0]), + sizeof(*fallback), fallback_cmp ))) + return fallback->shape; + return -1; +} + /*********************************************************************** * create_xcursor_system_cursor * @@ -860,7 +967,6 @@ static Cursor create_xcursor_system_cursor( const ICONINFOEXW *info ) char valueA[64]; DWORD size, ret; - if (!pXcursorLibraryLoadCursor) return 0; if (!info->szModName[0]) return 0; p = strrchrW( info->szModName, '\\' ); @@ -904,7 +1010,14 @@ static Cursor create_xcursor_system_cursor( const ICONINFOEXW *info ) done: if (valueA[0]) { - cursor = pXcursorLibraryLoadCursor( gdi_display, valueA ); +#ifdef SONAME_LIBXCURSOR + if (pXcursorLibraryLoadCursor) cursor = pXcursorLibraryLoadCursor( gdi_display, valueA ); +#endif + if (!cursor) + { + int shape = find_fallback_shape( valueA ); + if (shape != -1) cursor = XCreateFontCursor( gdi_display, shape ); + } if (!cursor) WARN( "no system cursor found for %s mapped to %s\n", debugstr_w(name), debugstr_a(valueA) ); } @@ -912,8 +1025,6 @@ done: return cursor; } -#endif /* SONAME_LIBXCURSOR */ - /*********************************************************************** * create_xlib_monochrome_cursor @@ -1154,14 +1265,12 @@ static Cursor create_cursor( HANDLE handle ) info.cbSize = sizeof(info); if (!GetIconInfoExW( handle, &info )) return 0; -#ifdef SONAME_LIBXCURSOR if (use_system_cursors && (cursor = create_xcursor_system_cursor( &info ))) { DeleteObject( info.hbmColor ); DeleteObject( info.hbmMask ); return cursor; } -#endif GetObjectW( info.hbmMask, sizeof(bm), &bm ); if (!info.hbmColor) bm.bmHeight = max( 1, bm.bmHeight / 2 );

1 0

Alexandre Julliard : winex11: Check the bpp instead of the depth in the R8G8B8 format test.
by Alexandre Julliard 17 Jan '13

17 Jan '13

Module: wine Branch: master Commit: ae0ae4b9bae40ffb7f9e1963c1ed1d1764019317 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae0ae4b9bae40ffb7f9e1963c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 17 14:36:51 2013 +0100 winex11: Check the bpp instead of the depth in the R8G8B8 format test. --- dlls/winex11.drv/bitblt.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 84e8751..e91ca75 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1042,7 +1042,8 @@ static BOOL matching_color_info( const XVisualInfo *vis, const BITMAPINFO *info static inline BOOL is_r8g8b8( const XVisualInfo *vis ) { - return vis->depth == 24 && vis->red_mask == 0xff0000 && vis->blue_mask == 0x0000ff; + const XPixmapFormatValues *format = pixmap_formats[vis->depth]; + return format->bits_per_pixel == 24 && vis->red_mask == 0xff0000 && vis->blue_mask == 0x0000ff; } static inline BOOL image_needs_byteswap( XImage *image, BOOL is_r8g8b8, int bit_count )

1 0

Henri Verbeet : wined3d: Get rid of the "opengl" field in struct wined3d_adapter.
by Alexandre Julliard 17 Jan '13

17 Jan '13

Module: wine Branch: master Commit: 6c7cce55a771459ab361d29eb09439997f0f506a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c7cce55a771459ab361d29eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 17 10:24:29 2013 +0100 wined3d: Get rid of the "opengl" field in struct wined3d_adapter. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 4 +--- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 491c224..40ffe66 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1188,7 +1188,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, if (device->d3d_initialized) return WINED3DERR_INVALIDCALL; - if (!device->adapter->opengl) + if (device->wined3d->flags & WINED3D_NO3D) return WINED3DERR_INVALIDCALL; device->valid_rt_mask = 0; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e5b7f33..b8fba57 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5137,8 +5137,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINEDDSCAPS_VISIBLE; caps->ddraw_caps.stride_align = DDRAW_PITCH_ALIGNMENT; - /* Set D3D caps if OpenGL is available. */ - if (adapter->opengl) + if (!(wined3d->flags & WINED3D_NO3D)) { caps->ddraw_caps.dds_caps |= WINEDDSCAPS_3DDEVICE | WINEDDSCAPS_MIPMAP | @@ -5601,7 +5600,6 @@ static BOOL InitAdapters(struct wined3d *wined3d) select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); fillGLAttribFuncs(&adapter->gl_info); - adapter->opengl = TRUE; } wined3d->adapter_count = 1; TRACE("%u adapters successfully initialized.\n", wined3d->adapter_count); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ed777e5..af5ad2f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1569,8 +1569,6 @@ struct wined3d_driver_info struct wined3d_adapter { UINT ordinal; - BOOL opengl; - POINT monitorPoint; enum wined3d_format_id screen_format;

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2013