September 2014 - Wine-Devel

Re: wineps.drv: Fix bug using different enumeration value on user defined printer page sizes for printers using the same ppd.
by Huw Davies Sept. 23, 2014

Sept. 23, 2014

On Tue, Sep 23, 2014 at 11:09:39AM +0200, Ralf Habacker wrote: > diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c > index 520355a..b440da0 100644 > --- a/dlls/wineps.drv/ppd.c > +++ b/dlls/wineps.drv/ppd.c > @@ -179,7 +179,6 @@ static const struct { > {NULL, 0} > }; > > -static WORD UserPageType = DMPAPER_USER; > static WORD UserBinType = DMBIN_USER; > > /*********************************************************************** > @@ -695,6 +694,7 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer ) > char *def_pagesize_override = NULL, *def_duplex_override = NULL; > PAGESIZE *page, *page_cursor2; > struct map_context c; > + WORD UserPageType = DMPAPER_USER; > Right, but you want to move UserBinType too. Also, your commit message isn't great. Huw.

1 0

Re: [3/3] dpvoice: Add DirectPlay Voice Test
by Marvin Sept. 23, 2014

Sept. 23, 2014

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 https://testbot.winehq.org/JobDetails.pl?Key=9013 Your paranoid android. === w2000pro (32 bit voice) === voice.c:237: Test failed: Voice Connect failed with 0x80150183 === wxppro (32 bit voice) === voice.c:237: Test failed: Voice Connect failed with 0x80150183

1 0

Re: wined3d: Correctly display fog for right-handed projection matrix (try 2)
by Henri Verbeet Sept. 22, 2014

Sept. 22, 2014

On 18 September 2014 21:57, Joachim Priesner <joachim.priesner(a)web.de> wrote: > When using a right-handed projection matrix, z coordinates of vertices may be negative. This is not considered in the code generating the GLSL fog shader. The patch fixes that and adds a test. > The patch is likely correct, but the test has room for improvement. For example, it doesn't currently distinguish between using the absolute fog coordinate in the vertex shader or doing the same in the fragment shader. Also, please don't forget about ddraw and d3d8.

3 3

Re: vbscript: Don't try to convert int to short in return_int.
by Marvin Sept. 22, 2014

Sept. 22, 2014

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 https://testbot.winehq.org/JobDetails.pl?Key=8999 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH] mshtml: add anchor element put_query and get_query
by Marvin Sept. 22, 2014

Sept. 22, 2014

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 https://testbot.winehq.org/JobDetails.pl?Key=8998 Your paranoid android. === w2000pro (32 bit dom) === dom.c:7368: Test failed: search = (null), expected ?word=abc dom.c:7379: Test failed: href = L"http://test/word=abc?how?old=are", expected http://test/?how?old=are#hash dom.c:7379: Test failed: value = L"http://test/word=abc?how?old=are", expected http://test/?how?old=are#hash

1 0

Re: [PATCH] dwrite: use correct variable (Coverity)
by Nikolay Sivov Sept. 21, 2014

Sept. 21, 2014

On 9/21/2014 16:35, Marcus Meissner wrote: > 1232720 Mixing enum types > > these are actually different values. > --- > dlls/dwrite/tests/font.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c > index 3a17064..fe4eb4b 100644 > --- a/dlls/dwrite/tests/font.c > +++ b/dlls/dwrite/tests/font.c > @@ -957,7 +957,7 @@ static void test_FontLoader(void) > ok(face == DWRITE_FONT_FACE_TYPE_UNKNOWN, "got %i\n", face); > ok(count == 0, "got %i\n", count); > > - hr = IDWriteFactory_CreateFontFace(factory, type, 1, &ffile, 0, 0, &fface); > + hr = IDWriteFactory_CreateFontFace(factory, face, 1, &ffile, 0, 0, &fface); > ok(hr == 0x8faecafe, "got 0x%08x\n", hr); > IDWriteFontFile_Release(ffile); > It's supposed to be DWRITE_FONT_FACE_TYPE_CFF (it is now) or DWRITE_FONT_FACE_TYPE_TRUETYPE.

2 1

Re: [PATCH] dwrite: use correct variable (Coverity)
by Marvin Sept. 21, 2014

Sept. 21, 2014

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 https://testbot.winehq.org/JobDetails.pl?Key=8996 Your paranoid android. === wvistau64 (32 bit font) === font.c:961: Test failed: got 0x80070057 === w2008s64 (32 bit font) === font.c:961: Test failed: got 0x80070057 === w7u (32 bit font) === font.c:961: Test failed: got 0x80070057 === w8 (32 bit font) === font.c:961: Test failed: got 0x80070057 === wvistau64 (64 bit font) === font.c:961: Test failed: got 0x80070057 === w2008s64 (64 bit font) === font.c:961: Test failed: got 0x80070057

1 0

Re: [PATCH] vbscript: Implemented RGB(try 2)
by Marvin Sept. 20, 2014

Sept. 20, 2014

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 https://testbot.winehq.org/JobDetails.pl?Key=8993 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH] vbscript: Implemented RGB
by Nikolay Sivov Sept. 19, 2014

Sept. 19, 2014

On 09/18/2014 08:46 PM, Shuai Meng wrote: > + LONG total, color[3];//color[0] for red, color[1] for green, color[2] for blue. This could be just 'int', as you use to_int(). > static HRESULT return_int(VARIANT *res, int val) > { > - if((short)val == val) > - return return_short(res, val); > - That's a questionable thing to do as it affects all other places where this helper is used. > + if(color[i] > 255) > + color[i] = 255; This needs a test too. > + total = color[0] + 256 * color[1] + 256 * 256 * color[2]; RGB() macro does the same thing.

4 6

Re: [3/3] gdiplus: Add a more optimized loop for composing onto PARGB.
by Andrew Eikum Sept. 19, 2014

Sept. 19, 2014

On Fri, Sep 19, 2014 at 11:28:13AM -0500, Vincent Povirk wrote: > + else if ((fg & 0xff000000) == 0xff) This will never be true. Andrew

2 1

Re: [PATCH 1/2] riched20: Stub for ITextFont interface and implement ITextRange::GetFont. (try 3)
by Huw Davies Sept. 19, 2014

Sept. 19, 2014

On Fri, Sep 19, 2014 at 08:58:51PM +0800, Jactry Zeng wrote: > dlls/riched20/richole.c | 786 > +++++++++++++++++++++++++++++++++++++++++- > dlls/riched20/tests/richole.c | 47 +++ > 2 files changed, 831 insertions(+), 2 deletions(-) These two look good to me. Huw.

1 0

Re: rpcrt4: Fix buffer size calculation for arrays with embedded pointers
by Huw Davies Sept. 19, 2014

Sept. 19, 2014

On Thu, Sep 18, 2014 at 02:29:07PM +0200, Eric Kohl wrote: > I finally found the bug in the function EmbeddedPointerBufferSize where > the pointer to the current array element was not incremented while the > surrounding for loop traversed the array. The pointer was always > pointing at the first element of the array. I also found the same bug in > the function EmbeddedPointerMarshall. Perhaps also EmbeddedPointerFree? We probably need some tests. Huw.

1 1

Re: [PATCH 1/2] riched20: Stub for ITextFont interface and implement ITextRange::GetFont. (try 2)
by Huw Davies Sept. 19, 2014

Sept. 19, 2014

On Thu, Sep 18, 2014 at 09:15:11PM +0800, Jactry Zeng wrote: > +static IRichEditOleImpl *get_reOle(ITextFontImpl *txtFont) > +{ > + if (txtFont->txtRge) > + return txtFont->txtRge->reOle; > + else > + return txtFont->txtSel->reOle; > +} You're using two-space indents here, while the rest is four-space. A couple of these have sneaked in in earlier patches too - make sure your editor is set up correctly! > +static HRESULT CreateITextFont(ITextFontImpl **ptxtFont) > +{ > + ITextFontImpl *txtFont = NULL; This initialization isn't very useful. > + txtFont = heap_alloc(sizeof(ITextFontImpl)); > + if (!txtFont) > + return E_OUTOFMEMORY; > + > + txtFont->ITextFont_iface.lpVtbl = &tfvt; > + txtFont->ref = 1; > + *ptxtFont = txtFont; > + return S_OK; > +} It would make more sense to initialize txtSel and txtRge to NULL here - the caller then only needs to touch the one it needs. Otherwise, this one and the next one look good to me. Huw.

2 1

Re: [PATCH] vbscript: Implemented RGB
by Qian Hong Sept. 19, 2014

Sept. 19, 2014

Hi Shuai, Please don't use C++ style comment, see: http://wiki.winehq.org/DeveloperFaq#head-24502845ecdabaeb82c82889a665c445d8… https://www.winehq.org/site/docs/winedev-guide/style-notes

2 1

Re: wined3d: Correctly display fog for right-handed projection matrix
by Bruno Jesus Sept. 18, 2014

Sept. 18, 2014

On Thu, Sep 18, 2014 at 3:30 PM, Joachim Priesner <joachim.priesner(a)web.de> wrote: > + // A right-handed perspective projection matrix designed so that vertices > + // (x in [-1..1], y in [-1..1], z = 0.1) will be mapped to the view plane. > + // Obtained from D3DXMatrixPerspectiveFovRH with the parameters > + // fov=84.29deg, aspect=640/480 near=0.01, far=100 Hi, Joachim. Please don't use C++ style comments, see: http://wiki.winehq.org/DeveloperFaq#head-24502845ecdabaeb82c82889a665c445d8… https://www.winehq.org/site/docs/winedev-guide/style-notes

1 0

Re: [PATCH] vbscript: Implemented RGB
by Marvin Sept. 18, 2014

Sept. 18, 2014

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 https://testbot.winehq.org/JobDetails.pl?Key=8974 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 4/5] riched20: Stub for ITextFont interface and implement ITextRange::GetFont.
by Huw Davies Sept. 17, 2014

Sept. 17, 2014

On Wed, Sep 17, 2014 at 05:39:23PM +0800, Jactry Zeng wrote: > > +typedef struct ITextFontImpl { > + ITextFont ITextFont_iface; > + LONG ref; > + struct list entry; > + > + IRichEditOleImpl *reOle; > + ITextRangeImpl *txtRge; > + ITextSelectionImpl *txtSel; > +} ITextFontImpl; Since the ITextFont objects do hold a ref on their parent range / selection objects I don't think we need the list stuff again. I wouldn't store the reOle pointer here, but use txtRge / txtSel to access it (and check for disconnections). You probably want a helper function to do that. Huw.

2 1

Re: [PATCH 4/5] riched20: Implement ITextRange::Collapse. (try 2)
by Indrek Altpere Sept. 17, 2014

Sept. 17, 2014

This seems to be a typo, I think the original variable name was mean to be isedge or is_edge. Perhaps this check would be simpler to understand and would not create local variable if it were like this? if (*end == *start) return S_FALSE; Regards, Indrek

3 2

Re: winedbg: Respect TMPDIR environment variable
by Michael Stefaniuc Sept. 17, 2014

Sept. 17, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 09/16/2014 09:25 PM, André Hentschel wrote: > First attack on https://bugs.winehq.org/show_bug.cgi?id=14838 > > diff --git a/programs/winedbg/gdbproxy.c > b/programs/winedbg/gdbproxy.c index 0865f44..d7596a0 100644 --- > a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ > -2342,11 +2342,13 @@ static BOOL gdb_exec(const char* wine_path, > unsigned port, unsigned flags) { char buf[MAX_PATH]; int > fd; - const char* gdb_path; + const char *gdb_path, > *tmp_path; FILE* f; > > if (!(gdb_path = getenv("WINE_GDB"))) gdb_path = "gdb"; - > strcpy(buf,"/tmp/winegdb.XXXXXX"); + if (!(tmp_path = > getenv("TMPDIR"))) tmp_path = "/tmp"; + strcpy(buf, tmp_path); + > strcat(buf, "/winegdb.XXXXXX"); Just wondering, as we already have the .wine-$UID directory in TMPDIR shouldn't this file be placed in that directory too? > fd = mkstemps(buf, 0); if (fd == -1) return FALSE; if ((f = > fdopen(fd, "w+")) == NULL) return FALSE; > bye michael -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) iD8DBQFUGVSO0ei8kcpE1VERAgC/AJ9Ow9H7xnu/qQ3VYlh49BXOgG75pACePrh7 aLhMgo8NZ7EhpQCB2cs8NnY= =OHEq -----END PGP SIGNATURE-----

1 0

Re: [PATCH 4/5] riched20: Implement ITextRange::Collapse. (try 2)
by Huw Davies Sept. 17, 2014

Sept. 17, 2014

On Tue, Sep 16, 2014 at 06:39:32PM +0800, Jactry Zeng wrote: > +static HRESULT range_Collapse(LONG bStart, LONG *start, LONG *end) > +{ > + BOOL isdege = !(*end - *start); This is a strange way to test for an equality! Also, isdegen or is_degen would be much better choices for the variable name. Huw.

1 1

Re: [PATCH 3/5] riched20: Implement ITextRange::GetDuplicate. (try 3)
by Huw Davies Sept. 17, 2014

Sept. 17, 2014

On Tue, Sep 16, 2014 at 06:39:20PM +0800, Jactry Zeng wrote: > + hres = CreateITextRange(This->reOle, This->start, This->end, ppRange); > + if (FAILED(hres)) > + return E_FAIL; > + return hres; Actually since CreateITextRange can only fail in out-of-memory cases we can't easily test this behaviour and there's no guarantee that the docs are correct anyway. So just return CreateITextRange(..) here would be cleaner. Huw.

1 0

Re: [PATCH 4/8] riched20: Implement ITextRange::GetDuplicate. (try 2)
by Huw Davies Sept. 16, 2014

Sept. 16, 2014

On Fri, Sep 12, 2014 at 08:33:42PM +0800, Jactry Zeng wrote: > diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c > index a88aff2..b85ffda 100644 > --- a/dlls/riched20/richole.c > +++ b/dlls/riched20/richole.c > + hres = CreateITextRange(This->reOle, This->start, This->end, ppRange); > + if(hres) > + return E_FAIL; This isn't the way to test for failure. Use the FAILED() macro. Huw.

2 1

Re: [PATCH 1/2] riched20: Implement ITextRange::GetChar.
by Alexandre Julliard Sept. 15, 2014

Sept. 15, 2014

Jactry Zeng <wine(a)jactry.com> writes: > +#define TEST_TXTRGE_GETCHAR(first, lim, expected_char) \ > + create_interfaces(&w, &reOle, &txtDoc, NULL); \ > + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); \ > + ITextDocument_Range(txtDoc, first, lim, &txtRge); \ > + pch = 0xdeadbeef; \ > + hres = ITextRange_GetChar(txtRge, &pch); \ > + ok(hres == S_OK, "ITextRange_GetChar\n"); \ > + ok(pch == expected_char, "got wrong char: %c\n", pch); \ > + ITextRange_Release(txtRge); \ > + release_interfaces(&w, &reOle, &txtDoc, NULL); Please avoid that sort of huge macro. If necessary, use helper functions instead. -- Alexandre Julliard julliard(a)winehq.org

2 1

Problem with CompareString/CompareStringEx - accented characters
by Virgo Pärna Sept. 15, 2014

Sept. 15, 2014

I have been trying to figure out, what is wrong with wine's implementation of CompareString and CompareStringEx functions. From what I can figure out, those functions completely ignore locale passed to them. That alone is not a critical issue, but what causes problems to me, is that it seems always act, as if NORM_IGNORENONSPACE was passed (comparision shows, that A and Ä are same). I did try to rip relavent parts out of wine for test utility and it seems, that A and Ä have same value in collation_table which is used by compare_diacritic_weights. Could it be, that the make_unicode's READ_SORTKEYS_FILE looses relavent information, when generating collation.c file? My perl is even worse than my C, so figuring out those regexes is way beyond me. I did spam https://bugs.winehq.org/show_bug.cgi?id=9583 with my analysis. -- Virgo Pärna virgo.parna(a)mail.ee

1 0

Re: [PATCH 6/8] d3d8: Mark tests which no longer pass due to reverts as todo_wine.
by Marvin Sept. 14, 2014

Sept. 14, 2014

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 https://testbot.winehq.org/JobDetails.pl?Key=8913 Your paranoid android. === w8 (32 bit device) === device.c:2398: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3040: Test failed: Expected wndproc 0x412cf0, got 0x412cf0.

2 1