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

Re: Alexandre Julliard : oleaut32/tests: Add tmarshal test.
by Alexandre Julliard 23 Jan '07

23 Jan '07

Alexandre Julliard <julliard(a)wine.codeweavers.com> writes: > Module: wine > Branch: master > Commit: aa9dcb42019e0ebc0913d1a56b150684212099ea > URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa9dcb42019e0ebc0913d1a56… > > Author: Alexandre Julliard <julliard(a)winehq.org> > Date: Mon Jan 22 23:18:45 2007 +0100 > > oleaut32/tests: Add tmarshal test. Sorry, that one should of course have been credited to Rob Shearman, not sure why my name got in there instead... -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: user32: WM_SETFONT on button shouldn't repaint directly
by Clinton Stimpson 23 Jan '07

23 Jan '07

Anything wrong with this patch? It hasn't been accepted. Thanks, Clint Clinton Stimpson wrote: > This patch includes a couple improvements over the patch submitted > yesterday. > > Fix WM_SETFONT on a button to invalidate the rect instead of painting it > directly. > Test included. > > Thanks, > Clinton Stimpson > > ChangeLog: > user32: don't repaint button directly when setting font > > > ------------------------------------------------------------------------ > > Index: dlls/user32/button.c > =================================================================== > RCS file: /home/wine/wine/dlls/user32/button.c,v > retrieving revision 1.1 > diff -u -r1.1 button.c > --- dlls/user32/button.c 16 Nov 2006 14:02:17 -0000 1.1 > +++ dlls/user32/button.c 19 Jan 2007 06:03:45 -0000 > @@ -410,7 +410,7 @@ > > case WM_SETFONT: > set_button_font( hWnd, (HFONT)wParam ); > - if (lParam) paint_button( hWnd, btn_type, ODA_DRAWENTIRE ); > + if (LOWORD(lParam)) InvalidateRect(hWnd, NULL, TRUE); > break; > > case WM_GETFONT: > Index: dlls/user32/tests/msg.c > =================================================================== > RCS file: /home/wine/wine/dlls/user32/tests/msg.c,v > retrieving revision 1.15 > diff -u -r1.15 msg.c > --- dlls/user32/tests/msg.c 9 Jan 2007 12:11:42 -0000 1.15 > +++ dlls/user32/tests/msg.c 19 Jan 2007 06:03:45 -0000 > @@ -4159,6 +4159,14 @@ > { WM_CAPTURECHANGED, sent|wparam|defwinproc, 0 }, > { 0 } > }; > +static const struct message WmSetFontButtonSeq[] = > +{ > + { WM_SETFONT, sent }, > + { WM_PAINT, sent }, > + { WM_ERASEBKGND, sent|defwinproc }, > + { WM_CTLCOLORBTN, sent|defwinproc }, > + { 0 } > +}; > > static WNDPROC old_button_proc; > > @@ -4239,6 +4247,9 @@ > unsigned int i; > HWND hwnd; > DWORD dlg_code; > + MSG msg; > + LOGFONTA lf; > + HFONT zfont; > > subclass_button(); > > @@ -4278,6 +4289,25 @@ > > SendMessageA(hwnd, WM_LBUTTONUP, 0, 0); > ok_sequence(WmLButtonUpSeq, "WM_LBUTTONUP on a button", FALSE); > + > + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); > + flush_sequence(); > + > + lstrcpyA(lf.lfFaceName, "Symbol"); > + lf.lfHeight = 10; > + lf.lfItalic = 0; > + lf.lfEscapement = 0; > + lf.lfOrientation = 0; > + lf.lfUnderline = 0; > + lf.lfStrikeOut = 0; > + lf.lfWeight = 3; > + lf.lfWidth = 10; > + zfont = CreateFontIndirectA(&lf); > + SendMessageA(hwnd, WM_SETFONT, (WPARAM)zfont, TRUE); > + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); > + ok_sequence(WmSetFontButtonSeq, "WM_SETFONT on a button", FALSE); > + DeleteObject(zfont); > + > DestroyWindow(hwnd); > } > > > > ------------------------------------------------------------------------ > >

2 1

Re: Howdy! Newbie with keyboard patches.
by seebs＠plethora.net 22 Jan '07

22 Jan '07

Someone asked for a copy in unified diff format. So, here's the version that also translates F25-F32 into control-alt-shift (F1-F8). I don't know my way around the rest of the tree to encode this cleanly as an option for winecfg. --- wine-0.9.29/dlls/winex11.drv/keyboard.c 2007-01-09 09:42:47.000000000 -0600 +++ wine-0.9.29.patch/dlls/winex11.drv/keyboard.c 2007-01-22 14:18:23.000000000 -0600 @@ -1020,9 +1020,9 @@ /* function keys */ VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, VK_F7, VK_F8, VK_F9, VK_F10, /* FFC0 */ - VK_F11, VK_F12, VK_F13, VK_F14, VK_F15, VK_F16, 0, 0, /* FFC8 */ - 0, 0, 0, 0, 0, 0, 0, 0, /* FFD0 */ - 0, 0, 0, 0, 0, 0, 0, 0, /* FFD8 */ + VK_F11, VK_F12, VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, /* FFC8 */ + VK_F19, VK_F20, VK_F21, VK_F22, VK_F23, VK_F24, VK_F25, VK_F26, /* FFD0 */ + VK_F27, VK_F28, VK_F29, VK_F30, VK_F31, VK_F32, 0, 0, /* FFD8 */ /* modifier keys */ 0, VK_SHIFT, VK_SHIFT, VK_CONTROL, /* FFE0 */ VK_CONTROL, VK_CAPITAL, 0, VK_MENU, @@ -1066,8 +1066,8 @@ /* function keys */ 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44, /* FFC0 */ - 0x57, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FFC8 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FFD0 */ + 0x57, 0x58, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, /* FFC8 */ + 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x76, 0x00, 0x00, /* FFD0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FFD8 */ /* modifier keys */ 0x00, 0x2A, 0x36, 0x1D, 0x11D, 0x3A, 0x00, 0x38, /* FFE0 */ @@ -1465,7 +1465,35 @@ if ( event->type == KeyRelease ) dwFlags |= KEYEVENTF_KEYUP; if ( vkey & 0x100 ) dwFlags |= KEYEVENTF_EXTENDEDKEY; - X11DRV_send_keyboard_input( vkey & 0xff, bScan, dwFlags, event_time, 0, 0 ); + if ((vkey & 0xFF) >= VK_F13 && (vkey & 0xFF) <= VK_F24) { + /* translate to control-alt-F(N-12) */ + vkey = vkey - 12; + if (event->type != KeyRelease) { + X11DRV_send_keyboard_input(VK_MENU, 0, 0, event_time, 0, 0 ); + X11DRV_send_keyboard_input(VK_CONTROL, 0, 0, event_time, 0, 0 ); + } + X11DRV_send_keyboard_input( vkey & 0xff, bScan, dwFlags, event_time, 0, 0 ); + if (event->type != KeyRelease) { + X11DRV_send_keyboard_input(VK_CONTROL, 0, KEYEVENTF_KEYUP, event_time, 0, 0 ); + X11DRV_send_keyboard_input(VK_MENU, 0, KEYEVENTF_KEYUP, event_time, 0, 0 ); + } + } else if ((vkey & 0xFF) >= VK_F25 && (vkey & 0xFF) <= VK_F32) { + /* translate to control-alt-shift-F(N-24) */ + vkey = vkey - 24; + if (event->type != KeyRelease) { + X11DRV_send_keyboard_input(VK_MENU, 0, 0, event_time, 0, 0 ); + X11DRV_send_keyboard_input(VK_CONTROL, 0, 0, event_time, 0, 0 ); + X11DRV_send_keyboard_input(VK_SHIFT, 0, 0, event_time, 0, 0 ); + } + X11DRV_send_keyboard_input( vkey & 0xff, bScan, dwFlags, event_time, 0, 0 ); + if (event->type != KeyRelease) { + X11DRV_send_keyboard_input(VK_SHIFT, 0, KEYEVENTF_KEYUP, event_time, 0, 0 ); + X11DRV_send_keyboard_input(VK_CONTROL, 0, KEYEVENTF_KEYUP, event_time, 0, 0 ); + X11DRV_send_keyboard_input(VK_MENU, 0, KEYEVENTF_KEYUP, event_time, 0, 0 ); + } + } else { + X11DRV_send_keyboard_input( vkey & 0xff, bScan, dwFlags, event_time, 0, 0 ); + } } } } @@ -2253,8 +2281,10 @@ function keys. Soooo.. We will leave the table alone and fudge the lookup here till the other part is found and fixed!!! */ - if ( ((scanCode >= 0x13b) && (scanCode <= 0x144)) || - (scanCode == 0x157) || (scanCode == 0x158)) + if (((scanCode >= 0x13b) && (scanCode <= 0x144)) || + ((scanCode >= 0x164) && (scanCode <= 0x16e)) || + (scanCode == 0x157) || (scanCode == 0x158) || + (scanCode == 0x176)) scanCode &= 0xff; /* remove "extended-key" flag for Fx keys */ /* let's do scancode -> keycode -> keysym -> String */ --- wine-0.9.29/include/winuser.h 2007-01-09 09:42:47.000000000 -0600 +++ wine-0.9.29.patch/include/winuser.h 2007-01-22 13:56:34.000000000 -0600 @@ -3595,7 +3595,14 @@ #define VK_F22 0x85 #define VK_F23 0x86 #define VK_F24 0x87 -/* 0x88-0x8F Unassigned */ +#define VK_F25 0x88 +#define VK_F26 0x89 +#define VK_F27 0x8A +#define VK_F28 0x8B +#define VK_F29 0x8C +#define VK_F30 0x8D +#define VK_F31 0x8E +#define VK_F32 0x8F #define VK_NUMLOCK 0x90 #define VK_SCROLL 0x91 #define VK_OEM_NEC_EQUAL 0x92

1 0

Re: kernel32: Don't require full access to the newly created process and thread.
by Robert Shearman 22 Jan '07

22 Jan '07

Vitaliy Margolen wrote: > - req->process_access = PROCESS_ALL_ACCESS; > + req->process_access = MAXIMUM_ALLOWED | PROCESS_ALL_ACCESS; > req->process_attr = (psa && (psa->nLength >= sizeof(*psa)) && psa->bInheritHandle) ? OBJ_INHERIT : 0; > - req->thread_access = THREAD_ALL_ACCESS; > + req->thread_access = MAXIMUM_ALLOWED | THREAD_ALL_ACCESS; This looks wrong/confusing. I don't think MAXIMUM_ALLOWED does anything more when or'd with specific access rights. -- Rob Shearman

2 2

Re: comctl32: Fix the updown control test to pass under XP
by Lei Zhang 22 Jan '07

22 Jan '07

Hey, I was just about to send a similar patch in as well. I mentioned this in a different thread yesterday, but the updown ok_sequence_() function is not honoring the optional flag, you need this chunk of code as well: diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c @@ -279,6 +280,8 @@ static void ok_sequence_(int sequence_in expected++; actual++; } + else if (expected->flags & optional) + expected++; else if (todo) { failcount++; On 1/20/07, Dmitry Timoshkov <dmitry(a)codeweavers.com> wrote: > Hello, > > this patch makes the updown test pass cleanly under XP, and (inadvertently) > allows one more message sequence to pass under Wine. > > Changelog: > comctl32: Fix the updown control test to pass under XP. > > --- > dlls/comctl32/tests/updown.c | 13 +++++++++++-- > 1 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c > index e0b8131..9a9c493 100644 > --- a/dlls/comctl32/tests/updown.c > +++ b/dlls/comctl32/tests/updown.c > @@ -109,6 +109,7 @@ static const struct message create_parent_wnd_seq[] = { > { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, > /* Win9x adds SWP_NOZORDER below */ > { WM_WINDOWPOSCHANGED, sent, /*|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE*/ }, > + { WM_NCCALCSIZE, sent|wparam|optional, 1 }, > { WM_SIZE, sent }, > { WM_MOVE, sent }, > { 0 } > @@ -123,7 +124,7 @@ static const struct message add_updown_with_edit_seq[] = { > { WM_WINDOWPOSCHANGING, sent }, > { WM_NCCALCSIZE, sent|wparam, TRUE }, > { WM_WINDOWPOSCHANGED, sent }, > - { WM_SIZE, sent|wparam|lparam|defwinproc, SIZE_RESTORED, MAKELONG(91, 75) }, > + { WM_SIZE, sent|wparam|defwinproc, SIZE_RESTORED /*, MAKELONG(91, 75) exact size depends on font */ }, > { 0 } > }; > > @@ -202,6 +203,8 @@ static void ok_sequence_(int sequence_index, const struct message *expected, > > while (expected->message && actual->message) > { > + trace_( file, line)("expected %04x - actual %04x\n", expected->message, actual->message); > + > if (expected->message == actual->message) > { > if (expected->flags & wparam) > @@ -356,6 +359,8 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP > message != WM_GETICON && > message != WM_DEVICECHANGE) > { > + trace("parent: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam); > + > msg.message = message; > msg.flags = sent|wparam|lparam; > if (defwndproc_counter) msg.flags |= defwinproc; > @@ -413,6 +418,8 @@ static LRESULT WINAPI edit_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, > LRESULT ret; > struct message msg; > > + trace("edit: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam); > + > msg.message = message; > msg.flags = sent|wparam|lparam; > if (defwndproc_counter) msg.flags |= defwinproc; > @@ -459,6 +466,8 @@ static LRESULT WINAPI updown_subclass_proc(HWND hwnd, UINT message, WPARAM wPara > LRESULT ret; > struct message msg; > > + trace("updown: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam); > + > msg.message = message; > msg.flags = sent|wparam|lparam; > if (defwndproc_counter) msg.flags |= defwinproc; > @@ -519,7 +528,7 @@ static void test_create_updown_control(void) > updown = create_updown_control(); > ok(updown != NULL, "Failed to create updown control\n"); > ok_sequence(PARENT_SEQ_INDEX, add_updown_to_parent_seq, "add updown control to parent", TRUE); > - ok_sequence(EDIT_SEQ_INDEX, add_updown_with_edit_seq, "add updown control with edit", TRUE); > + ok_sequence(EDIT_SEQ_INDEX, add_updown_with_edit_seq, "add updown control with edit", FALSE); > > flush_sequences(); > > -- > 1.4.4.4 > > > > > >

1 0

Re: [4] snmpapi: Implement SnmpUtil{DbgPrint, IdsToA, OidToA, PrintAsnAny, PrintOid}.
by Alexandre Julliard 22 Jan '07

22 Jan '07

Hans Leidekker <hans(a)it.vu.nl> writes: > +/*********************************************************************** > + * SnmpUtilPrintOid (SNMPAPI.@) > + */ > +void WINAPI SnmpUtilPrintOid(AsnObjectIdentifier *oid) > +{ > + unsigned int i; > + > + TRACE("(%p)\n", oid); > + > + if (!oid) return; > + > + for (i = 0; i < oid->idLength; i++) > + { > + printf("%u", oid->ids[i]); > + if (i < oid->idLength - 1) printf("."); > + } > +} You don't want to use stdio functions in Wine. If apps really depend on these functions you'd have to use msvcrt, but otherwise you can simply use TRACE (or not implement them at all). -- Alexandre Julliard julliard(a)winehq.org

3 2

Re: [AppDB] Langauge fixes for the FAQ
by Francois Gouget 22 Jan '07

22 Jan '07

On Sat, 20 Jan 2007, Alexander Nicolaysen Sørnes wrote: > Langauge fixes for the FAQ. -Q: How can I submit How-to's? +Q: How can I submit how-to's? I tend to prefer 'howto' or 'how to' rather than 'how-to'. Also, plurals normally don't have a single quote. So I'd write 'howtos'. Alternately this could be rephrased as 'How can I submit a how to?'. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Stolen from an Internet user: "f u cn rd ths, u cn gt a gd jb n cmptr prgrmmng !"

5 4

Re: SHELL32: Implement the property sheet extension array functions (resend)
by Thomas Weidenmueller 22 Jan '07

22 Jan '07

Any feedback for why the patch hasn't been accepted? - Thomas

1 0

Re: [PATCH 1/14] winex11.drv: Make X11DRV_window_to_X_rect use hwnd instead of win_data
by Alexandre Julliard 22 Jan '07

22 Jan '07

Pierre d'Herbemont <pdherbemont(a)free.fr> writes: > -void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ) > +void X11DRV_window_to_X_rect( HWND hwnd, RECT *rect ) > { > RECT rc; > > - if (!data->managed) return; > + if (!is_window_managed(hwnd)) return; > if (IsRectEmpty( rect )) return; This won't work, is_window_managed() will re-evaluate the managed flag so it will give wrong results if the window style has changed. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 7/14] user32: Send the WM_NCCREATE message from user32's CreateWindow
by Robert Shearman 22 Jan '07

22 Jan '07

Pierre d'Herbemont wrote: > @@ -1031,18 +1032,6 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CRE > /* get class or window DC if needed */ > alloc_window_dce( data ); > > - /* send WM_NCCREATE */ > - TRACE( "hwnd %p cs %d,%d %dx%d\n", hwnd, cs->x, cs->y, cs->cx, cs->cy ); > - if (unicode) > - ret = SendMessageW( hwnd, WM_NCCREATE, 0, (LPARAM)cs ); > - else > - ret = SendMessageA( hwnd, WM_NCCREATE, 0, (LPARAM)cs ); > - if (!ret) > - { > - WARN("aborted by WM_xxCREATE!\n"); > - return FALSE; > - } > - > I'm not an expert in this area by any means, but couldn't there now be a problem where calling GetDCEx on the window during WM_NCCREATE processing would fail? Maybe there should be a PreCreateWindow function? -- Rob Shearman

2 1