September 2007 - Wine-devel

Re: shell32[1/2]: shlview: make the shell view control Unicode (fixesbuf #9767)
by Dmitry Timoshkov 26 Sep '07

26 Sep '07

"Mikolaj Zalewski" <mikolaj(a)zalewski.pl> wrote: > When the control class is Unicode the listview will be sending > LVN_GETDISPINFOW instead of LVN_GETDISPINFOA and filenames with > charactes outside of the ACP will display properly. > I'm changing the type of a define from the include/ directory but > that's a define not present in the Windows SDK. If that define doesn't present in SDK it shouldn't be in Wine either. > --- a/include/shlobj.h > +++ b/include/shlobj.h > @@ -149,7 +149,7 @@ typedef struct > */ > > typedef GUID SHELLVIEWID; > -#define SV_CLASS_NAME ("SHELLDLL_DefView") > +#define SV_CLASS_NAME ((const WCHAR[]){'S','H','E','L','L','D','L','L','_','D','e','f','V','i','e','w',0}) This construct is not portable. Please move this to appropriate source file, and use 'static const WCHAR ...' syntax. -- Dmitry.

1 0

Re: comctl32: remove unneeded todo_wine, because test pass
by James Hawkins 26 Sep '07

26 Sep '07

On 9/25/07, Christian Gmeiner <christian.gmeiner(a)gmail.com> wrote: > I am running make test an a fresh git fetch; git rebase origin and am > getting this: > > ../../../tools/runtest -q -P wine -M comctl32.dll -T ../../.. -p > comctl32_test.exe.so monthcal.c && touch monthcal.ok > err:monthcal:MONTHCAL_WindowProc unknown msg 2006 wp=00000000 lp=00000000 > err:monthcal:MONTHCAL_WindowProc unknown msg 2005 wp=00000001 lp=00000000 > err:monthcal:MONTHCAL_WindowProc unknown msg 2006 wp=00000000 lp=00000000 > err:monthcal:MONTHCAL_WindowProc unknown msg 2005 wp=00000000 lp=00000000 > err:monthcal:MONTHCAL_WindowProc unknown msg 2006 wp=00000000 lp=00000000 > err:monthcal:MONTHCAL_WindowProc unknown msg 2005 wp=00000001 lp=00000000 > monthcal.c:818: Test succeeded inside todo block: Expected 131073, got 131073 > make[2]: *** [monthcal.ok] Fehler 1 > > This patch removes the todo_wine.. as it seems to work now. If this > patch gets not accepted, please tell me why. > Becuase it doesn't pass for other people, particularly Julliard; otherwise, it would have been fixed by now. -- James Hawkins

5 4

Wine GSoC 2007 project membership
by Alexander Nicolaysen Sørnes 25 Sep '07

25 Sep '07

Hello all, I received a passing evaluation in this year's GSoC, but I was not added to the Wine project hosting for 2007, does anyone here have the power to add me? Alexander N. Sørnes

2 3

Re: user32: Make message test pass cleanly under XP SP2
by Alexandre Julliard 25 Sep '07

25 Sep '07

Dmitry Timoshkov <dmitry(a)codeweavers.com> writes: > /* posted message */ > PostMessageA( hwnd, WM_CHAR, dbch[0], 0 ); > + msg.message = 0xdeadbeef; > ok( !PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE ), "got message %x\n", msg.message ); > PostMessageA( hwnd, WM_CHAR, dbch[1], 0 ); > ok( PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE ), "no message\n" ); > ok( msg.message == WM_CHAR, "unexpected message %x\n", msg.message ); > ok( msg.wParam == wch, "bad wparam %lx/%x\n", msg.wParam, wch ); > + msg.message = 0xdeadbeef; > ok( !PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE ), "got message %x\n", msg.message ); > > /* posted thread message */ > PostThreadMessageA( GetCurrentThreadId(), WM_CHAR, dbch[0], 0 ); > + msg.message = 0xdeadbeef; > ok( !PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE ), "got message %x\n", msg.message ); > PostMessageA( hwnd, WM_CHAR, dbch[1], 0 ); > ok( PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE ), "no message\n" ); > ok( msg.message == WM_CHAR, "unexpected message %x\n", msg.message ); > ok( msg.wParam == wch, "bad wparam %lx/%x\n", msg.wParam, wch ); > + msg.message = 0xdeadbeef; > ok( !PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE ), "got message %x\n", msg.message ); I'm not sure I see the point of that change, since the message is not tested when PeekMessage fails. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [5/5] winex11: Use an offscreen redirected window for child OpenGL rendering
by Alexandre Julliard 25 Sep '07

25 Sep '07

Chris Robinson <chris.kcat(a)gmail.com> writes: > + if(w > 0 && h > 0) { > + XFlush(gdi_display); > + XCopyArea(gdi_display, physDev->gl_drawable, physDev->drawable, > + physDev->gc, 0, 0, w, h, physDev->dc_rect.left, > + physDev->dc_rect.top); Why do you need an XFlush here? > + if(data->whole_window && vis->visualid == XVisualIDFromVisual(visual)) > + { > + TRACE("Whole window available and visual match, rendering onscreen\n"); > + goto done; > + } > + > + if(!composite_gl) > + goto done; There's no sense in having a config option for this since the alternative doesn't work anyway, particularly since you removed the scissor support. > + data->gl_drawable = XCreateWindow(gdi_display, root_window, -w, 0, w, h, > + 0, vis->depth, InputOutput, > + vis->visual, > + CWColormap | CWOverrideRedirect, > + &attrib); The window needs to be created on the thread display, and as a child of the main window. > +static void update_gl_drawable(struct x11drv_win_data *data) > +{ > + unsigned int border, depth; > + int x, y, w, h; > + Window root_win; > + > + if(!data->gl_drawable) > + return; > + > + wine_tsx11_lock(); > + XGetGeometry(gdi_display, data->gl_drawable, &root_win, &x, &y, > + (unsigned int*)&w, (unsigned int*)&h, &border, &depth); You must not use XGetGeometry, this incurs a server round-trip. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: user32: Make message test pass cleanly under XP SP2
by Anatoly Lyutin 25 Sep '07

25 Sep '07

Dmitry Timoshkov wrote: > Hello, > > Changelog: > user32: Make message test pass cleanly under XP SP2. > > --- > dlls/user32/tests/msg.c | 142 +++++++++++++++++++++++++++++++++------------- > 1 files changed, 102 insertions(+), 40 deletions(-) > > > > @@ -224,51 +226,53 @@ static const struct message WmSwitchChild[] = { > /* Switch MDI child */ > { WM_MDIACTIVATE, sent },/* in the MDI client */ > { WM_WINDOWPOSCHANGING, sent|wparam,SWP_NOSIZE|SWP_NOMOVE },/* in the 1st MDI child */ > + { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, > { WM_CHILDACTIVATE, sent },/* in the 1st MDI child */ > /* Deactivate 2nd MDI child */ > - { WM_NCACTIVATE, sent|defwinproc|optional },/* in the 2nd MDI child */ > - { WM_MDIACTIVATE, sent|defwinproc|optional },/* in the 2nd MDI child */ > - { WM_CREATE, hook }, > + { WM_NCACTIVATE, sent|wparam|defwinproc, 0 }, /* in the 2nd MDI child */ > + { WM_MDIACTIVATE, sent|defwinproc }, /* in the 2nd MDI child */ > + { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, > /* Preparing for maximize and maximaze the 1st MDI child */ > - { WM_GETMINMAXINFO, sent|defwinproc|optional },/* in the 1st MDI child */ > - { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc|optional, SWP_FRAMECHANGED|SWP_STATECHANGED },/* in the 1st MDI child */ > - { WM_GETMINMAXINFO, sent|defwinproc|optional },/* in the 1st MDI child */ > - { WM_NCCALCSIZE, sent|wparam|defwinproc|optional, 1 },/* in the 1st MDI child */ > - { WM_CHILDACTIVATE, sent|defwinproc|optional },/* in the 1st MDI child */ > - { WM_WINDOWPOSCHANGED, sent|defwinproc|optional },/* in the 1st MDI child */ > - { WM_MOVE, sent|defwinproc|optional },/* in the 1st MDI child */ > - { WM_SIZE, sent|defwinproc|optional },/* in the 1st MDI child */ > + { WM_GETMINMAXINFO, sent|defwinproc }, /* in the 1st MDI child */ > + { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, SWP_FRAMECHANGED|SWP_STATECHANGED }, /* in the 1st MDI child */ > + { WM_NCCALCSIZE, sent|wparam|defwinproc, 1 }, /* in the 1st MDI child */ > + { WM_CHILDACTIVATE, sent|defwinproc }, /* in the 1st MDI child */ > + { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|0x8000 }, /* in the 1st MDI child */ > + { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, /* in the 1st MDI child */ > /* Lock redraw 2nd MDI child */ > - { WM_SETREDRAW, sent|defwinproc|optional },/* in the 2nd MDI child */ > - { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc|optional, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE },/* in the 2nd MDI child */ > - { WM_NCCALCSIZE, sent|wparam|defwinproc|optional, 1 },/* in the 2nd MDI child */ > - { WM_WINDOWPOSCHANGED, sent|defwinproc|optional },/* in the 2nd MDI child */ > - { WM_CREATE, hook }, > + { WM_SETREDRAW, sent|wparam|defwinproc, 0 }, /* in the 2nd MDI child */ > + { HCBT_MINMAX, hook|lparam, 0, SW_NORMALNA }, > /* Restore 2nd MDI child */ > - { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc|optional, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_SHOWWINDOW|SWP_STATECHANGED },/* in the 2nd MDI child */ > - { WM_GETMINMAXINFO, sent|defwinproc|optional },/* in the 2nd MDI child */ > - { WM_NCCALCSIZE, sent|wparam|defwinproc|optional, 1 },/* in the 2nd MDI child */ > - { WM_WINDOWPOSCHANGED, sent|defwinproc|optional },/* in the 2nd MDI child */ > - { WM_MOVE, sent|defwinproc|optional },/* in the 2nd MDI child */ > - { WM_SIZE, sent|defwinproc|optional },/* in the 2nd MDI child */ > + { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|0x8000 },/* in the 2nd MDI child */ > + { WM_NCCALCSIZE, sent|wparam|defwinproc, 1 },/* in the 2nd MDI child */ > + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, /* in the 2nd MDI child */ > + { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|0x8000 }, /* in the 2nd MDI child */ > + { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, /* in the 2nd MDI child */ > + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, /* in the 2nd MDI child */ > /* Redraw 2nd MDI child */ > - { WM_SETREDRAW, sent|defwinproc|optional },/* in the 2nd MDI child */ > - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_NOSIZE|SWP_FRAMECHANGED|SWP_NOMOVE },/* in the MDI frame */ > - { WM_NCCALCSIZE, sent|wparam, 1 },/* in the MDI frame */ > - { WM_WINDOWPOSCHANGED, sent},/* in the MDI frame */ > - { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc|optional, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE },/* in the 1st MDI child */ > - { WM_NCACTIVATE, sent|wparam|defwinproc|optional, 1 },/* in the 1st MDI child */ > - { WM_SETVISIBLE, hook }, > - { WM_KILLFOCUS, sent|defwinproc|optional }, /* in the 2nd MDI child */ > - { WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, /* in MDI client */ > - { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, > + { WM_SETREDRAW, sent|wparam|defwinproc, 1 },/* in the 2nd MDI child */ > + /* Redraw MDI frame */ > + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE },/* in MDI frame */ > + { WM_NCCALCSIZE, sent|wparam, 1 },/* in MDI frame */ > + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE}, /* in MDI frame */ > + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, /* in MDI frame */ > + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, /* in the 1st MDI child */ > + { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, /* in the 1st MDI child */ > + { WM_NCACTIVATE, sent|wparam|defwinproc, 1 }, /* in the 1st MDI child */ > + { HCBT_SETFOCUS, hook }, > + { WM_KILLFOCUS, sent|defwinproc }, /* in the 2nd MDI child */ > + { WM_IME_SETCONTEXT, sent|wparam|defwinproc, 0 },/* in the 1st MDI child */ > + { WM_IME_SETCONTEXT, sent|wparam, 1 }, /* in MDI client */ > { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, > { WM_SETFOCUS, sent },/* in the MDI client */ > - { WM_SETVISIBLE, hook }, > + { HCBT_SETFOCUS, hook }, > { WM_KILLFOCUS, sent },/* in the MDI client */ > - { WM_SETFOCUS, sent|defwinproc|optional },/* in the 1st MDI child */ > - { WM_MDIACTIVATE, sent|defwinproc|optional },/* in the 1st MDI child */ > - { WM_WINDOWPOSCHANGED, sent },/* in the 1st MDI child */ > + { WM_IME_SETCONTEXT, sent|wparam, 0 }, /* in MDI client */ > + { WM_IME_SETCONTEXT, sent|wparam|defwinproc, 1 }, /* in the 1st MDI child */ > + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, > + { WM_SETFOCUS, sent|defwinproc }, /* in the 1st MDI child */ > + { WM_MDIACTIVATE, sent|defwinproc },/* in the 1st MDI child */ > + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, /* in the 1st MDI child */ > { 0 } > }; > Sorry! It falls in my Windows XP SP2 with: msg.c:3267:expected 0009 - actual 0009 msg.c:3267:expected 0008 - actual 0008 msg.c:3267:expected 0281 - actual 0007 msg.c:3267: Test failed: Child did not switch correctly: the msg 0x0281 was expected, but got msg 0x0007 instead msg.c:3268:end of test for switch maximized MDI children -- Best regards Anatoly Lyutin.

2 2

Re: widl [2/6]: Fix conformant array test failures
by Alexandre Julliard 25 Sep '07

25 Sep '07

Dan Hipschman <dsh(a)linux.ucla.edu> writes: > This patch gets conformant arrays working in the tests. Currently, only > the address of some conformant arrays are being marshalled, and this wasn't > showing up in the tests because some storage was static. This patch fixes > the problem by writing pointers to conformant array types in the format > string. This also requires handling field pointer conformances, and > expression evaluation routines that expect the containing structure of a > conformant array at the top of the stack, rather than the conformant array > itself. With this patch, the tests still pass, but correctly this time. It breaks the ole32 tests: ../../../tools/runtest -q -P wine -M ole32.dll -T ../../.. -p ole32_test.exe.so moniker.c && touch moniker.ok moniker.c:897: Test failed: IRunningObjectTable_EnumRunning hr=800703e6 wine: Unhandled page fault on read access to 0x00000000 at address 0x60527ff6 (thread 0010), starting debugger... WineDbg starting on pid 000f Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x60527ff6). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:60527ff6 ESP:0033fa90 EBP:0033fe58 EFLAGS:00010206( - 00 - RIP1) EAX:0033fe30 EBX:6054601c ECX:00000000 EDX:00000000 ESI:800703e6 EDI:6053e4ec Stack dump: 0x0033fa90: 00000000 6053e498 800703e6 60542308 0x0033faa0: 0033fe34 00000100 00000000 00000000 0x0033fab0: 60547478 60547474 6053cdc8 0033fe48 0x0033fac0: 0033fe44 0033fe40 0033fe38 0033fe20 0x0033fad0: 6053d190 60542308 0033fe14 6053e720 0x0033fae0: 6053e2dc 60539d74 6053e154 60539de8 Backtrace: =>1 0x60527ff6 func_moniker+0x15f6() [/home/julliard/wine/wine/dlls/ole32/tests/moniker.c:898] in ole32_test (0x0033fe58) 2 0x60538df8 run_test+0x128(name=0x1103ce) [/home/julliard/wine/wine/dlls/ole32/tests/../../../include/wine/test.h:389] in ole32_test (0x0033fea8) 3 0x6053948d main+0x14d(argc=<register ECX not in topmost frame>, argv=<register ECX not in topmost frame>) [/home/julliard/wine/wine/dlls/ole32/tests/../../../include/wine/test.h:437] in ole32_test (0x0033fed8) 4 0x6053955b __wine_spec_exe_entry+0x5b(peb=0x7ffdf000) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:36] in ole32_test (0x0033ff08) 5 0x7b87446e start_process+0xee(arg=0x0) [/home/julliard/wine/wine/dlls/kernel32/process.c:839] in kernel32 (0x0033ffe8) 6 0x600289a7 wine_switch_to_stack+0x17() in libwine.so.1 (0x00000000) 0x60527ff6 func_moniker+0x15f6 [/home/julliard/wine/wine/dlls/ole32/tests/moniker.c:898] in ole32_test: movl 0x0(%edx),%ecx 898 hr = IEnumMoniker_QueryInterface(spEM1, &IID_IUnknown, (void*) &lpEM1); Wine-dbg> -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: wtsapi32: add stub for WTSRegisterSessionNotification
by Louis. Lenders 24 Sep '07

24 Sep '07

Anything wrong with these simple stubs? http://www.winehq.org/pipermail/wine-patches/2007-September/043944.html and http://www.winehq.org/pipermail/wine-patches/2007-September/043945.html ? --------------------------------- Yahoo! Answers - Get better answers from someone who knows. Tryit now.

1 0

Re: mlang: fix memory leaks in error path (found by Smatch).
by Tijl Coosemans 24 Sep '07

24 Sep '07

On Monday 24 September 2007 14:20:51 Lionel_Debroux wrote: > ConvertINetString leaks some heap memory in an error path. Found in > Michael Stefaniuc's list of Wine potential bugs detected by Smatch. > > 2007-09-24 Lionel Debroux <lionel_debroux(a)yahoo.fr> > * dlls/mlang/mlang.c: > mlang: fix memory leaks in error path (found by Smatch). > > diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c > index eb14ad0..c6274c5 100644 > --- a/dlls/mlang/mlang.c > +++ b/dlls/mlang/mlang.c > @@ -635,9 +635,10 @@ HRESULT WINAPI ConvertINetString( > pDstStrW = HeapAlloc(GetProcessHeap(), 0, cDstSizeW * sizeof(WCHAR)); > hr = ConvertINetMultiByteToUnicode(pdwMode, dwSrcEncoding, pSrcStr, pcSrcSize, pDstStrW, &cDstSizeW); > if (hr != S_OK) > - return hr; > + goto cleanup; > > hr = ConvertINetUnicodeToMultiByte(pdwMode, dwDstEncoding, pDstStrW, &cDstSizeW, pDstStr, pcDstSize); > +cleanup: > HeapFree(GetProcessHeap(), 0, pDstStrW); > return hr; > } This is a bikeshed issue really, but I wonder what Wine's policy on gotos like this is. Imo, it's better to add the HeapFree call to the if block and let the compiler work it out.

3 2

Would like to contribute to wine
by Maciej Kowalczyk 24 Sep '07

24 Sep '07

Hi all, I'm looking for subject for my Master's thesis. It might be interesting to do something useful for Wine. On this year's Google SoC I found an interesting application called "Windows Printing subsystem bridge (i.e. use WIN32 drivers to print from wine)". It was accepted but I can't find any information about any progress. I think it is doable because Windows 2000 and later printer drivers are work in user-space. In suse repository I found ddiwrapper package. It does something similar but only for some Canon drivers and wraps to use by CUPS. Or maybe you have other ideas? Best regards, Maciej Kowalczyk

6 8