January 2013 - Wine-Commits

Jacek Caban : mshtml: Treat doctype nodes as comment nodes.
by Alexandre Julliard Jan. 17, 2013

Jan. 17, 2013

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 Jan. 17, 2013

Jan. 17, 2013

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

Hans Leidekker : wmiutils: Implement IWbemPath::SetClassName.
by Alexandre Julliard Jan. 17, 2013

Jan. 17, 2013

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

Hans Leidekker : wmiutils: Implement IWbemPath::RemoveAllNamespaces.
by Alexandre Julliard Jan. 17, 2013

Jan. 17, 2013

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

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Jan. 17, 2013

Jan. 17, 2013

Module: wine Branch: master Commit: 175039e736fde0b8114c38068aeceadc0bc03759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=175039e736fde0b8114c38068… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Jan 17 21:24:30 2013 +0200 po: Update Finnish translation. --- po/fi.po | 78 ++++++++++++++++++++------------------------------------------ 1 files changed, 25 insertions(+), 53 deletions(-) diff --git a/po/fi.po b/po/fi.po index b2e0ffa..cd023d1 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3535,7 +3535,7 @@ msgstr "Päättymätön merkkijonovakio" #: jscript.rc:39 msgid "'return' statement outside of function" -msgstr "" +msgstr "'return' funktion ulkopuolella" #: jscript.rc:40 msgid "Can't have 'break' outside of loop" @@ -8269,16 +8269,12 @@ msgid "Don't install" msgstr "Älä asenna" #: urlmon.rc:40 -#, fuzzy -#| msgid "" -#| "When installed, ActiveX has full access to your computer.Do not click " -#| "install unless you have absolute trust in the above source." 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 "" -"Asennuksen jälkeen ActiveX voi täysin hallita tietokonettasi. Asenna vain, " -"jos luotat yllä mainittuun lähteeseen täysin." +"Asennuksen jälkeen ActiveX-komponentti voi täysin hallita tietokonettasi. " +"Asenna vain, jos luotat yllä mainittuun lähteeseen täysin." #: urlmon.rc:48 msgid "Installation of component failed: %08x" @@ -10072,10 +10068,8 @@ msgid "Wine Command Prompt" msgstr "Winen komentokehote" #: cmd.rc:349 -#, fuzzy -#| msgid "CMD Version %1!S!\n" msgid "Wine CMD Version %1!S!\n" -msgstr "CMD versio %1!S!\n" +msgstr "Wine CMD versio %1!S!\n" #: cmd.rc:350 msgid "More? " @@ -10108,27 +10102,27 @@ msgstr "'%1' ei ole sisäinen eikä ulkoinen komento eikä komentojono.\n" #: cmd.rc:357 msgid "Division by zero error.\n" -msgstr "" +msgstr "Virheellinen jako nollalla.\n" #: cmd.rc:358 msgid "Expected an operand.\n" -msgstr "" +msgstr "Odotettiin operandia.\n" #: cmd.rc:359 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Expected an operator.\n" -msgstr "Odottamaton verkkovirhe.\n" +msgstr "Odotettiin operaattoria.\n" #: cmd.rc:360 msgid "Mismatch in parentheses.\n" -msgstr "" +msgstr "Sulut eivät täsmää.\n" #: cmd.rc:361 msgid "" "Badly formed number - must be one of decimal (12),\n" " hexadecimal (0x34) or octal (056).\n" msgstr "" +"Luvun muoto on virheellinen – täytyy olla desimaaliluku (12),\n" +" heksadesimaaliluku (0x34) tai oktaaliluku (056).\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" @@ -10177,10 +10171,8 @@ msgid "Connection-specific DNS suffix" msgstr "Yhteysspesifinen DNS-pääte" #: ipconfig.rc:33 -#, fuzzy -#| msgid "IP address" msgid "IPv4 address" -msgstr "IP-osoite" +msgstr "IPv4-osoite" #: ipconfig.rc:34 msgid "Hostname" @@ -10223,10 +10215,8 @@ msgid "Default gateway" msgstr "Oletusyhdyskäytävä" #: ipconfig.rc:47 -#, fuzzy -#| msgid "IP address" msgid "IPv6 address" -msgstr "IP-osoite" +msgstr "IPv6-osoite" #: net.rc:27 msgid "" @@ -10359,78 +10349,60 @@ msgid "The following services are running:\n" msgstr "Seuraavat palvelut ovat toiminnassa:\n" #: netstat.rc:27 -#, fuzzy -#| msgid "LAN Connection" msgid "Active Connections" -msgstr "Lähiverkkoyhteys" +msgstr "Aktiiviset yhteydet" #: netstat.rc:28 msgid "Proto" -msgstr "" +msgstr "Prot." #: netstat.rc:29 -#, fuzzy -#| msgid "Email Address" msgid "Local Address" -msgstr "Sähköpostiosoite" +msgstr "Paikallinen osoite" #: netstat.rc:30 -#, fuzzy -#| msgid "Street Address" msgid "Foreign Address" -msgstr "Katuosoite" +msgstr "Etäosoite" #: netstat.rc:31 -#, fuzzy -#| msgid "Status" msgid "State" msgstr "Tila" #: netstat.rc:32 -#, fuzzy -#| msgid "Interfaces" msgid "Interface Statistics" -msgstr "Rajapinnat" +msgstr "Rajapinnan tilastot" #: netstat.rc:33 msgid "Sent" -msgstr "" +msgstr "Lähetetty" #: netstat.rc:34 msgid "Received" -msgstr "" +msgstr "Vastaanotettu" #: netstat.rc:35 -#, fuzzy -#| msgid "bytes" msgid "Bytes" -msgstr "tavua" +msgstr "Tavuja" #: netstat.rc:36 msgid "Unicast packets" -msgstr "" +msgstr "Unicast-paketteja" #: netstat.rc:37 msgid "Non-unicast packets" -msgstr "" +msgstr "Ei-unicast-paketteja" #: netstat.rc:38 -#, fuzzy -#| msgid "Disclaimer" msgid "Discards" -msgstr "Vastuuvapaus" +msgstr "Hylkäyksiä" #: netstat.rc:39 -#, fuzzy -#| msgid "Error" msgid "Errors" -msgstr "Virhe" +msgstr "Virheitä" #: netstat.rc:40 -#, fuzzy -#| msgid "Unknown port.\n" msgid "Unknown protocols" -msgstr "Tuntematon portti.\n" +msgstr "Vieraita protokollia" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

Nikolay Sivov : qmgr: COM cleanup of IBackgroundCopyJob2 interface.
by Alexandre Julliard Jan. 17, 2013

Jan. 17, 2013

Module: wine Branch: master Commit: a7449dbf598c009f4af62c04969dff0f77f5a12d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7449dbf598c009f4af62c049… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 17 22:39:26 2013 +0400 qmgr: COM cleanup of IBackgroundCopyJob2 interface. --- dlls/qmgr/enum_files.c | 7 ++--- dlls/qmgr/enum_jobs.c | 6 ++-- dlls/qmgr/file.c | 4 +- dlls/qmgr/job.c | 64 +++++++++++++++++++++++++++-------------------- dlls/qmgr/qmgr.c | 9 +++--- dlls/qmgr/qmgr.h | 7 ++--- 6 files changed, 52 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a7449dbf598c009f4af62…

1 0

Aric Stewart : usp10: Implement GPOS Cursive Attachment Positioning Subtable.
by Alexandre Julliard Jan. 17, 2013

Jan. 17, 2013

Module: wine Branch: master Commit: 62b4f31d6ddcbb7a76f6ca5378ffe157288d4835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62b4f31d6ddcbb7a76f6ca537… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jan 17 09:57:16 2013 -0600 usp10: Implement GPOS Cursive Attachment Positioning Subtable. --- dlls/usp10/opentype.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index e729919..3bec2d3 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -375,6 +375,18 @@ typedef struct { } GPOS_PairSet; typedef struct { + WORD EntryAnchor; + WORD ExitAnchor; +} GPOS_EntryExitRecord; + +typedef struct { + WORD PosFormat; + WORD Coverage; + WORD EntryExitCount; + GPOS_EntryExitRecord EntryExitRecord[1]; +} GPOS_CursivePosFormat1; + +typedef struct { WORD PosFormat; WORD MarkCoverage; WORD BaseCoverage; @@ -1333,6 +1345,49 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const SCRIPT_AN return glyph_index+1; } +static VOID GPOS_apply_CursiveAttachment(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, + INT glyph_count, INT ppem, LPPOINT pt) +{ + int j; + int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; + + if (glyph_index + write_dir < 0 || glyph_index + write_dir >= glyph_count) return; + + TRACE("Cursive Attachment Positioning Subtable\n"); + + for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) + { + const GPOS_CursivePosFormat1 *cpf1; + WORD offset = GET_BE_WORD(look->SubTable[j]); + cpf1 = (const GPOS_CursivePosFormat1*)((const BYTE*)look+offset); + if (GET_BE_WORD(cpf1->PosFormat) == 1) + { + int index_exit, index_entry; + offset = GET_BE_WORD( cpf1->Coverage ); + index_exit = GSUB_is_glyph_covered((const BYTE*)cpf1+offset, glyphs[glyph_index]); + if (index_exit != -1 && cpf1->EntryExitRecord[index_exit].ExitAnchor!= 0) + { + index_entry = GSUB_is_glyph_covered((const BYTE*)cpf1+offset, glyphs[glyph_index+write_dir]); + if (index_entry != -1 && cpf1->EntryExitRecord[index_entry].EntryAnchor != 0) + { + POINT exit_pt, entry_pt; + offset = GET_BE_WORD(cpf1->EntryExitRecord[index_exit].ExitAnchor); + GPOS_get_anchor_values((const BYTE*)cpf1 + offset, &exit_pt, ppem); + offset = GET_BE_WORD(cpf1->EntryExitRecord[index_entry].EntryAnchor); + GPOS_get_anchor_values((const BYTE*)cpf1 + offset, &entry_pt, ppem); + TRACE("Found linkage %x[%i,%i] %x[%i,%i]\n",glyphs[glyph_index], exit_pt.x,exit_pt.y, glyphs[glyph_index+write_dir], entry_pt.x, entry_pt.y); + pt->x = entry_pt.x - exit_pt.x; + pt->y = entry_pt.y - exit_pt.y; + return; + } + } + } + else + FIXME("Cursive Attachment Positioning: Format %i Unhandled\n",GET_BE_WORD(cpf1->PosFormat)); + } + return; +} + static VOID GPOS_apply_MarkToBase(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, INT glyph_count, INT ppem, LPPOINT pt) { @@ -1726,6 +1781,21 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, c } return index; } + case 3: + { + POINT desU = {0,0}; + double devX, devY; + int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; + + GPOS_apply_CursiveAttachment(look, analysis, glyphs, glyph_index, glyph_count, ppem, &desU); + if (desU.x || desU.y) + { + GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY); + /* Windows does not appear to apply X offsets here */ + pGoffset[glyph_index].dv = round(devY) + pGoffset[glyph_index+write_dir].dv; + } + break; + } case 4: { double devX, devY;

1 0

Hans Leidekker : wmiutils: Implement IWbemPath::SetNamespaceAt.
by Alexandre Julliard Jan. 17, 2013

Jan. 17, 2013

Module: wine Branch: master Commit: f4597120b150eaa6fd0d7ba6b12b435dbffb53fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4597120b150eaa6fd0d7ba6b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 17 15:31:45 2013 +0100 wmiutils: Implement IWbemPath::SetNamespaceAt. --- dlls/wmiutils/path.c | 48 ++++++++++++++++++++++-- dlls/wmiutils/tests/path.c | 75 ++++++++++++++++++++++++++++++++++++++ dlls/wmiutils/wmiutils_private.h | 6 +++ 3 files changed, 125 insertions(+), 4 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 73c1c62..afcad67 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -500,11 +500,50 @@ static HRESULT WINAPI path_GetNamespaceCount( static HRESULT WINAPI path_SetNamespaceAt( IWbemPath *iface, - ULONG uIndex, - LPCWSTR pszName) + ULONG idx, + LPCWSTR name) { - FIXME("%p, %u, %s\n", iface, uIndex, debugstr_w(pszName)); - return E_NOTIMPL; + struct path *path = impl_from_IWbemPath( iface ); + static const ULONGLONG flags = + WBEMPATH_INFO_V1_COMPLIANT | WBEMPATH_INFO_V2_COMPLIANT | + WBEMPATH_INFO_CIM_COMPLIANT; + int i, *tmp_len; + WCHAR **tmp, *new; + DWORD size; + + TRACE("%p, %u, %s\n", iface, idx, debugstr_w(name)); + + if (idx > path->num_namespaces || !name) return WBEM_E_INVALID_PARAMETER; + if (!(new = strdupW( name ))) return WBEM_E_OUT_OF_MEMORY; + + size = (path->num_namespaces + 1) * sizeof(WCHAR *); + if (path->namespaces) tmp = heap_realloc( path->namespaces, size ); + else tmp = heap_alloc( size ); + if (!tmp) + { + heap_free( new ); + return WBEM_E_OUT_OF_MEMORY; + } + path->namespaces = tmp; + size = (path->num_namespaces + 1) * sizeof(int); + if (path->len_namespaces) tmp_len = heap_realloc( path->len_namespaces, size ); + else tmp_len = heap_alloc( size ); + if (!tmp_len) + { + heap_free( new ); + return WBEM_E_OUT_OF_MEMORY; + } + path->len_namespaces = tmp_len; + for (i = idx; i < path->num_namespaces; i++) + { + path->namespaces[i + 1] = path->namespaces[i]; + path->len_namespaces[i + 1] = path->len_namespaces[i]; + } + path->namespaces[idx] = new; + path->len_namespaces[idx] = strlenW( new ); + path->num_namespaces++; + path->flags |= flags; + return S_OK; } static HRESULT WINAPI path_GetNamespaceAt( @@ -532,6 +571,7 @@ static HRESULT WINAPI path_RemoveNamespaceAt( 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) { diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index 049d9b3..31246e9 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -702,6 +702,80 @@ static void test_IWbemPath_RemoveNamespaceAt(void) IWbemPath_Release( path ); } +static void test_IWbemPath_SetNamespaceAt(void) +{ + static const ULONGLONG expected_flags = + WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_V1_COMPLIANT | + WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT | + WBEMPATH_INFO_SERVER_NAMESPACE_ONLY; + static const WCHAR rootW[] = {'r','o','o','t',0}; + 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_SetNamespaceAt( path, 0, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + hr = IWbemPath_SetNamespaceAt( path, 1, cimv2W ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + hr = IWbemPath_SetNamespaceAt( path, 0, cimv2W ); + ok( hr == S_OK, "got %08x\n", hr ); + + count = 0xdeadbeef; + hr = IWbemPath_GetNamespaceCount( path, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count == 1, "got %u\n", count ); + + 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 ); + + 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_SetNamespaceAt( path, 0, rootW ); + 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 ); + + 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 ); @@ -716,6 +790,7 @@ START_TEST (path) test_IWbemPath_GetNamespaceAt(); test_IWbemPath_RemoveAllNamespaces(); test_IWbemPath_RemoveNamespaceAt(); + test_IWbemPath_SetNamespaceAt(); CoUninitialize(); } diff --git a/dlls/wmiutils/wmiutils_private.h b/dlls/wmiutils/wmiutils_private.h index 9837ce8..98180c9 100644 --- a/dlls/wmiutils/wmiutils_private.h +++ b/dlls/wmiutils/wmiutils_private.h @@ -27,6 +27,12 @@ static inline void *heap_alloc( size_t len ) return HeapAlloc( GetProcessHeap(), 0, len ); } +static void *heap_realloc( void *mem, size_t len ) __WINE_ALLOC_SIZE(2); +static inline void *heap_realloc( void *mem, size_t len ) +{ + return HeapReAlloc( GetProcessHeap(), 0, mem, len ); +} + static inline BOOL heap_free( void *mem ) { return HeapFree( GetProcessHeap(), 0, mem );

1 0

Hans Leidekker : wmiutils: Implement IWbemPath::GetNamespaceAt.
by Alexandre Julliard Jan. 17, 2013

Jan. 17, 2013

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

Rico Schüller : d3dx9/tests: Use D3DXFloat16To32Array( ) instead of a custom function.
by Alexandre Julliard Jan. 17, 2013

Jan. 17, 2013

Module: wine Branch: master Commit: 2fb6dcb3f220158756c4571e7c7298d2f803dff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb6dcb3f220158756c4571e7… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jan 16 22:12:51 2013 +0100 d3dx9/tests: Use D3DXFloat16To32Array() instead of a custom function. --- dlls/d3dx9_36/tests/texture.c | 24 ++---------------------- 1 files changed, 2 insertions(+), 22 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 28fb47e..5f51db1 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -106,24 +106,6 @@ static inline void expect_vec4_(unsigned int line, const D3DXVECTOR4 *expected, got->x, got->y, got->z, got->w); } -static inline float float_16_to_32(unsigned short in) -{ - unsigned short s = (in & 0x8000); - unsigned short e = (in & 0x7C00) >> 10; - unsigned short m = in & 0x3FF; - float sgn = (s ? -1.0f : 1.0f); - - if (e == 0) - { - if (m == 0) return sgn * 0.0f; /* +0.0 or -0.0 */ - else return sgn * powf(2, -14.0f) * (m / 1024.0f); - } - else - { - return sgn * powf(2, e - 15.0f) * (1.0f + (m / 1024.0f)); - } -} - static BOOL is_autogenmipmap_supported(IDirect3DDevice9 *device, D3DRESOURCETYPE resource_type) { HRESULT hr; @@ -1071,10 +1053,8 @@ static void test_D3DXFillTexture(IDirect3DDevice9 *device) { D3DXVECTOR4 got, expected; - got.x = float_16_to_32(*ptr++); - got.y = float_16_to_32(*ptr++); - got.z = float_16_to_32(*ptr++); - got.w = float_16_to_32(*ptr++); + D3DXFloat16To32Array((FLOAT *)&got, (D3DXFLOAT16 *)ptr, 4); + ptr += 4; expected.x = (x + 0.5f) / 4.0f; expected.y = (y + 0.5f) / 4.0f;

1 0