June 2012 - Wine-Devel - list.winehq.org

Re: [PATCH 1/4] hhctrl.ocx: Add HTML to Unicode decoding capability (try 2).

by Erich E. Hoover

On Tue, Jun 12, 2012 at 2:07 AM, Jacek Caban <jacek(a)codeweavers.com> wrote: > ... > You didn't address most of my comments. Feel free to ask for > clarifications if something was not clear enough. I'm really sorry about that, for some reason gmail hid them as a quote. Erich

June 12, 2012

Re: [1/2] msxml3/tests: Reduce code duplication for the namespace change tests.

by Nikolay Sivov

On 6/12/2012 13:33, Ulrik Dickow wrote: > Den 12-06-2012 13:11, Nikolay Sivov skrev: >> On 6/12/2012 11:52, Ulrik Dickow wrote: >>> + /* create on element and try to alter namespace after that */ >>> + doc = (doc_version == 0 ? >>> + create_document(&IID_IXMLDOMDocument) : >>> + create_document_version(60, &IID_IXMLDOMDocument)); >>> + if (!doc) return; >> Please use something like CLSID array with every available Document >> CLSID, instead of only testing 2 of them. There's a lot of examples for >> that in saxreader.c. > Yes, that would be a good idea later on. But note that I didn't invent > this "only test 2 of them" thing. This first patch was meant as a tiny > structural improvement to the code, without changing _any_ functionality > at all (except that the line number info becomes a bit less useful). Sure, I'm not saying that it's your invention or that you're responsible for that, but since you're willing to change corresponding implementation it's better to have it fully tested and that means with all possible versions too. > >>> + test_namespaces_change(0); >>> + test_namespaces_change(60); >>> >>> free_bstrs(); >>> } >> It's better to avoid nested test calls like that imho, you could just >> add another call in main test list. > Yes, I considered that, but again would make this patch change as little > as possible, except for simplifying existing code. > > Ok, since I have to redo patch 2 anyway, I'll also make this improvement > to patch 1. Thanks.

June 12, 2012

Re: [2/2] msxml3: Support xmlns[:*] attribute nodes intelligently.

by Nikolay Sivov

On 6/12/2012 11:55, Ulrik Dickow wrote: > Patch 2 of 2 from http://bugs.winehq.org/show_bug.cgi?id=26226 . > > > > + /* Emit appropriate fixme or warning in case of unsupported or invalid namespace. > + * The W3C spec would like us to exit earlier for attempts to redefine the namespace for > + * the reserved "xmlns" attribute or prefix (http://www.w3.org/TR/xml-names/#ns-decl) > + * likehttp://gdome2.cs.unibo.it/gtk-doc/gdome2-gdomeelement.html#GDOME-EL-SETATTRIBUTENS, > + * but since native msxml3 accepts anything here, it's safest to just continue with warning. > + */ The question is more like what libxml2 thinks about that. If it follows w3c here which is likely the question will be - won't it break somewhere internally in libxml2 code if we hack it that way? > + if(namespaceURI && namespaceURI[0] && node_type != NODE_ELEMENT) > + { > + if(node_type == NODE_ATTRIBUTE) > + switch((!strcmpW(name, xmlnsW) || > + !strncmpW(name, xmlnscW, sizeof(xmlnscW)/sizeof(WCHAR))) + > + !strcmpW(namespaceURI, w3xmlns)) Could you please simplify that, it's a bit hard to read. > + * Note: We would be more in line with the native msxml if we only detected a > + * redundancy/conflict for prefixes existing on the element itself (in element->ns > + * or in the linked list element->nsDef). But as long as our *_get_xml() doesn't > + * eliminate redundant namespace definitions in children, this behaviour may be > + * an advantage in some cases. As disadvantage is that we incorrectly regard the > + * redefinition in element 'b' in '<a xmlns="x"><b xmlns="y"/></a>' as a conflict. > + * Libxml2 currently doesn't have a function or option to only search for namespaces > + * on the current node; but it would be easy to make a reduced version of xmlSearchNs > + * (currently defined inhttp://git.gnome.org/browse/libxml2/tree/tree.c#n5871) > + * However, most apps probably set the ns to y on node b creation, so no conflict here. > + * I don't think it's better to potentially break one thing while fixing the other. And I guess I like a thought on making xmlSearchNs version that will do what we want from it. Just to clarify - is that right that libxml2 problem here is a lack of some checks that lead to duplication and conflicts later? (that are visible in doc dumps too) > +/* Convenient helper function for creating an attribute node in a given namespace. > + * Note: CHECK_HR() should not be here, but in caller, to give optimal line number info. > + */ You mean EXPECT_HR here I guess. > +static HRESULT create_attribute_ns( > + IXMLDOMDocument *doc, > + const char *attr_name, > + const char *nsURI, > + IXMLDOMAttribute **attr_ptr) > +{ > + HRESULT hr; > + VARIANT var; > + IXMLDOMNode *node; > + > + V_VT(&var) = VT_I1; > + V_I1(&var) = NODE_ATTRIBUTE; > + > + hr = IXMLDOMDocument_createNode(doc, var,_bstr_(attr_name),_bstr_(nsURI), &node); > + if (hr == S_OK) > + { > + IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMAttribute, (void**) attr_ptr); > + IXMLDOMNode_Release(node); > + } > + return hr; > +} Please null out pointer in case of failure, or better always before createNode().

June 12, 2012

Re: [1/2] msxml3/tests: Reduce code duplication for the namespace change tests.

by Nikolay Sivov

On 6/12/2012 11:52, Ulrik Dickow wrote: > Patch 1 of 2 from http://bugs.winehq.org/show_bug.cgi?id=26226 . > > > > +static void test_namespaces_change(int doc_version) > +{ > + IXMLDOMDocument *doc; > + IXMLDOMElement *elem; > + IXMLDOMNode *node; > + > + VARIANT var; > + HRESULT hr; > + BSTR str; > + > + /* create on element and try to alter namespace after that */ > + doc = (doc_version == 0 ? > + create_document(&IID_IXMLDOMDocument) : > + create_document_version(60, &IID_IXMLDOMDocument)); > + if (!doc) return; Please use something like CLSID array with every available Document CLSID, instead of only testing 2 of them. There's a lot of examples for that in saxreader.c. > + test_namespaces_change(0); > + test_namespaces_change(60); > > free_bstrs(); > } It's better to avoid nested test calls like that imho, you could just add another call in main test list. > +static void test_namespaces_change(int doc_version) > +{ > + IXMLDOMDocument *doc; > + IXMLDOMElement *elem; > + IXMLDOMNode *node; ... > + > + IXMLDOMElement_Release(elem); > + IXMLDOMDocument_Release(doc); > +} > + When this is running on all CLSIDs please add free_bstrs() here.

June 12, 2012

Re: Command line parameters

by John Emmas

On 7 Jun 2012, at 21:43, Hin-Tak Leung wrote: > --- On Thu, 7/6/12, Dan Kegel <dank(a)kegel.com> wrote: > >> >> Example: >> wine notepad /home/dank/foo.txt >> This fails because notepad treats / as the beginning of an >> option (see http://source.winehq.org/source/programs/notepad/main.c#L616 >> ). >> >> So, no, Wine doesn't translate arguments for you. > > It would probably work in any of these though: > > z:/home/dank/foo.txt > h:/foo.txt > \\home\\dank\\foo.txt > h:\\foo.txt > > (the double backslash for its been interpreted by bash, or whatever shell you use) > Thanks Hin-Tak and Dan but I think we're at crossed purposes now. Remember that my original question had nothing to do with paths. I simply used paths as a convenient example. My question is about command-line parameters and (more specifically) about UTF-8 string conversion. Here's an example.... Consider a Windows user whose name is Göran. The UTF-8 byte sequence for this is:- 47 C3 B6 72 61 6E -- (6 bytes) whereas Windows would expect something like this (depending on the user's locale):- 47 F6 72 61 6E -- (5 bytes) Let's suppose that a Linux app launches a Windows child process (via Wine). The (Linux) host app needs to pass the string "Göran" as one of the command-line parameters. Linux uses UTF-8 and will therefore pass the first sequence of bytes to Wine (6 bytes). But Windows doesn't understand UTF-8. A Windows app would expect the second byte sequence (5 bytes - or 10 bytes for a Unicode app). Does Wine carry out the necessary conversion or does it simply pass the original byte string unmodified? That's what I'm trying to find out. Thanks. John

June 12, 2012

Re: configure.ac: Get the needed libs from cups-config (for OpenBSD)

by Alexandre Julliard

André Hentschel <nerv(a)dawncrow.de> writes: > Inspired by Matias Colli, see bug 17896. > I made sure it doesn't hurt on other OS and send it because it doesn't seem he will do it and it's a oneliner. It doesn't work for me on Debian testing, not without manually creating symlinks for the libs that cups-config requires. It sounds like OpenBSD should fix their libcups build. -- Alexandre Julliard julliard(a)winehq.org

June 12, 2012

Re: [1/2] msxml3/tests: Reduce code duplication for the namespace change tests.

by Ulrik Dickow

Den 12-06-2012 13:11, Nikolay Sivov skrev: > On 6/12/2012 11:52, Ulrik Dickow wrote: >> + /* create on element and try to alter namespace after that */ >> + doc = (doc_version == 0 ? >> + create_document(&IID_IXMLDOMDocument) : >> + create_document_version(60, &IID_IXMLDOMDocument)); >> + if (!doc) return; > Please use something like CLSID array with every available Document > CLSID, instead of only testing 2 of them. There's a lot of examples for > that in saxreader.c. Yes, that would be a good idea later on. But note that I didn't invent this "only test 2 of them" thing. This first patch was meant as a tiny structural improvement to the code, without changing _any_ functionality at all (except that the line number info becomes a bit less useful). >> + test_namespaces_change(0); >> + test_namespaces_change(60); >> >> free_bstrs(); >> } > It's better to avoid nested test calls like that imho, you could just > add another call in main test list. Yes, I considered that, but again would make this patch change as little as possible, except for simplifying existing code. Ok, since I have to redo patch 2 anyway, I'll also make this improvement to patch 1. >> +static void test_namespaces_change(int doc_version) >> +{ >> + IXMLDOMDocument *doc; >> + IXMLDOMElement *elem; >> + IXMLDOMNode *node; > ... >> + >> + IXMLDOMElement_Release(elem); >> + IXMLDOMDocument_Release(doc); >> +} >> + > When this is running on all CLSIDs please add free_bstrs() here. Sure, already done in my second patch, where I began slurping up a lot more bstrs in the function.

June 12, 2012

Re: [PATCH] ntprint: Do not fail when the spooler service was stopped

by Alexandre Julliard

Detlef Riekenberg <wine.dev(a)web.de> writes: > @@ -88,22 +92,25 @@ static void test_PSetupDestroyMonitorInfo(VOID) > { > HANDLE mi; > > - > SetLastError(0xdeadbeef); > pPSetupDestroyMonitorInfo(NULL); > - /* lasterror is returned */ > - trace("returned with %u\n", GetLastError()); > + /* lasterror is untouched */ > + ok(GetLastError() == 0xdeadbeef, "returned with 0x%x\n", GetLastError()); Testing last error on success is not useful. -- Alexandre Julliard julliard(a)winehq.org

June 12, 2012

Re: [PATCH 1/4] hhctrl.ocx: Add HTML to Unicode decoding capability (try 2).

by Jacek Caban

Hi Erich, On 06/11/12 21:01, Erich E. Hoover wrote: > Real Name: > Erich Hoover > > Description: > This patch adds the ability in HTML Help to convert HTML encoded > characters (e.g. ê) into the Unicode character equivalent. This > feature is needed by the table of contents and the index for > displaying international characters in some CHM files. With this > version of the patch the decoding is done manually by parsing the HTML > characters instead of using the web browser control. It is important > to note that HTML Help only supports characters within the ANSI code > pages, so support for multi-byte characters is not necessary. > > Changelog: > hhctrl.ocx: Add HTML to Unicode decoding capability. You didn't address most of my comments. Feel free to ask for clarifications if something was not clear enough. Jacek

June 12, 2012

Re: [1/4] msi/tests: Use only uppercase characters for the PID_REVNUMBER property.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=18972 Your paranoid android. === WNT4WSSP6 (32 bit install) === install.c:6053: Test failed: Per-user icon file isn't where it's expected (C:\WINNT\Profiles\Default User\Application Data\Microsoft\Installer\{7DF88A49-996F-4EC8-A022-BF956F9B2CBB}\testicon)

June 12, 2012