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

Re: [PATCH 2/2] packager: Add loading support for Ole10Native storage objects

by Vincent Povirk

+ hr = IStorage_OpenStream(pStg, ole10nativeW, NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stream); You should probably use STGM_READ here.

June 17, 2014

Re: [4/5] msvcrt: Move write flag setting code for reuse.

by Piotr Caban

On 06/14/14 01:23, Grazvydas Ignotas wrote: > --- > dlls/msvcrt/file.c | 27 +++++++++++++++------------ > 1 file changed, 15 insertions(+), 12 deletions(-) > > diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c > index 7523bbb..d6fb9ef 100644 > --- a/dlls/msvcrt/file.c > +++ b/dlls/msvcrt/file.c > @@ -3641,6 +3641,17 @@ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* f > return buf_start; > } > > +static inline int msvcrt_set_write_direction(MSVCRT_FILE* file) > +{ > + if(!(file->_flag & MSVCRT__IOWRT)) { > + if(file->_flag & MSVCRT__IORW) > + file->_flag |= MSVCRT__IOWRT; > + else > + return MSVCRT_EOF; > + } > + return 0; > +} I don't see a good reason for making this code reusable. The code is used to inform how the buffer is used (if it's used for writing or reading). This means that it doesn't make sense to set it if buffer is not used. The only valid use of it I can see in wine sources is _flsbuf. I've wrote a test that shows that _IOWRT flag is not set if _bufsiz==0 or in the case you're implementing. You can see it's code and result on windows here: https://testbot.winehq.org/JobDetails.pl?Key=7552

June 17, 2014

Re: [PATCH 1/5] d2d1: Implement d2d_d3d_render_target_CreateSolidColorBrush().

by Henri Verbeet

On 16 June 2014 16:50, Jacek Caban <jacek(a)codeweavers.com> wrote: >> struct d2d_brush *b = unsafe_impl_from_ID2DBrush(brush); > > Since you have many different vtbls for ID2DBrush implementation, you > can't use the usual vtbl trick for checking if passed pointer is really > our implementation. One way this can be solved is to abuse Other places that do this kind of thing just check against multiple vtbls. > QueryInterface, so that you could call: > > ID2DBrush_QueryInterface(brush, &IID_brush_struct, (void**)&brush_struct); > > QueryInterface could just return the struct directly for that special > IID. And yeah, returning struct instead of an interface is not pretty, > but that's probably fine here. You could even skip AddRef in this case. > That works, although personally I'd say it's a little more complex than just having the casts, and not really any prettier. I don't care too strongly though, so as far as I'm concerned it comes down to whatever Alexandre prefers. >> ... >> ID3D10Device_PSSetShader(device, b->shader); >> ID3D10Device_PSSetConstantBuffers(device, 0, 1, &b->cb); >> ... >> ID3D10Device_DrawIndexed(device, ...); > > I see, this could really use common code. > Sure. Eventually we'll probably have something like "d2d_brush_apply(brush, device);", and we'll probably want to queue up and merge draw operations until ID2D1RenderTarget::EndDraw(), but that's the basic idea. >> I think the two casts, while not very pretty, are worth it in comparison. > > This, again, depends on how this will look when the implementation is > more complete. Such casts are usually a sign of a design problem, but > the final decision is up to you. *If* such casts will be only in brush > creation code, that's not too bad. Yeah, it should only be needed in the creation / initialization code, everything else should just operate on struct d2d_brush. > You could make them even more local > (eg. by replacing d2d_solid_color_brush_init by a function that returns > ID2D1SolidBrush interface pointer, so that caller doesn't need to do any > more cast and the problem does not spread across the code). > Yeah, perhaps. Effectively that just means moving most of the body of d2d_d3d_render_target_CreateSolidColorBrush() to brush.c, and it's another one of those things that I'm not really opposed to, but don't really think are worth it either.

June 17, 2014

Re: [PATCH 4/4] vbscript: Implemented Abs(try 2)

by Jacek Caban

On 06/17/14 08:00, Shuai Meng wrote: > diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c > index d21784d..e646a29 100644 > --- a/dlls/vbscript/global.c > +++ b/dlls/vbscript/global.c > @@ -1302,8 +1302,24 @@ static HRESULT Global_ChrW(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI > > static HRESULT Global_Abs(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > { > - FIXME("\n"); > - return E_NOTIMPL; > + VARIANT v; > + HRESULT hres; > + > + TRACE("(%s)\n", debugstr_variant(arg)); > + > + assert(args_cnt == 1); > + > + V_VT(&v) = VT_EMPTY; > + hres = VariantChangeType(&v, arg, VARIANT_LOCALBOOL, VT_R8); > + if (FAILED(hres)) > + return S_OK; Please use to_double here. Also note weird indention here. Jacek

June 17, 2014

Re: [PATCH 3/4] vbscript: Implemented Sgn(try 2)

by Jacek Caban

On 06/17/14 07:59, Shuai Meng wrote: > diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c > index c2b2edd..d21784d 100644 > --- a/dlls/vbscript/global.c > +++ b/dlls/vbscript/global.c > @@ -1320,8 +1320,24 @@ static HRESULT Global_Int(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA > > static HRESULT Global_Sgn(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > { > - FIXME("\n"); > - return E_NOTIMPL; > + VARIANT v; > + HRESULT hres; > + > + TRACE("(%s)\n", debugstr_variant(arg)); > + > + assert(args_cnt == 1); > + > + V_VT(&v) = VT_EMPTY; > + hres = VariantChangeType(&v, arg, VARIANT_LOCALBOOL, VT_R8); > + if (FAILED(hres)) > + return S_OK; Please use to_double() instead. to_double may need some fixes (it may require similar changes as you did for to_string first). Jacek

June 17, 2014

Re: [PATCH 2/4] vbscript: Implemented VarType(try 2)

by Jacek Caban

On 06/17/14 07:59, Shuai Meng wrote: > diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c > index 5357df8..c2b2edd 100644 > --- a/dlls/vbscript/global.c > +++ b/dlls/vbscript/global.c > @@ -602,8 +602,52 @@ static HRESULT Global_Oct(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA > > static HRESULT Global_VarType(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > { > - FIXME("\n"); > - return E_NOTIMPL; > + TRACE("(%s)\n", debugstr_variant(arg)); > + > + assert(args_cnt == 1); > + > + if(res) { > + V_VT(res) = VT_I2; > + switch(V_VT(arg)) { > + case VT_EMPTY: > + V_I2(res) = VT_EMPTY; > + break; > + case VT_NULL: > + V_I2(res) = VT_NULL; > + break; > + case VT_I2: > + V_I2(res) = VT_I2; > + break; (...) This all could be just: V_I2(res) = V_VT(arg); To handle unsupported types, you could use something like: if(V_VT(arg) & ~VT_TYPEMASK) { FIXME("..."); return E_NOTIMPL; } if(res) { V_VT(res) = VT_I2; V_I2(res) = V_VT(arg); } Jacek

June 17, 2014

Re: [PATCH 1/4] vbscript: Implemented TypeName(try 2)

by Jacek Caban

On 06/17/14 07:58, Shuai Meng wrote: > iff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c > index 5160374..5357df8 100644 > --- a/dlls/vbscript/global.c > +++ b/dlls/vbscript/global.c > @@ -1502,8 +1502,57 @@ static HRESULT Global_DatePart(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, > > static HRESULT Global_TypeName(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > { > - FIXME("\n"); > - return E_NOTIMPL; > + static const WCHAR ByteW[] = {'B', 'y', 't', 'e', 0}; > + static const WCHAR IntegerW[] = {'I', 'n', 't', 'e', 'g', 'e', 'r', 0}; > + static const WCHAR LongW[] = {'L', 'o', 'n', 'g', 0}; > + static const WCHAR SingleW[] = {'S', 'i', 'n', 'g', 'l', 'e', 0}; > + static const WCHAR DoubleW[] = {'D', 'o', 'u', 'b', 'l', 'e', 0}; > + static const WCHAR CurrencyW[] = {'C', 'u', 'r', 'r', 'e', 'n', 'c', 'y', 0}; > + static const WCHAR DecimalW[] = {'D', 'e', 'c', 'i', 'm', 'a', 'l', 0}; > + static const WCHAR DateW[] = {'D', 'a', 't', 'e', 0}; > + static const WCHAR StringW[] = {'S', 't', 'r', 'i', 'n', 'g', 0}; > + static const WCHAR BooleanW[] = {'B', 'o', 'o', 'l', 'e', 'a', 'n', 0}; > + static const WCHAR EmptyW[] = {'E', 'm', 'p', 't', 'y', 0}; > + static const WCHAR NullW[] = {'N', 'u', 'l', 'l', 0}; > + /*static const WCHAR ObjectW[] = {'O', 'b', 'j', 'e', 'c', 't', 0}; Please don't leave such commented things in the patch. You could remove it, but ideally this should have tests and implementation. > + static const WCHAR NothingW[] = {'N', 'o', 't', 'h', 'i', 'n', 'g', 0};*/ > + > + TRACE("(%s)\n", debugstr_variant(arg)); > + > + assert(args_cnt == 1); > + > + if(res) { This if() is not needed. return_string will take care of NULL res. > + switch(V_VT(arg)) { > + case VT_UI1: Please don't add 8 space indention. I personally prefer no additional indentions for cases, but in any case, if you do indention, use 4 spaces as the rest of file. > + return return_string(res, ByteW); > + case VT_I2: > + return return_string(res, IntegerW); > + case VT_I4: > + return return_string(res, LongW); > + case VT_R4: > + return return_string(res, SingleW); > + case VT_R8: > + return return_string(res, DoubleW); > + case VT_CY: > + return return_string(res, CurrencyW); > + case VT_DECIMAL: > + return return_string(res, DecimalW); > + case VT_DATE: > + return return_string(res, DateW); > + case VT_BSTR: > + return return_string(res, StringW); > + case VT_BOOL: > + return return_string(res, BooleanW); > + case VT_EMPTY: > + return return_string(res, EmptyW); > + case VT_NULL: > + return return_string(res, NullW); > + default: > + FIXME("arg %s not supported\n", debugstr_variant(arg)); > + return E_NOTIMPL; > + } > + } > + return S_OK; > } > > static HRESULT Global_Array(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 2cf9bb7..32f4dc3 100644 > --- a/dlls/vbscript/tests/api.vbs > +++ b/dlls/vbscript/tests/api.vbs > @@ -845,4 +845,25 @@ MyObject.myval = 0 > Call ok(CSng(MyObject) = 0, "CSng(MyObject) = " & CSng(MyObject)) > Call ok(getVT(CSng(MyObject)) = "VT_R4", "getVT(CSng(MyObject)) = " & getVT(CSng(MyObject))) > > +Call ok(TypeName(CByte(255)) = "Byte", "TypeName(CByte(255)) = " & TypeName(CByte(255))) > +Call ok(getVT(TypeName(CByte(255))) = "VT_BSTR", "getVT(TypeName(CByte(255))) = " & getVT(TypeName(CByte(255)))) > +Call ok(TypeName(255) = "Integer", "TypeName(255) = " & TypeName(255)) > +Call ok(getVT(TypeName(255)) = "VT_BSTR", "getVT(TypeName(255)) = " & getVT(TypeName(255))) > +Call ok(TypeName(32768) = "Long", "TypeName(32768) = " & TypeName(32768)) > +Call ok(getVT(TypeName(32768)) = "VT_BSTR", "getVT(TypeName(32768)) = " & getVT(TypeName(32768))) > +Call ok(TypeName(CSng(0.5)) = "Single", "TypeName(CSng(0.5)) = " & TypeName(CSng(0.5))) > +Call ok(getVT(TypeName(CSng(0.5))) = "VT_BSTR", "getVT(TypeName(CSng(0.5))) = " & getVT(TypeName(CSng(0.5)))) > +Call ok(TypeName(-0.5) = "Double", "TypeName(-0.5) = " & TypeName(-0.5)) > +Call ok(getVT(TypeName(-0.5)) = "VT_BSTR", "getVT(TypeName(-0.5)) = " & getVT(TypeName(-0.5))) > +Call ok(TypeName(CCur(0.5)) = "Currency", "TypeName(CCur(0.5)) = " & TypeName(CCur(0.5))) > +Call ok(getVT(TypeName(CCur(0.5))) = "VT_BSTR", "getVT(TypeName(CCur(0.5))) = " & getVT(TypeName(CCur(0.5)))) > +Call ok(TypeName(CStr(0.5)) = "String", "TypeName(CStr(0.5)) = " & TypeName(CStr(0.5))) > +Call ok(getVT(TypeName(CStr(0.5))) = "VT_BSTR", "getVT(TypeName(CStr(0.5))) = " & getVT(TypeName(CStr(0.5)))) > +Call ok(TypeName(CBool(0.5)) = "Boolean", "TypeName(CBool(0.5)) = " & TypeName(CBool(0.5))) > +Call ok(getVT(TypeName(CBool(0.5))) = "VT_BSTR", "getVT(TypeName(CBool(0.5))) = " & getVT(TypeName(CBool(0.5)))) Using True or False directly instead of CBool() would be cleaner. Jacek

June 17, 2014

Re: [PATCH 4/4] vbscript: Implemented Abs(try 2)

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

June 17, 2014

Re: [PATCH 3/4] vbscript: Implemented Sgn(try 2)

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

June 17, 2014

Re: [PATCH 2/4] vbscript: Implemented VarType(try 2)

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

June 17, 2014