September 2014 - Wine-Devel

Re: [PATCH] jscript: Implemented conditional compilation support for @if, @elif, @else and @end keywords.
by Marvin Sept. 26, 2014

Sept. 26, 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=9084 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 (try 3)
by Marvin Sept. 25, 2014

Sept. 25, 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=9072 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 10/10] ddraw/tests: Test focus loss style changes.
by Marvin Sept. 25, 2014

Sept. 25, 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=9071 Your paranoid android. === w8 (32 bit ddraw1) === ddraw1.c:1318: Test failed: Expected color 0x00ff0000 for test 0, got 0x0000ff00. ddraw1.c:1340: Test failed: Expected color 0x000000ff for test 0, got 0x0000ff00.

1 0

Re: [PATCH 09/10] d3d/tests: Add focus loss style tests.
by Marvin Sept. 25, 2014

Sept. 25, 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=9070 Your paranoid android. === w2000pro (32 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6. === wxppro (32 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6. === wvistau64 (32 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6. === w2008s64 (32 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6. === w7u (32 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6. === wvistau64 (64 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6. === w2008s64 (64 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6.

1 0

Re: [PATCH 09/10] d3d/tests: Add focus loss style tests.
by Marvin Sept. 25, 2014

Sept. 25, 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=9069 Your paranoid android. === w2000pro (32 bit device) === device.c:2193: Test failed: Got unexpected wparam 0 for message 6. === wxppro (32 bit device) === device.c:2193: Test failed: Got unexpected wparam 0 for message 6. === wvistau64 (32 bit device) === device.c:2193: Test failed: Got unexpected wparam 0 for message 6. === w2008s64 (32 bit device) === device.c:2193: Test failed: Got unexpected wparam 0 for message 6. === w7u (32 bit device) === device.c:2193: Test failed: Got unexpected wparam 0 for message 6. === w8 (32 bit device) === device.c:2388: Test failed: Expected message 0x6 for window 0x1, but didn't receive it. device.c:2393: Test failed: The focus window is active. device.c:2426: Test failed: Expected message 0x6 for window 0x1, but didn't receive it.

1 0

Re: [PATCH 08/10] d3d/tests: Additional swapchains are only allowed in windowed mode.
by Marvin Sept. 25, 2014

Sept. 25, 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=9068 Your paranoid android. === w2000pro (32 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6. === wxppro (32 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6. === wvistau64 (32 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6. === w2008s64 (32 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6. === w7u (32 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6. === wvistau64 (64 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6. === w2008s64 (64 bit device) === device.c:3154: Test failed: Got unexpected wparam 0 for message 6.

1 0

Re: [PATCH 08/10] d3d/tests: Additional swapchains are only allowed in windowed mode.
by Marvin Sept. 25, 2014

Sept. 25, 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=9067 Your paranoid android. === w2000pro (32 bit device) === device.c:2193: Test failed: Got unexpected wparam 0 for message 6. === wxppro (32 bit device) === device.c:2193: Test failed: Got unexpected wparam 0 for message 6. === wvistau64 (32 bit device) === device.c:2193: Test failed: Got unexpected wparam 0 for message 6. === w2008s64 (32 bit device) === device.c:2193: Test failed: Got unexpected wparam 0 for message 6. === w7u (32 bit device) === device.c:2193: Test failed: Got unexpected wparam 0 for message 6. === w8 (32 bit device) === device.c:2388: Test failed: Expected message 0x6 for window 0x1, but didn't receive it. device.c:2393: Test failed: The focus window is active. device.c:2426: Test failed: Expected message 0x6 for window 0x1, but didn't receive it.

1 0

Re: [PATCH 07/10] wined3d: Do not minimize invisible windows.
by Marvin Sept. 25, 2014

Sept. 25, 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=9066 Your paranoid android. === w2000pro (32 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6. === wxppro (32 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6. === wvistau64 (32 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6. === w2008s64 (32 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6. === w7u (32 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6. === wvistau64 (64 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6. === w2008s64 (64 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6.

1 0

Re: [PATCH 07/10] wined3d: Do not minimize invisible windows.
by Marvin Sept. 25, 2014

Sept. 25, 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=9065 Your paranoid android. === w2000pro (32 bit device) === device.c:2146: Test failed: Got unexpected wparam 0 for message 6. === wxppro (32 bit device) === device.c:2146: Test failed: Got unexpected wparam 0 for message 6. === wvistau64 (32 bit device) === device.c:2146: Test failed: Got unexpected wparam 0 for message 6. === w2008s64 (32 bit device) === device.c:2146: Test failed: Got unexpected wparam 0 for message 6. === w7u (32 bit device) === device.c:2146: Test failed: Got unexpected wparam 0 for message 6. === w8 (32 bit device) === device.c:2341: Test failed: Expected message 0x6 for window 0x1, but didn't receive it. device.c:2346: Test failed: The focus window is active. device.c:2379: Test failed: Expected message 0x6 for window 0x1, but didn't receive it.

1 0

Re: [PATCH 06/10] d3d8/tests: Test messages on focus loss.
by Marvin Sept. 25, 2014

Sept. 25, 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=9064 Your paranoid android. === w2000pro (32 bit device) === device.c:2146: Test failed: Got unexpected wparam 0 for message 6. === wxppro (32 bit device) === device.c:2146: Test failed: Got unexpected wparam 0 for message 6. === wvistau64 (32 bit device) === device.c:2146: Test failed: Got unexpected wparam 0 for message 6. === w2008s64 (32 bit device) === device.c:2146: Test failed: Got unexpected wparam 0 for message 6. === w7u (32 bit device) === device.c:2146: Test failed: Got unexpected wparam 0 for message 6. === w8 (32 bit device) === device.c:2321: Test failed: Expected message 0x6 for window 0x1, but didn't receive it. device.c:2326: Test failed: The focus window is active. device.c:2332: Test failed: Got unexpect width 640. device.c:2333: Test failed: Got unexpect height 480. device.c:2472: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3114: Test failed: Expected wndproc 0x413050, got 0x413050.

1 0

Re: d3d10core: Add support for map_type flags D3D10_MAP_READ, D3D10_MAP_WRITE_NO_OVERWRITE and D3D10_MAP_DISCARD. (try 2)
by Henri Verbeet Sept. 25, 2014

Sept. 25, 2014

On 24 September 2014 17:06, Johannes Brandstätter <jbrandst(a)2ds.eu> wrote: > + DWORD wine_map_flags = wined3d_map_flags_from_d3d10_map_type(map_type); > > TRACE("iface %p, map_type %u, map_flags %#x, data %p.\n", iface, map_type, map_flags, data); > > - if (map_type != D3D10_MAP_READ_WRITE) > - FIXME("Ignoring map_type %#x.\n", map_type); > if (map_flags) > FIXME("Ignoring map_flags %#x.\n", map_flags); > > - return wined3d_buffer_map(buffer->wined3d_buffer, 0, 0, (BYTE **)data, 0); > + return wined3d_buffer_map(buffer->wined3d_buffer, 0, 0, (BYTE **)data, wine_map_flags); You don't really need the wine_map_flags variable here. > +DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) > +{ > + switch (map_type) > + { > + case D3D10_MAP_READ_WRITE: > + return 0; > + > + case D3D10_MAP_READ: > + return WINED3D_MAP_READONLY; > + > + case D3D10_MAP_WRITE_DISCARD: > + return WINED3D_MAP_DISCARD; > + > + case D3D10_MAP_WRITE_NO_OVERWRITE: > + return WINED3D_MAP_NOOVERWRITE; > + > + default: > + FIXME("Unhandled map_type %#x.\n", map_type); > + } > + > + return 0; You can just return in the default case.

1 0

Re: [PATCH 04/10] d3d9/tests: Test messages on focus loss.
by Marvin Sept. 25, 2014

Sept. 25, 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=9062 Your paranoid android. === w2000pro (32 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6. === wxppro (32 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6. === wvistau64 (32 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6. === w2008s64 (32 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6. === w7u (32 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6. === wvistau64 (64 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6. === w2008s64 (64 bit device) === device.c:3107: Test failed: Got unexpected wparam 0 for message 6.

1 0

Question about implementing a test for BCryptGetFipsAlgorithmMode
by Kai Blaschke Sept. 24, 2014

Sept. 24, 2014

Hi, I had a small patch lying around here for some while which properly implements the BCryptGetFipsAlgorithmMode function, behaving identically to the original implementation. Just one question is bugging me, regarding the test. To properly test the function, I'd have to write to a registry key in HKLM\System\CurrentControlSet\Control\Lsa. Is it safe to assume that the test has write access to this key? Additionally, I noticed I put a small bug in the code, returning false for all registry values which are multiples of 256, which is a result of simply casting a registry DWORD value to a BOOLEAN. To my surprise, the original function - tested with WinXP and Win7 - has the same bug, so I wouldn't fix my implementation before sending in the patch if no one votes against it. Regards Kai

3 5

Re: [PATCH 4/5] d3d9/tests: Extend focus loss tests.
by Henri Verbeet Sept. 24, 2014

Sept. 24, 2014

I don't think the tests really support the implementation. For example, they don't test multiple swapchains at all, and they basically only test if WS_MINIMIZE is set or not as far as window styles are concerned. I'd expect at least some basic message and style tests along the lines of e.g. test_wndproc() and test_window_style().

2 3

Re: dpvoice: Add DirectPlay Voice Test (try 2)
by Alexandre Julliard Sept. 24, 2014

Sept. 24, 2014

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > Hi, > Fix errors on systems which don't have Direct Voice configured. > > Changelog: > dpvoice: Add DirectPlay Voice Test It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M dpvoice.dll -p dpvoice_test.exe.so voice && touch voice.ok voice.c:106: Test succeeded inside todo block: AddComponent(addr) with 0x00000000 voice.c:109: Test succeeded inside todo block: AddComponent(port)) with 0x00000000 voice.c:187: Test succeeded inside todo block: AddComponent(addr) with 0x00000000 voice.c:190: Test succeeded inside todo block: AddComponent(port)) with 0x00000000 make: *** [voice.ok] Error 4 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: d3d10core: Add support for map_type flags D3D10_MAP_READ, D3D10_MAP_WRITE_NO_OVERWRITE and D3D10_MAP_DISCARD.
by Henri Verbeet Sept. 24, 2014

Sept. 24, 2014

On 23 September 2014 12:55, Johannes Brandstätter <jbrandst(a)2ds.eu> wrote: > + switch (map_type) > + { > + case D3D10_MAP_READ: > + wine_map_flags = WINED3D_MAP_READONLY; > + break; > + > + case D3D10_MAP_WRITE_DISCARD: > + wine_map_flags = WINED3D_MAP_DISCARD; > + break; > + > + case D3D10_MAP_WRITE_NO_OVERWRITE: > + wine_map_flags = WINED3D_MAP_NOOVERWRITE; > + break; > + > + default: > + FIXME("Ignoring map_type %#x.\n", map_type); > + } > + } You'll want to turn that into a helper function and use it for the other resource mapping functions as well. See also e.g. wined3d_usage_from_d3d10core() and wined3dformat_from_dxgi_format().

1 0

Re: [PATCH 1/2] jscript: Add define for JS_E_OUT_OF_MEMORY.
by Jacek Caban Sept. 24, 2014

Sept. 24, 2014

Hi Qian, On 09/24/14 10:45, Qian Hong wrote: > --- a/dlls/jscript/resource.h > +++ b/dlls/jscript/resource.h > @@ -24,6 +24,7 @@ > > #define IDS_TO_PRIMITIVE 0x0001 > #define IDS_INVALID_CALL_ARG 0x0005 > +#define IDS_OUT_OF_MEMORY 0x0007 Adding private defines that are not used is not really useful. Please at least add resources. Jacek

2 1

Re: [PATCH] mshtml: Add IHTMLAnchorElement::search propertyimplementation(try 3)
by Jacek Caban Sept. 24, 2014

Sept. 24, 2014

Hi Hao, On 09/24/14 11:14, Hao Peng wrote: > +#define test_anchor_search_strange(a,h,n) _test_anchor_search_strange(__LINE__,a,h,n) > +static void _test_anchor_search_strange(unsigned line, IUnknown *unk, const char *search, const char *result) > +{ > + IHTMLAnchorElement *anchor = _get_anchor_iface(line, unk); > + BSTR str; > + HRESULT hres; > + > + if ( ! result) > + result = search; > + > + str = search ? a2bstr(search) : NULL; > + hres = IHTMLAnchorElement_put_search(anchor, str); > + ok_(__FILE__,line)(hres == S_OK, "put_search failed: %08x\n", hres); > + SysFreeString(str); > + > + hres = IHTMLAnchorElement_get_search(anchor, &str); > + ok_(__FILE__,line)(hres == S_OK, "get_search failed: %08x\n", hres); > + if ( ! str) > + /* due to IE5's incorrect behavior, search string without leading "?" is interpreted > + as part of the pathname, and can not be accessed by get_search. */ > + win_skip("incorrect behavior on IE5"); Why do you need this? Those tests are already not ran on IE5 anyway. Jacek

1 0

Re: libwine: Respect TMPDIR environment variable
by Alexandre Julliard Sept. 24, 2014

Sept. 24, 2014

André Hentschel <nerv(a)dawncrow.de> writes: > @@ -36,7 +36,7 @@ > #include "wine/library.h" > > static const char server_config_dir[] = "/.wine"; /* config dir relative to $HOME */ > -static const char server_root_prefix[] = "/tmp/.wine"; /* prefix for server root dir */ > +static const char server_root_prefix[] = "/.wine"; /* prefix for server root dir */ > static const char server_dir_prefix[] = "/server-"; /* prefix for server dir */ > > static char *bindir; > @@ -220,15 +220,19 @@ static char *get_runtime_argvdir( const char *argv0 ) > /* initialize the server directory value */ > static void init_server_dir( dev_t dev, ino_t ino ) > { > + const char* tmpdir; > char *p, *root; > > + if (!(tmpdir = getenv("TMPDIR"))) tmpdir = "/tmp"; The server dir needs to be unique for a given prefix, so it cannot depend on environment variables. -- Alexandre Julliard julliard(a)winehq.org

1 0

Patches for adding IRichEditOle/ITextDocument support for ITextServices::QueryInterface ask for review
by Jactry Zeng Sept. 24, 2014

Sept. 24, 2014

Hi folks, I wrote two patches for adding IRichEditOle/ITextDocument support for ITextServices::QueryInterface(for bug 17042[1]), but I'm no sure is it the correct way. I need your review and comment! I will really appreciate it! There are some tests for ITextServices::QueryInterface in dlls/riched20/txtsrv.c: test_QueryInterfaces(): 1. refcount = get_refcount((IUnknown *)txtserv); ok(refcount == 1, "got wrong ref count: %d\n", refcount); /* IID_IRichEditOle */ hres = ITextServices_QueryInterface(txtserv, &IID_IRichEditOle, (void **)&txtsrv_reOle); ok(hres == S_OK, "ITextServices_QueryInterface\n"); refcount = get_refcount((IUnknown *)txtserv); ok(refcount == 2, "got wrong ref count: %d\n", refcount); >From this case we know ref count of ITextServices will increase after get a IRichEditOle interface from ITextServices::QueryInterface. ITextServices::QueryInterface(&IID_ITextDocument) is also similar. 2. refcount = get_refcount((IUnknown *)txtserv); ok(refcount == 2, "got wrong ref count: %d\n", refcount); if (SUCCEEDED(hres)) { refcount = get_refcount((IUnknown *)txtsrv_reOle); ok(refcount == 2, "got wrong ref count: %d\n", refcount); hres = IRichEditOle_QueryInterface(txtsrv_reOle, &IID_ITextDocument, (void **)&txtDoc); ok(hres == S_OK, "IRichEditOle_QueryInterface: 0x%08x\n", hres); refcount = get_refcount((IUnknown *)txtserv); ok(refcount == 3, "got wrong ref count: %d\n", refcount); refcount = get_refcount((IUnknown *)txtsrv_reOle); ok(refcount == 3, "got wrong ref count: %d\n", refcount); >From this case we know when a IRichEditOle was got by ITextServices::QueryInterface(&IID_IRichEditOle) then we used IRichEditOle::QueryInterface to get another interface, the ref count of ITextServices will increase too. For implementing this feature I added IUnknown *parent in IRichEditOleImpl and passed ITextServices interface into CreateIRichEditOle when we call it in ITextServices::QueryInterface: dlls/riched20/richole.c ---snip--- typedef struct IRichEditOleImpl { IRichEditOle IRichEditOle_iface; ITextDocument ITextDocument_iface; LONG ref; ME_TextEditor *editor; ITextSelectionImpl *txtSel; IOleClientSiteImpl *clientSite; struct list rangelist; IUnknown *parent; } IRichEditOleImpl; ---snip--- dlls/riched20/txtsrv.c ---snip--- else if (IsEqualIID(riid, &IID_IRichEditOle) || IsEqualIID(riid, &IID_ITextDocument)) { if (!This->editor->reOle) CreateIRichEditOle(This->editor, (LPVOID *)&(This->editor->reOle), iface); IRichEditOle_QueryInterface(This->editor->reOle, riid, (void **)ppv); return S_OK; } else { ---snip--- 3. By some other tests, I found when a ITextServices was got by IRichEditOle::QueryInterface, then we use ITextServices::QueryInterface to got another interface, the ref count of IRichEditOle will increase too. Thanks! [1] https://bugs.winehq.org/show_bug.cgi?id=17042 -- Regards, Jactry Zeng

1 0

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

Sept. 23, 2014

> +typedef struct ITextFontImpl { > + ITextFont ITextFont_iface; > + LONG ref; > + > + ITextRangeImpl *txtRge; > + ITextSelectionImpl *txtSel; > +} ITextFontImpl; > + I think 'range' and 'selection' would be more readable, but what's more important you don't use 'txtSel' at all. > +static HRESULT WINAPI ITextFont_fnQueryInterface(ITextFont *me, REFIID riid, void **ppvObj) If we want some unification, it's usually called 'iface', not 'me'. > + *ppvObj = me; That's not how it should look. > +static IRichEditOleImpl *get_reOle(ITextFontImpl *txtFont) > +{ > + if (txtFont->txtRge) > + return txtFont->txtRge->reOle; > + else > + return txtFont->txtSel->reOle; > +} Please use a better naming, like 'get_reole_from_font()' or something like that. > + FIXME("not implemented: %p\n", This); > + return E_NOTIMPL; This should give a proper trace line with arguments, and it should appear on every call. > + ITextFontImpl *This = impl_from_ITextFont(me); > + if (pValue) > + return E_INVALIDARG; > + if (!get_reOle(This)) > + return CO_E_RELEASED; > + > + FIXME("Stub\n"); > + *pValue = tomFalse; > + return S_OK; That's another example of tracing done wrong. > static HRESULT WINAPI ITextRange_fnGetFont(ITextRange *me, ITextFont **pFont) > { > ITextRangeImpl *This = impl_from_ITextRange(me); > + ITextFontImpl *txtFont = NULL; > + HRESULT hres; > + > if (!This->reOle) > return CO_E_RELEASED; > > - FIXME("not implemented %p\n", This); > - return E_NOTIMPL; > + TRACE("%p\n", This); And another.

2 1

Re: [PATCH] vbscript: Implemented RGB(try 2)
by Jacek Caban Sept. 23, 2014

Sept. 23, 2014

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