- wine-devel - winehq.org

Re: [PATCH] vbscript: Implemented RGB(try 2)
by Jacek Caban 23 Sep '14

23 Sep '14

On 09/20/14 11:27, Shuai Meng wrote: > diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c > index 311c892..14276c5 100644 > --- a/dlls/vbscript/global.c > +++ b/dlls/vbscript/global.c > @@ -112,9 +112,6 @@ static HRESULT return_short(VARIANT *res, short val) > > static HRESULT return_int(VARIANT *res, int val) > { > - if((short)val == val) > - return return_short(res, val); This really needs tests. I wrote them to review your patch, so I may submit them for you. > - > if(res) { > V_VT(res) = VT_I4; > V_I4(res) = val; > @@ -783,8 +780,28 @@ static HRESULT Global_UBound(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA > > static HRESULT Global_RGB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > { > - FIXME("\n"); > - return E_NOTIMPL; > + HRESULT hres; > + int i, total, color[3];/* color[0] for red, color[1] for green, color[2] for blue. */ > + > + TRACE("%s %s %s\n", debugstr_variant(arg), debugstr_variant(arg + 1), debugstr_variant(arg + 2)); > + > + assert(args_cnt == 3); > + > + for(i = 0; i < 3; i++) { > + hres = to_int(arg + i, color + i); > + if(FAILED(hres)) > + return hres; > + } > + > + for(i = 0; i < 3;i++) { Why do you need two loops? Can you do that in just one? > + if(color[i] > 255) > + color[i] = 255; > + if(color[i] < 0) > + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); > + } > + total = RGB(color[0], color[1], color[2]); > + > + return return_int(res, total); > } > > static HRESULT Global_Len(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs > index d688e17..f9c86f8 100644 > --- a/dlls/vbscript/tests/api.vbs > +++ b/dlls/vbscript/tests/api.vbs > @@ -1240,4 +1240,40 @@ Call ok(getVT(Log(CByte(2))) = "VT_R8", "getVT(Log(CByte(2))) = " & getVT(Log(CB > Call ok(getVT(Date) = "VT_DATE", "getVT(Date) = " & getVT(Date)) > Call ok(getVT(Time) = "VT_DATE", "getVT(Time) = " & getVT(Time)) > > +Sub testRGBError(arg1, arg2, arg3, error_num1, error_num2) > + on error resume next > + Dim x > + > + Call Err.clear() > + x = RGB(arg1, arg2, arg3) > + Call ok(Err.number = error_num1, "Err.number1 = " & Err.number) > + > + Call Err.clear() > + Call RGB(arg1, arg2, arg3) > + Call ok(Err.number = error_num2, "Err.number2 = " & Err.number) If error codes are equal in all cases, you don't need two separated error_num* arguments. > +End Sub > + > +Call ok(RGB(-0.5, -0.5, -0.5) = 0, "RGB(-0.5, -0.5, -0.5) = " & RGB(-0.5, -0.5, -0.5)) > +Call ok(getVT(RGB(-0.5, -0.5, -0.5)) = "VT_I4", "getVT(RGB(-0.5, -0.5, -0.5)) = " & getVT(RGB(-0.5, -0.5, -0.5))) > +Call ok(RGB(0, 0, 0) = 0, "RGB(0, 0, 0) = " & RGB(0, 0, 0)) > +Call ok(getVT(RGB(0, 0, 0)) = "VT_I4", "getVT(RGB(0, 0, 0)) = " & getVT(RGB(0, 0, 0))) > +Call ok(RGB(0.49, 0.49, 0.49) = 0, "RGB(0.49, 0.49, 0.49) = " & RGB(0.49, 0.49, 0.49)) > +Call ok(getVT(RGB(0.49, 0.49, 0.49)) = "VT_I4", "getVT(RGB(0.49, 0.49, 0.49)) = " & getVT(RGB(0.49, 0.49, 0.49))) > +Call ok(RGB(0.5, 0.5, 0.5) = 0, "RGB(0.5, 0.5, 0.5) = " & RGB(0.5, 0.5, 0.5)) > +Call ok(getVT(RGB(0.5, 0.5, 0.5)) = "VT_I4", "getVT(RGB(0.5, 0.5, 0.5)) = " & getVT(RGB(0.5, 0.5, 0.5))) > +Call ok(RGB(1, 1, 1) = 65793, "RGB(1, 1, 1) = " & RGB(1, 1, 1)) This would be a lot cleaner if you used hex constant (it's &hXXXX& in vbscript). > +Call ok(getVT(RGB(1, 1, 1)) = "VT_I4", "getVT(RGB(1, 1, 1)) = " & getVT(RGB(1, 1, 1))) > +Call ok(RGB(1.49, 1.49, 1.49) = 65793, "RGB(1.49, 1.49, 1.49) = " & RGB(1.49, 1.49, 1.49)) > +Call ok(getVT(RGB(1.49, 1.49, 1.49)) = "VT_I4", "getVT(RGB(1.49, 1.49, 1.49)) = " & getVT(RGB(1.49, 1.49, 1.49))) > +Call ok(RGB(2, 2, 2) = 131586, "RGB(2, 2, 2) = " & RGB(2, 2, 2)) > +Call ok(getVT(RGB(2, 2, 2)) = "VT_I4", "getVT(RGB(2, 2, 2)) = " & getVT(RGB(2, 2, 2))) > +Call ok(RGB(255, 255, 255) = 16777215, "RGB(255, 255, 255) = " & RGB(255, 255, 255)) > +Call ok(getVT(RGB(255, 255, 255)) = "VT_I4", "getVT(RGB(255, 255, 255)) = " & getVT(RGB(255, 255, 255))) > +Call ok(RGB(256, 256, 256) = 16777215, "RGB(256, 256, 256) = " & RGB(256, 256, 256)) > +Call ok(getVT(RGB(256, 256, 256)) = "VT_I4", "getVT(RGB(256, 256, 256)) = " & getVT(RGB(256, 256, 256))) > +Call ok(RGB("255", "255", "255") = 16777215, "RGB(""255"", ""255"", ""255"") = " & RGB("255", "255", "255")) > +Call ok(getVT(RGB("255", "255", "255")) = "VT_I4", "getVT(RGB(""255"", ""255"", ""255"")) = " & getVT(RGB("255", "255", "255"))) R=G=B in all your tests, so you don't really check if those are correctly handled. Please add tests where all those are different. Jacek

3 4

Re: user32: Return early on child windows in DrawMenuBar
by Marvin 23 Sep '14

23 Sep '14

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=9017 Your paranoid android. === w7u (32 bit msg) === msg.c:12111: Test failed: unexpected hwnd 0014013C msg.c:12133: Test failed: bad time 308e5/308f5

1 0

Re: [PATCH 5/5] d3d8/tests: Extend focus loss tests.
by Marvin 23 Sep '14

23 Sep '14

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=9015 Your paranoid android. === w8 (32 bit device) === device.c:2398: Test failed: Expected foreground window 000301E2, got 0002004C. device.c:3040: Test failed: Expected wndproc 0x412cf0, got 0x412cf0.

1 0

Re: [PATCH 4/5] d3d9/tests: Extend focus loss tests.
by Marvin 23 Sep '14

23 Sep '14

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=9014 Your paranoid android. === wvistau64 (32 bit d3d9ex) === d3d9ex: unhandled exception c0000005 at 00000000 === w2008s64 (32 bit d3d9ex) === d3d9ex: unhandled exception c0000005 at 00000000 === w7u (32 bit d3d9ex) === d3d9ex: unhandled exception c0000005 at 00000000 === wvistau64 (64 bit d3d9ex) === d3d9ex: unhandled exception c0000005 at 0000000000000000 === w2008s64 (64 bit d3d9ex) === d3d9ex: unhandled exception c0000005 at 0000000000000000

1 0

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

23 Sep '14

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 23 Sep '14

23 Sep '14

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 22 Sep '14

22 Sep '14

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 22 Sep '14

22 Sep '14

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 22 Sep '14

22 Sep '14

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 21 Sep '14

21 Sep '14

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 21 Sep '14

21 Sep '14

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 20 Sep '14

20 Sep '14

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 19 Sep '14

19 Sep '14

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 19 Sep '14

19 Sep '14

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 19 Sep '14

19 Sep '14

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 19 Sep '14

19 Sep '14

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 19 Sep '14

19 Sep '14

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 19 Sep '14

19 Sep '14

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 18 Sep '14

18 Sep '14

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 18 Sep '14

18 Sep '14

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 17 Sep '14

17 Sep '14

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 17 Sep '14

17 Sep '14

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 17 Sep '14

17 Sep '14

-----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 17 Sep '14

17 Sep '14

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 17 Sep '14

17 Sep '14

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 16 Sep '14

16 Sep '14

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 15 Sep '14

15 Sep '14

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 15 Sep '14

15 Sep '14

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 15 Sep '14

15 Sep '14

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

Re: [PATCH 5/8] Revert "wined3d: Restore the pixel format of the window whose pixel format was actually changed."
by Ken Thomases 15 Sep '14

15 Sep '14

It seems I accidentally sent this one twice. Please ignore the duplicate, but the series should be OK otherwise. -Ken On Sep 14, 2014, at 7:47 PM, Ken Thomases <ken(a)codeweavers.com> wrote: > > This reverts commit 4c4552c5a1910a9d5adf8eccff0ac62d89ffe376. > > For: > https://bugs.winehq.org/show_bug.cgi?id=35655 > https://bugs.winehq.org/show_bug.cgi?id=35718 > https://bugs.winehq.org/show_bug.cgi?id=35950 > https://bugs.winehq.org/show_bug.cgi?id=35975 > https://bugs.winehq.org/show_bug.cgi?id=36900 > --- > dlls/wined3d/context.c | 87 +++++++++++------------------------------- > dlls/wined3d/wined3d_private.h | 1 - > 2 files changed, 22 insertions(+), 66 deletions(-) > > <0005-Revert-wined3d-Restore-the-pixel-format-of-the-windo.patch>

1 0

Re: wininet: Avoid compiler warnings due to negation before binary operator. (RESEND)
by Alexandre Julliard 12 Sep '14

12 Sep '14

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > As of last week, what will become GCC 5.0 does warn about this as > part of -Wall. > > There are a couple of cases in Wine, such as this, which I'd like > to address. Please find a way that doesn't make the code unnecessarily ugly. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/8] riched20: Stub for ITextRange interface and implement ITextDocument::Range. (try 5)
by Huw Davies 12 Sep '14

12 Sep '14

On Fri, Sep 12, 2014 at 08:33:29PM +0800, Jactry Zeng wrote: > Thanks Huw and Sebastian. > > Superseded patch 106499. > > ChangeLog: > try 5: > - Alloc txtRge in CreateITextRange() > try 4: > - Simplify with macros in include/wine/list.h > - Using LONG instead of int in This->start and This->end > - Limit cp1 to (0, TextLength) > --- > dlls/riched20/richole.c | 730 > +++++++++++++++++++++++++++++++++++++++++- > dlls/riched20/tests/richole.c | 35 +- > 2 files changed, 762 insertions(+), 3 deletions(-) This first one looks ok to me. You'll need to re-send the rest of the series, but it would be better to wait until this gets in. Huw.

1 0

Re: [PATCH 1/8] riched20: Stub for ITextRange interface and implement ITextDocument::Range. (resend try 4)
by Huw Davies 12 Sep '14

12 Sep '14

On Thu, Sep 11, 2014 at 05:35:38PM +0800, Jactry Zeng wrote: > +static HRESULT CreateITextRange(IRichEditOleImpl *reOle, LONG start, LONG end, > + ITextRangeImpl *txtRge, ITextRange** ppRange) > +{ > + txtRge->ITextRange_iface.lpVtbl = &trvt; > + txtRge->ref = 1; > + txtRge->reOle = reOle; > + txtRge->start = start; > + txtRge->end = end; > + list_add_head(&reOle->rangelist, &txtRge->entry); > + *ppRange = &txtRge->ITextRange_iface; > + return S_OK; > +} This looks very suspicious to me. You're storing a reference to 'reOle' so you should AddRef it somewhere. It may be better to pass the interface ptr, AddRef and store that. Also, is the purpose of rangelist just to be able to NULL out reOle when the parent object is destroyed? If so, this can go away if you correctly handle the ref counting. Huw.

3 13

Re: reg: Add reg.exe test suite. (try 3)
by Marvin 11 Sep '14

11 Sep '14

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=8896 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: dpnet/tests: Make test_lobbyclient() static.
by Marvin 11 Sep '14

11 Sep '14

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=8895 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/8] riched20: Implement ITextSelection::GetChar and ITextRange::GetChar. (resend try2)
by Marvin 11 Sep '14

11 Sep '14

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=8888 Your paranoid android. === wxppro (32 bit richole) === Failure running script in VM: Timed out in create_socket while connecting to testnet.winehq.org:22001:10.42.42.134:4242

1 0

Re: reg: Add reg.exe test suite. (try 2)
by Alexandre Julliard 10 Sep '14

10 Sep '14

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > Try 2: > - Avoid memory allocation in run_reg_exe_ function. > - Add more broken tests in WinXP. > - Compare the exit code outside of run_reg_exe function. > - Introduce REG_EXIT_SUCCESS/REG_EXIT_FAILURE constant and use it. It fails here on 64-bit: ../../../../wine/tools/runtest -q -P wine -T ../../.. -M reg.exe -p reg.exe_test.exe.so reg && touch reg.ok reg.c:180: Test succeeded inside todo block: got wrong data make: *** [reg.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [2/3]dwrite: build non-system font collections as a list of font families
by Nikolay Sivov 10 Sep '14

10 Sep '14

On 09/09/2014 04:10 AM, Aric Stewart wrote: > @@ -920,6 +939,8 @@ static UINT32 WINAPI dwritefontcollection_GetFontFamilyCount(IDWriteFontCollecti > { > struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); > TRACE("(%p)\n", This); > + if (This->family_count) > + return This->family_count; > return This->count; This looks particularly suspicious, probably naming needs some work. Other parts need to be improved as well I think, like avoiding impl_from_* in your own internal functions.

1 0

Re: mshtml: Bind events to document node instead of body element.
by Marvin 10 Sep '14

10 Sep '14

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=8870 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: reg: Add reg.exe test suite.
by Marvin 09 Sep '14

09 Sep '14

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=8862 Your paranoid android. === wxppro (32 bit reg) === reg.c:132: Test failed: got exit code 0, expected 1

1 0

Re: dxguid: Add dvoice.h
by Alexandre Julliard 09 Sep '14

09 Sep '14

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > Hi, > > > Changelog: > dxguid: Add dvoice.h There shouldn't be any need to do that. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: (try 7)[1/5] imm32: Move thread data from TLSEntry to an internal list
by Alexandre Julliard 09 Sep '14

09 Sep '14

Aric Stewart <aric(a)codeweavers.com> writes: > + if (thread_data->defaultContext) /* someone beat us */ > + IMM_DestroyContext(defaultContext); I don't think you should be doing that inside the thread lock. > + IMMThreadData* thread_data = IMM_GetThreadData(0); > + if (thread_data->hwndDefault == NULL) > + thread_data->hwndDefault = CreateWindowExW( WS_EX_TOOLWINDOW, That one is suspicious too. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [2/3] wineps.drv: Allow text copy paste from print to pdf
by Huw Davies 09 Sep '14

09 Sep '14

On Mon, Sep 08, 2014 at 09:19:54PM -0700, Daniel Horn wrote: > -void get_glyph_name(HDC hdc, WORD index, char *name) > +void get_glyph_name(HDC hdc, BOOL unicode, WORD index, char *name) > { > - /* FIXME */ > - sprintf(name, "g%04x", index); > + if(unicode) > + sprintf(name, "uni%04X", index); > + else > + sprintf(name, "g%04x", index); > return; > } The right way to do this is to look up the glyph's name in the font's 'post' table. Huw.

1 0

Re: [1/3] wineps.drv: Avoid marking composite unicode subglyphs as downloaded (resend)
by Huw Davies 09 Sep '14

09 Sep '14

On Mon, Sep 08, 2014 at 09:18:51PM -0700, Daniel Horn wrote: > Fixes a bug with caching composite unicode glyphs (if a ñ came before any n in the document, > then all subsequent n's would appear as a box) > This was because the glyph was marked as having been sent down when it was only a component > of a more complex glyph This shouldn't be necessary, I suspect something else is going wrong. If the 'n' has been downloaded as part of a 'ñ' then it really shouldn't be necessary to download the 'n' again. Huw.

2 2

Re: [PATCH 1/4] mshtml: Return E_POINTER when p is NULL in HTMLStyle_get_pixelLeft.
by Jacek Caban 09 Sep '14

09 Sep '14

Hi Jactry, On 09/09/14 08:06, Jactry Zeng wrote: > diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c > index f098cb0..9469243 100644 > --- a/dlls/mshtml/htmlstyle.c > +++ b/dlls/mshtml/htmlstyle.c > @@ -2482,6 +2482,8 @@ static HRESULT WINAPI HTMLStyle_get_pixelLeft(IHTMLStyle *iface, LONG *p) > HTMLStyle *This = impl_from_IHTMLStyle(iface); > > TRACE("(%p)->(%p)\n", This, p); > + if(!p) > + return E_POINTER; Since you're adding those checks to many functions, it would probably make sense to move that to get_nsstyle_pixel_val. Jacek

2 1

Re: [PATCH 1/11] ntdll: Make nt_to_unix_file_name_attr return always safe to free.
by Alexandre Julliard 09 Sep '14

09 Sep '14

"Erich E. Hoover" <erich.e.hoover(a)gmail.com> writes: > While working on an upcoming patch set I discovered that several of > the file handling primitives are not safe to free under all > circumstances. This would not normally be a problem (since a > comparison can usually be made against STATUS_SUCCESS). However, > there are several cases where this comparison is insufficient (mostly > when STATUS_NO_SUCH_FILE occurs). There are two ways to solve this > problem: > 1) Make these routines always safe to free (and always free them) > 2) Specifically add checks for STATUS_NO_SUCH_FILE and free all these > cases manually STATUS_NO_SUCH_FILE returning a valid string only happens when trying to create the file or things like that, not for normal opens, so most of your changes are unnecessary. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 4/4] mshtml: Add IHTMLStyle::pixelTop property implementation.
by Marvin 09 Sep '14

09 Sep '14

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=8853 Your paranoid android. === wxppro (32 bit style) === style.c:1295: Test failed: pixelHeight = 5 === wvistau64 (32 bit style) === style.c:1295: Test failed: pixelHeight = 5 === w2008s64 (32 bit style) === style.c:1295: Test failed: pixelHeight = 5 === w7u (32 bit style) === style.c:1295: Test failed: pixelHeight = 5 === w8 (32 bit style) === style.c:1295: Test failed: pixelHeight = 5 === wvistau64 (64 bit style) === style.c:1295: Test failed: pixelHeight = 5 === w2008s64 (64 bit style) === style.c:1295: Test failed: pixelHeight = 5

1 0

Re: [PATCH 3/4] mshtml: Add IHTMLStyle::pixelHeight property implementation.
by Marvin 09 Sep '14

09 Sep '14

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=8852 Your paranoid android. === wxppro (32 bit style) === style.c:1274: Test failed: pixelHeight = 5 === wvistau64 (32 bit style) === style.c:1274: Test failed: pixelHeight = 5 === w2008s64 (32 bit style) === style.c:1274: Test failed: pixelHeight = 5 === w7u (32 bit style) === style.c:1274: Test failed: pixelHeight = 5 === w8 (32 bit style) === style.c:1274: Test failed: pixelHeight = 5 === wvistau64 (64 bit style) === style.c:1274: Test failed: pixelHeight = 5 === w2008s64 (64 bit style) === style.c:1274: Test failed: pixelHeight = 5

1 0

Re: user32: Also set cch member in GetMenuItemInfo when passing a null pointer.
by Nikolay Sivov 08 Sep '14

08 Sep '14

A test would be nice.

1 0

Re: (resend 2)[1/4]dwrite: Implement GetInformationalStrings
by Alexandre Julliard 08 Sep '14

08 Sep '14

Aric Stewart <aric(a)codeweavers.com> writes: > read strings from OpenType 'name' table You are not reading anything, once again this is mostly dead code. -- Alexandre Julliard julliard(a)winehq.org

1 0

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-devel