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

Re: [PATCH] riched20: Don't create too many IRichEditOle interfaces for a RichEdit.

by Jactry Zeng

2014-06-25 16:24 GMT+08:00 Huw Davies <huw(a)codeweavers.com>: > > > This is not the way to do this. You want to be calling AddRef > on the interface. You probably want to do the if(editor->reOle) > check in the EM_GETOLEINTERFACE handler and only call this > constructor when needed. Thanks Huw! A newer version will be sent. -- Regards, Jactry Zeng

June 25, 2014

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

by Shuai Meng

2014-06-25 17:37 GMT+08:00 Piotr Caban <piotr.caban(a)gmail.com>: > On 06/25/14 11:35, Piotr Caban wrote: > >> On 06/25/14 04:21, Shuai Meng wrote: >> >>> + hres = VariantChangeType(&dst, v, VARIANT_LOCALBOOL, VT_R8); >>> >> There's no need to pass VARIANT_LOCALBOOL flag here. >> >> static HRESULT Global_Sgn(vbdisp_t *This, VARIANT *arg, unsigned >>> args_cnt, VARIANT *res) >>> { >>> - FIXME("\n"); >>> - return E_NOTIMPL; >>> + double v; >>> + HRESULT hres; >>> + >>> + TRACE("(%s)\n", debugstr_variant(arg)); >>> + >>> + assert(args_cnt == 1); >>> + >>> + hres = to_double(arg, &v); >>> + if (FAILED(hres)) >>> + return S_OK; >>> >> I haven't seen it earlier, you should probably return hres here. > Yes, you are right, I made a mistake here. Thank you.

June 25, 2014

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

by Piotr Caban

On 06/25/14 11:35, Piotr Caban wrote: > On 06/25/14 04:21, Shuai Meng wrote: >> + hres = VariantChangeType(&dst, v, VARIANT_LOCALBOOL, VT_R8); > There's no need to pass VARIANT_LOCALBOOL flag here. > >> static HRESULT Global_Sgn(vbdisp_t *This, VARIANT *arg, unsigned >> args_cnt, VARIANT *res) >> { >> - FIXME("\n"); >> - return E_NOTIMPL; >> + double v; >> + HRESULT hres; >> + >> + TRACE("(%s)\n", debugstr_variant(arg)); >> + >> + assert(args_cnt == 1); >> + >> + hres = to_double(arg, &v); >> + if (FAILED(hres)) >> + return S_OK; I haven't seen it earlier, you should probably return hres here.

June 25, 2014

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

by Piotr Caban

On 06/25/14 04:21, Shuai Meng wrote: > + hres = VariantChangeType(&dst, v, VARIANT_LOCALBOOL, VT_R8); There's no need to pass VARIANT_LOCALBOOL flag here. > static HRESULT Global_Sgn(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > { > - FIXME("\n"); > - return E_NOTIMPL; > + double v; > + HRESULT hres; > + > + TRACE("(%s)\n", debugstr_variant(arg)); > + > + assert(args_cnt == 1); > + > + hres = to_double(arg, &v); > + if (FAILED(hres)) > + return S_OK; > + > + if(!res) > + return DISP_E_BADVARTYPE; This function should not return error if res is NULL. There's similar mistake in Abs implementation. Cheers, Piotr

June 25, 2014

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

by Piotr Caban

On 06/25/14 04:19, Shuai Meng wrote: > 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(V_VT(arg) & ~VT_TYPEMASK) { > + FIXME("not supported %s\n", debugstr_variant(arg)); > + return E_NOTIMPL; > + } > + > + if(!res) > + return DISP_E_BADVARTYPE; This function should not return error if res is NULL.

June 25, 2014

Re: wined3d: Use shader and fragment capabilities to select d3d level

by Henri Verbeet

On 23 June 2014 21:10, Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> wrote: > +static UINT d3d_level_from_gl_info(const struct wined3d_gl_info *gl_info) > +{ > + struct shader_caps shader_caps; > + struct fragment_caps fragment_caps; > + const struct wined3d_shader_backend_ops *shader_backend; > + const struct fragment_pipeline *fragment_pipeline; > + > + shader_backend = select_shader_backend(gl_info); > + shader_backend->shader_get_caps(gl_info, &shader_caps); > + > + if (shader_caps.vs_version >= 4) > + return 10; > + //wine can not use SM 4 on mesa drivers as the necessary functionality is not exposed on compatibility contexts, but still set the pci id accordingly Please avoid C99 features like // comments. > + if (shader_caps.vs_version == 3 && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30)) > + return 10; > + if (shader_caps.vs_version >= 2) > + return 9; > + if (shader_caps.vs_version == 1) > + return 8; > + > + fragment_pipeline = select_fragment_implementation(gl_info, shader_backend); > + fragment_pipeline->get_caps(gl_info, &fragment_caps); > + > + if (fragment_caps.TextureOpCaps & WINED3DTEXOPCAPS_DOTPRODUCT3) > + return 7; > + if (gl_info->limits.textures > 1) > + return 6; That's "fragment_caps.MaxSimultaneousTextures". It probably makes sense to reorganize things a bit. For example, the gl_info parameter to the select_card() callbacks in struct gl_vendor_selection is really only used by select_card_nvidia_binary() and select_card_amd_binary() to call d3d_level_from_gl_info(), but I don't think anything of value would be lost if those used a plain table like e.g. select_card_amd_mesa(). (At which point you wouldn't need a callback there anymore either.) d3d_level_from_gl_info() should probably get the shader and fragment caps passed as parameters, and be renamed. It probably makes sense to make it return some kind of enum instead of a plain number, so you can e.g. distinguish between D3D9 SM2 and D3D9 SM3. That would also allow the fallback card selection code to use plain tables instead of callbacks.

June 25, 2014

Re: Tahoma fonts and Greek language

by Huw Davies

On Tue, Jun 24, 2014 at 11:07:26AM +0300, Petros F wrote: > Hello, > > When you install wine in a PC with Greek language, or run a program that > requires or uses Greek fonts, the fonts could not appear correctly because of > the pre-installed tahoma font which it hasn't Greek letters for some reason. So > the user has to change the font manually to another font or to paste a Greek > tahoma font into /usr/share/fonts or /home/.fonts folder. > I was wondering if it is possible to include these tahoma fonts (that have > Greek letters) and the procedure of their installation in the wine > installation? No, of course not. You'll have to draw the Greek glyphs yourself. Huw.

June 25, 2014

Re: [PATCH] riched20: Don't create too many IRichEditOle interfaces for a RichEdit.

by Huw Davies

On Wed, Jun 25, 2014 at 01:59:42PM +0800, Jactry Zeng wrote: > @@ -1502,6 +1503,13 @@ LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *ppObj) > { > IRichEditOleImpl *reo; > > + if (editor->reOle) > + { > + reo = editor->reOle; > + reo->ref++; > + *ppObj = reo; > + return 1; > + } > reo = heap_alloc(sizeof(IRichEditOleImpl)); > if (!reo) > return 0; This is not the way to do this. You want to be calling AddRef on the interface. You probably want to do the if(editor->reOle) check in the EM_GETOLEINTERFACE handler and only call this constructor when needed. Huw.

June 25, 2014

RE: [Patch 3/3] regsvr32: Convert char* to WCHAR*

by Hugh McMaster

On Wednesday, 25 June 2014 2:07 AM, Vincent Povirk wrote: > You should probably combine this with patch 1, so we don't have an > intermediate stage where the output is broken. Good point. I'll send a combined patch. Thank you.

June 25, 2014

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

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=7680 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 25, 2014