December 2009 - Wine-Devel - list.winehq.org

re: RFC: winediag script
by Dan Kegel Dec. 2, 2009

Dec. 2, 2009

I love the idea. Could it be packaged with wine, or do you think it would be better off being a cousin of winetricks?

2 1

Re: [3/6] imagehlp: Implement ImageRemoveCertificate
by Jacek Caban Dec. 2, 2009

Dec. 2, 2009

Hi Owen, Owen Rudge wrote: > --- > dlls/imagehlp/integrity.c | 73 > +++++++++++++++++++++++++++++++++++++-- > dlls/imagehlp/tests/integrity.c | 4 +- > 2 files changed, 72 insertions(+), 5 deletions(-) + cert_data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, data_size); + + if (!cert_data) + return FALSE; + + ret = SetFilePointer(FileHandle, offset + cert_size_padded, NULL, FILE_BEGIN); + + if (ret == INVALID_SET_FILE_POINTER) + return FALSE; + + /* Read any subsequent certificates */ + r = ReadFile(FileHandle, cert_data, data_size, &count, NULL); + + if ((!r) || (count != data_size)) + return FALSE; + + SetFilePointer(FileHandle, offset, NULL, FILE_BEGIN); + + /* Write them one index back */ + r = WriteFile(FileHandle, cert_data, data_size, &count, NULL); + + if ((!r) || (count != data_size)) + return FALSE; + + HeapFree(GetProcessHeap(), 0, cert_data); You leak cert_data on errors here. Jacek

1 0

Tests question.
by David Anderson Dec. 2, 2009

Dec. 2, 2009

I am trying to get the tests to run before I submit a patch to shdocvw/webbrowser.c. My first attempts to get the tests to run. This morning I did cd /home/davea/winebld/wine git fetch; git rebase origin # make sure you're up to date ./configure && make depend && make # rebuild the tree rm -rf ~/.wine # be sure to test in a clean WINEPREFIX sudo cp /home/downloads/wine_gecko-1.0.0-x86.cab /usr/local/share/wine/gecko sh ../apps/winetricks winxp mkdir /home/davea/.wine/drive_c/windows/system32/gecko/1.0.0/wine_gecko /bin/echo -n "Wine Gecko 1.0.0" >/home/davea/.wine/drive_c/windows/system32/gec ko/1.0.0/wine_gecko/VERSION cat /home/davea/.wine/drive_c/windows/system32/gecko/1.0.0/wine_gecko/VERSION make testclean make test and it failed on an init_d3d8 call. ../../../tools/runtest -q -P wine -M d3d8.dll -T ../../.. -p d3d8_test.exe.so visual.c && touch visual.ok err:wgl:opengl_error No OpenGL support compiled in. err:d3d_caps:WineD3D_CreateFakeGLContext Can't find a suitable iPixelFormat. err:d3d:InitAdapters Failed to get a gl context for default adapter err:d3d:WineDirect3DCreate Direct3D8 is not available without opengl visual.c:131: Tests skipped: could not create D3D8 visual.c:1312: Test failed: Could not initialize direct3d make[2]: *** [visual.ok] Error 1 make[2]: Leaving directory `/home/davea/winebld/wine/dlls/d3d8/tests' make[1]: *** [d3d8/tests/__test__] Error 2 make[1]: Leaving directory `/home/davea/winebld/wine/dlls' make: *** [dlls/__test__] Error 2 I note that d3d8/tests/visual.c does a win_skip() when the init_d3d3() fails. Why not a skip() ? Changing the win_skip here to: if (!d3d8_ptr) { skip("could not create D3D8\n"); return NULL; } enables the test to continue. Which is right? win_skip or skip? Why? This is on Ubuntu 9.10 (32bit), open-src drivers, ATI 4350 pci card. Thanks in advance for any clues. DavidAnderson

2 1

Re: Tests question.
by James Mckenzie Dec. 2, 2009

Dec. 2, 2009

>I am trying to get the tests to run before I submit a patch to >shdocvw/webbrowser.c. My first attempts to get the tests to run. > >This morning I did >cd /home/davea/winebld/wine >git fetch; git rebase origin # make sure you're up to date >./configure && make depend && make # rebuild the tree >rm -rf ~/.wine # be sure to test in a clean WINEPREFIX > >sudo cp /home/downloads/wine_gecko-1.0.0-x86.cab /usr/local/share/wine/gecko >sh ../apps/winetricks winxp >mkdir /home/davea/.wine/drive_c/windows/system32/gecko/1.0.0/wine_gecko >/bin/echo -n "Wine Gecko 1.0.0" > >/home/davea/.wine/drive_c/windows/system32/gec >ko/1.0.0/wine_gecko/VERSION >cat >/home/davea/.wine/drive_c/windows/system32/gecko/1.0.0/wine_gecko/VERSION >make testclean >make test > >and it failed on an init_d3d8 call. > >../../../tools/runtest -q -P wine -M d3d8.dll -T ../../.. -p >d3d8_test.exe.so visual.c && touch visual.ok >err:wgl:opengl_error No OpenGL support compiled in. This is what is causing the error. I get the same error on a series of Wine builds for MacOSX and I do have openGL support compiled in as far as I know. >err:d3d_caps:WineD3D_CreateFakeGLContext Can't find a suitable iPixelFormat. >err:d3d:InitAdapters Failed to get a gl context for default adapter >err:d3d:WineDirect3DCreate Direct3D8 is not available without opengl this is where Direct3D8 cannot initialize due to the above error. >visual.c:131: Tests skipped: could not create D3D8 >visual.c:1312: Test failed: Could not initialize direct3d And finally you get this error when running the test. >make[2]: *** [visual.ok] Error 1 >make[2]: Leaving directory `/home/davea/winebld/wine/dlls/d3d8/tests' >make[1]: *** [d3d8/tests/__test__] Error 2 >make[1]: Leaving directory `/home/davea/winebld/wine/dlls' >make: *** [dlls/__test__] Error 2 > >I note that d3d8/tests/visual.c does a win_skip() when the init_d3d3() >fails. Why not a skip() ? > Because it will cause your test to pass is not a good reason to put in a skip(). Fix the OpenGL error and this test should give proper results. James McKenzie

1 0

RFC: winediag script
by Roderick Colenbrander Dec. 2, 2009

Dec. 2, 2009

Hi, Over the years I have assisted a lot of people setting up Wine. In a lot of cases Wine doesn't work well because of missing libraries, pulseaudio, misconfigured display drivers and so on. I have written a script called 'winediag' which attempts to scan a system for the most common problems. Right now it contains mostly display driver related checks and a few basic audio / printing checks. I hope people have suggestions for most tests e.g. network tests (/etc/hosts, samba), more thorough driver checks and son. What do you guys think about it so far? (BTW I'm not a shell guru, so I would love to get some positive feedback) Thanks, Roderick Colenbrander

1 0

Re: [PATCH 1/2] msvcrt: Add test to check if signal(SIGBREAK, ...) works (todo_wine).
by James Mckenzie Dec. 2, 2009

Dec. 2, 2009

Peter Rosin <peda(a)lysator.liu.se> >Subject: [PATCH 1/2] msvcrt: Add test to check if signal(SIGBREAK, ...) works (todo_wine). > > AUTHORS is not a developer editable file. Resubmit without this change. When you have submitted enough changes to Wine, you name will be added by AJ. James McKenzie

1 0

Valgrind cleanup status
by Dan Kegel Dec. 2, 2009

Dec. 2, 2009

The logs of valgrind errors at http://kegel.com/wine/valgrind/logs/ are showing a nice downward trend: date files errors nonleak errors 2009-10-23 84 2383 339 2009-10-26 82 2344 319 2009-10-27 82 2318 294 2009-10-28 83 2325 294 2009-10-29 80 2279 253 2009-10-30 81 2304 280 2009-11-03 80 2612 301 2009-11-04 78 2290 276 2009-11-05 79 2295 268 2009-11-09 73 2215 254 2009-11-10 75 2266 296 2009-11-11 75 2236 263 2009-11-13 72 2264 234 2009-11-16 69 1724 222 2009-11-17 69 1711 221 2009-11-18 88 1736 253 2009-11-19 85 1696 247 2009-11-26 76 1628 168 2009-11-27 88 1797 302 2009-11-30 76 1779 288 2009-12-01 73 1723 230 The spike at 11-27 was when I started running with my heap tail corruption detection patch; those errors were present before, but not detected. Thanks to everyone who's been chipping away at these warnings. (Part of the decline has been knowing which suppressions to add, but that's ok, cleaner logs are good.) I'm mostly worried about nonleak errors for now, so I might be undercounting leak errors somewhat. As always, more help with these would be welcome. Some of the errors aren't that hard to deal with (but at the same time, some of them look easy but are subtle, so take care). - Dan

1 0

Re: [2/4] ntdll: add support for the HEAP_FREE_CHECKING_ENABLED style of heap overrun detection.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Dan Kegel <dank(a)kegel.com> writes: > @@ -85,6 +85,7 @@ typedef struct > > #define ARENA_INUSE_FILLER 0x55 > #define ARENA_FREE_FILLER 0xaa > +#define ARENA_PAD_FILLER(address) (((int)(address) & 1) ? 0xee : 0xfe) Don't cast addresses to int. > +static PVOID HEAP_ValidateTail( const HEAP *heap, const void *arena, const void *p, SIZE_T size, SIZE_T filler_size ) > +{ > + unsigned char *tail = ((unsigned char *)p) + size; > + int j=0; Please use correct types. j should be a SIZE_T, tail should be a const pointer. > @@ -1477,7 +1561,9 @@ BOOLEAN WINAPI RtlFreeHeap( HANDLE heap, ULONG flags, PVOID ptr ) > pInUse = (ARENA_INUSE *)ptr - 1; > if (!(subheap = HEAP_FindSubHeap( heapPtr, pInUse ))) > { > - if (!find_large_block( heapPtr, ptr )) goto error; > + ARENA_LARGE *arena = find_large_block( heapPtr, ptr ); > + if (!arena) goto error; > + if (!validate_large_arena( heapPtr, arena, NOISY )) goto error; Validation should only happen when explicitly requested. > diff --git a/dlls/ntdll/tests/heap.c b/dlls/ntdll/tests/heap.c > new file mode 100644 > index 0000000..7cfa554 > --- /dev/null > +++ b/dlls/ntdll/tests/heap.c The tests should go with the existing heap tests in kernel32. > +static void test_free_overrun(void) > +{ > + if ((pRtlGetNtGlobalFlags() & FLG_HEAP_ENABLE_FREE_CHECK) == 0) { > + skip("\ > +Skipping heap free padding overrun test. To enable:\n\ > +on Wine, use gflags to enable global heap free checking, or set the following key:\n\ > +[HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\Control\\Session Manager]\n\ > +\"GlobalFlag\"=dword:00000020\n\ > +On Windows, use gflags to enable heap free checking for ntdll_test.exe.\n"); > + return; You should create your own heap with checking enabled so that it can be tested in all cases. Also the patch is still too large, changes to sensitive areas like the heap code should be very small and focused. -- Alexandre Julliard julliard(a)winehq.org

2 3

New winetricks 20091125: new verbs ie7, alsa, fbo, pbuffer, ...
by Dan Kegel Dec. 2, 2009

Dec. 2, 2009

Pie's in the oven, time for another winetricks release. Changes in this version: Add experimental dotnet35 verb Add IE7 verb. Based on a patch by Hans Leidekker. Add verbs alsa, audioio, coreaudio, esound, jack, nas, oss to override sound driver Add verbs backbuffer, fbo, pbuffer for setting offscreen rendering buffer Don't crash winecfg if native comctl32 is used Fix gecko to work with wine-1.1.33. Make vc2003toolkit and psdk2003 verbs run on windows On cleanup, remove $WINETRICKS_TMP, not just the files in it Sorted command menu Update Firefox to 3.5.5 Update mpc to latest version, move the exe to Program Files and add it to %PATH% Online as always at http://kegel.com/wine/winetricks or http://winezeug.googlecode.com (Bug reports to the issue tracker at the above URL, please.) Thanks to Austin English, Erik Inge Bolsoe, and Hans Leidekker. This message posted in gmail (basic mode) in ie7 in wine.

3 3

Silencing RtlNtStatusToDosErrorNoTeb() a bit
by Wolfram Sang Dec. 2, 2009

Dec. 2, 2009

Hi, while debugging an application (Project One, available at [1]), I noticed that wine (today's git) throws a lot of these fixmes: fixme:ntdll:RtlNtStatusToDosErrorNoTeb no mapping for c0000109 Looking around, I found this page[2] stating that ERROR_MR_MID_NOT_FOUND is an expected return value for c0000109, so that the fixme is not needed here. I updated the if clause accordingly: diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c index 9469f6f..e125163 100644 --- a/dlls/ntdll/error.c +++ b/dlls/ntdll/error.c @@ -68,7 +68,9 @@ ULONG WINAPI RtlNtStatusToDosErrorNoTeb( NTSTATUS status ) if (status < table->end) { DWORD ret = table->table[status - table->start]; - if (ret == ERROR_MR_MID_NOT_FOUND) FIXME( "no mapping for %08x\n", status ); + if (ret == ERROR_MR_MID_NOT_FOUND && + status != STATUS_MESSAGE_NOT_FOUND) + FIXME( "no mapping for %08x\n", status ); return ret; } table++; This solution has the advantage of being not very intrusive, but the disadvantage that it might be not nicely maintainable. Another &&-block has to be added for each other status found validly returning ERROR_MR_MID_NOT_FOUND. Another solution might be to define, let's say, ERROR_WINE_FIXME for all real fixmes and convert them to ERROR_MR_MID_NOT_FOUND. Something like (just a draft): #define ERROR_WINE_FIXME 0xffffffff DWORD ret = table->table[status - table->start]; if (ret == ERROR_WINE_FIXME) { FIXME( "no mapping for %08x\n", status ); ret = ERROR_MR_MID_NOT_FOUND; } return ret; [and lots of table entries changed] Well, this is pretty intrusive, but may be better distinguishing the different cases perhaps. Then again, this additional #define is polluting the ERROR_-namespace. I think I prefer the first version for now, perhaps there is no second status validly returning ERROR_MR_MID_NOT_FOUND? Any advice on how I should proceed? Thanks in advance, Wolfram [1] ftp://ftp.scs-trc.net/pub/c64/Tools/Graphics/Project1_V0.5.zip [2] http://support.microsoft.com/kb/113996

2 2