September 2012 - Wine-Devel

Re: (try 3) imm32: there is only 1 default Hwnd per thread

by Alexandre Julliard

Aric Stewart <aric(a)codeweavers.com> writes: > Do you want to delay on this fix until I figure our what should be > happening with IMMGWL_IMC. Or I can have a second patch addressing > IMMGWL_IMC and how that is suppose to be handled. I think a few more test cases would be a good idea at this point. -- Alexandre Julliard julliard(a)winehq.org

Sept. 26, 2012

Re: (try 3) imm32: there is only 1 default Hwnd per thread

by Aric Stewart

On 9/26/12 10:18 AM, Alexandre Julliard wrote: > Aric Stewart <aric(a)codeweavers.com> writes: > >> - if (data->imeWnd == NULL) >> + if (defWnd == NULL) >> { >> /* create the ime window */ >> - data->imeWnd = CreateWindowExW( WS_EX_TOOLWINDOW, >> + defWnd = CreateWindowExW( WS_EX_TOOLWINDOW, >> data->immKbd->imeClassName, NULL, WS_POPUP, 0, 0, 1, 1, 0, >> 0, data->immKbd->hIME, 0); >> - SetWindowLongPtrW(data->imeWnd, IMMGWL_IMC, (LONG_PTR)data); >> - IMM_GetThreadData()->hwndDefault = data->imeWnd; >> + SetWindowLongPtrW(defWnd, IMMGWL_IMC, (LONG_PTR)data); >> + IMM_GetThreadData()->hwndDefault = defWnd; > > So now, shouldn't you be resetting IMMGWL_IMC at some point? > Yeah, I am digging into that as we speak. My testing on testbot is not giving me any real rational results on that area. At least nothing matching my documentation as to how it is suppose to work. I need to get my Japanese VM back up and working and really try to dig into that. Right now it is working and more correct that it was. My guess is that we should not be dealing with IMMGWL_IMC at all at that point anyway. Do you want to delay on this fix until I figure our what should be happening with IMMGWL_IMC. Or I can have a second patch addressing IMMGWL_IMC and how that is suppose to be handled. -aric

Sept. 26, 2012

Re: (try 3) imm32: there is only 1 default Hwnd per thread

by Alexandre Julliard

Aric Stewart <aric(a)codeweavers.com> writes: > - if (data->imeWnd == NULL) > + if (defWnd == NULL) > { > /* create the ime window */ > - data->imeWnd = CreateWindowExW( WS_EX_TOOLWINDOW, > + defWnd = CreateWindowExW( WS_EX_TOOLWINDOW, > data->immKbd->imeClassName, NULL, WS_POPUP, 0, 0, 1, 1, 0, > 0, data->immKbd->hIME, 0); > - SetWindowLongPtrW(data->imeWnd, IMMGWL_IMC, (LONG_PTR)data); > - IMM_GetThreadData()->hwndDefault = data->imeWnd; > + SetWindowLongPtrW(defWnd, IMMGWL_IMC, (LONG_PTR)data); > + IMM_GetThreadData()->hwndDefault = defWnd; So now, shouldn't you be resetting IMMGWL_IMC at some point? -- Alexandre Julliard julliard(a)winehq.org

Sept. 26, 2012

Re: (resend) imm32: there is only 1 default Hwnd per thread

by Aric Stewart

On 9/26/12 7:27 AM, Alexandre Julliard wrote: > Aric Stewart <aric(a)codeweavers.com> writes: > >> This corrects issues with applications that create and manage multiple IMCs >> try 2: >> avoid premature destruction of the window >> --- >> dlls/imm32/imm.c | 22 ++++++++++++---------- >> dlls/imm32/tests/imm32.c | 28 ++++++++++++++++++++++++++++ >> 2 files changed, 40 insertions(+), 10 deletions(-) >> >> >> >> diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c >> index 7394101..a18aa26 100644 >> --- a/dlls/imm32/imm.c >> +++ b/dlls/imm32/imm.c >> @@ -678,10 +678,6 @@ static BOOL IMM_DestroyContext(HIMC hIMC) >> data->immKbd->pImeSelect(hIMC, FALSE); >> SendMessageW(data->IMC.hWnd, WM_IME_SELECT, FALSE, (LPARAM)GetKeyboardLayout(0)); >> >> - if (IMM_GetThreadData()->hwndDefault == data->imeWnd) >> - IMM_GetThreadData()->hwndDefault = NULL; >> - DestroyWindow(data->imeWnd); >> - >> ImmDestroyIMCC(data->IMC.hCompStr); >> ImmDestroyIMCC(data->IMC.hCandInfo); >> ImmDestroyIMCC(data->IMC.hGuideLine); >> @@ -2323,12 +2319,18 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) >> >> if (data->imeWnd == NULL) >> { >> - /* create the ime window */ >> - data->imeWnd = CreateWindowExW( WS_EX_TOOLWINDOW, >> - data->immKbd->imeClassName, NULL, WS_POPUP, 0, 0, 1, 1, 0, >> - 0, data->immKbd->hIME, 0); >> - SetWindowLongPtrW(data->imeWnd, IMMGWL_IMC, (LONG_PTR)data); >> - IMM_GetThreadData()->hwndDefault = data->imeWnd; >> + HWND def = IMM_GetThreadData()->hwndDefault; >> + if (def == NULL) >> + { >> + /* create the ime window */ >> + data->imeWnd = CreateWindowExW( WS_EX_TOOLWINDOW, >> + data->immKbd->imeClassName, NULL, WS_POPUP, 0, 0, 1, 1, 0, >> + 0, data->immKbd->hIME, 0); >> + SetWindowLongPtrW(data->imeWnd, IMMGWL_IMC, (LONG_PTR)data); >> + IMM_GetThreadData()->hwndDefault = data->imeWnd; >> + } >> + else >> + data->imeWnd = def; > > So why is there a window in the IMC at all, if it's not used for > anything? > So looking and reading my documentation I can see i had a bit of a miss-understanding about the default IME window all the way back to when i initial did the code for loading IME as separate dlls. This is a leftover from that. There should not be a window in the IMC. I will remove that. -aric

Sept. 26, 2012

Re: [PATCH 2/8] vbscript: Added VT_R8 support to to_int

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 http://testbot.winehq.org/JobDetails.pl?Key=21824 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

Sept. 26, 2012

Re: [PATCH 1/8] vbscript: Added Round 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 http://testbot.winehq.org/JobDetails.pl?Key=21823 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

Sept. 26, 2012

Re: (resend) imm32: there is only 1 default Hwnd per thread

by Alexandre Julliard

Aric Stewart <aric(a)codeweavers.com> writes: > This corrects issues with applications that create and manage multiple IMCs > try 2: > avoid premature destruction of the window > --- > dlls/imm32/imm.c | 22 ++++++++++++---------- > dlls/imm32/tests/imm32.c | 28 ++++++++++++++++++++++++++++ > 2 files changed, 40 insertions(+), 10 deletions(-) > > > > diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c > index 7394101..a18aa26 100644 > --- a/dlls/imm32/imm.c > +++ b/dlls/imm32/imm.c > @@ -678,10 +678,6 @@ static BOOL IMM_DestroyContext(HIMC hIMC) > data->immKbd->pImeSelect(hIMC, FALSE); > SendMessageW(data->IMC.hWnd, WM_IME_SELECT, FALSE, (LPARAM)GetKeyboardLayout(0)); > > - if (IMM_GetThreadData()->hwndDefault == data->imeWnd) > - IMM_GetThreadData()->hwndDefault = NULL; > - DestroyWindow(data->imeWnd); > - > ImmDestroyIMCC(data->IMC.hCompStr); > ImmDestroyIMCC(data->IMC.hCandInfo); > ImmDestroyIMCC(data->IMC.hGuideLine); > @@ -2323,12 +2319,18 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) > > if (data->imeWnd == NULL) > { > - /* create the ime window */ > - data->imeWnd = CreateWindowExW( WS_EX_TOOLWINDOW, > - data->immKbd->imeClassName, NULL, WS_POPUP, 0, 0, 1, 1, 0, > - 0, data->immKbd->hIME, 0); > - SetWindowLongPtrW(data->imeWnd, IMMGWL_IMC, (LONG_PTR)data); > - IMM_GetThreadData()->hwndDefault = data->imeWnd; > + HWND def = IMM_GetThreadData()->hwndDefault; > + if (def == NULL) > + { > + /* create the ime window */ > + data->imeWnd = CreateWindowExW( WS_EX_TOOLWINDOW, > + data->immKbd->imeClassName, NULL, WS_POPUP, 0, 0, 1, 1, 0, > + 0, data->immKbd->hIME, 0); > + SetWindowLongPtrW(data->imeWnd, IMMGWL_IMC, (LONG_PTR)data); > + IMM_GetThreadData()->hwndDefault = data->imeWnd; > + } > + else > + data->imeWnd = def; So why is there a window in the IMC at all, if it's not used for anything? -- Alexandre Julliard julliard(a)winehq.org

Sept. 26, 2012

Re: d3dx9 [patch 1/5]: Implement D3DXSHMultiply4

by Rico Schüller

On 26.09.2012 12:17, Nozomi Kodama wrote: > + ta =0.28209479f * a[0]+ 0.14567312f * a[8]+ 0.12615663f * a[6]; > + tb =0.28209479f * b[0]+ 0.14567312f * b[8]+ 0.12615663f * b[6]; > + out[13] += ta * b[13] + tb * a[13]; > + t = a[13] * b[13]; > + out[0] +=0.28209479f *t; Please use spaces with care. The preferred way is "x = 123 * a[0] + 456 * b[234]; Mostly one space is enough, only use two or more if you like to indent something, that's mostly not the case when calculating a value. Even then, please be consistent across your patch. > + D3DXSHMultiply4(c, a, b); What happens if you use something like D3DXSHMultiply4(c, c, c). Is that allowed? Also is there a reason why it uses slightly different values than e.g. D3DXSHMultiply3? Why don't we use defines? A problem might be to find good names... Maybe the Multiply functions could share the same base? To me it looks like they do share a lot of calculations, And if the order doesn't matter (see comment above) then it may be possible to rearrange the calculation. ta = 0.28209479f * a[0] - 0.12615663f * a[6] - 0.21850969f * a[8]; vs ta = 0.28209479f * a[0] - 0.12615662f * a[6] - 0.21850968f * a[8]; Cheers Rico

Sept. 26, 2012

Re: winspool/tests: Don't crash when AddJob/GetJob fails (win8)

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 http://testbot.winehq.org/JobDetails.pl?Key=21799 Your paranoid android. === WINEBUILD (build) === Can't determine base name

Sept. 25, 2012

Re: ImmIsUIMessageA/W

by André Hentschel

Am 25.09.2012 21:54, schrieb Henri Verbeet: > On 25 September 2012 21:12, André Hentschel <nerv(a)dawncrow.de> wrote: >> I don't remember the app, be free to patch it in again, at best with tests. >> > Wasn't that for World of Tanks? > Oh, true. thx. It's all about http://bugs.winehq.org/show_bug.cgi?id=27554 d08fa61a568c618278132cd6abb6a093a5c7799a break WoT and 7673d67c1e1cfdcdf7560beea9162c3699329aa5 fixed it -- Best Regards, André Hentschel

Sept. 25, 2012