January 2010 - Wine-devel - list.winehq.org

Re: [PATCH 3/3] jscript: Add error handling to Array.reverse
by Paul Vriens 22 Jan '10

22 Jan '10

Hi Piotr, On 01/20/2010 05:23 PM, Piotr Caban wrote: > + if(FAILED(hres1)) > + return hres1; > + > hres2 = jsdisp_propget_idx(jsthis, l,&v2, ei, sp); > + if(FAILED(hres2)) { > + VariantClear(&v1); > + return hres2; > + } > > if(hres1 == DISP_E_UNKNOWNNAME) > - jsdisp_delete_idx(jsthis, l); > + hres1 = jsdisp_delete_idx(jsthis, l); Coverity (CID 1022) correctly spotted that the last if() will never be reached as we are now bailing out on a FAILED(hres1). Could you have a look? The same is true (me thinks) for hres2 but Coverity doesn't complain about that one, strange? -- Cheers, Paul.

1 0

RFC: dwarf merge patch
by André Hentschel 21 Jan '10

21 Jan '10

Hi, I made a patch to merge code from ntdll/signal_x86_64.c to dbghelp/dwarf.c The operator DW_OP_deref_size needs to read different sizes of variables from memory into a fixed size variable. Now i am not sure if my solution is the smallest and easiest one, so i would be happy for every comment on this. http://www.winehq.org/pipermail/wine-patches/2010-January/083899.html -- Best Regards, André Hentschel

2 3

Fwd: [user32/tests] Don't crash on Win9x/WinMe
by Peter Dons Tychsen 21 Jan '10

21 Jan '10

Forgot wine-devel, >>I'm lost here as TrackPopupMenu() is not called in a loop. It's only called once. So which API function are you referring to? I was referring to the "loop" we got into on NT4 where the proc handler would be re-entered again and again. My idea was that if this happened on 9x as well, then this we could cause a crash. Apparently this is not the case. Thanks, /pedro

1 0

Re: winex11.drv: Added missing mouse position clipping. (try 2)
by Vitaliy Margolen 21 Jan '10

21 Jan '10

Lauri Kenttä wrote: > When the cursor position is clipped with ClipCursor, the cursor should be > confined to that area. This patch fixes cursor position clipping in > X11DRV_ClipCursor, X11DRV_GetCursorPos, X11DRV_SetCursorPos and > X11DRV_send_mouse_input and makes the mouse warp to the new position if > moved outside the clip rect. > > The previous try fixed only clipping (not warping) and only in > GetCursorPos, but the problem wasn't that small after all. > --- > dlls/winex11.drv/mouse.c | 52 > ++++++++++++++++++++++++++++++++++++--------- > 1 files changed, 41 insertions(+), 11 deletions(-) > You changing way too many things without a single test. Lots of those areas you touch will break oh so many apps. For starters write some tests and verify what you doing is correct. You should be able to write tests for all injected messages (send_mouse_event). If you can't make an automated test, write a visual test for the rest and send to wine-devel. Especially pay attention to all messages sent, and order of calling hook, sending messages, modifying values returned from GetCursorPos(). You breaking that. And don't try to keep pointer inside Wine's window - this won't get past AJ. Vitaliy.

2 2

Re: [user32/tests] Don't crash on Win9x/WinMe
by Peter Dons Tychsen 21 Jan '10

21 Jan '10

> It took a while but I found the culprit. The crash is most likely because > the window is (about to be) destroyed. > > The only thing left to do is to fix the 211 test failures on NT4. > > I fixed a typo while at it and used a define instead of a magic value. > > > Are you sure this is the right fix? Is this crash not caused by the loop, and not the actual call to the menu? Other test-cases call the same API without this problem. /pedro

2 3

Re: wmc: Fix symbol was not declared and using plain integer as NULL pointer sparse warnings.
by Jacek Caban 21 Jan '10

21 Jan '10

Hi Rob, On 1/21/10 12:57 PM, Rob Shearman wrote: > --- > tools/wmc/wmc.c | 8 +++++--- > tools/wmc/wmc.h | 2 +- > 2 files changed, 6 insertions(+), 4 deletions(-) > --- a/tools/wmc/wmc.h +++ b/tools/wmc/wmc.h @@ -65,7 +65,7 @@ extern node_t *nodehead; extern lan_blk_t *lanblockhead; int mcy_lex(void); -FILE *yyin; +extern FILE *yyin; It looks like it worked before your patch only because it's used only in wmc.c, which means that it probably should be static. Thanks, Jacek

2 2

Re: cmd: Added cmd.exe tests.
by Paul Vriens 21 Jan '10

21 Jan '10

On 01/20/2010 06:35 PM, Jacek Caban wrote: > --- > programs/cmd/tests/Makefile.in | 14 ++ > programs/cmd/tests/batch.c | 286 ++++++++++++++++++++++++++++++++++ > programs/cmd/tests/rsrc.rc | 23 +++ > programs/cmd/tests/test_echo.cmd | 9 + > programs/cmd/tests/test_echo.cmd.out | 21 +++ > 5 files changed, 353 insertions(+), 0 deletions(-) > create mode 100644 programs/cmd/tests/Makefile.in > create mode 100644 programs/cmd/tests/batch.c > create mode 100644 programs/cmd/tests/rsrc.rc > create mode 100644 programs/cmd/tests/test_echo.cmd > create mode 100644 programs/cmd/tests/test_echo.cmd.out > Hi Jacek, Is the intention to have these being part of winetest? I do think more makefile magic (Dan's old patches?) is needed to get this actually to compile, not? -- Cheers, Paul.

2 1

Some Wine development statistics
by Paul Vriens 21 Jan '10

21 Jan '10

Hi, Just found this: http://gitstats.sourceforge.net/examples/wine/index.html -- Cheers, Paul.

1 0

Re: [PATCH] user32/tests: check that SetCursorPos doesn't call hooks.
by Nicolas Le Cam 21 Jan '10

21 Jan '10

2010/1/21 Lauri Kenttä <lauri.kentta(a)gmail.com>: > SetCursorPos should not call mouse low-level hooks. > --- > dlls/user32/tests/input.c | 16 ++++++++++++++++ > 1 files changed, 16 insertions(+), 0 deletions(-) > > diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c > index 7713ff6..a5dba06 100644 > --- a/dlls/user32/tests/input.c > +++ b/dlls/user32/tests/input.c > @@ -1198,6 +1198,7 @@ static void test_keynames(void) > > static POINT pt_old, pt_new; > static BOOL clipped; > +static int hook_proc2_call_times; > #define STEP 3 > > static LRESULT CALLBACK hook_proc1( int code, WPARAM wparam, LPARAM lparam ) > @@ -1231,6 +1232,8 @@ static LRESULT CALLBACK hook_proc2( int code, WPARAM wparam, LPARAM lparam ) > MSLLHOOKSTRUCT *hook = (MSLLHOOKSTRUCT *)lparam; > POINT pt; > > + ++hook_proc2_call_times; > + > if (code == HC_ACTION) > { > ok(hook->pt.x == pt_new.x && hook->pt.y == pt_new.y, > @@ -1281,6 +1284,7 @@ static void test_mouse_ll_hook(void) > HHOOK hook1, hook2; > POINT pt_org, pt; > RECT rc; > + int hook_proc2_call_times_old; > > GetCursorPos(&pt_org); > hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW | WS_VISIBLE, > @@ -1347,6 +1351,18 @@ static void test_mouse_ll_hook(void) > GetCursorPos(&pt); > ok(pt.x == pt_new.x && pt.y == pt_new.y, "Position changed: (%d,%d)\n", pt.x, pt.y); > > + /* Check that SetCursorPos doesn't call hooks. > + * Check twice: first moving to old coordinates, then to new. */ > + SetCursorPos(10, 10); > + > + hook_proc2_call_times_old = hook_proc2_call_times; > + SetCursorPos(10, 10); > + ok(hook_proc2_call_times_old == hook_proc2_call_times, "Hooks called\n"); > + > + hook_proc2_call_times_old = hook_proc2_call_times; > + SetCursorPos(20, 20); > + ok(hook_proc2_call_times_old == hook_proc2_call_times, "Hooks called\n"); > + > UnhookWindowsHookEx(hook2); > done: > DestroyWindow(hwnd); > -- > 1.6.6 > > > > Hi Lauri, What about resetting hook_proc2_call_times to 0 before calling SetCursorPos and just checking if it has changed ? Also other static variables used in hook procs aren't prefixed, this is more trivial but everyone is encouraged to follow current code style of the file. -- Nicolas Le Cam

2 1

Re: gdi32: Add OEM charset for processing in TranslateCharsetInfo
by Dmitry Timoshkov 21 Jan '10

21 Jan '10

Ilya Shpigor <shpigor(a)etersoft.ru> wrote: > Some details about this patch: > > The getting charset through the GetTextCharset works with mistakes for OEM > charset. The problem exist in SelectObject where the gdi font is created from > the logical font. Wine try to get information about the charset in this gdi > font creation through TranslateCharsetInfo, but don't able to do it. This > function works with predefined array of supported charsets and code pages. > OEM charset is absent in this array. > > Full list of this array in MSDN: > http://msdn.microsoft.com/en-us/library/dd317754%28VS.85%29.aspx > > This patch add the necessary items to this array. Then you need to add an extensive set of tests for TranslateCharsetInfo() to confirm that it's the source of the problem. Somehow I doubt that this is a correct place for the fix. -- Dmitry.

1 0