April 2014 - Wine-Devel - list.winehq.org

Re: [PATCH] vbscript: Fixed CBool

by Piotr Caban

On 04/29/14 16:04, Shuai Meng wrote: > > Thank you for commenting. > > 2014-04-29 21:30 GMT+08:00 Piotr Caban <piotr.caban(a)gmail.com > <mailto:piotr.caban(a)gmail.com>>: > > On 04/29/14 15:06, Shuai Meng wrote: > > + if(!res) > + return S_OK; > > You can't return early if res is NULL. You still need to do the > conversion and return error if it fails. > > I don't quite get it, do you mean I should do like this: > if(res) > { > .... > } > return S_OK; No, I mean that you should do something like this: VARIANT v; ... V_VT(&v) = VT_EMPTY; hr = VariantChangeType(..., &v); if(FAILED(hr)) return hr; ... if(res) *res = v; else VariantClear(&v); > It would be nice to add following tests (these are the tests Jacek > was asking for): > > Call ok(CBool("True") = true, "CBool(""True"") = " & CBool("True")) > Call ok(CBool("fAlSe") = false, "CBool(""fAlSe"") = " & CBool("fAlSe")) > > > I do notice it, but they failed in testbot. Just as MSDN says, If > /expression/ can't be interpreted as a numeric value, a run-time error > occurs. You must have done something else incorrectly. Here's a run that succeeded: https://testbot.winehq.org/JobDetails.pl?Key=6665. It shows that CBool("True") returns true. > sub testCBoolError > on error resume next > > call Err.clear() > call CBool("#FALSE#") > call ok(Err.number = 458, "Err.number = " & Err.number) > end sub > Call testCBoolError > > Is this function written to provoke an error on purpose in order to test > CBool("#FALSE#")? It's meant to handle error returned by CBool("#FALSE#"). Other invalid parameters may be tested in the same way. Cheers, Piotr

April 29, 2014

Re: [PATCH] vbscript: Fixed CBool

by Shuai Meng

Thank you for commenting. 2014-04-29 21:30 GMT+08:00 Piotr Caban <piotr.caban(a)gmail.com>: > On 04/29/14 15:06, Shuai Meng wrote: > >> + if(!res) >> + return S_OK; >> > You can't return early if res is NULL. You still need to do the conversion > and return error if it fails. > I don't quite get it, do you mean I should do like this: if(res) { .... } return S_OK; > > +Call ok(CBool(Empty) = False, "CBool(Empty) = " & CBool(Empty)) >> +Call ok(getVT(CBool(Empty)) = "VT_BOOL", "getVT(CBool(Empty)) = " & >> getVT(CBool(Empty))) >> +Call ok(CBool(1) = True, "CBool(1) = " & CBool(1)) >> +Call ok(getVT(CBool(1)) = "VT_BOOL", "getVT(CBool(1)) = " & >> getVT(CBool(1))) >> +Call ok(CBool(0) = False, "CBool(0) = " & CBool(0)) >> +Call ok(getVT(CBool(0)) = "VT_BOOL", "getVT(CBool(0)) = " & >> getVT(CBool(0))) >> +Call ok(CBool(-0.56) = True, "CBool(-0.56) = " & CBool(-0.56)) >> +Call ok(getVT(CBool(-0.56)) = "VT_BOOL", "getVT(CBool(-0.56)) = " & >> getVT(CBool(-0.56))) >> +Call ok(CBool("-1") = True, "CBool(""-1"") = " & CBool("-1")) >> +Call ok(getVT(CBool("-1")) = "VT_BOOL", "getVT(CBool(""-1"")) = " & >> getVT(CBool("-1"))) >> > It would be nice to add following tests (these are the tests Jacek was > asking for): Call ok(CBool("True") = true, "CBool(""True"") = " & CBool("True")) > Call ok(CBool("fAlSe") = false, "CBool(""fAlSe"") = " & CBool("fAlSe")) > I do notice it, but they failed in testbot. Just as MSDN says, If *expression* can't be interpreted as a numeric value, a run-time error occurs. sub testCBoolError > on error resume next > > call Err.clear() > call CBool("#FALSE#") > call ok(Err.number = 458, "Err.number = " & Err.number) > end sub > Call testCBoolError > > Is this function written to provoke an error on purpose in order to test CBool("#FALSE#")? Can CBool("True") assume the same form? Because CBool("True") always fails in testbot as I have said.

April 29, 2014

Re: msctf: Added ITfInputProcessorProfileMgr interface stub implementation.

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 https://testbot.winehq.org/JobDetails.pl?Key=6663 Your paranoid android. === w864 (32 bit inputprocessor) === inputprocessor.c:791: Test failed: Deactivation came unexpectedly

April 29, 2014

Re: [PATCH] vbscript: Fixed CBool

by Piotr Caban

On 04/29/14 15:06, Shuai Meng wrote: > + if(!res) > + return S_OK; You can't return early if res is NULL. You still need to do the conversion and return error if it fails. > +Call ok(CBool(Empty) = False, "CBool(Empty) = " & CBool(Empty)) > +Call ok(getVT(CBool(Empty)) = "VT_BOOL", "getVT(CBool(Empty)) = " & getVT(CBool(Empty))) > +Call ok(CBool(1) = True, "CBool(1) = " & CBool(1)) > +Call ok(getVT(CBool(1)) = "VT_BOOL", "getVT(CBool(1)) = " & getVT(CBool(1))) > +Call ok(CBool(0) = False, "CBool(0) = " & CBool(0)) > +Call ok(getVT(CBool(0)) = "VT_BOOL", "getVT(CBool(0)) = " & getVT(CBool(0))) > +Call ok(CBool(-0.56) = True, "CBool(-0.56) = " & CBool(-0.56)) > +Call ok(getVT(CBool(-0.56)) = "VT_BOOL", "getVT(CBool(-0.56)) = " & getVT(CBool(-0.56))) > +Call ok(CBool("-1") = True, "CBool(""-1"") = " & CBool("-1")) > +Call ok(getVT(CBool("-1")) = "VT_BOOL", "getVT(CBool(""-1"")) = " & getVT(CBool("-1"))) It would be nice to add following tests (these are the tests Jacek was asking for): Call ok(CBool("True") = true, "CBool(""True"") = " & CBool("True")) Call ok(CBool("fAlSe") = false, "CBool(""fAlSe"") = " & CBool("fAlSe")) sub testCBoolError on error resume next call Err.clear() call CBool("#FALSE#") call ok(Err.number = 458, "Err.number = " & Err.number) end sub Call testCBoolError

April 29, 2014

Re: [PATCH] vbscript: Fixed CBool

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

April 29, 2014

Re: [PATCH 3/5] ddraw/tests: Handle a backbuffer palette misbehavior on Windows 8.

by Henri Verbeet

On 28 April 2014 15:21, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > + * reference crashes. The primary has an extra reference after creation call, making > + * it tricky to destroy. Creating the primary adds 5 references to the ddraw interface, This is because of the 8 bpp display mode, I have a patch.

April 29, 2014

Re: [PATCH 01/10] vbscript: Fixed CBool(try 3)

by Shuai Meng

2014-04-21 17:18 GMT+08:00 Jacek Caban <jacek(a)codeweavers.com>: > Hi Shuai, > > On 04/21/14 03:45, Shuai Meng wrote: > > - > > - return return_bool(res, val); > > + V_VT(res) = VT_EMPTY; > > + return VariantChangeType(res, arg, VARIANT_LOCALBOOL, VT_BOOL); > > You can't assume that res is not NULL. If result of the function is not > used, it will be NULL. A simple test case is like this: > > call CBool(0) > > Also, are you sure we want VARIANT_LOCALBOOL here? Did you test it > (probably by running tests on localized Windows with translated string > "False")? > > Looking at CBool tests: > > +Call ok(CBool(Empty) = False, "CBool(Empty) = " & CBool(Empty)) > +Call ok(getVT(CBool(Empty)) = "VT_BOOL", "getVT(CBool(Empty)) = " & > getVT(CBool(Empty))) > +Call ok(CBool(1) = True, "CBool(1) = " & CBool(1)) > +Call ok(getVT(CBool(1)) = "VT_BOOL", "getVT(CBool(1)) = " & > getVT(CBool(1))) > +Call ok(CBool(CLng(0)) = False, "CBool(CLng(0)) = " & CBool(CLng(0))) > +Call ok(getVT(CBool(CLng(0))) = "VT_BOOL", "getVT(CBool(CLng(0))) = " & > getVT(CBool(CLng(0)))) > +Call ok(CBool(CSng(0.5)) = True, "CBool(CSng(0.5)) = " & CBool(CSng(0.5))) > +Call ok(getVT(CBool(CSng(0.5))) = "VT_BOOL", "getVT(CBool(CSng(0.5))) = " > & getVT(CBool(CSng(0.5)))) > +Call ok(CBool(-0.56) = True, "CBool(-0.56) = " & CBool(-0.56)) > +Call ok(getVT(CBool(-0.56)) = "VT_BOOL", "getVT(CBool(-0.56)) = " & > getVT(CBool(-0.56))) > +Call ok(CBool(CCur(8.55)) = True, "CBool(CCur(8.55)) = " & > CBool(CCur(8.55))) > +Call ok(getVT(CBool(CCur(8.55))) = "VT_BOOL", "getVT(CBool(CCur(8.55))) = > " & getVT(CBool(CCur(8.55)))) > +Call ok(CBool(CDate(0)) = False, "CBool(CDate(0)) = " & CBool(CDate(0))) > +Call ok(getVT(CBool(CDate(0))) = "VT_BOOL", "getVT(CBool(CDate(0))) = " & > getVT(CBool(CDate(0)))) > +Call ok(CBool(CDate(3.33)) = True, "CBool(CDate(3.33)) = " & > CBool(CDate(3.33))) > +Call ok(getVT(CBool(CDate(3.33))) = "VT_BOOL", "getVT(CBool(CDate(3.33))) > = " & getVT(CBool(CDate(3.33)))) > +Call ok(CBool("6666.78") = True, "CBool(""6666.78"") = " & > CBool("6666.78")) > +Call ok(getVT(CBool("6666.78")) = "VT_BOOL", "getVT(CBool(""6666.78"")) = > " & getVT(CBool("6666.78"))) > +Call ok(CBool(CByte(-0.1)) = False, "CBool(CByte(-0.1)) = " & > CBool(CByte(-0.1))) > +Call ok(getVT(CBool(CByte(-0.1))) = "VT_BOOL", "getVT(CBool(CByte(-0.1))) > = " & getVT(CBool(CByte(-0.1)))) > > Those look mostly good. However I'd like to see some more tests. > Interesting case is for example empty string and a "false", "False" and > "#FALSE#" string. These strings can't pass tests in testbot, I have tried. And I find a line in http://msdn.microsoft.com/en-us/library/2k9sfx3c(v=vs.84).aspx says that "If *expression* can't be interpreted as a numeric value, a run-time error occurs." Also I'd really like to see tests on object default > values. See the attached patch for an example. > I copied the example, and found that though tests on object default values passed in testbot, they can't pass in wine. I think this is because VariantChangeType function can't change an object into a VT_BOOL. So I delete them. > Those comments apply also to other patches in the series. It may be > easier to proceed if you resent just the first patch fixed and include > tests that don't depending on other patches in the series in the patch > itself. > > Cheers, > Jacek > > > >

April 29, 2014

Re: [PATCH 2/5] ddraw: Implement D3DOP_STATERENDER on top of IDirect3DDevice3_SetRenderState().

by Henri Verbeet

On 29 April 2014 12:10, Stefan Dösinger <stefandoesinger(a)gmail.com> wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Am 2014-04-29 10:41, schrieb Henri Verbeet: >> + if (FAILED(IDirect3DDevice3_SetRenderState(&device->IDirect3DDevice2_iface, > Is the use of IDirect3DDevice2_iface intentional? > No, that is wrong, although this will work.

April 29, 2014

Re: [PATCH 2/5] ddraw: Implement D3DOP_STATERENDER on top of IDirect3DDevice3_SetRenderState().

by Stefan Dösinger

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-04-29 10:41, schrieb Henri Verbeet: > + if (FAILED(IDirect3DDevice3_SetRenderState(&device->IDirect3DDevice2_iface, Is the use of IDirect3DDevice2_iface intentional? -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTX3qrAAoJEN0/YqbEcdMwtacP/jW2hvsXFttAPKuQPjK1nLqI /EOKHK2V7p8kf9WrjvJfcy3WosiNVR3Z6WW0yF/EuF5rrqLw1zSGG0Go4WBTw5h3 DA7xDfnCZhIR9eNOnaxF9OWYaUzDI18/iEMlAVdxrVdpIJJBcrG5x/tWkklFzP9n gIS/LO3msAlTq3xeV96rXty+BYVt+iET2h49Iauw8NKJp9XGfn1a1DtSnY/LCBLV xzgTaKy1nym0Y8zI7xswzmqBsB2F0Mo8Rm7KlzHQz83lltFXS6Q1n/OyX/aVUg6R y8iM3H3gDpaeuykob+HuoEGU96JlYskPZFs94SYpdI0g5O2khM2znQ+qakJiI3ar KSa1DnudgN3eK8a735MUylas4P1IrwMRyMa8BXj5U7qN99WPkHyL0WeF+8JGD5JA A0d1Z/Ox+nA0V+4jFW6aSPeyIFI5BXSROltsDAztF4tjO16QPzMl9/tWOS8NeK23 9VEn/xqbg06oyHrTc5KKhi3u5NhUcoB5wXiTWUfmUftWEd91sUmwnvA/OHYPnAz3 xU1Fy/5E73LR1x5BJNRqZMmtKQxbRnmdMB7mf8wBJNqzt4oxzsqtVkVj1k5QOG/L WFUUmN6bL2iecLunNLo4jH8oPRujjUDW5kZHm4UCBPwtB+GecUMtP8rsSLVj++bu znfeqwAijofsnfpAL9Fa =Egcb -----END PGP SIGNATURE-----

April 29, 2014

Re: [PATCH 01/10] vbscript: Fixed CBool(try 3)

by Shuai Meng

2014-04-29 0:04 GMT+08:00 Piotr Caban <piotr.caban(a)gmail.com>: > On 04/28/14 17:26, Shuai Meng wrote: > >> >> >> >> 2014-04-21 17:18 GMT+08:00 Jacek Caban <jacek(a)codeweavers.com >> <mailto:jacek(a)codeweavers.com>>: >> >> >> Hi Shuai, >> >> On 04/21/14 03:45, Shuai Meng wrote: >> > - >> > - return return_bool(res, val); >> > + V_VT(res) = VT_EMPTY; >> > + return VariantChangeType(res, arg, VARIANT_LOCALBOOL, >> VT_BOOL); >> >> You can't assume that res is not NULL. If result of the function is >> not >> used, it will be NULL. A simple test case is like this: >> >> call CBool(0) >> >> Also, are you sure we want VARIANT_LOCALBOOL here? Did you test it >> (probably by running tests on localized Windows with translated string >> "False")? >> >> I don't quite understand what this parameter means, in fact I just >> copy it from to_string(). If not VARIANT_LOCALBOOL, waht esle should be >> filled here? >> > > I've checked what happens on non-english locale and CStr(True) = "True". > So the flag is used incorrectly in CStr implementation. CBool is also > failing when localized string is passed. > > You can use 0 as flag in VariantChangeType. > I've fixed this, but another problem appears. I put my new patch in the attachment, along with the test result of wine. It fails when tested in wine, while normal in my windows. I can't understand, this patch is almost the same with the previous one.

April 29, 2014