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

Re: riched20: Don't create undos in ME_StreamIn
by Alexandre Julliard Jan. 24, 2007

Jan. 24, 2007

"Matt Finnicum" <mattfinn(a)gmail.com> writes: > This fixes bug 7148 - a regression caused by one of my older patches. > This restores the old code that prevented ME_StreamIn from erroneously > creating undos. > > Changelog: > riched20: Don't create undos in ME_StreamIn It breaks the tests: ../../../tools/runtest -q -P wine -M riched20.dll -T ../../.. -p riched20_test.exe.so editor.c && touch editor.ok editor.c:862: Test failed: EM_SETUNDOLIMIT didn't allow the first undo with UNDOLIMIT set to 2 editor.c:865: Test failed: EM_SETUNDOLIMIT didn't allow a second undo with UNDOLIMIT set to 2 editor.c:1447: Test failed: test paste: strcmp = -1 make[2]: *** [editor.ok] Error 3 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: add support for slists
by Dmitry Timoshkov Jan. 24, 2007

Jan. 24, 2007

And one more... "Damjan Jovanovic" <damjan.jov(a)gmail.com> wrote: > +__int64 interlocked_cmpxchg64( __int64 **dest, __int64 *xchg, __int64 *compare ) > +{ > + _lwp_mutex_lock( &interlocked_mutex ); > + if (memcmp(*dest, compare, 8) == 0) > + memcpy(*dest, xchg, 8); > + else > + memcpy(compare, *dest); > + _lwp_mutex_unlock( &interlocked_mutex ); > + return compare; > +} Is there any particular reason that you use memcmp/memcpy instead of directly manipulating 64-bit values? -- Dmitry.

2 1

Re: add support for slists
by Dmitry Timoshkov Jan. 24, 2007

Jan. 24, 2007

And some other problems with the patch: "Damjan Jovanovic" <damjan.jov(a)gmail.com> wrote: > --- a/include/winbase.h 2007-01-09 17:42:47.000000000 +0200 > +++ b/include/winbase.h 2007-01-24 09:50:04.000000000 +0200 > @@ -2343,6 +2343,14 @@ > > #endif /* __i386__ && __GNUC__ && __WINESRC__ && !_NTSYSTEM_ */ > > +#if (_WIN32_WINNT >= 0x0501) > +VOID WINAPI InitializeSListHead(PSLIST_HEADER); > +USHORT WINAPI QueryDepthSList(PSLIST_HEADER); > +PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER); > +PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER); > +PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY); > +#endif Usually Wine doesn't use and doesn't need the checks for _WIN32_WINNT and similar macros. There are a couple of violations to that rule, but they need to be fixed. libs/port/interlocked.c changes should be sent separately, please remove c++ comments from them first. -- Dmitry.

1 0

Re: add support for slists
by Dmitry Timoshkov Jan. 24, 2007

Jan. 24, 2007

"Damjan Jovanovic" <damjan.jov(a)gmail.com> wrote: > + kernel32 = LoadLibraryA("KERNEL32.DLL"); All the kernel32 tests are already implicitly linked to kernel32.dll, therefore GetModuleHandle("kernel32.dll") is perfectly enough and is guaranteed to succeed. > + if (kernel32 == NULL) > + { > + trace("couldn't open KERNEL32.DLL, skipping slist tests\n"); > + return; > + } There was a new Wine test function introduced to mark the skipped tests - skip(), please use it when a test is going to be skipped for whatever reason. > + pInitializeSListHead = (void*) GetProcAddress(kernel32, "InitializeSListHead"); > + pQueryDepthSList = (void*) GetProcAddress(kernel32, "QueryDepthSList"); > + pInterlockedFlushSList = (void*) GetProcAddress(kernel32, "InterlockedFlushSList"); > + pInterlockedPopEntrySList = (void*) GetProcAddress(kernel32, "InterlockedPopEntrySList"); > + pInterlockedPushEntrySList = (void*) GetProcAddress(kernel32, "InterlockedPushEntrySList"); > + if (pInitializeSListHead == NULL || > + pQueryDepthSList == NULL || > + pInterlockedFlushSList == NULL || > + pInterlockedPopEntrySList == NULL || > + pInterlockedPushEntrySList == NULL) > + { > + trace("some required slist entrypoints were not found, skipping tests\n"); > + FreeLibrary(kernel32); > + } A 'return;' is missing here, as well as a skip() call. -- Dmitry.

1 0

Re: doc: Add info about where to get the Windows DDK
by Detlef Riekenberg Jan. 24, 2007

Jan. 24, 2007

On Mi, 2007-01-24 at 13:31 +1100, Jeff Latimer wrote: Thanks for your update. Just a small typo (Device => Driver): DDK is the Windows Driver Development Kit -- By by ... Detlef

1 0

gecko download busted?
by Dan Kegel Jan. 23, 2007

Jan. 23, 2007

Wine-0.9.27's iexplore.exe isn't downloading gecko for me. It tries, but then gives up, and says html rendering is disabled. +wininet shows that it did connect to winehq.org and got a redirect to sourceforge: trace:wininet:HTTP_GetResponseHeaders raw headers: L"HTTP/1.1 302 Found\r\nDate: Thu, 11 Jan 2007 15:47:17 GMT\r\nServer: Apache/2.0.54 (Debian GNU/Linux)\r\nLocation: http://optusnet.dl.sourceforge.net/sourceforge/wine/wine_gecko.cab\r\nConne…: close\r\nContent-Type: text/html\r\n\r\n" but no connection request to that new URL, and the cabextract failed. I guess I'll try with a newer wine once I get to the office... - Dan

4 4

Directplay Sevice Provider
by Alessandro Pignotti Jan. 23, 2007

Jan. 23, 2007

Hi everyone, i'm taking a look at wine's directplay implementation. From the the wiki i've seen that there are efforts to understand the directplay protocol. But it seems to be be quite a difficult task. Would not be a better idea to implement a wine directplay service provider with our own protocol, not compatible with microsoft tcp/ip service provider, but portable and usable on both windows and linux? Bye Pignotti Alessandro -- Vi Veri Veniversum Vivus Vici -Dr. Faustus - Marlowe

4 3

Re: user32: WM_SETFONT on button shouldn't repaint directly
by Dmitry Timoshkov Jan. 23, 2007

Jan. 23, 2007

"Clinton Stimpson" <cjstimpson(a)utwire.net> wrote: > - if (lParam) paint_button( hWnd, btn_type, ODA_DRAWENTIRE ); > + if (LOWORD(lParam)) InvalidateRect(hWnd, NULL, TRUE); Your test doesn't show that the usage of LOWORD(lParam) is justified. -- Dmitry.

1 0

Howdy! Newbie with keyboard patches.
by seebs＠plethora.net Jan. 23, 2007

Jan. 23, 2007

Hi! I'm new to Wine, but not a total newbie at C. I have a very specific interest: I would like Wine to support more keys. Background: Windows has support for no fewer than 24 function keys; in fact, possibly, as many as 32. However, right now, Wine only supports 16 of them. It is insanely trivial to patch Wine to support 24 function keys by plugging new values into nonchar_key_vkey and nonchar_key_scan. It is not much harder to support 32 at least partially; some sites claim that vkey values 0x88-0x8F are intended to be used as F25-F32, but there are no corresponding codes. Well, okay; it's not unheard of for a key to have a vkey value but no corresponding scan code. I have diffs for this. It works. There's just one TINY little problem. Many Windows games have no support for these keys! NOOOOO! I have implemented and tested a patch which is almost certainly unsuitable for production, but which is very convenient to me; it is this patch I enclose. This patch replaces F13-F24 with "control-alt-F1" through "control-alt-F12", and F25-F32 control-alt-shift-F1 through F8. Now, this is great for me, but it is obviously unsuitable as the only behavior; it deprives people of functioning keys. (My implementation my also be utter crap, but "it works in Warcraft", and that's my real interest.) I have no clue how to do Wine configuration settings. I think that this behavior is likely to be useful to a lot of people; X systems are easy to configure to generate extra keysyms, and many people have interesting keyboards which generate a broad range of additional values. Binding them to function keys is useful, and this patch would allow people to use such things in Windows games. Insofar as I have any possible copyright claim on this patch, I hereby release it into the public domain. Also, not in patch form, the winuser.h change: #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 --- *** keyboard.c.orig Mon Jan 22 11:10:15 2007 --- keyboard.c Mon Jan 22 13:59:38 2007 *************** *** 1020,1027 **** /* 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 */ /* modifier keys */ 0, VK_SHIFT, VK_SHIFT, VK_CONTROL, /* FFE0 */ --- 1020,1027 ---- /* 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, VK_F17, VK_F18, /* FFC8 */ ! VK_F19, VK_F20, VK_F21, VK_F22, VK_F23, VK_F24, 0, 0, /* FFD0 */ 0, 0, 0, 0, 0, 0, 0, 0, /* FFD8 */ /* modifier keys */ 0, VK_SHIFT, VK_SHIFT, VK_CONTROL, /* FFE0 */ *************** *** 1066,1073 **** /* 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 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FFD8 */ /* modifier keys */ 0x00, 0x2A, 0x36, 0x1D, 0x11D, 0x3A, 0x00, 0x38, /* FFE0 */ --- 1066,1073 ---- /* function keys */ 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44, /* FFC0 */ ! 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,1471 **** 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 ); } } } --- 1465,1499 ---- if ( event->type == KeyRelease ) dwFlags |= KEYEVENTF_KEYUP; if ( vkey & 0x100 ) dwFlags |= KEYEVENTF_EXTENDEDKEY; ! 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-F(N-12) */ ! 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,2260 **** 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)) scanCode &= 0xff; /* remove "extended-key" flag for Fx keys */ /* let's do scancode -> keycode -> keysym -> String */ --- 2281,2290 ---- 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 >= 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 */

4 9

Re: [try3]: user32/tests: add tests for WM_SETICON - what's wrong?
by Kirill K. Smirnov Jan. 23, 2007

Jan. 23, 2007

Anything wrong with them again? http://www.winehq.org/pipermail/wine-patches/2007-January/035044.html http://www.winehq.org/pipermail/wine-patches/2007-January/035043.html Thanks, Kirill

1 0

Re: Alexandre Julliard : oleaut32/tests: Add tmarshal test.
by Alexandre Julliard Jan. 23, 2007

Jan. 23, 2007

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 Jan. 23, 2007

Jan. 23, 2007

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 Jan. 22, 2007

Jan. 22, 2007

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 Jan. 22, 2007

Jan. 22, 2007

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 Jan. 22, 2007

Jan. 22, 2007

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 Jan. 22, 2007

Jan. 22, 2007

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 Jan. 22, 2007

Jan. 22, 2007

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 Jan. 22, 2007

Jan. 22, 2007

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 Jan. 22, 2007

Jan. 22, 2007

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 Jan. 22, 2007

Jan. 22, 2007

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

Re: [2/2] shell32: Add proper support for SHGetFileInfo(SHGFI_ICONLOCATION | SHGFI_USEFILEATTRIBUTES).
by Frank Richter Jan. 22, 2007

Jan. 22, 2007

On 18.01.2007 16:23, Francois Gouget wrote: > + if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) > + { > + lstrcpyW(psfi->szDisplayName, swShell32Name); > + psfi->iIcon = -IDI_SHELL_FOLDER; > + } At least on Windows, folders have a file type, too - see HKCR\Folder. So maybe use 'HCR_GetDefaultIconW(L"Folder", ...)' when the directory attribute is set, and 'HCR_GetDefaultIconW(sTemp, ...)' otherwise? -f.r.

2 1

Re: server: Reverse return value and status in token_access_check to be consistent.
by Robert Shearman Jan. 22, 2007

Jan. 22, 2007

Vitaliy Margolen wrote: > Change Log: > - server: Reverse return value and status in token_access_check to be consistent. > - server: Do not set successful status by default. Set it explicitly in each case. > - advapi32: Add few tests. > > It is some-what confusing to have token_access_check return 2 statuses. And > even more so, when it doesn't match with the native. Usually function returns > a status if call to it succeeded (all parameters are valid, caller allowed > to perform requested operation, etc). And extra parameters would indicate > if some check(s) succeeded or not. > I agree with the spirit of this patch, but it is not clear which part of this patch fixes the new tests. So please split this patch up into tests, cleanups and bug fixes. > @@ -866,24 +862,17 @@ static unsigned int token_access_check( > ace = ace_next( ace ); > } > > + done: > The indentation of this label is incorrect. -- Rob Shearman

1 0

Re: user32: Some apps pass a color bitmap as a mask to CreateIconIndirect, convert it to b/w
by Kirill K. Smirnov Jan. 22, 2007

Jan. 22, 2007

Hi, these patches http://www.winehq.org/pipermail/wine-patches/2007-January/035014.html http://www.winehq.org/pipermail/wine-patches/2007-January/035052.html totally break qip IM icons. (www.qip.ru) I suspect the reason is hidden in GetDIBits(...) - resulting AND mask is not correct. XOR mask is correct. BTW, these patches heal systray taskmgr icon! -- Kirill

2 1

Re: [PATCH 1/2] ntdll: Implement RtlDecodePointer and RtlEncodePointer
by Alexandre Julliard Jan. 22, 2007

Jan. 22, 2007

Mike McCormack <mike(a)codeweavers.com> writes: > + /* there's no ntdll.RtlInterlockedCompareExchangePointer() ... */ > + RtlEnterCriticalSection( &pointer_obfuscator_cs ); No, but we have interlocked_cmpxchg_ptr() in libwine... -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/8] server: export few functions we will need for security descriptor checks.
by Dmitry Timoshkov Jan. 22, 2007

Jan. 22, 2007

"Vitaliy Margolen" <wine-patches(a)kievinfo.com> wrote: > +++ b/server/security.h > @@ -41,10 +41,16 @@ extern const LUID SeCreateGlobalPrivileg > > extern const PSID security_interactive_sid; > > +extern void map_generic_mask(unsigned int *mask, const GENERIC_MAPPING *mapping); > +++ b/server/token.c > /* maps from generic rights to specific rights as given by a mapping */ > -static inline void map_generic_mask(unsigned int *mask, const GENERIC_MAPPING *mapping) > +inline void map_generic_mask(unsigned int *mask, const GENERIC_MAPPING *mapping) 'inline' above probably should be removed. -- Dmitry.

1 0