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

Re: [PATCH] riched20: Don't create too many IRichEditOle interfaces for a RichEdit. (try 2)
by Huw Davies 25 Jun '14

25 Jun '14

On Wed, Jun 25, 2014 at 06:56:00PM +0800, Jactry Zeng wrote: > diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c > index 2af2582..65e70fa 100644 > --- a/dlls/riched20/editor.c > +++ b/dlls/riched20/editor.c > @@ -4468,6 +4468,13 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, > case EM_GETOLEINTERFACE: > { > LPVOID *ppvObj = (LPVOID*) lParam; > + if (editor->reOle) > + { > + *ppvObj = editor->reOle; > + IRichEditOle_AddRef(*ppvObj); > + return 1; > + } > + > return CreateIRichEditOle(editor, ppvObj); > } > case EM_GETPASSWORDCHAR: Better to assign editor->reOle here too. That will be one ref, then every returned iface should add another ref. So the first iface returned will have refcount of 2 and then your tests will pass. You release the final ref in the editor destructor. > diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h > index f139c29..3722c82 100644 > --- a/dlls/riched20/editstr.h > +++ b/dlls/riched20/editstr.h > @@ -388,6 +388,7 @@ typedef struct tagME_TextEditor > { > HWND hWnd, hwndParent; > ITextHost *texthost; > + LPVOID reOle; Needs correct type. Huw.

2 1

Failing tests on test bots
by Jeremy White 25 Jun '14

25 Jun '14

Alright, We have a new VM server. We have a new WineHQ server. Things should be stable, or getting better from now on. But we still have 32 failures: http://www.winehq.org/~jwhite/e29fd5429234.html This sucks. Let's fix it. Cheers, Jeremy

1 0

Re: [PATCH 2/4] vbscript: Implemented VarType(try 3)
by Piotr Caban 25 Jun '14

25 Jun '14

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.

2 3

Re: [PATCH] riched20: Don't create too many IRichEditOle interfaces for a RichEdit.
by Huw Davies 25 Jun '14

25 Jun '14

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.

2 1

Re: [PATCH 3/4] vbscript: Implemented Sgn(try 3)
by Piotr Caban 25 Jun '14

25 Jun '14

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

2 2

Re: [Patch 3/3] regsvr32: Convert char* to WCHAR*
by Vincent Povirk 25 Jun '14

25 Jun '14

You should probably combine this with patch 1, so we don't have an intermediate stage where the output is broken. On Tue, Jun 24, 2014 at 7:07 AM, Hugh McMaster <hugh.mcmaster(a)masterindexing.com> wrote: > This patch converts the char* strings of DllRegisterServer, DllUnregisterServer and DllInstall to WCHAR* strings for direct Unicode output. This avoids the need to modify any resource strings. > > >

2 1

Re: [PATCH 4/4] vbscript: Implemented Abs(try 3)
by Marvin 24 Jun '14

24 Jun '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=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

1 0

Re: [PATCH 3/4] vbscript: Implemented Sgn(try 3)
by Marvin 24 Jun '14

24 Jun '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=7679 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 2/4] vbscript: Implemented VarType(try 3)
by Marvin 24 Jun '14

24 Jun '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=7678 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 1/4] vbscript: Implemented TypeName(try 3)
by Marvin 24 Jun '14

24 Jun '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=7677 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