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

One school's list of must-have apps

by Dan Kegel

Here's a school that actually did transition to Linux: http://searchopensource.techtarget.com/originalContent/0,289142,sid39_gci12… They didn't use Wine. Here's what they said about legacy windows apps: "Using Wyse terminals, the district also planned to offer students and staff thin-client desktops running OpenOffice.org. Ericom software – a Citrix alternative -- enabled the terminals to run the district's existing and irreplaceable Microsoft Windows educational applications, including Type to Learn, Reading Counts and Kid Pix." - Dan

Feb. 28, 2007

Re: Wine's Wiki Defaced

by Felix Nawothnig

Francois Gouget wrote: > Someone has defaced Wine's Wiki frontpage. > Also I have either forgotten my password or the user accounts don't > work anymore. Could someone look into this? Reverted it (no idea about the accounts, I was still logged in).

Feb. 28, 2007

Re: Using ex-user32 controls from native comctl32 6

by Felix Nawothnig

Frank Richter wrote: >>So, any idea how Windows makes comctl32 register the user classes? > I think it just re-registered the classes, but I'm not sure. > A trace with class registrations (ie +class) might give some hint at > what native does. Okay, I was stupid. I removed registration of all the user32 classes, only some were copied over to comctl32. Anyway, it works "fine" know. Well. Actually it doesn't even initialize without some stubs but it runs. I have a native edit control in wine for the first time since 9x times eh? :) Felix

Feb. 28, 2007

Wine's Wiki Defaced

by Francois Gouget

Someone has defaced Wine's Wiki frontpage. Also I have either forgotten my password or the user accounts don't work anymore. Could someone look into this? -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ War doesn't determine who's right. War determines who's left.

Feb. 28, 2007

Re: [6/6] d3d9: Add a mova rounding test

by H. Verbeet

On 28/02/07, Alexandre Julliard <julliard(a)winehq.org> wrote: > The test fails here: > > ../../../tools/runtest -q -P wine -M d3d9.dll -T ../../.. -p d3d9_test.exe.so visual.c && touch visual.ok > visual.c:405: Test failed: Expected color 00ffff00, got 00000000 (for input -2.400000) > visual.c:405: Test failed: Expected color 00ffff00, got 00000000 (for input -1.600000) > visual.c:405: Test failed: Expected color 0000ffff, got 00000000 (for input -0.400000) > visual.c:405: Test failed: Expected color 0000ffff, got 00000000 (for input 0.400000) > visual.c:405: Test failed: Expected color 00ff00ff, got 00000000 (for input 1.600000) > visual.c:405: Test failed: Expected color 00ff00ff, got 00000000 (for input 2.400000) > make: *** [visual.ok] Error 6 > Could you run that with +d3d_caps and possibly dump the value of caps.VertexShaderVersion? On a default Wine install that test should be getting skipped because our ARB shader backend doesn't support vs_2_0.

Feb. 28, 2007

Re: Unknown issue with test.winehq.org

by Alexandre Julliard

Paul Vriens <paul.vriens.wine(a)gmail.com> writes: > exception: 42 tests executed (0 marked as todo, 0 failures), 0 skipped. > exception: 279 tests executed (0 marked as todo, 5 failures), 0 skipped. > > The first one triggers the 'end of this test' in dissect. The second > one is thus not accepted as dissect expects a 'start' line (and a line > in between actually). > > The question now is: should dissect handle these cases or is this > particular test-case wrong? It's because some of the tests are run in a child process. dissect should probably handle it, ideally by reporting the sum of the test counts as the results for the whole test. -- Alexandre Julliard julliard(a)winehq.org

Feb. 28, 2007

Re: msiexec.exe service registration

by James Hawkins

On 2/27/07, Jeremy <jcgarbage(a)comcast.net> wrote: > In msiexec.c, the DoRegServer calls OpenSCManager, however, on a fresh > installation, ie no ~/.wine, the HKLM\CurrentControlSet\Services does > not yet exist, so that OpenSCManager fails. What is the correct way to > guarantee that this key exists? > See bug 7402. http://bugs.winehq.org/show_bug.cgi?id=7402 -- James Hawkins

Feb. 28, 2007

Re: Unknown issue with test.winehq.org

by Paul Vriens

Paul Vriens wrote: > Hi, > > So finally we have a working winetest executable and the test.winehq.org > scripts should be able to handle the new reports. > > Could someone have a look what the issue currently is on the webserver > as I've sent several reports (a few hours ago) and they are not handled > yet? > > Cheers, > > Paul. > Hi, I think I've found the issue. The error dissect outputs is something like: /wine/winetest/queue/errAfg8T: no start line:4789: ntdll:exception done (5) when looking at the report file I see that with a newer version of the ntdll exception tests we suddenly have 2 lines: exception: 42 tests executed (0 marked as todo, 0 failures), 0 skipped. exception: 279 tests executed (0 marked as todo, 5 failures), 0 skipped. The first one triggers the 'end of this test' in dissect. The second one is thus not accepted as dissect expects a 'start' line (and a line in between actually). The question now is: should dissect handle these cases or is this particular test-case wrong? Cheers, Paul.

Feb. 28, 2007

msi automation patches

by Misha Koshelev

Ok, so since my patches weren't commited to git yet, I've consolidated the new automation changes I've made in the attached patches. James and Rob, if they look good to you I will submit these version to wine-patches (so my total will once again be four patches, 1 is http://www.winehq.org/pipermail/wine-patches/2007-February/036359.html , 2 and 3 attached, and 4 is http://www.winehq.org/pipermail/wine-patches/2007-February/036362.html ) and wait to submit anything more for automation until all 4 patches are in. Please let me know Rob (I used DispGetParam, thanks a lot, so probably just need to look at my AutomationObject::Invoke and then the individual object Invoke handlers in the 0003 patch below) and James (I guess in regards to comments and formatting). Thanks a lot Misha

Feb. 28, 2007

Re: kernel32: Implement ReplaceFileA/ReplaceFileW

by Felix Nawothnig

Erich Hoover wrote: >>>> The "right" way would probably to do the copying yourself by >>>> read/write.. but I dunno. >>> Except that it would ignore the permissions issues that have already >>> been coded into the copy routines (and any updates that may eventually >> No, CreateFile (and friends) does the permissions checks (which you >> would still have to call). > That was worded poorly, Copy/Move already handle copying file attributes > and I imagine would eventually implement copying the access control list > information. Implementing ReplaceFile as calls to either Copy or Move > takes these issues into account. I see your point. However, since the function you are implementing is in kernel32 anyway you could abstract it away and make both functions (CopyFile and ReplaceFile) call some internal function. That way you would get rid of the locking completly which is argueably somewhat ugly. Felix

Feb. 28, 2007

Re: [8/8] WineD3D: Use the source surface's texture for writing the backup

by H. Verbeet

On 28/02/07, Stefan Dösinger <stefan(a)codeweavers.com> wrote: >The hwstretch blit code creates a new texture each time it is called to back up the back buffer and >releases it afterwards. It is more efficient to keep the texture and release it with the surface. This >patch uses the source surface's texture to do the job. Because the source surface is an active render >target its texture is either only needed for blitting(onscreen target) or will be completely overwritten >on the next render target change(offscreen target). Is this supposed to work with FBOs?

Feb. 28, 2007

Unknown issue with test.winehq.org

by Paul Vriens

Hi, So finally we have a working winetest executable and the test.winehq.org scripts should be able to handle the new reports. Could someone have a look what the issue currently is on the webserver as I've sent several reports (a few hours ago) and they are not handled yet? Cheers, Paul.

Feb. 28, 2007

Re: [4/8] WineD3D: Prepare only fixed function samplers for blit

by H. Verbeet

On 28/02/07, Stefan Dösinger <stefan(a)codeweavers.com> wrote: >+ /* The blitting code uses (for now) the fixed function pipeline, so make sure to reset all fixed >+ * function texture unit. No need to care for higher samplers >+ */ >+ for(i = GL_LIMITS(texture_stages) - 1; i > 0 ; i--) { You should use GL_LIMITS(textures) here, since that's the number of fixed function texture units.

Feb. 28, 2007

Re: kernel32: Implement ReplaceFileA/ReplaceFileW

by Erich Hoover

Oops, I must have hit the wrong reply button. >>> The "right" way would probably to do the copying yourself by >>> read/write.. but I dunno. >> Except that it would ignore the permissions issues that have already >> been coded into the copy routines (and any updates that may eventually > No, CreateFile (and friends) does the permissions checks (which you > would still have to call). That was worded poorly, Copy/Move already handle copying file attributes and I imagine would eventually implement copying the access control list information. Implementing ReplaceFile as calls to either Copy or Move takes these issues into account. >> be made to these routines). Also, it seems to me that MSDN is >> describing the list of function calls that ReplaceFile actually makes. > No it doesn't? >From my perspective the "remarks" section discusses the implementation of ReplaceFile as calls to existing API functions (as a sort of macro) as a convenience. Granted, it discusses moving files instead of copying but that conflicted with the file locking. Should I make a new patch file with the previously attached changes or would you prefer that the function be implemented in the read/write manner? Re-implementing the function in such a fashion would make it possible to do a more move-like operation while maintaining the file locking, but would lose out on any future improvements to CopyFile. Erich Hoover ehoover(a)mines.edu On 2/28/07, Felix Nawothnig <flexo(a)holycrap.org> wrote: > > (CC-ing wine-devel again) > > Erich Hoover wrote: > >> The "right" way would probably to do the copying yourself by > >> read/write.. but I dunno. > > Except that it would ignore the permissions issues that have already > > been coded into the copy routines (and any updates that may eventually > > No, CreateFile (and friends) does the permissions checks (which you > would still have to call). > > > be made to these routines). Also, it seems to me that MSDN is > > describing the list of function calls that ReplaceFile actually makes. > > No it doesn't? > > Your other objections were right. Your last version follows for > wine-devel. > > > ------------------------------------------------------------------------ > > > > > /************************************************************************** > > * ReplaceFileW (KERNEL32.@) > > * ReplaceFile (KERNEL32.@) > > */ > > BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName,LPCWSTR > lpReplacementFileName, > > LPCWSTR lpBackupFileName, DWORD dwReplaceFlags, > > LPVOID lpExclude, LPVOID lpReserved) > > { > > HANDLE hReplaced, hReplacement; > > BOOL skipBackup = FALSE; > > > > if(dwReplaceFlags) > > FIXME("Ignoring flags %x\n", dwReplaceFlags); > > /* First two arguments are mandatory */ > > if(!lpReplacedFileName || !lpReplacementFileName) > > { > > SetLastError( ERROR_INVALID_PARAMETER ); > > return FALSE; > > } > > /* > > * Lock the "replacement" file, fail if it does not exist > > */ > > if((hReplacement = CreateFileW(lpReplacementFileName, GENERIC_READ, > > FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, > > NULL, OPEN_EXISTING, 0, 0)) == INVALID_HANDLE_VALUE) > > { > > return FALSE; > > } > > if(!LockFile( hReplacement, 0, 0, 0, 0 )) > > { > > CloseHandle( hReplacement ); > > return FALSE; > > } > > /* > > * Lock the "replaced" file while we're working. > > */ > > if((hReplaced = CreateFileW(lpReplacedFileName, GENERIC_READ, > > FILE_SHARE_READ | FILE_SHARE_WRITE, > > NULL, OPEN_EXISTING, 0, 0)) == INVALID_HANDLE_VALUE) > > { > > /* If "replaced" does not exist then create it for the lock, but > skip backup */ > > if((hReplaced = CreateFileW(lpReplacedFileName, GENERIC_READ, > > FILE_SHARE_READ | FILE_SHARE_WRITE, > > NULL, CREATE_ALWAYS, 0, 0)) == INVALID_HANDLE_VALUE) > > { > > UnlockFile( hReplacement, 0, 0, 0, 0 ); > > CloseHandle( hReplacement ); > > return FALSE; > > } > > skipBackup = TRUE; > > } > > if(!LockFile( hReplaced, 0, 0, 0, 0 )) > > { > > UnlockFile( hReplacement, 0, 0, 0, 0 ); > > CloseHandle( hReplacement ); > > CloseHandle( hReplaced ); > > return FALSE; > > } > > /* > > * If the user wants a backup then that needs to be performed first > > */ > > if( lpBackupFileName && !skipBackup ) > > { > > /* If an existing backup exists then copy over it */ > > if(!CopyFileW( lpReplacedFileName, lpBackupFileName, FALSE )) > > goto replace_fail; > > } > > /* > > * Now that the backup has been performed (if requested), copy the > replacement > > * into place > > */ > > if(!CopyFileW( lpReplacementFileName, lpReplacedFileName, FALSE )) > > { > > /* Assume that all access denied errors are a write problem. */ > > if(GetLastError() == ERROR_ACCESS_DENIED) > > SetLastError( ERROR_UNABLE_TO_REMOVE_REPLACED ); > > else > > SetLastError( ERROR_UNABLE_TO_MOVE_REPLACEMENT ); > > goto replace_fail; > > } > > /* Delete the replacement file */ > > if(!DeleteFileW( lpReplacementFileName )) > > return FALSE; > > /* Unlock the handles */ > > UnlockFile( hReplacement, 0, 0, 0, 0 ); > > CloseHandle( hReplacement ); > > UnlockFile( hReplaced, 0, 0, 0, 0 ); > > CloseHandle( hReplaced ); > > /* All done, file replacement successful */ > > return TRUE; > > > > replace_fail: > > UnlockFile( hReplacement, 0, 0, 0, 0 ); > > CloseHandle( hReplacement ); > > UnlockFile( hReplaced, 0, 0, 0, 0 ); > > CloseHandle( hReplaced ); > > return FALSE; > > } > >

Feb. 28, 2007

Using ex-user32 controls from native comctl32 6

by Felix Nawothnig

(CC-ing to Frank Richter because I hope he knows the answer :) Hi. I've been trying to make wine use the ex-user32 controls (listbox, scrollbox, etc.) in comctl32 where Microsoft copied them to in version 6 to get message traces of those controls (I know I could use msg spy tools on Windows but comparing two Wine spy logs is way more straight forward, especially since those tools don't get you stuff like +win). You need a manifest file on Windows to get application to use comctl6 but we don't use that since we've chosen to theme the user controls via subclassing. I've tried to just remove registration of the classes from our user32 and use native comctl32 6 (which otherwise works nice) but no success. So, any idea how Windows makes comctl32 register the user classes? Felix

Feb. 28, 2007

Re: Using ex-user32 controls from native comctl32 6

by Frank Richter

On 28.02.2007 18:26, Felix Nawothnig wrote: > So, any idea how Windows makes comctl32 register the user classes? I think it just re-registered the classes, but I'm not sure. A trace with class registrations (ie +class) might give some hint at what native does. -f.r.

Feb. 28, 2007

Re: kernel32: Implement ReplaceFileA/ReplaceFileW

by Felix Nawothnig

(CC-ing wine-devel again) Erich Hoover wrote: >> The "right" way would probably to do the copying yourself by >> read/write.. but I dunno. > Except that it would ignore the permissions issues that have already > been coded into the copy routines (and any updates that may eventually No, CreateFile (and friends) does the permissions checks (which you would still have to call). > be made to these routines). Also, it seems to me that MSDN is > describing the list of function calls that ReplaceFile actually makes. No it doesn't? Your other objections were right. Your last version follows for wine-devel. > ------------------------------------------------------------------------ > > /************************************************************************** > * ReplaceFileW (KERNEL32.@) > * ReplaceFile (KERNEL32.@) > */ > BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName,LPCWSTR lpReplacementFileName, > LPCWSTR lpBackupFileName, DWORD dwReplaceFlags, > LPVOID lpExclude, LPVOID lpReserved) > { > HANDLE hReplaced, hReplacement; > BOOL skipBackup = FALSE; > > if(dwReplaceFlags) > FIXME("Ignoring flags %x\n", dwReplaceFlags); > /* First two arguments are mandatory */ > if(!lpReplacedFileName || !lpReplacementFileName) > { > SetLastError( ERROR_INVALID_PARAMETER ); > return FALSE; > } > /* > * Lock the "replacement" file, fail if it does not exist > */ > if((hReplacement = CreateFileW(lpReplacementFileName, GENERIC_READ, > FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, > NULL, OPEN_EXISTING, 0, 0)) == INVALID_HANDLE_VALUE) > { > return FALSE; > } > if(!LockFile( hReplacement, 0, 0, 0, 0 )) > { > CloseHandle( hReplacement ); > return FALSE; > } > /* > * Lock the "replaced" file while we're working. > */ > if((hReplaced = CreateFileW(lpReplacedFileName, GENERIC_READ, > FILE_SHARE_READ | FILE_SHARE_WRITE, > NULL, OPEN_EXISTING, 0, 0)) == INVALID_HANDLE_VALUE) > { > /* If "replaced" does not exist then create it for the lock, but skip backup */ > if((hReplaced = CreateFileW(lpReplacedFileName, GENERIC_READ, > FILE_SHARE_READ | FILE_SHARE_WRITE, > NULL, CREATE_ALWAYS, 0, 0)) == INVALID_HANDLE_VALUE) > { > UnlockFile( hReplacement, 0, 0, 0, 0 ); > CloseHandle( hReplacement ); > return FALSE; > } > skipBackup = TRUE; > } > if(!LockFile( hReplaced, 0, 0, 0, 0 )) > { > UnlockFile( hReplacement, 0, 0, 0, 0 ); > CloseHandle( hReplacement ); > CloseHandle( hReplaced ); > return FALSE; > } > /* > * If the user wants a backup then that needs to be performed first > */ > if( lpBackupFileName && !skipBackup ) > { > /* If an existing backup exists then copy over it */ > if(!CopyFileW( lpReplacedFileName, lpBackupFileName, FALSE )) > goto replace_fail; > } > /* > * Now that the backup has been performed (if requested), copy the replacement > * into place > */ > if(!CopyFileW( lpReplacementFileName, lpReplacedFileName, FALSE )) > { > /* Assume that all access denied errors are a write problem. */ > if(GetLastError() == ERROR_ACCESS_DENIED) > SetLastError( ERROR_UNABLE_TO_REMOVE_REPLACED ); > else > SetLastError( ERROR_UNABLE_TO_MOVE_REPLACEMENT ); > goto replace_fail; > } > /* Delete the replacement file */ > if(!DeleteFileW( lpReplacementFileName )) > return FALSE; > /* Unlock the handles */ > UnlockFile( hReplacement, 0, 0, 0, 0 ); > CloseHandle( hReplacement ); > UnlockFile( hReplaced, 0, 0, 0, 0 ); > CloseHandle( hReplaced ); > /* All done, file replacement successful */ > return TRUE; > > replace_fail: > UnlockFile( hReplacement, 0, 0, 0, 0 ); > CloseHandle( hReplacement ); > UnlockFile( hReplaced, 0, 0, 0, 0 ); > CloseHandle( hReplaced ); > return FALSE; > }

Feb. 28, 2007

Error Invalid EXE Format when executing a exe.so built with winelib

by Roger Wimbert

Here is the Debug output: warn:module:load_builtin_dll failed to load .so lib for builtin L"Z:\\bb\\s\\bc\\wine\\dmsw.exe.so": /bb/home/.wine/dosdevices/z:/bb/s/bc/wine/dmsw.exe.so: cannot allocate memory in static TLS block warn:module:load_dll Failed to load module L"Z:\\bb\\s\\bc\\wine\\dmsw.exe.so"; status=c000007b warn:module:load_builtin_dll failed to load .so lib for builtin L"Z:\\bb\\s\\bc\\wine\\dmsw.exe.so": /bb/home/.wine/dosdevices/z:/bb/s/bc/wine/dmsw.exe.so: cannot allocate memory in static TLS block warn:module:load_dll Failed to load module L"Z:\\bb\\s\\bc\\wine\\dmsw.exe.so"; status=c000007b wine: could not load L"Z:\\bb\\s\\bc\\wine\\dmsw.exe.so": Fehlerhaftes EXE-Format f³r It has something to do with TLS memory or threads, but the /lib/tls/libc.so is linked in: (rw 8 amd64) /bb/s/bc/wine 105>ldd dmsw.exe.so linux-gate.so.1 => (0xffffe000) libwine.so.1 => /usr/local/lib/libwine.so.1 (0x557be000) libm.so.6 => /lib/tls/libm.so.6 (0x558e8000) libc.so.6 => /lib/tls/libc.so.6 (0x5590a000) libdl.so.2 => /lib/libdl.so.2 (0x55a1f000) /lib/ld-linux.so.2 => /lib/ld-linux.so.2 (0x56555000) Our system: (rw 8 amd64) /bb/s/bc/wine 106>uname -a Linux amd64 2.6.5-7.193-smp #1 SMP Wed Jul 20 14:39:18 UTC 2005 x86_64 x86_64 x86_64 GNU/Linux glibc has version 2.3.3 A simple program does work, but no program which uses threads. wine is created with the 32 bit libraries. If I use the original exe of my program with wine, it does work. Does anyone has an idea what is going wrong? The makefile is attached. Thanks a lot. ### Generated by Winemaker TOPSRCDIR = /bb/s TOPOBJDIR = /bb/s/bc/wine SRCDIR = . SUBDIRS = DLLS = EXES = dmsw.exe ### Common settings CEXTRA = -mno-cygwin -fno-pic -fno-PIC CXXEXTRA = -mno-cygwin CFLAGS = -D_DMSW RCEXTRA = RCFLAGS = -DBB_WINE INCLUDE_PATH = -I. -I/bb/nt/wine -I/bb/s/i -I/bb/fg/i -I/bb/ze/i -I/bb/fe/i -I/bb/pbm/i -I/bb/wb1/i DLL_PATH = LIBRARY_PATH = LIBRARIES = -lmsvcrt40 -lws2_32 -lversion -lnetapi32 -liphlpapi -lcomctl32 -lshlwapi -lwinmm ### dmsw.exe sources and settings dmsw_exe_MODULE = dmsw.exe dmsw_exe_C_SRCS = /bb/s/c/bbcrypt.c \ /bb/s/c/bbdes.c \ /bb/s/c/bbmalloc.c \ /bb/s/c/bbmd5.c \ /bb/s/c/bbo.c \ /bb/s/c/bbtwofish.c \ /bb/s/c/cmp.c \ /bb/s/c/costri.c \ /bb/s/c/cpy.c \ /bb/s/c/datec.c \ /bb/s/c/dfa.c \ /bb/fg/c/dgcode.c \ /bb/fg/c/dgvar.c \ /bb/s/c/dhinfo.c \ /bb/s/c/dholz.c \ /bb/fg/c/digcte.c \ /bb/fg/c/digecm.c \ /bb/fg/c/digranox.c \ /bb/fg/c/digvec.c \ /bb/s/c/dirview.c \ /bb/s/c/dirwalk.c \ /bb/s/c/dmsb.c \ /bb/s/c/dmsc.c \ /bb/s/c/dmsca.c \ /bb/s/c/dmse.c \ /bb/s/c/dmsf.c \ /bb/s/c/dmsfr.c \ /bb/s/c/dmsg.c \ /bb/s/c/dmsh.c \ /bb/s/c/dmshc.c \ /bb/s/c/dmsl.c \ /bb/s/c/dmsliz.c \ /bb/s/c/dmsm.c \ /bb/s/c/dmsmv.c \ /bb/s/c/dmsp.c \ /bb/s/c/dmsr.c \ /bb/s/c/dmss.c \ /bb/s/c/dmssb.c \ /bb/s/c/dmst.c \ /bb/s/c/dmstast.c \ /bb/s/c/dmsw.c \ /bb/s/c/dmswf.c \ /bb/s/c/dmswicon.c \ /bb/s/c/dmsy.c \ /bb/s/c/encode.c \ /bb/s/c/fileleng.c \ /bb/s/c/fordat.c \ /bb/s/c/gtypes.c \ /bb/fg/c/image.c \ /bb/fg/c/imgprint.c \ /bb/s/c/itoa.c \ /bb/fg/c/jpegconv.c \ /bb/s/c/lru.c \ /bb/s/c/ltoa.c \ /bb/s/c/map.c \ /bb/s/c/msleep.c \ /bb/s/c/packbits.c \ /bb/s/c/packdiff.c \ /bb/s/c/pfad.c \ /bb/fg/c/rgbtools.c \ /bb/s/c/rtt.c \ /bb/s/c/scrinfo.c \ /bb/s/c/set.c \ /bb/s/c/sockcom.c \ /bb/s/c/softdum.c \ /bb/s/c/swap.c \ /bb/s/c/syslog.c \ /bb/s/c/textino.c \ /bb/fg/c/tiffconv.c \ /bb/s/c/udpcom.c \ /bb/s/c/utoa.c \ /bb/s/c/vgl.c \ /bb/s/c/w32argv.c \ /bb/fg/c/w32bmp.c \ /bb/s/c/w32error.c \ /bb/s/c/w32font.c \ /bb/fg/c/w32ico.c \ /bb/s/c/w32macadr.c \ /bb/s/c/w32pfad.c \ /bb/s/c/w32pipe.c \ /bb/s/c/w32print.c \ /bb/s/c/w32puts.c \ /bb/s/c/w32reg.c \ /bb/fg/c/w32scalebmp.c \ /bb/s/c/w32screen.c \ /bb/s/c/w32scroll.c \ /bb/s/c/w32toolbar.c \ /bb/s/c/w32tools.c \ /bb/s/c/w32winms.c \ /bb/s/c/wsinit.c \ /bb/s/c/zeitc.c dmsw_exe_CXX_SRCS= dmsw_exe_RC_SRCS = /bb/nt/rc/dmsw/dmsw_wine.rc dmsw_exe_LDFLAGS = -mwindows \ -mno-cygwin dmsw_exe_DLL_PATH= dmsw_exe_DLLS = odbc32 \ ole32 \ oleaut32 \ winspool dmsw_exe_LIBRARY_PATH= dmsw_exe_LIBRARIES= uuid dmsw_exe_OBJS = $(dmsw_exe_C_SRCS:.c=.o) \ $(dmsw_exe_CXX_SRCS:.cpp=.o) \ $(dmsw_exe_RC_SRCS:.rc=.res) ### Global source lists C_SRCS = $(dmsw_exe_C_SRCS) CXX_SRCS = $(dmsw_exe_CXX_SRCS) RC_SRCS = $(dmsw_exe_RC_SRCS) ### Tools CC = winegcc CXX = wineg++ RC = wrc ### Generic targets all: $(SUBDIRS) $(DLLS:%=%.so) $(EXES:%=%.so) ### Build rules .PHONY: all clean dummy $(SUBDIRS): dummy @cd $@ && $(MAKE) # Implicit rules .SUFFIXES: .cpp .rc .res DEFINCL = $(INCLUDE_PATH) $(DEFINES) $(OPTIONS) .c.o: $(CC) -c $(CFLAGS) $(CEXTRA) $(DEFINCL) -o $@ $< .cpp.o: $(CXX) -c $(CXXFLAGS) $(CXXEXTRA) $(DEFINCL) -o $@ $< .cxx.o: $(CXX) -c $(CXXFLAGS) $(CXXEXTRA) $(DEFINCL) -o $@ $< .rc.res: $(RC) $(RCFLAGS) $(RCEXTRA) $(DEFINCL) -fo$@ $< # Rules for cleaning CLEAN_FILES = y.tab.c y.tab.h lex.yy.c core *.orig *.rej \ \\\#*\\\# *~ *% .\\\#* clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__) $(RM) $(CLEAN_FILES) $(RC_SRCS:.rc=.res) $(C_SRCS:.c=.o) $(CXX_SRCS:.cpp=.o) $(RM) $(DLLS:%=%.so) $(EXES:%=%.so) $(EXES:%.exe=%) $(SUBDIRS:%=%/__clean__): dummy cd `dirname $@` && $(MAKE) clean $(EXTRASUBDIRS:%=%/__clean__): dummy -cd `dirname $@` && $(RM) $(CLEAN_FILES) ### Target specific build rules DEFLIB = $(LIBRARY_PATH) $(LIBRARIES) $(DLL_PATH) $(dmsw_exe_MODULE).so: $(dmsw_exe_OBJS) $(CC) $(dmsw_exe_LDFLAGS) -o $@ $(dmsw_exe_OBJS) $(dmsw_exe_LIBRARY_PATH) $(DEFLIB) $(dmsw_exe_DLLS:%=-l%) $(dmsw_exe_LIBRARIES:%=-l%)

Feb. 28, 2007

Re: fc4 rpms

by Bill Medland

On Wed, 2007-28-02 at 09:43 +0100, Andreas Bierfert wrote: > On Tue, 27 Feb 2007 18:17:04 -0800 > Bill Medland <billmedland(a)shaw.ca> wrote: > > > Is there any chance that someone with the ability can create the fedora > > core 4 wine rpms for version 0.9.30? > > > > Bill Medland > > If you want to I can upgrade the spec in fedora cvs to the newest versions as > well. It is sad that I cannot push builds for fc 3 and fc 4 anymore I might put > builds on my webpage if the audience is big enough... > > - Andreas > Thanks but that's no help for me; I guess I'll just build for myself. Actually it's for Red Hat Enterprise Linux 4 Server and Desktop for redistribution. I was hoping that I wouldn't have to become totally au fait with the more advanced stuff in the spec files, but I guess I need to bite the bullet. Thanks, anyway Bill

Feb. 28, 2007

Re: [8/12] WineD3D: Create multithreading contexts for swapchains

by Stefan Dösinger

Hi, > I can even run Tom Clancy's Rainbow Six Vegas, but there are still > problems with offscreen rendering. Yeah, offscreen rendering is unsupported with my multithreading patches. I have another patch to fix that, but I haven't tested it. I have a bit of a mess in my wine tree at the moment(2 sets of patches), I will clean that up, send a few non-multithreaded patches to wine-patches and the newest multithreading thing to wine-devel for testing.

Feb. 28, 2007

Re: [7/7] cmd.exe: Support rd dir1 dir2 dir3 etc

by Alexandre Julliard

"Ann & Jason Edmeades" <us(a)edmeades.me.uk> writes: > diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h > index d6357f0..a7a73ae 100644 > --- a/programs/cmd/wcmd.h > +++ b/programs/cmd/wcmd.h > @@ -27,6 +27,9 @@ > #include <stdio.h> > #include <ctype.h> > > +#include "wine/debug.h" > +WINE_DEFAULT_DEBUG_CHANNEL(cmd); Adding tracing is OK, but this should go in the C files that need it, not in a header. -- Alexandre Julliard julliard(a)winehq.org

Feb. 28, 2007

Re: [6/6] d3d9: Add a mova rounding test

by Alexandre Julliard

"H. Verbeet" <hverbeet(a)gmail.com> writes: > It should be noted that native d3d rounds to nearest even while Wine > doesn't. Applications are not supposed to depend on that though. > > Changelog: > - Add a mova rounding test The test fails here: ../../../tools/runtest -q -P wine -M d3d9.dll -T ../../.. -p d3d9_test.exe.so visual.c && touch visual.ok visual.c:405: Test failed: Expected color 00ffff00, got 00000000 (for input -2.400000) visual.c:405: Test failed: Expected color 00ffff00, got 00000000 (for input -1.600000) visual.c:405: Test failed: Expected color 0000ffff, got 00000000 (for input -0.400000) visual.c:405: Test failed: Expected color 0000ffff, got 00000000 (for input 0.400000) visual.c:405: Test failed: Expected color 00ff00ff, got 00000000 (for input 1.600000) visual.c:405: Test failed: Expected color 00ff00ff, got 00000000 (for input 2.400000) make: *** [visual.ok] Error 6 -- Alexandre Julliard julliard(a)winehq.org

Feb. 28, 2007

Re: wine and msys rxvt.exe

by Jakob Eriksson

Phil Krylov wrote: > > AFAIR MSys's rxvt.exe uses libW11.dll, which implements Xlib API on > top of Win32 USER/GDI (no extra X server). However, it could be still > difficult (probably because of API name clashes?) > Not sure why the message is about libX11.dll - probably it sees > $DISPLAY and tries to use real X? AFAIR rxvt can be used both with and without X server, so that's probable. regards, Jakob

Feb. 28, 2007

Re: msi: Add proper parameter handling to OLE automation interfaces.

by Robert Shearman

Misha Koshelev wrote: > +/* Macros for variant conversions */ > +#define V_DECLARE \ > + VARIANTARG vararg[pDispParams->cArgs]; \ > + int iVarCount; \ > + HRESULT hr = S_OK; \ > + memset(vararg, 0, sizeof(vararg)); > +#define V_PREPARE(n, type) \ > + VariantInit(&vararg[n]); \ > + hr = VariantChangeTypeEx(&vararg[n], &pDispParams->rgvarg[n], lcid, 0, VT_##type); \ > + if (FAILED(hr)) \ > + { \ > + *puArgErr = n; \ > + goto v_finish; \ > + } > +#define V_PREPAREOPT(n, type) \ > + VariantInit(&vararg[n]); \ > + if (FAILED(VariantChangeTypeEx(&vararg[n], &pDispParams->rgvarg[n], lcid, 0, VT_##type))) \ > + VariantClear(&vararg[n]); > +#define V_PREPARED(n) (V_VT(&vararg[n]) != VT_EMPTY) > +#define V(n, type) V_##type(&vararg[n]) > +#define V_RETURN(value, type) \ > + V_VT(pVarResult) = VT_##type; \ > + V_##type(pVarResult) = value; > +#define V_FAIL hr = E_FAIL; > +#define V_DEFAULT \ > + default: \ > + hr = DISP_E_MEMBERNOTFOUND; > +#define V_FINISH \ > + goto v_finish; /* suppress warnings about unused label v_free */ \ > +v_finish: \ > + for (iVarCount = 0; iVarCount < pDispParams->cArgs; iVarCount++) \ > + if (V_PREPARED(iVarCount)) \ > + VariantClear(&vararg[iVarCount]); \ > + return hr; > This is quite ugly. You can at replace at least some of this with calls to DispGetParam. A lot of the methods only have one parameter so will end up simpler without using these macros. -- Rob Shearman

Feb. 28, 2007

Re: fc4 rpms

by Marcus Meissner

On Wed, Feb 28, 2007 at 09:43:02AM +0100, Andreas Bierfert wrote: > On Tue, 27 Feb 2007 18:17:04 -0800 > Bill Medland <billmedland(a)shaw.ca> wrote: > > > Is there any chance that someone with the ability can create the fedora > > core 4 wine rpms for version 0.9.30? > > > > Bill Medland > > If you want to I can upgrade the spec in fedora cvs to the newest versions as > well. It is sad that I cannot push builds for fc 3 and fc 4 anymore I might put > builds on my webpage if the audience is big enough... Fedora Core 4 RPMs are still available in the openSUSE buildservice. YUM base URL: http://software.opensuse.org/download/Emulators:/Wine/Fedora_Core_4/ Ciao, Marcus

Feb. 28, 2007

Re: fc4 rpms

by Andreas Bierfert

On Tue, 27 Feb 2007 18:17:04 -0800 Bill Medland <billmedland(a)shaw.ca> wrote: > Is there any chance that someone with the ability can create the fedora > core 4 wine rpms for version 0.9.30? > > Bill Medland If you want to I can upgrade the spec in fedora cvs to the newest versions as well. It is sad that I cannot push builds for fc 3 and fc 4 anymore I might put builds on my webpage if the audience is big enough... - Andreas -- Andreas Bierfert | http://awbsworld.de | GPG: C58CF1CB andreas.bierfert(a)lowlatency.de | http://lowlatency.de | signed/encrypted phone: +49 2402 102373 | cell: +49 173 5803043 | mail preferred

Feb. 28, 2007

Re: [8/12] WineD3D: Create multithreading contexts for swapchains

by Mirek

Stefan Dösinger napsal(a): > This patch finishes the opengl side of multithreaded direct3d, which was > started with the state management rewrite(well, almost, no offscreen rendering > yet) It does not make Direct3D thread safe, because there is no protection > against race conditions. > > This patch improves multithreaded games a bit. They do not crash any more in a > gl call, but running them is kinda like a lottery, especially on smp systems. > > Vitaly and Andras have reported success with Prince of Persia 3D: Sands of > Time and some other games, and on my laptop Empire Earth is running. Empire > Earth deadlocks regularly on my dual core system at ddraw creation. I can even run Tom Clancy's Rainbow Six Vegas, but there are still problems with offscreen rendering. Mirek > > > ------------------------------------------------------------------------ > > From 49cc9a0aa6e06f559540758d5b0ed2252208a0ad Mon Sep 17 00:00:00 2001 > From: Stefan Doesinger <stefan(a)codeweavers.com> > Date: Sun, 25 Feb 2007 00:18:25 +0100 > Subject: [PATCH] WineD3D: Create multithreading contexts for swapchains > > This patch adds a routine to clone the main context of a swapchain to use it with a different thread on the > same drawable. This will enable multithreaded direct3d rendering, or better enable an attempt to do that. > From the opengl point of view it will work, but because concurrency control is not implemented yet(appart > of ENTER_GL() / LEAVE_GL() ) games may crash randomly, show strange behavior, ... > > The other problem is that this code was only tested with the open source radeon driver yet. While what > wined3d is doing here should be allowed by the spec, some drivers may have some bugs when using multiple > contexts on one drawable. > --- > dlls/wined3d/context.c | 4 ++-- > dlls/wined3d/swapchain.c | 30 ++++++++++++++++++++++++++++++ > dlls/wined3d/wined3d_private.h | 2 ++ > 3 files changed, 34 insertions(+), 2 deletions(-) > > diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c > index 3a815b3..8545568 100644 > --- a/dlls/wined3d/context.c > +++ b/dlls/wined3d/context.c > @@ -626,8 +626,8 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU > } > > if(!context) { > - /* TODO: Create a new context for the thread */ > - FIXME("Context creation for a new thread not implemented yet\n"); > + /* Create a new context for the thread */ > + context = IWineD3DSwapChainImpl_CreateContextForThread(swapchain); > } > } else { > context = ((IWineD3DSwapChainImpl *) swapchain)->context[0]; > diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c > index 2977a05..3b8e3e8 100644 > --- a/dlls/wined3d/swapchain.c > +++ b/dlls/wined3d/swapchain.c > @@ -510,3 +510,33 @@ const IWineD3DSwapChainVtbl IWineD3DSwapChain_Vtbl = > IWineD3DSwapChainImpl_SetGammaRamp, > IWineD3DSwapChainImpl_GetGammaRamp > }; > + > +WineD3DContext *IWineD3DSwapChainImpl_CreateContextForThread(IWineD3DSwapChain *iface) { > + WineD3DContext *ctx; > + IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *) iface; > + WineD3DContext **newArray; > + > + TRACE("Creating a new context for swapchain %p, thread %d\n", This, GetCurrentThreadId()); > + > + ctx = CreateContext(This->wineD3DDevice, (IWineD3DSurfaceImpl *) This->frontBuffer, > + This->context[0]->display, This->win); > + if(!ctx) { > + ERR("Failed to create a new context for the swapchain\n"); > + return NULL; > + } > + > + newArray = HeapAlloc(GetProcessHeap(), 0, sizeof(*newArray) * This->num_contexts + 1); > + if(!newArray) { > + ERR("Out of memory when trying to allocate a new context array\n"); > + DestroyContext(This->wineD3DDevice, ctx); > + return NULL; > + } > + memcpy(newArray, This->context, sizeof(*newArray) * This->num_contexts); > + HeapFree(GetProcessHeap(), 0, This->context); > + newArray[This->num_contexts] = ctx; > + This->context = newArray; > + This->num_contexts++; > + > + TRACE("Returning context %p\n", ctx); > + return ctx; > +} > diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h > index 45e69bf..fa4232c 100644 > --- a/dlls/wined3d/wined3d_private.h > +++ b/dlls/wined3d/wined3d_private.h > @@ -1341,6 +1341,8 @@ typedef struct IWineD3DSwapChainImpl > > extern const IWineD3DSwapChainVtbl IWineD3DSwapChain_Vtbl; > > +WineD3DContext *IWineD3DSwapChainImpl_CreateContextForThread(IWineD3DSwapChain *iface); > + > /***************************************************************************** > * Utility function prototypes > */ > > > ------------------------------------------------------------------------ > >

Feb. 28, 2007

Re: msi: automation: clean up comments.

by James Hawkins

On 2/27/07, Misha Koshelev <mk144210(a)bcm.tmc.edu> wrote: > Looking back at James comments, maybe I did have a little too much > commenting there :) > You're sending patches that change code that hasn't been committed yet. Instead, you need to go back and change the original patch and resend. -- James Hawkins

Feb. 28, 2007

Re: msi: Expand OLE automation interface parameter handling.

by James Hawkins

On 2/27/07, Misha Koshelev <mk144210(a)bcm.tmc.edu> wrote: > This applies on top of my other OLE automation patches. Added new > checks: > Why don't you wait until the other patches are committed before sending these new patches? It makes it hard to review, because I don't have your other patches applied. > - Parameter we are looking for is not passed? > - Only set puArgErr if it is passed > - Make sure pVarResult is valid before we write to it > - Don't return S_FAIL. MSDN doesn't mention it in the Invoke help, so we > won't use it. > You need to add tests for these items. -- James Hawkins

Feb. 28, 2007

Success story with Flash on Wine

by Dan Kegel

http://blog.brokenfunction.com/2007/02/27/debugging-flash-on-linux/ says "... How strange, the wine-powered standalone player is the most stable Flash player I've used yet. On Windows it would occasionally be unable to connect to the debugger until I restarted Eclipse, usually related to having to many players open at the same time. On Linux it will crash unexpectedly. Now I can have a dozen debuggers open at the same time with no crashes yet." Cool!

Feb. 28, 2007

msiexec.exe service registration

by Jeremy

In msiexec.c, the DoRegServer calls OpenSCManager, however, on a fresh installation, ie no ~/.wine, the HKLM\CurrentControlSet\Services does not yet exist, so that OpenSCManager fails. What is the correct way to guarantee that this key exists? Regards, Jeremy

Feb. 27, 2007

fc4 rpms

by Bill Medland

Is there any chance that someone with the ability can create the fedora core 4 wine rpms for version 0.9.30? Bill Medland

Feb. 27, 2007

Re: Make sure keyboard state is up to date before processing GetAsyncKeyState.

by Aric Stewart

That could be true. Since it was only used in this one place I was not sure the protocol for adding it to the header file or just as a prototype in this file. I will resubmit the patch -aric Detlef Riekenberg wrote: > On Di, 2007-02-27 at 20:28 +0900, Aric Stewart wrote: >> --- a/dlls/winex11.drv/keyboard.c >> +++ b/dlls/winex11.drv/keyboard.c >> @@ -94,6 +94,9 @@ static int kcControl, kcAlt, kcShift, kc >> >> static char KEYBOARD_MapDeadKeysym(KeySym keysym); >> >> +extern DWORD X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, >> + const HANDLE *handles, DWORD timeout, DWORD mask, >> DWORD flags); > > I have no Idea about the code, but... > > IMHO, that declaration fit perfect into x11drv.h > >

Feb. 27, 2007

RE: xcopy try 3

by Joris Huizer

--- Ann & Jason Edmeades <us(a)edmeades.me.uk> wrote: > > For reference, in case anyone else hits it, the > problem here is I like my > windows editor so generally edit over a samba share. > (I've just found...) Makes me feel like why not use wine to run it...? Oh well, just babbling, you must have a valid reason for that regards, Joris ____________________________________________________________________________________ The fish are biting. Get more visitors on your site using Yahoo! Search Marketing. http://searchmarketing.yahoo.com/arp/sponsoredsearch_v2.php

Feb. 27, 2007

RE: xcopy try 3

by Ann & Jason Edmeades

>> diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in >> new file mode 100755 >All the files you create or modify are marked executable, could you >please fix that? Thanks for the heads up - I should have fixed it now, any problems please let me know. For reference, in case anyone else hits it, the problem here is I like my windows editor so generally edit over a samba share. (I've just found...) Samba by default 'maps' the archive bit on windows to the execute bit on unix, hence any time I modified the file it was turning the execute bit on. To remove it, add 'map archive no' to the share in smb.conf The things you learn! Jason

Feb. 27, 2007

Re: Commit 37591409b28c2000e70bd0d3c654a3a7559a4a26 breaks accentuation

by Pedro Araujo Chaves Jr.

On 2/27/07, Dmitry Timoshkov <dmitry(a)codeweavers.com> wrote: > Please open a bug report regarding this problem, with all the appropriate > info: an aplication that shows the problem, the fonts used, etc. If you > could add a test to the existing tests in the above mentioned commit that > shows the problem that would be great. Been there, done that: http://bugs.winehq.org/show_bug.cgi?id=7571 In order to clarify things, please see the attachment: http://bugs.winehq.org/attachment.cgi?id=5133&action=view There I provided links for many of the fonts I used (all legal, AFAIK). Cheers, Pedro.

Feb. 27, 2007

Re: mingw linking problem

by Paul Millar

Hi Stefan, On Sunday 25 February 2007 18:13, Stefan Leichter wrote: > This fail for some dlls at the linking, eg. comdlg32.dll misses the imports > > _IID_IContextMenu, _IID_IShellFolder, _IID_IPersistFolder2, > _IID_IShellBrowser, _IID_ICommDlgBrowser, _IID_IShellView, These are part of the MinGW's W32api v3.8. I don't know how long they've been in W32api, so you may need to upgrade to this version. > _SID_STopLevelBrowser The set of patches I have includes a definition for this GUID (as well as many, many others). The complete set of patches (against w32api v3.8) is available from: http://www.astro.gla.ac.uk/users/paulm/Cross/mingw-w32api-patches-2007-02-2… Using a MinGW tool-chain (that has these patches) I was able to build comdlg32.dll N.B. The latest batch of patches (that fixed cross-compiling) are due to Stefan! Thanks! HTH, Paul.

Feb. 27, 2007

Re: wininet: Constify a formal parameter of CommitURLCacheEntry{A|W}() (Resend)

by Andrew Talbot

James Hawkins wrote: > #ifndef USE_FIXED_COMMIT_URL_CACHE_ENTRY > // Temporary state of affairs until we reconcile our apis. > Thanks, James. Maybe one day, then. :) -- Andy.

Feb. 27, 2007

Re: dplay: directplay should initialize session Guid patch + conformance tests

by Detlef Riekenberg

On Di, 2007-02-27 at 13:15 +0100, Alessandro Pignotti wrote: > +dlls/dplayx/tests/Makefile That is will not work since today, as the format changed. The correct entry is created by "tools/make_makefiles" I updated the wiki, that autogenerated code should not be included in a Patch -- By by ... Detlef

Feb. 27, 2007

Re: Make sure keyboard state is up to date before processing GetAsyncKeyState.

by Detlef Riekenberg

On Di, 2007-02-27 at 20:28 +0900, Aric Stewart wrote: > --- a/dlls/winex11.drv/keyboard.c > +++ b/dlls/winex11.drv/keyboard.c > @@ -94,6 +94,9 @@ static int kcControl, kcAlt, kcShift, kc > > static char KEYBOARD_MapDeadKeysym(KeySym keysym); > > +extern DWORD X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, > + const HANDLE *handles, DWORD timeout, DWORD mask, > DWORD flags); I have no Idea about the code, but... IMHO, that declaration fit perfect into x11drv.h -- By by ... Detlef

Feb. 27, 2007

Re: Commit 37591409b28c2000e70bd0d3c654a3a7559a4a26 breaks accentuation

by Dmitry Timoshkov

"Pedro Araujo Chaves Jr." <inckie(a)gmail.com> wrote: > After some regression testing, I found out that commit > 37591409b28c2000e70bd0d3c654a3a7559a4a26 by Dmitry Timoshkov breaks > accentuation - at least for Brazilian Portuguese in Lotus Notes R5. > > I did some testing and found out that only TrueType fonts are affected > - that is, the fonts Notes lists as 'default foo' without the double-T > icon are all accented properly. To make matters worse, the affected > fonts don't behave the same way. > > For example, the string > > áéíóú ÁÉÍÓÚ àèìòù ÀÈÌÒÙ ãõ ÃÕ âêîôû ÂÊÎÔÛ äëïöü ÄËÏÖÜ > > renders as > > įéķóś ĮÉĶÓŚ ąčģņł ĄČĢŅŁ ćõ ĆÕ āźīōū ĀŹĪŌŪ äėļöü ÄĖĻÖÜ > > with Trebuchet MS. You can see they're pretty different - well, most > of you, at least. Please open a bug report regarding this problem, with all the appropriate info: an aplication that shows the problem, the fonts used, etc. If you could add a test to the existing tests in the above mentioned commit that shows the problem that would be great. -- Dmitry.

Feb. 27, 2007

Commit 37591409b28c2000e70bd0d3c654a3a7559a4a26 breaks accentuation

by Pedro Araujo Chaves Jr.

Hi all, After some regression testing, I found out that commit 37591409b28c2000e70bd0d3c654a3a7559a4a26 by Dmitry Timoshkov breaks accentuation - at least for Brazilian Portuguese in Lotus Notes R5. I did some testing and found out that only TrueType fonts are affected - that is, the fonts Notes lists as 'default foo' without the double-T icon are all accented properly. To make matters worse, the affected fonts don't behave the same way. For example, the string áéíóú ÁÉÍÓÚ àèìòù ÀÈÌÒÙ ãõ ÃÕ âêîôû ÂÊÎÔÛ äëïöü ÄËÏÖÜ renders as įéķóś ĮÉĶÓŚ ąčģņł ĄČĢŅŁ ćõ ĆÕ āźīōū ĀŹĪŌŪ äėļöü ÄĖĻÖÜ with Trebuchet MS. You can see they're pretty different - well, most of you, at least. However, that's only a display-and-print issue, as I can copy the text and paste it elsewhere, and the accents are in their right places (and in the right letters, for that matter) - as one would expect. Regarding Microsoft fonts, by the way, Calibri, Candara, Consolas, Constantia, Corbel, Segoe Print, and Segoe Script (couldn't test Cambria) all behave exactly like Trebuchet MS, whereas Segoe UI behaves just like Times New Roman, which shows problems only with graves and tildes. However the behavior is kinda random among the many other fonts (from many unrelated sources, of course) I tested, so I (still) didn't do an exhaustive check for a pattern. Would anybody have any word on this? Cheers, Pedro.

Feb. 27, 2007

Re: [3/12 WineD3D/DDraw: Forward DDSCL_MULTITHREADED to WineD3D

by Stefan Dösinger

> What exactly is this supposed to fix? We already pass the behaviour > flags through to IWineD3DImpl_CreateDevice(), so shouldn't wined3d > just handle it there? In DirectDraw the multithreading flag is set after creating the device, so I need a seperate method to set it in wined3d, because I don't know it at initialization time. This method has to initialize the thread safety things in wined3d. Now d3d8 and d3d9 call SetMultithreaded too because it is clearer to have SetMultithreaded called by ddraw, d3d8 and d3d9 instead of ddraw and wined3d. On the other hand, there are now 2 places where the multithreaded flag is passed to wined3d now, CreateDevice and SetMultithreaded. I could call SetMultithreaded from wined3d::CreateDevice, and not call it from d3d8/9, or I could remove the WINED3DCREATE_MULTITHREADED flag from the public wined3d_interface.h header, sinaling that CreateDevice ignores that flag? Or anything I missed?

Feb. 27, 2007

Re: dplay: directplay should initialize session Guid patch +conformance tests

by H. Verbeet

On 27/02/07, Dmitry Timoshkov <dmitry(a)codeweavers.com> wrote: > > +BOOL FAR PASCAL EnumConnectionsCallback(LPCGUID lpguidSP, LPVOID lpConnection, > > + DWORD dwConnectionSize, LPCDPNAME lpName, DWORD dwFlags, > > + LPVOID lpContext) > > +{ > > This doesn't look like a proper type of callb ack for IDirectPlayX_EnumConnections. > I wondered about that as well, but it does appear to be what the DXSDK headers specify.

Feb. 27, 2007

Re: dplay: directplay should initialize session Guid patch +conformance tests

by Dmitry Timoshkov

"Alessandro Pignotti" <alex.pigna(a)inventati.org> wrote: > +BOOL FAR PASCAL EnumConnectionsCallback(LPCGUID lpguidSP, LPVOID lpConnection, > + DWORD dwConnectionSize, LPCDPNAME lpName, DWORD dwFlags, > + LPVOID lpContext) > +{ This doesn't look like a proper type of callb ack for IDirectPlayX_EnumConnections. > + bzero(&sessionDesc,sizeof(DPSESSIONDESC2)); > + bzero(&zeroGuid,16); Use memset instead of non-portable bzero. > + LPDIRECTPLAY4 pDP = NULL; This initialization is redundant. If you also could use 4 spaces indents instead of tabs, and add an empty line after data declarations that would be nice as well. And a personal opinion: all that lines without a single space delimiting variables, functions, equal signs are absolutely not readable. -- Dmitry.

Feb. 27, 2007

Re: ntdll: resend 1/4 NtCreateMailslotFile tests

by Alexandre Julliard

Jeff Latimer <lats(a)yless4u.com.au> writes: > diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in > index cccc4c5..4ceccfd 100644 > --- a/dlls/ntdll/tests/Makefile.in > +++ b/dlls/ntdll/tests/Makefile.in > @@ -14,6 +14,7 @@ CTESTS = \ > generated.c \ > info.c \ > large_int.c \ > + mailslot.c \ Naming it file.c would be better, since that's the name of the corresponding source file, and that makes it more general so it can later contain other tests too. -- Alexandre Julliard julliard(a)winehq.org

Feb. 27, 2007

Re: [4/6] cmd.exe : Prompt during rd /s command

by Alexandre Julliard

"Ann & Jason Edmeades" <us(a)edmeades.me.uk> writes: > + /* Load the translated 'Are you sure' message */ > + LoadString (hinst, WCMD_YESORN, buffer, sizeof(buffer)); > + > + /* Loop waiting on a Y or N */ > + while (answer[0] != 'Y' && answer[0] != 'N') { Making the message translatable is good, but the Y/N answers need to be translatable too... -- Alexandre Julliard julliard(a)winehq.org

Feb. 27, 2007

Re: [1/12] - [12/12] WineD3D (multithreading)

by Stefan Dösinger

Am Dienstag 27 Februar 2007 09:54 schrieb Mirek: Looks like we have a rouge multithreaded game here - which is pretty strange since it worked before. > Here is output with only patches 1,2,3,4,5,6,7,10,11,12 (without patch 8 > and 9): > fixme:d3d:ActivateContext Context creation for a new thread not > implemented yet Can you send me a +d3d9,tid trace from that?

Feb. 27, 2007

Re: dplay: directplay should initialize session Guid patch + conformance tests

by Kai Blin

On Saturday 24 February 2007 22:10, Alessandro Pignotti wrote: > Thanks for the suggestions, this version of the patch uses IsEqualGUID and > eliminates C++ style comments and insert a proper copyright notice in the > added file You might want to use #include "wine/test.h" instead of #include <wine/test.h>, all the other tests do that. Also, you should split out the test from the START_TEST(dplayx) function into a function called e.g. test_session_guid and do all the testing there. Also, please use IsEqualGUID() in EnumConnectionsCallback, too. Sorry for not replying earlier, but last week was kind of a mess, and I'm slowly catching up. Cheers, Kai -- Kai Blin, <kai Dot blin At gmail Dot com> WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin/ -- Will code for cotton.

Feb. 27, 2007

Re: GDI surfaces, GDI heap and wined3d's VideoMemorySize

by H. Verbeet

On 27/02/07, Chris Robinson <chris.kcat(a)gmail.com> wrote: > I thought it was added to the registry because Wine can't figure out the video > memory amount itself from OpenGL or X, and that allows the user to make it > report the proper amount (or at least, more proper). Before it was hard-coded > to 64MB. > Pretty much.

Feb. 27, 2007

Re: [1/12] - [12/12] WineD3D (multithreading)

by Mirek

Mirek napsal(a): > Stefan Dösinger napsal(a): >> Am Montag 26 Februar 2007 22:52 schrieb Mirek: >>> Stefan Dösinger napsal(a): >>>> Am Montag 26 Februar 2007 19:58 schrieb Mirek: >>>>> Hi, this series of patches broke some textures in TES IV: Oblivion, >>>>> should I create bug in winebugs? I tried some other apps, they >>>>> looks ok. >>>>> (bug is here after patch 7/12 and 8/12). >>>> Which patch breaks oblivion? Can you describe the kind of breakage? >>>> >>>> *cough* That game seems to be really picky *cough* >>> Patch number 7 and 8 (after patch 7 game crashed, after patch 8 it works >>> normal but with graphical problems). I have Core 2 Duo CPU and SMP >>> enabled, Nvidia GF6800GS with latest stable drivers. >>> >>> Here are some screenshots: >>> http://headline.czela.net/Mirek/wine/TES%20IV:%20Oblivion/regression/ >>> >>> 2007-02-26-224223.jpg is for comparsion. >>> >>> This is realy strange, because after I do some spells (graphical efects) >>> in game it just recover to normal state (everything looks like before). >> Strange yes. Does it print any fixme right before it crashes if you >> only apply patch 7? > Output with all patches 1,2,3,4,5,6,7,8,9,10,11,12 (only interesting part): fixme:d3d:IWineD3DDeviceImpl_ResourceReleased Vertex buffer released while bound to a state block, stream 0 fixme:d3d:IWineD3DDeviceImpl_ResourceReleased Vertex buffer released while bound to a state block, stream 0 fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb41-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb46-f175-11d1-a392-00e0291f3959} not found fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb41-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb46-f175-11d1-a392-00e0291f3959} not found fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:ActivateContext Offscreen rendering is only supported from the creation thread yet fixme:d3d:ActivateContext Expect a crash now ... fixme:d3d:IWineD3DDeviceImpl_ResourceReleased Vertex buffer released while bound to a state block, stream 0 fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb41-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb46-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb41-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb46-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb41-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb46-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb41-f175-11d1-a392-00e0291f3959} not found And output without patch 7,8 an 9 (same part): fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=24400 < primary_done=24404) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=8016 < primary_done=8020) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=8016 < primary_done=8020) fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb41-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb46-f175-11d1-a392-00e0291f3959} not found fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=19580 < primary_done=19584) fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb41-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb46-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb41-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb46-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb41-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb46-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb41-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb46-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb41-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb46-f175-11d1-a392-00e0291f3959} not found fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb41-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb46-f175-11d1-a392-00e0291f3959} not found fixme:d3d:IWineD3DDeviceImpl_ResourceReleased Vertex buffer released while bound to a state block, stream 0 fixme:d3d:IWineD3DDeviceImpl_ResourceReleased Vertex buffer released while bound to a state block, stream 0 fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb41-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb46-f175-11d1-a392-00e0291f3959} not found fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb41-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb46-f175-11d1-a392-00e0291f3959} not found fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb41-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb46-f175-11d1-a392-00e0291f3959} not found fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:d3d:CreateVBO Failed to create a vertex buffer object. Continuing, but performance issues can occur err:d3d:CreateIndexBufferVBO Creating a vbo failed, continueing without vbo for this buffer fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb41-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb46-f175-11d1-a392-00e0291f3959} not found fixme:d3d:IWineD3DDeviceImpl_ResourceReleased Vertex buffer released while bound to a state block, stream 0 fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb41-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb46-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb41-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb46-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb41-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb46-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb41-f175-11d1-a392-00e0291f3959} not found fixme:devenum:DEVENUM_ICreateDevEnum_CreateClassEnumerator Category {cc7bfb46-f175-11d1-a392-00e0291f3959} not found

Feb. 27, 2007

Re: [1/12] - [12/12] WineD3D (multithreading)

by Mirek

Stefan Dösinger napsal(a): > Am Montag 26 Februar 2007 22:52 schrieb Mirek: >> Stefan Dösinger napsal(a): >>> Am Montag 26 Februar 2007 19:58 schrieb Mirek: >>>> Hi, this series of patches broke some textures in TES IV: Oblivion, >>>> should I create bug in winebugs? I tried some other apps, they looks ok. >>>> (bug is here after patch 7/12 and 8/12). >>> Which patch breaks oblivion? Can you describe the kind of breakage? >>> >>> *cough* That game seems to be really picky *cough* >> Patch number 7 and 8 (after patch 7 game crashed, after patch 8 it works >> normal but with graphical problems). I have Core 2 Duo CPU and SMP >> enabled, Nvidia GF6800GS with latest stable drivers. >> >> Here are some screenshots: >> http://headline.czela.net/Mirek/wine/TES%20IV:%20Oblivion/regression/ >> >> 2007-02-26-224223.jpg is for comparsion. >> >> This is realy strange, because after I do some spells (graphical efects) >> in game it just recover to normal state (everything looks like before). > Strange yes. Does it print any fixme right before it crashes if you only apply > patch 7? Here is output with only patches 1,2,3,4,5,6,7,10,11,12 (without patch 8 and 9): fixme:d3d:ActivateContext Context creation for a new thread not implemented yet wine: Unhandled page fault on read access to 0x00001098 at address 0x7c544f6c (thread 0010), starting debugger... Unhandled exception: page fault on read access to 0x00001098 in 32-bit code (0x7c544f6c). Register dump: CS:0073 SS:007b DS:007b ES:007b FS:0033 GS:003b EIP:7c544f6c ESP:7bdedd70 EBP:7bdeddd8 EFLAGS:00210246( - 00 -RIZP1) EAX:001b9268 EBX:7c5db078 ECX:00000000 EDX:00000000 ESI:00000000 EDI:0016be08 Stack dump: 0x7bdedd70: 0018ab38 7c5db9c4 7c5bc8dc 7c5bc694 0x7bdedd80: 16e9fa10 7efe5368 7bdedde8 7efa2396 0x7bdedd90: 00110020 175e21e0 7bdeddb8 7efa16f3 0x7bdedda0: 7efe5368 000e0000 00000000 00000000 0x7bdeddb0: 00000000 7efe5368 7bdede18 7e32d53c 0x7bdeddc0: 175069b8 001b9268 0018ab38 7c5db078 Backtrace: =>1 0x7c544f6c ActivateContext+0x2ac(This=0x1b9268, target=0x205618, usage=0x1) [/usr/src/wine/dlls/wined3d/context.c:761] in wined3d (0x7bdeddd8) 2 0x7c54f23d CreateVBO+0x6d(object=<register ESI not in topmost frame>) [/usr/src/wine/dlls/wined3d/device.c:330] in wined3d (0x7bdede18) 3 0x7c553e27 IWineD3DDeviceImpl_CreateVertexBuffer+0x1f7(iface=<register EDI not in topmost frame>, Size=0x120, Usage=0x8, FVF=0x0, Pool=0x1, ppVertexBuffer=0x16e9fa08, sharedHandle=0x0, parent=0x16e9fa00) [/usr/src/wine/dlls/wined3d/device.c:447] in wined3d (0x7bdede68) 4 0x7c781815 IDirect3DDevice9Impl_CreateVertexBuffer+0x95(iface=0x186870, Size=0x120, Usage=<register EDI not in topmost frame>, FVF=0x0, Pool=0x1, ppVertexBuffer=0x7bdedee0, pSharedHandle=0x0) [/root/.WineCVS/sources/cvswine/wine/dlls/d3d9/vertexbuffer.c:177] in d3d9 (0x7bdedea8) 5 0x006e2d7d in oblivion (+0x2e2d7d) (0x7bdedee0) 6 0x00000000 (0x26034550) 7 0x130003e4 (0x01c00000) 8 0x2a08eed8 (0x2a08ee10) 9 0xbffadd7c (0xbfd1fd64) 10 0x00000000 (0x00000000) 0x7c544f6c ActivateContext+0x2ac [/usr/src/wine/dlls/wined3d/context.c:761] in wined3d: movl 0x1098(%edx),%eax 761 ret = glXMakeCurrent(context->display, context->drawable, context->glCtx); Modules: Module Address Debug info Name (104 modules) PE 400000-b59000 Export oblivion PE b60000-daf000 Deferred d3dx9_27 PE 18000000-18068000 Deferred binkw32 ELF 7b1f1000-7b28a000 Deferred oleaut32<elf> \-PE 7b200000-7b28a000 \ oleaut32 ELF 7bf00000-7bf03000 Deferred <wine-loader> ELF 7bf80000-7bfa7000 Deferred msvfw32<elf> \-PE 7bf90000-7bfa7000 \ msvfw32 ELF 7bfa7000-7c000000 Deferred quartz<elf> \-PE 7bfb0000-7c000000 \ quartz ELF 7c491000-7c521000 Deferred libglu.so.1 ELF 7c521000-7c5dc000 Dwarf wined3d<elf> \-PE 7c530000-7c5dc000 \ wined3d ELF 7c718000-7c737000 Deferred devenum<elf> \-PE 7c720000-7c737000 \ devenum ELF 7c737000-7c742000 Deferred libgcc_s.so.1 ELF 7c747000-7c75b000 Deferred avicap32<elf> \-PE 7c750000-7c75b000 \ avicap32 ELF 7c762000-7c78d000 Dwarf d3d9<elf> \-PE 7c770000-7c78d000 \ d3d9 ELF 7c9a8000-7ca69000 Deferred libasound.so.2 ELF 7ca69000-7ca94000 Deferred winealsa<elf> \-PE 7ca70000-7ca94000 \ winealsa ELF 7ca94000-7cac6000 Deferred uxtheme<elf> \-PE 7caa0000-7cac6000 \ uxtheme ELF 7cd55000-7cd6a000 Deferred midimap<elf> \-PE 7cd60000-7cd6a000 \ midimap ELF 7cd6a000-7cd6f000 Deferred libxfixes.so.3 ELF 7cd75000-7cd8d000 Deferred msacm32<elf> \-PE 7cd80000-7cd8d000 \ msacm32 ELF 7cd8f000-7cd92000 Deferred libxinerama.so.1 ELF 7cd95000-7cdb2000 Deferred imm32<elf> \-PE 7cda0000-7cdb2000 \ imm32 ELF 7d75c000-7e0cd000 Deferred libglcore.so.1 ELF 7e0cd000-7e161000 Deferred libgl.so.1 ELF 7e161000-7e166000 Deferred libxdmcp.so.6 ELF 7e166000-7e169000 Deferred libxau.so.6 ELF 7e169000-7e255000 Deferred libx11.so.6 ELF 7e255000-7e263000 Deferred libxext.so.6 ELF 7e263000-7e268000 Deferred libxxf86vm.so.1 ELF 7e268000-7e280000 Deferred libice.so.6 ELF 7e280000-7e289000 Deferred libsm.so.6 ELF 7e289000-7e292000 Deferred libxcursor.so.1 ELF 7e292000-7e295000 Deferred libxrandr.so.2 ELF 7e295000-7e29d000 Deferred libxrender.so.1 ELF 7e2a9000-7e336000 Deferred winex11<elf> \-PE 7e2c0000-7e336000 \ winex11 ELF 7e3ac000-7e3cc000 Deferred libexpat.so.1 ELF 7e3cc000-7e3f7000 Deferred libfontconfig.so.1 ELF 7e3f7000-7e40b000 Deferred libz.so.1 ELF 7e40b000-7e475000 Deferred libfreetype.so.6 ELF 7e495000-7e4c1000 Deferred ws2_32<elf> \-PE 7e4a0000-7e4c1000 \ ws2_32 ELF 7e4c1000-7e4db000 Deferred wsock32<elf> \-PE 7e4d0000-7e4db000 \ wsock32 ELF 7e4db000-7e53f000 Deferred msvcrt<elf> \-PE 7e4f0000-7e53f000 \ msvcrt ELF 7e53f000-7e553000 Deferred lz32<elf> \-PE 7e550000-7e553000 \ lz32 ELF 7e553000-7e5ab000 Deferred shlwapi<elf> \-PE 7e560000-7e5ab000 \ shlwapi ELF 7e5ab000-7e6a0000 Deferred shell32<elf> \-PE 7e5c0000-7e6a0000 \ shell32 ELF 7e6a0000-7e6e9000 Deferred dsound<elf> \-PE 7e6b0000-7e6e9000 \ dsound ELF 7e6e9000-7e777000 Deferred winmm<elf> \-PE 7e6f0000-7e777000 \ winmm ELF 7e777000-7e78a000 Deferred libresolv.so.2 ELF 7e78a000-7e78c000 Deferred libnvidia-tls.so.1 ELF 7e791000-7e7aa000 Deferred version<elf> \-PE 7e7a0000-7e7aa000 \ version ELF 7e7aa000-7e7c8000 Deferred iphlpapi<elf> \-PE 7e7b0000-7e7c8000 \ iphlpapi ELF 7e7c8000-7e81d000 Deferred rpcrt4<elf> \-PE 7e7d0000-7e81d000 \ rpcrt4 ELF 7e81d000-7e8b6000 Deferred ole32<elf> \-PE 7e830000-7e8b6000 \ ole32 ELF 7e8b6000-7e8ec000 Deferred dinput<elf> \-PE 7e8c0000-7e8ec000 \ dinput ELF 7e8ec000-7e905000 Deferred dinput8<elf> \-PE 7e8f0000-7e905000 \ dinput8 ELF 7e905000-7e94b000 Deferred advapi32<elf> \-PE 7e910000-7e94b000 \ advapi32 ELF 7e94b000-7e9de000 Deferred gdi32<elf> \-PE 7e960000-7e9de000 \ gdi32 ELF 7e9de000-7eb18000 Deferred user32<elf> \-PE 7ea00000-7eb18000 \ user32 ELF 7eb18000-7ebd5000 Deferred comctl32<elf> \-PE 7eb20000-7ebd5000 \ comctl32 ELF 7edd5000-7eefb000 Deferred kernel32<elf> \-PE 7edf0000-7eefb000 \ kernel32 ELF 7eefb000-7ef06000 Deferred libnss_files.so.2 ELF 7ef06000-7ef10000 Deferred libnss_nis.so.2 ELF 7ef10000-7ef26000 Deferred libnsl.so.1 ELF 7ef26000-7ef4b000 Deferred libm.so.6 ELF 7ef4b000-7ef4f000 Deferred iso8859-2.so ELF 7ef6b000-7f000000 Deferred ntdll<elf> \-PE 7ef80000-7f000000 \ ntdll ELF b7d2a000-b7d2e000 Deferred libdl.so.2 ELF b7d2e000-b7e60000 Deferred libc.so.6 ELF b7e60000-b7e72000 Deferred libpthread.so.0 ELF b7e77000-b7e80000 Deferred libnss_compat.so.2 ELF b7e93000-b7fa4000 Deferred libwine.so.1 ELF b7fa6000-b7fbd000 Deferred ld-linux.so.2 Threads: process tid prio (all id:s are in hex) 0000000a 0000000c 0 0000000b 0 00000008 (D) G:\usr\games\oblivion\Oblivion.exe 00000013 0 00000010 -1 <== 0000000f -1 0000000e 15 0000000d 0 00000009 0

Feb. 27, 2007

Re: [PATCH] seperate AC_CONFIG_FILES.

by Marcus Meissner

On Tue, Feb 27, 2007 at 01:03:09AM +0100, Detlef Riekenberg wrote: > On Mo, 2007-02-26 at 22:06 +0100, Marcus Meissner wrote: > > > -AC_CONFIG_FILES([ > > -Make.rules > > -dlls/Makedll.rules > > -dlls/Makeimplib.rules > > -dlls/Maketest.rules > > -programs/Makeprog.rules > > -Makefile > > -dlls/Makefile > > Does "tools/make_makefiles" still work after your Patch? > - for a new dll > - for a new test > - for a new program > > I'm unable to test that here (my autoconf is to old) Seems I need to actually change tools/make_makefiles instead of configure.ac :( Ciao, Marcus

Feb. 27, 2007

Re: configure: Break single-line ac_config_files list into multiple lines.

by Jan Zerebecki

On Sat, Feb 24, 2007 at 02:15:29PM +0200, Saulius Krasuckas wrote: > This long line breaks automated rebasing of one of testing branches on > (namely ntoskrnl) on my box every time a new dll or program is added. > That's because I need to merge conflict for this line by my hand. You might find http://wiki.winehq.org/There_are_always_conflicts_in_configure interesting. Jan

Feb. 26, 2007

Re: GDI surfaces, GDI heap and wined3d's VideoMemorySize

by Chris Robinson

On Sunday 25 February 2007 03:36:02 pm Vitaliy Margolen wrote: > The memory size setting is only in registry because you should not touch > it in the first place. I thought it was added to the registry because Wine can't figure out the video memory amount itself from OpenGL or X, and that allows the user to make it report the proper amount (or at least, more proper). Before it was hard-coded to 64MB.

Feb. 26, 2007

Re: kernel32: Implement ReplaceFileA/ReplaceFileW

by Felix Nawothnig

Erich Hoover wrote: > Is the attached more like what you're looking for? I did some investigation and... actually I'm looking for an equivalent to the linux splice syscall. Win32 is the most braindead API ever. Duh. The "right" way would probably to do the copying yourself by read/write.. but I dunno. Your code looks solid at the first glance. Three things: - I'd remove the FILE_SHARE_DELETE and FILE_SHARE_WRITE. - Use MoveFile instead of CopyFile/DeleteFile at the end? - Are you sure you're supposed to set ERROR_INVALID_PARAMETER no matter what bad happens? If the function which failed already set LE you should probably keep it... Felix

Feb. 26, 2007

Re: kernel32: Implement ReplaceFileA/ReplaceFileW

by Erich Hoover

Is the attached more like what you're looking for? Erich Hoover ehoover(a)mines.edu On 2/26/07, Felix Nawothnig <flexo(a)holycrap.org> wrote: > > Erich Hoover wrote: > > I assume you're referring to the file existence check and file delete, > > followed by the actual copy and move. I implemented these checks in > > this manner in order to provide error codes consistent with the > > documentation. I am not incredibly familiar with the Wine internals, > > but it looks to me like the functions called should handle a > > simultaneous call from another thread (without unnecessary code > > duplication). For example, if the "replaced" file goes missing between > > the check and the CopyFileW call then CopyFileW will return an error. > > If the "replaced" file appears between the DeleteFileW call and the > > MoveFileExW call (since the MOVEFILE_REPLACE_EXISTING flag is not set), > > then the MoveFileExW call will fail. The documentation's expected error > > codes for ReplaceFile seem to be consistent with these potential > > outcomes. > > Reading MSDN that doesn't seem to be the case. The way I see it all > those errors documented could be caused by file permisions. MSDN doesn't > say anything about race cons. > > Some notes about the patch: > > + /* Maker sure the "replacement" file exists before continuing */ > + if(!RtlDoesFileExists_U( lpReplacementFileName )) > + { > + SetLastError(ERROR_INVALID_PARAMETER); > + return FALSE; > + } > > This would probably the right place to lock the file... > > + /* > + * If the user wants a backup then that needs to be performed first > + * * Do not fail to backup if "replaced" does not exist > + */ > + if( lpBackupFileName && RtlDoesFileExists_U( lpReplacedFileName ) ) > > The call to RtlDoesFileExists_U() is redundant and introduces a race > con. CopyFileW() will check for existence, check GLE afterwards. > > + { > + /* If an existing backup exists then copy over it */ > + */ > + if(!CopyFileW( lpReplacedFileName, lpBackupFileName, FALSE )) > + { > + SetLastError(ERROR_INVALID_PARAMETER); > + return FALSE; > + } > + } > + /* > + * Now that the backup has been performed (if requested), copy the > replacement > + * into place (make sure we can delete the original file first) > + * * Do not fail if "replaced" does not exist > + */ > + if(RtlDoesFileExists_U( lpReplacedFileName ) && !DeleteFileW( > lpReplacedFileName )) > > Same here, DeleteFile() will check for existence. > > + { > + SetLastError(ERROR_UNABLE_TO_REMOVE_REPLACED); > + return FALSE; > + } > + if(!MoveFileExW( lpReplacementFileName, lpReplacedFileName, flags )) > > Couldn't you just get rid of the DeleteFile, check why MoveFileEx() > failed and get rid of the call to RtlDoesFileExists_U(lpReplacedFileName)? > > + { > + SetLastError(ERROR_UNABLE_TO_MOVE_REPLACEMENT); > + return FALSE; > + } > + /* All done, file replacement successful */ > + return TRUE; >

Feb. 26, 2007

Re: [7/12] WineD3D: Select an onscreen context based on the thread

by Stefan Dösinger

Am Montag 26 Februar 2007 13:49 schrieb Stefan Dösinger: Alexandre, do not patch 7, 8 and 9 yet, they are reported to cause regressions. Patch 10, 11 and 12 should apply without them too.

Feb. 26, 2007

Re: [PATCH] seperate AC_CONFIG_FILES.

by Detlef Riekenberg

On Mo, 2007-02-26 at 22:06 +0100, Marcus Meissner wrote: > -AC_CONFIG_FILES([ > -Make.rules > -dlls/Makedll.rules > -dlls/Makeimplib.rules > -dlls/Maketest.rules > -programs/Makeprog.rules > -Makefile > -dlls/Makefile Does "tools/make_makefiles" still work after your Patch? - for a new dll - for a new test - for a new program I'm unable to test that here (my autoconf is to old) -- By by ... Detlef

Feb. 26, 2007

Re: [1/12] - [12/12] WineD3D (multithreading)

by Stefan Dösinger

Am Montag 26 Februar 2007 22:52 schrieb Mirek: > Stefan Dösinger napsal(a): > > Am Montag 26 Februar 2007 19:58 schrieb Mirek: > >> Hi, this series of patches broke some textures in TES IV: Oblivion, > >> should I create bug in winebugs? I tried some other apps, they looks ok. > >> (bug is here after patch 7/12 and 8/12). > > > > Which patch breaks oblivion? Can you describe the kind of breakage? > > > > *cough* That game seems to be really picky *cough* > > Patch number 7 and 8 (after patch 7 game crashed, after patch 8 it works > normal but with graphical problems). I have Core 2 Duo CPU and SMP > enabled, Nvidia GF6800GS with latest stable drivers. > > Here are some screenshots: > http://headline.czela.net/Mirek/wine/TES%20IV:%20Oblivion/regression/ > > 2007-02-26-224223.jpg is for comparsion. > > This is realy strange, because after I do some spells (graphical efects) > in game it just recover to normal state (everything looks like before). Strange yes. Does it print any fixme right before it crashes if you only apply patch 7?

Feb. 26, 2007

Re: wininet: Constify a formal parameter of CommitURLCacheEntry{A|W}() (Resend)

by James Hawkins

On 2/26/07, Andrew Talbot <Andrew.Talbot(a)talbotville.com> wrote: > James Hawkins wrote: > > > On 2/26/07, Andrew Talbot <Andrew.Talbot(a)talbotville.com> wrote: > >> What is wrong with this patch, please? > >> > > > > This isn't how it's defined in the SDK headers. > > > > Am I right in thinking that for non-embedded-CE versions of Windows the > lpHeaderInfo variable of CommitURLCacheEntry() is now a LPCTSTR? In which > case, I presume that the comment about the ascii version requiring a LPBYTE > is now wrong: the "A" version should now have a LPCSTR and the "W" version, > a LPCWSTR. > #ifndef USE_FIXED_COMMIT_URL_CACHE_ENTRY // Temporary state of affairs until we reconcile our apis. // Why are we doing this? HeaderInfo _should_ be string data. // However, one group is passing binary data instead. For the // unicode api, we've decided to disallow this, but this // brings up an inconsistency between the u and a apis, which // is undesirable. // For Beta 1, we'll go with this behaviour, but in future releases // we want to make these apis consistent. BOOLAPI CommitUrlCacheEntryA( __in LPCSTR lpszUrlName, __in_opt LPCSTR lpszLocalFileName, __in FILETIME ExpireTime, __in FILETIME LastModifiedTime, __in DWORD CacheEntryType, __in_ecount_opt(dwHeaderSize) LPBYTE lpHeaderInfo, __in_opt DWORD dwHeaderSize, __reserved LPCSTR lpszFileExtension, __in_opt LPCSTR lpszOriginalUrl ); BOOLAPI CommitUrlCacheEntryW( __in LPCWSTR lpszUrlName, __in_opt LPCWSTR lpszLocalFileName, __in FILETIME ExpireTime, __in FILETIME LastModifiedTime, __in DWORD CacheEntryType, __in_ecount_opt(dwHeaders) LPWSTR lpszHeaderInfo, __in DWORD dwHeaders, __reserved LPCWSTR lpszFileExtension, __in_opt LPCWSTR lpszOriginalUrl ); #ifdef UNICODE #define CommitUrlCacheEntry CommitUrlCacheEntryW #else #define CommitUrlCacheEntry CommitUrlCacheEntryA #endif #else CommitUrlCacheEntryA( __in LPCSTR lpszUrlName, __in_opt LPCSTR lpszLocalFileName, __in FILETIME ExpireTime, __in FILETIME LastModifiedTime, __in DWORD CacheEntryType, __in_ecount_opt(dwHeaderSize) LPCSTR lpHeaderInfo, __in DWORD dwHeaderSize, __reserved LPCSTR lpszFileExtension, __in_opt LPCSTR lpszOriginalUrl ); CommitUrlCacheEntryW( __in LPCWSTR lpszUrlName, __in_opt LPCWSTR lpszLocalFileName, __in FILETIME ExpireTime, __in FILETIME LastModifiedTime, __in DWORD CacheEntryType, __in_ecount_opt(dwHeaderSize) LPCWSTR lpHeaderInfo, __in DWORD dwHeaderSize, __reserved LPCWSTR lpszFileExtension, __in_opt LPCWSTR lpszOriginalUrl ); #ifdef UNICODE #define CommitUrlCacheEntry CommitUrlCacheEntryW #else #define CommitUrlCacheEntry CommitUrlCacheEntryA #endif // !UNICODE #endif -- James Hawkins

Feb. 26, 2007

Re: wininet: Constify a formal parameter of CommitURLCacheEntry{A|W}() (Resend)

by Andrew Talbot

Andrew Talbot wrote: > ... but the corresponding parameter of > CommitURLCacheEntry() [...] ought to be a LPTSTR.... Or rather, a LPCTSTR. So, is there any scope to constify, here? -- A.

Feb. 26, 2007

Re: wininet: Constify a formal parameter of CommitURLCacheEntry{A|W}() (Resend)

by Andrew Talbot

The problem seems to be that the INTERNET_CACHE_ENTRY_INFO structure has a member lpHeaderInfo that is a LPBYTE, but the corresponding parameter of CommitURLCacheEntry() - sorry, I truncated its name in the original posting - ought to be a LPTSTR. It is not yet clear to me what is required. -- Andy.

Feb. 26, 2007

Re: wininet: Constify a formal parameter of CommitURLCacheEntry{A|W}() (Resend)

by Andrew Talbot

James Hawkins wrote: > On 2/26/07, Andrew Talbot <Andrew.Talbot(a)talbotville.com> wrote: >> What is wrong with this patch, please? >> > > This isn't how it's defined in the SDK headers. > Am I right in thinking that for non-embedded-CE versions of Windows the lpHeaderInfo variable of CommitURLCacheEntry() is now a LPCTSTR? In which case, I presume that the comment about the ascii version requiring a LPBYTE is now wrong: the "A" version should now have a LPCSTR and the "W" version, a LPCWSTR. -- Andy.

Feb. 26, 2007

Re: Add localizable strings support for popup menu in selection tree control.

by James Hawkins

On 2/26/07, Крылов Николай <krna(a)rambler.ru> wrote: > diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c > index 35a192c..3826326 100644 > --- a/dlls/msi/dialog.c > +++ b/dlls/msi/dialog.c > @@ -1755,17 +1755,41 @@ msi_seltree_popup_menu( HWND hwnd, INT x > HMENU hMenu; > INT r; > > + static const WCHAR szMenuLocal[] = > {'M','e','n','u','L','o','c','a','l',0}; > + static const WCHAR szMenuAllLocal[] = > {'M','e','n','u','A','l','l','L','o','c','a','l',0}; > + static const WCHAR szMenuAdvertise[] = > {'M','e','n','u','A','d','v','e','r','t','i','s','e',0}; > + static const WCHAR szMenuAbsent[] = > {'M','e','n','u','A','b','s','e','n','t',0}; > + /* If msi_dialog_get_uitext returns NULL - use default strings: */ > + static const WCHAR szMenuLocalDef[] = > {'I','n','s','t','a','l','l',' ','f','e','a','t','u','r','e',' ', > 'l','o','c','a','l','l','y',0}; > + static const WCHAR szMenuAllLocalDef[] = > {'I','n','s','t','a','l','l',' ','e','n','t','i','r','e',' > ','f','e','a','t','u','r','e',0}; > + static const WCHAR szMenuAdvertiseDef[] = > {'I','n','s','t','a','l','l',' ','o','n',' ','d','e','m','a','n','d',0}; > + static const WCHAR szMenuAbsentDef[] = {'D','o','n','\'','t',' > ','i','n','s','t','a','l','l',0}; > + > + LPWSTR szLocal,szAllLocal,szAdvertise,szAbsent; > + struct msi_selection_tree_info *info; > + > + info = GetPropW(hwnd, szButtonData); > + > + szLocal= msi_dialog_get_uitext( info->dialog, szMenuLocal ); > + szAllLocal= msi_dialog_get_uitext( info->dialog, szMenuAllLocal ); > + szAdvertise= msi_dialog_get_uitext( info->dialog, szMenuAdvertise > ); > + szAbsent= msi_dialog_get_uitext( info->dialog, szMenuAbsent ); > + > /* create a menu to display */ > hMenu = CreatePopupMenu(); > > - /* FIXME: load strings from resources */ > - AppendMenuA( hMenu, MF_ENABLED, INSTALLSTATE_LOCAL, "Install > feature locally"); > - AppendMenuA( hMenu, MF_GRAYED, 0x1000, "Install entire feature"); > - AppendMenuA( hMenu, MF_ENABLED, INSTALLSTATE_ADVERTISED, "Install > on demand"); > - AppendMenuA( hMenu, MF_ENABLED, INSTALLSTATE_ABSENT, "Don't > install"); > + /* Use strings from resources */ > + AppendMenuW( hMenu, MF_ENABLED, INSTALLSTATE_LOCAL, > (szLocal==NULL)?szMenuLocalDef:szLocal ); > + AppendMenuW( hMenu, MF_GRAYED, 0x1000, > (szAllLocal==NULL)?szMenuAllLocalDef:szAllLocal ); > + AppendMenuW( hMenu, MF_ENABLED, INSTALLSTATE_ADVERTISED, > (szAdvertise==NULL)?szMenuAdvertiseDef:szAdvertise ); > + AppendMenuW( hMenu, MF_ENABLED, INSTALLSTATE_ABSENT, > (szAbsent==NULL)?szMenuAbsentDef:szAbsent ); > r = TrackPopupMenu( hMenu, TPM_LEFTALIGN | TPM_TOPALIGN | > TPM_RETURNCMD, > x, y, 0, hwnd, NULL ); > DestroyMenu( hMenu ); > + if(szLocal) msi_free(szLocal); > + if(szAllLocal) msi_free(szAllLocal); > + if(szAdvertise) msi_free(szAdvertise); > + if(szAbsent) msi_free(szAbsent); > return r; > } > Don't check values for NULL before freeing them. The check is redundant, and we spent a long time removing such checks. -- James Hawkins

Feb. 26, 2007

Re: kernel32: Implement ReplaceFileA/ReplaceFileW

by Felix Nawothnig

Erich Hoover wrote: > I assume you're referring to the file existence check and file delete, > followed by the actual copy and move. I implemented these checks in > this manner in order to provide error codes consistent with the > documentation. I am not incredibly familiar with the Wine internals, > but it looks to me like the functions called should handle a > simultaneous call from another thread (without unnecessary code > duplication). For example, if the "replaced" file goes missing between > the check and the CopyFileW call then CopyFileW will return an error. > If the "replaced" file appears between the DeleteFileW call and the > MoveFileExW call (since the MOVEFILE_REPLACE_EXISTING flag is not set), > then the MoveFileExW call will fail. The documentation's expected error > codes for ReplaceFile seem to be consistent with these potential > outcomes. Reading MSDN that doesn't seem to be the case. The way I see it all those errors documented could be caused by file permisions. MSDN doesn't say anything about race cons. Some notes about the patch: + /* Maker sure the "replacement" file exists before continuing */ + if(!RtlDoesFileExists_U( lpReplacementFileName )) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } This would probably the right place to lock the file... + /* + * If the user wants a backup then that needs to be performed first + * * Do not fail to backup if "replaced" does not exist + */ + if( lpBackupFileName && RtlDoesFileExists_U( lpReplacedFileName ) ) The call to RtlDoesFileExists_U() is redundant and introduces a race con. CopyFileW() will check for existence, check GLE afterwards. + { + /* If an existing backup exists then copy over it */ + */ + if(!CopyFileW( lpReplacedFileName, lpBackupFileName, FALSE )) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + } + /* + * Now that the backup has been performed (if requested), copy the replacement + * into place (make sure we can delete the original file first) + * * Do not fail if "replaced" does not exist + */ + if(RtlDoesFileExists_U( lpReplacedFileName ) && !DeleteFileW( lpReplacedFileName )) Same here, DeleteFile() will check for existence. + { + SetLastError(ERROR_UNABLE_TO_REMOVE_REPLACED); + return FALSE; + } + if(!MoveFileExW( lpReplacementFileName, lpReplacedFileName, flags )) Couldn't you just get rid of the DeleteFile, check why MoveFileEx() failed and get rid of the call to RtlDoesFileExists_U(lpReplacedFileName)? + { + SetLastError(ERROR_UNABLE_TO_MOVE_REPLACEMENT); + return FALSE; + } + /* All done, file replacement successful */ + return TRUE;

Feb. 26, 2007

Re: [1/12] - [12/12] WineD3D (multithreading)

by Mirek

Stefan Dösinger napsal(a): > Am Montag 26 Februar 2007 19:58 schrieb Mirek: >> Hi, this series of patches broke some textures in TES IV: Oblivion, >> should I create bug in winebugs? I tried some other apps, they looks ok. >> (bug is here after patch 7/12 and 8/12). > Which patch breaks oblivion? Can you describe the kind of breakage? > > *cough* That game seems to be really picky *cough* Patch number 7 and 8 (after patch 7 game crashed, after patch 8 it works normal but with graphical problems). I have Core 2 Duo CPU and SMP enabled, Nvidia GF6800GS with latest stable drivers. Here are some screenshots: http://headline.czela.net/Mirek/wine/TES%20IV:%20Oblivion/regression/ 2007-02-26-224223.jpg is for comparsion. This is realy strange, because after I do some spells (graphical efects) in game it just recover to normal state (everything looks like before).

Feb. 26, 2007

Re: wininet: Constify a formal parameter of CommitURLCache{A|W}() (Resend)

by James Hawkins

On 2/26/07, Andrew Talbot <Andrew.Talbot(a)talbotville.com> wrote: > What is wrong with this patch, please? > This isn't how it's defined in the SDK headers. -- James Hawkins

Feb. 26, 2007

Re: [1/12] - [12/12] WineD3D (multithreading)

by Stefan Dösinger

Am Montag 26 Februar 2007 19:58 schrieb Mirek: > Hi, this series of patches broke some textures in TES IV: Oblivion, > should I create bug in winebugs? I tried some other apps, they looks ok. > (bug is here after patch 7/12 and 8/12). Which patch breaks oblivion? Can you describe the kind of breakage? *cough* That game seems to be really picky *cough*

Feb. 26, 2007

Re: kernel32: Implement ReplaceFileA/ReplaceFileW

by Erich Hoover

I assume you're referring to the file existence check and file delete, followed by the actual copy and move. I implemented these checks in this manner in order to provide error codes consistent with the documentation. I am not incredibly familiar with the Wine internals, but it looks to me like the functions called should handle a simultaneous call from another thread (without unnecessary code duplication). For example, if the "replaced" file goes missing between the check and the CopyFileW call then CopyFileW will return an error. If the "replaced" file appears between the DeleteFileW call and the MoveFileExW call (since the MOVEFILE_REPLACE_EXISTING flag is not set), then the MoveFileExW call will fail. The documentation's expected error codes for ReplaceFile seem to be consistent with these potential outcomes. I apologize if there's something I'm missing here, please let me know. Erich Hoover ehoover(a)mines.edu On 2/26/07, Felix Nawothnig <flexo(a)holycrap.org> wrote: > > Erich Hoover wrote: > > Real Name: > > Erich Hoover > > Description: > > Implements the functions ReplaceFileA and ReplaceFileW in kernel32 > > (Bug #7544). Also provides conformance test code to ensure proper > > functionality. > > Changelog: > > kernel32: Implement ReplaceFileA/ReplaceFileW > > Your patch seems to introduce lots of race cons. It's possible these > exist on Win32 too but can't we avoid them? >

Feb. 26, 2007

Re: kernel32: Implement ReplaceFileA/ReplaceFileW

by Felix Nawothnig

Erich Hoover wrote: > Real Name: > Erich Hoover > Description: > Implements the functions ReplaceFileA and ReplaceFileW in kernel32 > (Bug #7544). Also provides conformance test code to ensure proper > functionality. > Changelog: > kernel32: Implement ReplaceFileA/ReplaceFileW Your patch seems to introduce lots of race cons. It's possible these exist on Win32 too but can't we avoid them?

Feb. 26, 2007

Re: [1/12] - [12/12] WineD3D (multithreading)

by Mirek

Hi, this series of patches broke some textures in TES IV: Oblivion, should I create bug in winebugs? I tried some other apps, they looks ok. (bug is here after patch 7/12 and 8/12). Mirek

Feb. 26, 2007

Re: GDI surfaces, GDI heap and wined3d's VideoMemorySize

by Alexandre Julliard

Robert Shearman <rob(a)codeweavers.com> writes: > CreateCompatibleDC should be made to fail if the CreateRectRgn call fails. Yes, I committed a fix for that. -- Alexandre Julliard julliard(a)winehq.org

Feb. 26, 2007

Re: xcopy try 3

by Alexandre Julliard

"Ann & Jason Edmeades" <us(a)edmeades.me.uk> writes: > diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in > new file mode 100755 All the files you create or modify are marked executable, could you please fix that? -- Alexandre Julliard julliard(a)winehq.org

Feb. 26, 2007

Re: GDI surfaces, GDI heap and wined3d's VideoMemorySize

by Robert Shearman

Rok Mandeljc wrote: > Hey all, > > I've been experiencing an odd behavior in Baldur's Gate 2; when > "VideoMemorySize" registry key for wined3d is set to anything greater > than 64MB (69MB, actually), it stops before playing intro movie, > printing following line: > err:clipping:CLIPPING_UpdateGCRegion hVisRgn is zero. Please report this. > > Tracing the source of issue by inserting custom traces I got the following: > IDirectDrawImpl_CreateNewSurface -> IWineD3DDeviceImpl_CreateSurface > (decides to use GDI surface) -> IWineGDISurfaceImpl_PrivateSetup -> > IWineD3DSurfaceImpl_GetDC -> > CreateCompatibleDC -> CreateRectRgn -> REGION_CreateRegion -> > GDI_AllocObject -> alloc_large_heap > > alloc_large_heap fails because it can't find next large handle and > returns NULL, which is passed up the chain, where CreateCompatibleDC > puts it in dc->hVisRgn. Then DC_InitDC is called with that dc, which > calls CLIPPING_UpdateGCRegion, and that one finally chokes on it, > printing afore-mentioned line and calling exit(1). > > Now, when the game is run with 64MB of VideoMemorySize, upon reaching > the same point, IDirectDrawImpl_CreateNewSurface returns > WINED3DERR_OUTOFVIDEOMEMORY (because of > "IWineD3DDevice_GetAvailableTextureMem(iface) <= _size" check in > D3DCREATERESOURCEOBJECTINSTANCE macro) and intro movie starts playing. > So it seems Baldur's Gate 2 is trying to create as many surfaces as > possible before running out of memory. And the problem arises when > specified memory size is large enough to take up all GDI's heap... > > Sorry for the long-winded description of the problem, but I'm not sure > where and how this should be fixed (is it wined3d issue or should GDI > have its heap enlarged?), otherwise I'd do it myself... > CreateCompatibleDC should be made to fail if the CreateRectRgn call fails. -- Rob Shearman

Feb. 26, 2007

Re: Wine and XP Themes

by Felix Nawothnig

Frank Richter wrote: > WRT speed: themes usually use alpha-blending extensively; however, the > speed of Wine's AlphaBlend() can almost be measured in geological terms; Why is that? Looking at it it seems to be using XRender - since theming doesn't require Aero and stuff what way would there be to speed it up? (I admit I didn't really read the code. :) Felix

Feb. 26, 2007

Re: [9/12] WineD3D: When multithreading, call glFinish after drawing

by H. Verbeet

Would GL_NV_fence be usefull here?

Feb. 26, 2007

Re: Using InternalGetWindowText Instead of Sending WM_GETTEXT when Drawing Window Captions

by Alexandre Julliard

Robert Shearman <rob(a)codeweavers.com> writes: > Yes, the table windows in the query designer in Access 2003. Access > 2003 works on Windows 2000+. Maybe it's NT4 that doesn't send them then. Anyway, if the app needs them I don't have a problem with adding them back. -- Alexandre Julliard julliard(a)winehq.org

Feb. 26, 2007

Re: [3/12 WineD3D/DDraw: Forward DDSCL_MULTITHREADED to WineD3D

by H. Verbeet

On 26/02/07, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > Note: that this patch conflicts with the ddraw thread safety patch. After this > patch here is applied, I will send an updated thread safety patch for the > ddraw implementation > What exactly is this supposed to fix? We already pass the behaviour flags through to IWineD3DImpl_CreateDevice(), so shouldn't wined3d just handle it there?

Feb. 26, 2007

Re: GDI surfaces, GDI heap and wined3d's VideoMemorySize

by Stefan Dösinger

Am Sonntag 25 Februar 2007 21:57 schrieb Rok Mandeljc: > Hey all, > Now, when the game is run with 64MB of VideoMemorySize, upon reaching > the same point, IDirectDrawImpl_CreateNewSurface returns > WINED3DERR_OUTOFVIDEOMEMORY (because of > "IWineD3DDevice_GetAvailableTextureMem(iface) <= _size" check in > D3DCREATERESOURCEOBJECTINSTANCE macro) and intro movie starts playing. > So it seems Baldur's Gate 2 is trying to create as many surfaces as > possible before running out of memory. And the problem arises when > specified memory size is large enough to take up all GDI's heap... Now that seems interesting. Actually, I have never had a 2D application creating that much surfaces, and the old ddraw code only advertised 8 mb of mem. It might be an out of memory somewhere, but not sure how and why. You could try opengl surfaces. Those do not have a DIB section, unless the app calls GetDC on the surface

Feb. 26, 2007

Re: Using InternalGetWindowText Instead of Sending WM_GETTEXT when Drawing Window Captions

by Robert Shearman

Alexandre Julliard wrote: > Robert Shearman <rob(a)codeweavers.com> writes: > > >> Hi Alexandre, >> >> A patch of yours from 2.5 years ago >> (http://source.winehq.org/git/wine.git/?a=commitdiff;h=b72994b6d4a04352e1893…) >> changed the behaviour to not send WM_GETTEXT any more. My experiments >> on Windows show that WM_GETTEXT should be used. Can you remember what >> the reasoning behind the change in this patch was? >> > > Probably to avoid potential deadlocks; I'm not sure there's one > correct way, IIRC Win2k doesn't send them but XP does. Do you have > something that depends on receiving them? Yes, the table windows in the query designer in Access 2003. Access 2003 works on Windows 2000+. -- Rob Shearman

Feb. 26, 2007

Re: Using InternalGetWindowText Instead of Sending WM_GETTEXT when Drawing Window Captions

by Alexandre Julliard

Robert Shearman <rob(a)codeweavers.com> writes: > Hi Alexandre, > > A patch of yours from 2.5 years ago > (http://source.winehq.org/git/wine.git/?a=commitdiff;h=b72994b6d4a04352e1893…) > changed the behaviour to not send WM_GETTEXT any more. My experiments > on Windows show that WM_GETTEXT should be used. Can you remember what > the reasoning behind the change in this patch was? Probably to avoid potential deadlocks; I'm not sure there's one correct way, IIRC Win2k doesn't send them but XP does. Do you have something that depends on receiving them? -- Alexandre Julliard julliard(a)winehq.org

Feb. 26, 2007

wine or wine-preloader exit with code 2 on x86_64

by Escuder Nicolas

Hello, I have build wine with the help of wiki WineOn64bit LDFLAGS="-L/lib32 -L/usr/lib32 -Wl,-rpath,/lib32 -Wl,-rpath,/usr/lib32" ./configure --prefix=/opt/wine --datadir=/usr/share But wine or wine-preloader always return 2 as you can see : [root(a)nico wine-0.9.31]# loader/wine-preloader [root(a)nico wine-0.9.31]# echo $? 2 [root(a)nico wine-0.9.31]# ./wine --version [root(a)nico wine-0.9.31]# echo $? 2 Anyone can help please ? See you, Escuder Nicolas

Feb. 26, 2007

Using InternalGetWindowText Instead of Sending WM_GETTEXT when Drawing Window Captions

by Robert Shearman

Hi Alexandre, A patch of yours from 2.5 years ago (http://source.winehq.org/git/wine.git/?a=commitdiff;h=b72994b6d4a04352e1893…) changed the behaviour to not send WM_GETTEXT any more. My experiments on Windows show that WM_GETTEXT should be used. Can you remember what the reasoning behind the change in this patch was? -- Rob Shearman

Feb. 26, 2007

Re: [2/4 revised] msi: Expand IDL file to contain all OLE automation interfaces.

by Misha Koshelev

On Sun, 2007-02-25 at 22:51 -0600, James Hawkins wrote: > On 2/25/07, Misha Koshelev <mk144210(a)bcm.tmc.edu> wrote: > > This patch expands the IDL to contain all OLE automation interfaces that > > the freely downloadable MS Windows Installer contains, and adds a > > msiserver_dispids.h file that has define statements for all the dispids. > > > > Changelog: > > > > * msi: Expand IDL file to contain all OLE automation interfaces. > > > > * Copyright (C) 2007 Mike McCormack > + * Misha Koshelev > > You have to repeat the Copyright (C) 2007 part for your name. It seems from doing a find . -name \*.idl -exec head {} \; -print that you are generally correct, but the formatting for copyright notices does vary. dlls/stdole32.tlb/std_ole_v1.idl and std_ole_v2.idl in that directory has: /* * Copyright (C) 2003 Robert Shearman * 2005 Huw Davies which is where I got the idea to do mine that way in the first place. > > + [id(DISPID_INSTALLER_OPENDATABASE)] > + Database* OpenDatabase( > + [in] BSTR > DatabasePath, > + [in] > VARIANT OpenMode); > + [id(DISPID_INSTALLER_SUMMARYINFORMATION), propget] > + SummaryInfo* SummaryInformation( > + > [in] BSTR PackagePath, > + > [in, optional, defaultvalue(0)] long UpdateCount); > + [id(DISPID_INSTALLER_ENABLELOG)] > + void EnableLog( > + [in] BSTR LogMode, > + [in] BSTR LogFile); > > Did you copy and paste this from OleView? This formatting is ridiculous. >

Feb. 26, 2007

Re: dlls: Move the 16-bit dll stubs to the appropriate subdirectories.

by Alexandre Julliard

Brian Gerst <bgerst(a)didntduck.org> writes: >>From 36873109949f308cc9d34f4df9bb0af4c219262b Mon Sep 17 00:00:00 2001 > From: Brian Gerst <bgerst(a)didntduck.org> > Date: Sat, 24 Feb 2007 08:59:48 -0500 > Subject: dlls: Move the 16-bit dll stubs to the appropriate subdirectories. This won't work, they won't be found when running inside the build tree. -- Alexandre Julliard julliard(a)winehq.org

Feb. 26, 2007

Re: comctl32: rebar[2/3]: WM_SETFONT should send a RBN_HEIGHTCHANGED if necessary (with testcase)

by Alexandre Julliard

Mikołaj Zalewski <mikolaj(a)zalewski.pl> writes: > This allows as to eliminate the third parameter of REBAR_Layout. > From 2edae3656159e84a0366b65e1bd1d13e3089dc97 Mon Sep 17 00:00:00 2001 > From: =?utf-8?q?Miko=C5=82aj_Zalewski?= <mikolaj(a)zalewski.pl> > Date: Mon, 19 Feb 2007 20:42:08 +0100 > Subject: [PATCH] comctl32: rebar: WM_SETFONT should send a RBN_HEIGHTCHANGED if necessary (with testcase) The tests fail here: ../../../tools/runtest -q -P wine -M comctl32.dll -T ../../.. -p comctl32_test.exe.so rebar.c && touch rebar.ok rebar.c:696: Test failed: (int)SendMessage(hRebar, RB_GETROWCOUNT, 0, 0) expected 2 got 1 rebar.c:696: Test failed: invalid rect (notify) (-1,-1) (-1,-1) - expected (0,0) (672,20) make: *** [rebar.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

Feb. 26, 2007

Re: wine and msys rxvt.exe

by Wesley Parish

On Sunday 25 February 2007 22:30, L. Rahyen wrote: > Sunday February 25 2007 07:52、Wesley Parish さんは書きました: > > I installed msys a couple of years back, and decided to test rxvt.exe: > > > > bash-3.1$ wine .wine/drive_c/msys/1.0/bin/rxvt.exe > > libGL warning: 3D driver claims to not support visual 0x4b > > fixme:netapi32:NetWkstaUserGetInfo Level 1 processing is partially > > implemented fixme:advapi:LsaOpenPolicy > > ((null),0x68f478,0x00000001,0x68f494) stub fixme:advapi:LsaClose (0xcafe) > > stub > > fixme:advapi:LsaOpenPolicy ((null),0x68f488,0x000f0fff,0x68f484) stub > > fixme:netbios:NetServerEnum Stub ((null) 101 0x68ef04 -1 0x68ef08 > > 0x68ef0c 8 L"DOMAIN" (nil)) > > fixme:advapi:LsaClose (0xcafe) stub > > fixme:netapi32:NetUserGetInfo Level 3 is not implemented > > fixme:netapi32:NetUserGetInfo Level 3 is not implemented > > failed to load libX11.dllbash-3.1$ > > > > bash-3.1$ wine --version > > wine-0.9.29 > > > > Those are the error messages. > > > > My version of wine is a little old. Have the fixme's been fixed in the > > latest wine? > > Fixmes doesn't mean problems if there is no problems. This is rule of > thumb. If you want to get help please tell what problems you see when > trying to run the software. And if you can give a link to download demo > version of the software (or full version if it's free). Can do, will do. http://www.mingw.org/msys.shtml http://sourceforge.net/project/showfiles.php?group_id=2435 It's free. -- Clinersterton beademung, with all of love - RIP James Blish ----- Mau e ki, he aha te mea nui? You ask, what is the most important thing? Maku e ki, he tangata, he tangata, he tangata. I reply, it is people, it is people, it is people.

Feb. 26, 2007

Re: wine and msys rxvt.exe

by Wesley Parish

That is the case. cygwin's just one of several POSIX environments on the Win32 platform, and msys is the other FOSS POSIX environment on Win32. I thought it would be a good test. I will have to upgrade my Wine version, admittedly ... Wesley Parish On Monday 26 February 2007 18:59, John Smith wrote: > If I recall correctly, MSYS is the mingw linux environment emulated on > windows. rxvt would be the terminal used in the msys environment. > > Hopefully this will be of some use, > John Klehm > > On 2/25/07, Robert Shearman <rob(a)codeweavers.com> wrote: > > Wesley Parish wrote: > > > I installed msys a couple of years back, and decided to test rxvt.exe: > > > > > > bash-3.1$ wine .wine/drive_c/msys/1.0/bin/rxvt.exe > > > libGL warning: 3D driver claims to not support visual 0x4b > > > fixme:netapi32:NetWkstaUserGetInfo Level 1 processing is partially > > > > implemented > > > > > fixme:advapi:LsaOpenPolicy ((null),0x68f478,0x00000001,0x68f494) stub > > > fixme:advapi:LsaClose (0xcafe) stub > > > fixme:advapi:LsaOpenPolicy ((null),0x68f488,0x000f0fff,0x68f484) stub > > > fixme:netbios:NetServerEnum Stub ((null) 101 0x68ef04 -1 0x68ef08 > > > > 0x68ef0c 8 > > > > > L"DOMAIN" (nil)) > > > fixme:advapi:LsaClose (0xcafe) stub > > > fixme:netapi32:NetUserGetInfo Level 3 is not implemented > > > fixme:netapi32:NetUserGetInfo Level 3 is not implemented > > > failed to load libX11.dllbash-3.1$ > > > > > > bash-3.1$ wine --version > > > wine-0.9.29 > > > > > > Those are the error messages. > > > > > > My version of wine is a little old. Have the fixme's been fixed in the > > > > latest > > > > > wine? > > > > What is the program supposed to do? > > > > -- > > Rob Shearman -- Clinersterton beademung, with all of love - RIP James Blish ----- Mau e ki, he aha te mea nui? You ask, what is the most important thing? Maku e ki, he tangata, he tangata, he tangata. I reply, it is people, it is people, it is people.

Feb. 26, 2007

Re: wine and msys rxvt.exe

by Phil Krylov

On 26/02/07, Dmitry Timoshkov <dmitry(a)codeweavers.com> wrote: > "Wesley Parish" <wes.parish(a)paradise.net.nz> wrote: > > > failed to load libX11.dll > > Looks like rxvt.exe is linked to an MSys provided X11 libraries > that require a Windows X11 sever to be present and running. That's > a sort of layer on layer and I don't think that there is someone > who wants to make this configuration work. AFAIR MSys's rxvt.exe uses libW11.dll, which implements Xlib API on top of Win32 USER/GDI (no extra X server). However, it could be still difficult (probably because of API name clashes?) Not sure why the message is about libX11.dll - probably it sees $DISPLAY and tries to use real X? -- Ph.

Feb. 26, 2007

Re: wine and msys rxvt.exe

by Dmitry Timoshkov

"Wesley Parish" <wes.parish(a)paradise.net.nz> wrote: > failed to load libX11.dll Looks like rxvt.exe is linked to an MSys provided X11 libraries that require a Windows X11 sever to be present and running. That's a sort of layer on layer and I don't think that there is someone who wants to make this configuration work. -- Dmitry.

Feb. 26, 2007

Re: wine and msys rxvt.exe

by John Smith

If I recall correctly, MSYS is the mingw linux environment emulated on windows. rxvt would be the terminal used in the msys environment. Hopefully this will be of some use, John Klehm On 2/25/07, Robert Shearman <rob(a)codeweavers.com> wrote: > > Wesley Parish wrote: > > I installed msys a couple of years back, and decided to test rxvt.exe: > > > > bash-3.1$ wine .wine/drive_c/msys/1.0/bin/rxvt.exe > > libGL warning: 3D driver claims to not support visual 0x4b > > fixme:netapi32:NetWkstaUserGetInfo Level 1 processing is partially > implemented > > fixme:advapi:LsaOpenPolicy ((null),0x68f478,0x00000001,0x68f494) stub > > fixme:advapi:LsaClose (0xcafe) stub > > fixme:advapi:LsaOpenPolicy ((null),0x68f488,0x000f0fff,0x68f484) stub > > fixme:netbios:NetServerEnum Stub ((null) 101 0x68ef04 -1 0x68ef08 > 0x68ef0c 8 > > L"DOMAIN" (nil)) > > fixme:advapi:LsaClose (0xcafe) stub > > fixme:netapi32:NetUserGetInfo Level 3 is not implemented > > fixme:netapi32:NetUserGetInfo Level 3 is not implemented > > failed to load libX11.dllbash-3.1$ > > > > bash-3.1$ wine --version > > wine-0.9.29 > > > > Those are the error messages. > > > > My version of wine is a little old. Have the fixme's been fixed in the > latest > > wine? > > > > What is the program supposed to do? > > -- > Rob Shearman > > > >

Feb. 25, 2007

Re: We should have a .desktop file for the Uninstaller application

by Vitaliy Margolen

James Liggett wrote: > On Sun, 2007-02-25 at 20:29 -0800, Scott Ritchie wrote: >> As it is, most people don't even know this handy uninstaller applet >> exists. So let's fix that. > Good idea. And while we're at it, why not one for winecfg too? > > James > I was actually thinking about automatically creating those and other entries from wineshelllink whenever it creates Wine menu entry for the first time. However it would have to be aware of the WINEPREFIX and create separate entries for at least winecfg and uninstaller. So it's kind of defeats the propose of making it easy. Vitaliy.

Feb. 25, 2007

Re: We should have a .desktop file for the Uninstaller application

by James Liggett

On Sun, 2007-02-25 at 20:29 -0800, Scott Ritchie wrote: > As it is, most people don't even know this handy uninstaller applet > exists. So let's fix that. Good idea. And while we're at it, why not one for winecfg too? James

Feb. 25, 2007

Re: [3/4 revised] msi: Add partial, expandable OLE automation support.

by James Hawkins

On 2/25/07, Misha Koshelev <mk144210(a)bcm.tmc.edu> wrote: > This patch adds OLE automation support to MSI. It does this by creating > a wrapper class, which implements any of the OLE automation classes as > long as a function is given which is called from within the wrapper > classes invoke method after appropriate error checking. Basic > functionality is implemented, and it is fairly straightforward to add > the rest as the methods are all already implemented as functions in the > DLL. > +/* + * If you would like to implement a new automation function/object, look towards the bottom of this + * file for the "meat and potatoes" section. + */ + +/* FIXME: I don't know how big this should be */ +#define MAX_MSI_STRING 1000 + +/* + * AutomationObject - "base" class for all automation objects so we don't have to repeat functions. Just + * need to implement Invoke function for each dispinterface that is called from within + * the AutomationObject Invoke function which performs error checking, and pass the new + * function to create_automation_object. + */ + +typedef interface AutomationObject AutomationObject; + +interface AutomationObject { + /* + * VTables - We provide IDispatch, IProvideClassInfo, IProvideClassInfo2, IProvideMultipleClassInfo + */ + const IDispatchVtbl *lpVtbl; + const IProvideClassInfoVtbl *lpvtblIProvideClassInfo; + const IProvideClassInfo2Vtbl *lpvtblIProvideClassInfo2; + const IProvideMultipleClassInfoVtbl *lpvtblIProvideMultipleClassInfo; + + /* Object reference count */ + LONG ref; + + /* Clsid for this class and it's appropriate ITypeInfo object */ + LPCLSID clsid; + ITypeInfo *iTypeInfo; + + /* The MSI handle of the current object */ + MSIHANDLE msiHandle; + + /* A function that is called from IDispatch::Invoke, specific to this type of object. By the + * time this function is called, basic error checking has been done in the AutomationObject + * Invoke function */ + HRESULT (STDMETHODCALLTYPE *funcInvoke)( + AutomationObject* This, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr); +}; You went a little comment crazy here (and elsewhere). You should tone it down a bit. Good code explains itself and requires little or no commenting. + /* + * Perform a sanity check on the parameters. + */ + if ( (This==0) || (ppvObject==0) ) + return E_INVALIDARG; + + /* + * Initialize the return parameter. + */ + *ppvObject = 0; + + /* + * Compare the riid with the interface IDs implemented by this object. + */ + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDispatch) || IsEqualGUID(riid, This->clsid)) + *ppvObject = This; + else if (IsEqualGUID(riid, &IID_IProvideClassInfo)) + *ppvObject = (IProvideClassInfo*)&(This->lpvtblIProvideClassInfo); + else if (IsEqualGUID(riid, &IID_IProvideClassInfo2)) + *ppvObject = (IProvideClassInfo2*)&(This->lpvtblIProvideClassInfo2); + else if (IsEqualGUID(riid, &IID_IProvideMultipleClassInfo)) + *ppvObject = (IProvideMultipleClassInfo*)&(This->lpvtblIProvideMultipleClassInfo); + + /* + * Check that we obtained an interface. + */ + if ((*ppvObject)==0) + { + TRACE("() : asking for unsupported interface %s\n",debugstr_guid(riid)); + return E_NOINTERFACE; + } + + /* + * Query Interface always increases the reference count by one when it is + * successful + */ + IClassFactory_AddRef(iface); + + return S_OK; +} Way too many comments. It may seem like nitpicking, but the comments clutter up the code and don't provide any useful information. -- James Hawkins

Feb. 25, 2007

Re: [2/4 revised] msi: Expand IDL file to contain all OLE automation interfaces.

by James Hawkins

On 2/25/07, Misha Koshelev <mk144210(a)bcm.tmc.edu> wrote: > This patch expands the IDL to contain all OLE automation interfaces that > the freely downloadable MS Windows Installer contains, and adds a > msiserver_dispids.h file that has define statements for all the dispids. > > Changelog: > > * msi: Expand IDL file to contain all OLE automation interfaces. > * Copyright (C) 2007 Mike McCormack + * Misha Koshelev You have to repeat the Copyright (C) 2007 part for your name. + [id(DISPID_INSTALLER_OPENDATABASE)] + Database* OpenDatabase( + [in] BSTR DatabasePath, + [in] VARIANT OpenMode); + [id(DISPID_INSTALLER_SUMMARYINFORMATION), propget] + SummaryInfo* SummaryInformation( + [in] BSTR PackagePath, + [in, optional, defaultvalue(0)] long UpdateCount); + [id(DISPID_INSTALLER_ENABLELOG)] + void EnableLog( + [in] BSTR LogMode, + [in] BSTR LogFile); Did you copy and paste this from OleView? This formatting is ridiculous. -- James Hawkins

Feb. 25, 2007

Re: msi: Add full JScript/VBScript support and partial expandable OLE automation support. [PATCH 3/3]

by Misha Koshelev

On Sun, 2007-02-25 at 13:00 +0000, Robert Shearman wrote: > Misha Koshelev wrote: > > +/* Macros to get pointer to AutomationObject) from the other VTables. */ > > > > Typo with extra ")" here. > > > +HRESULT WINAPI SessionImpl_Invoke( > > + AutomationObject* This, > > + DISPID dispIdMember, > > + REFIID riid, > > + LCID lcid, > > + WORD wFlags, > > + DISPPARAMS* pDispParams, > > + VARIANT* pVarResult, > > + EXCEPINFO* pExcepInfo, > > + UINT* puArgErr) > > +{ > > + WCHAR szString[MAX_MSI_STRING]; > > + DWORD dwLen = MAX_MSI_STRING; > > + IDispatch *iDispatch = NULL; > > + MSIHANDLE msiHandle; > > + LANGID langId; > > + UINT ret; > > + INSTALLSTATE iInstalled, iAction; > > > > Some error checking here would be good, like you do in > AutomationObject_Invoke. > > > + > > + switch (dispIdMember) > > + { > > > ... > > +/* > > + * AutomationObject - "base" class for all automation objects so we don't have to repeat functions. Just > > + * need to implement Invoke function for each dispinterface and pass the new function > > + * to create_automation_object. > > + */ > > + > > +typedef struct { > > + /* > > + * VTables - We provide IDispatch, IProvideClassInfo, IProvideClassInfo2, IProvideMultipleClassInfo > > + */ > > + const IDispatchVtbl *lpVtbl; > > + const IProvideClassInfoVtbl *lpvtblIProvideClassInfo; > > + const IProvideClassInfo2Vtbl *lpvtblIProvideClassInfo2; > > + const IProvideMultipleClassInfoVtbl *lpvtblIProvideMultipleClassInfo; > > + > > + /* Object reference count */ > > + LONG ref; > > + > > + /* Clsid for this class and it's appropriate ITypeInfo object */ > > + LPCLSID clsid; > > + ITypeInfo *iTypeInfo; > > + > > + /* The MSI handle of the current object */ > > + MSIHANDLE msiHandle;; > > + > > + /* A function that is called from IDispatch::Invoke, specific to this type of object */ > > + LPVOID funcInvoke; > > +} AutomationObject; > > > > You shouldn't need to expose the implementation details of > AutomationObject outside of automation.c. > > > + > > +/* This is the function that one needs to call to create an automation object. */ > > +extern HRESULT create_automation_object(MSIHANDLE msiHandle, IUnknown *pUnkOuter, LPVOID *ppObj, REFIID clsid, LPVOID funcInvoke); > > > > It is dangerous to use LPVOID as the type to pass a function in. > > > + > > +/* We need to expose these functions because our IActiveScriptSite calls it */ > > +extern HRESULT WINAPI LoadTypeInfo(IDispatch *iface, ITypeInfo **pptinfo, REFIID clsid, LCID lcid); > > +extern HRESULT WINAPI SessionImpl_Invoke(AutomationObject*,DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*); > > + > > +/* Disp Ids > > + * (not complete, look in msiserver.idl to add more) */ > > +typedef enum { > > + RecordDispId_StringData=1, > > + RecordDispId_IntegerData, > > + RecordDispId_SetStream, > > + RecordDispId_ReadStream, > > + RecordDispId_FieldCount, > > + RecordDispId_IsNull, > > + RecordDispId_DataSize, > > + RecordDispId_ClearData, > > + RecordDispId_FormatText > > +} RecordDispId; > > + > > +typedef enum { > > + ViewDispId_Execute=1, > > + ViewDispId_Fetch, > > + ViewDispId_Modify, > > + ViewDispId_Close, > > + ViewDispId_ColumnInfo, > > + ViewDispId_GetError > > +} ViewDispId; > > + > > +typedef enum { > > + DatabaseDispId_DatabaseState=1, > > + DatabaseDispId_SummaryInformation, > > + DatabaseDispId_OpenView, > > + DatabaseDispId_Commit, > > + DatabaseDispId_PrimaryKeys, > > + DatabaseDispId_Import, > > + DatabaseDispId_Export, > > + DatabaseDispId_Merge, > > + DatabaseDispId_GenerateTransform, > > + DatabaseDispId_ApplyTransform, > > + DatabaseDispId_EnableUIPreview, > > + DatabaseDispId_TablePersistent, > > + DatabaseDispId_CreateTransformSummaryInfo > > +} DatabaseDispId; > > + > > +typedef enum { > > + SessionDispId_Installer=1, > > + SessionDispId_Property, > > + SessionDispId_Language, > > + SessionDispId_Mode, > > + SessionDispId_Database, > > + SessionDispId_SourcePath, > > + SessionDispId_TargetPath, > > + SessionDispId_DoAction, > > + SessionDispId_Sequence, > > + SessionDispId_EvaluateCondition, > > + SessionDispId_FormatRecord, > > + SessionDispId_Message, > > + SessionDispId_FeatureCurrentState, > > + SessionDispId_FeatureRequestState, > > + SessionDispId_FeatureValidStates, > > + SessionDispId_FeatureCost, > > + SessionDispId_ComponentCurrentState, > > + SessionDispId_ComponentRequestState, > > + SessionDispId_SetInstallLevel, > > + SessionDispId_VerifyDiskSpace, > > + SessionDispId_ProductProperty, > > + SessionDispId_FeatureInfo, > > + SessionDispId_ComponentCost > > +} SessionDispId; > > > > See dlls/oleaut32/tests/tmarshal_dispids.h and > dlls/oleaut32/tests/tmarshal.idl for how to use DISPIDs properly. > > > +typedef struct { > > + IActiveScriptSite lpVtbl; > > + AutomationObject *session; > > > > You don't actually access this as anything other than an IDispatch > object, so you might as well change to "IDispatch *session". > > > +LPCWSTR read_script_from_file(LPCWSTR szFile, INT type) > > > > Should be static. > > > +/* JScript or VBScript? */ > > +LPCWSTR progid_from_type(INT type) > > > > Should also be static. > > > + > > +/* > > + * Call a script. This is our meat and potatoes. > > + * - Currently, since the function is relatively new, it will always end up returning S_OK. > > + * Think of it like a bonus feature, we can run the script - great. If we have a problem, > > + * we are no worse off than if this function had not been called. > > + */ > > +DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR filename, LPCWSTR function, LPCWSTR action) > > +{ > > + LPCWSTR script = NULL, progId = NULL; > > + HRESULT hr; > > + IActiveScript *iActiveScript = NULL; > > + IActiveScriptParse *iActiveScriptParse = NULL; > > > > I haven't seen this variable notation style before. In Hungarian > notation "p" is used instead of "i" to show a pointer to an object > exposing the interface declared. > I have implemented all the changes you outlined (thanks a lot) in this and your other email, with the exception of the extra error checking in each of the individual Invoke functions as they are called from within AutomationObject::Invoke after the error checking already occurs. What do you think? Thanks Misha p.s. The 5th patch is not a part of my submission, but is just a hack I used to make the IDL file with the dispids using oleview. This patch will make oleview use the DISPID_PARENT_MEMBER notation for ids and will output the include file to standard output. Thought maybe it would be useful for someone.

Feb. 25, 2007

We should have a .desktop file for the Uninstaller application

by Scott Ritchie

As it is, most people don't even know this handy uninstaller applet exists. So let's fix that. Thanks, Scott Ritchie

Feb. 25, 2007

Re: Wine and XP Themes

by Dmitry Timoshkov

"Frank Richter" <frank.richter(a)gmail.com> wrote: > The comctl32 controls all do theming "natively". The subclassing is done > only for control residing in user32 (the motivation was to avoid copying > and pasting all the control implementations from user32 to comctl32, as > Microsoft supposedly did). Sounds like a deja-vu: http://www.winehq.org/?issue=267#Theming%20Revisited -- Dmitry.

Feb. 25, 2007

Re: wined3d: Use application provided fog range when fog is enabled.

by Stefan Dösinger

Am Montag 26 Februar 2007 02:03 schrieb Vitaliy Margolen: > This should fix fog issues with PoP SoT. > --- > dlls/wined3d/state.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) Just wanted to add that this would fix the fixed function Z vs specular color alpha selection with table and vertex fog. Vertex shaders seem to be treated as transformed vertices. That said, the way the fixed function pipeline uses was developed by looking at what games need. The patch Vitaly sent looks good to me, but if there are any regressions I will have to try to write a unit test(though it will be tricky due to the pixel exactness thingy)

Feb. 25, 2007

Re: Wine and XP Themes

by Frank Richter

On 26.02.2007 00:33, Vitaliy Margolen wrote: > Oh and yeah the only "workaround" is not using themes at all. They are > buggy and never worked right anyway. They are an extra hackish layer on > top of some controls. The comctl32 controls all do theming "natively". The subclassing is done only for control residing in user32 (the motivation was to avoid copying and pasting all the control implementations from user32 to comctl32, as Microsoft supposedly did). WRT speed: themes usually use alpha-blending extensively; however, the speed of Wine's AlphaBlend() can almost be measured in geological terms; so at least part of the performance problem can be found there. -f.r.

Feb. 25, 2007

Re: GDI surfaces, GDI heap and wined3d's VideoMemorySize

by Vitaliy Margolen

Submit proper bug report to Wine bugzilla. The memory size setting is only in registry because you should not touch it in the first place. For any user support problems - use wine-users mailing list. Vitaliy Rok Mandeljc wrote: > Hey all, > > I've been experiencing an odd behavior in Baldur's Gate 2; when > "VideoMemorySize" registry key for wined3d is set to anything greater > than 64MB (69MB, actually), it stops before playing intro movie, > printing following line: > err:clipping:CLIPPING_UpdateGCRegion hVisRgn is zero. Please report this. > > Tracing the source of issue by inserting custom traces I got the following: > IDirectDrawImpl_CreateNewSurface -> IWineD3DDeviceImpl_CreateSurface > (decides to use GDI surface) -> IWineGDISurfaceImpl_PrivateSetup -> > IWineD3DSurfaceImpl_GetDC -> > CreateCompatibleDC -> CreateRectRgn -> REGION_CreateRegion -> > GDI_AllocObject -> alloc_large_heap > > alloc_large_heap fails because it can't find next large handle and > returns NULL, which is passed up the chain, where CreateCompatibleDC > puts it in dc->hVisRgn. Then DC_InitDC is called with that dc, which > calls CLIPPING_UpdateGCRegion, and that one finally chokes on it, > printing afore-mentioned line and calling exit(1). > > Now, when the game is run with 64MB of VideoMemorySize, upon reaching > the same point, IDirectDrawImpl_CreateNewSurface returns > WINED3DERR_OUTOFVIDEOMEMORY (because of > "IWineD3DDevice_GetAvailableTextureMem(iface) <= _size" check in > D3DCREATERESOURCEOBJECTINSTANCE macro) and intro movie starts playing. > So it seems Baldur's Gate 2 is trying to create as many surfaces as > possible before running out of memory. And the problem arises when > specified memory size is large enough to take up all GDI's heap... > > Sorry for the long-winded description of the problem, but I'm not sure > where and how this should be fixed (is it wined3d issue or should GDI > have its heap enlarged?), otherwise I'd do it myself... > > Regards, > Rok > -=-=-=-=-=- > Never say "Never" unless it is to say "Never Give Up." > -=-=-=-=-=--=-=-=-=-=- > * Generated by TagZilla 0.066 * http://tagzilla.mozdev.org * > >

Feb. 25, 2007

Re: Wine and XP Themes

by Vitaliy Margolen

Wrong mailing list. Use wine-users. Unless you want to hack on this yourself of course. Oh and yeah the only "workaround" is not using themes at all. They are buggy and never worked right anyway. They are an extra hackish layer on top of some controls. Vitaliy Andrew J. Barr wrote: > I would like to use the XP ClearLooks theme that is available to make > Wine apps blend in with my GNOME desktop. However, it seems that using > themes in Wine makes it rather slow. Is this a known problem, is there a > workaround of some kind, a registry setting or a patch, or is it best > just not to use themes with Wine right now? I am running Wine 0.9.31. > > According to a Google search, there seem to be scattered reports of this > problem but no diagnosis or solution. > > Regards, > Andrew Barr > > (cc'd replies requested) > >

Feb. 25, 2007

GDI surfaces, GDI heap and wined3d's VideoMemorySize

by Rok Mandeljc

Hey all, I've been experiencing an odd behavior in Baldur's Gate 2; when "VideoMemorySize" registry key for wined3d is set to anything greater than 64MB (69MB, actually), it stops before playing intro movie, printing following line: err:clipping:CLIPPING_UpdateGCRegion hVisRgn is zero. Please report this. Tracing the source of issue by inserting custom traces I got the following: IDirectDrawImpl_CreateNewSurface -> IWineD3DDeviceImpl_CreateSurface (decides to use GDI surface) -> IWineGDISurfaceImpl_PrivateSetup -> IWineD3DSurfaceImpl_GetDC -> CreateCompatibleDC -> CreateRectRgn -> REGION_CreateRegion -> GDI_AllocObject -> alloc_large_heap alloc_large_heap fails because it can't find next large handle and returns NULL, which is passed up the chain, where CreateCompatibleDC puts it in dc->hVisRgn. Then DC_InitDC is called with that dc, which calls CLIPPING_UpdateGCRegion, and that one finally chokes on it, printing afore-mentioned line and calling exit(1). Now, when the game is run with 64MB of VideoMemorySize, upon reaching the same point, IDirectDrawImpl_CreateNewSurface returns WINED3DERR_OUTOFVIDEOMEMORY (because of "IWineD3DDevice_GetAvailableTextureMem(iface) <= _size" check in D3DCREATERESOURCEOBJECTINSTANCE macro) and intro movie starts playing. So it seems Baldur's Gate 2 is trying to create as many surfaces as possible before running out of memory. And the problem arises when specified memory size is large enough to take up all GDI's heap... Sorry for the long-winded description of the problem, but I'm not sure where and how this should be fixed (is it wined3d issue or should GDI have its heap enlarged?), otherwise I'd do it myself... Regards, Rok -=-=-=-=-=- Never say "Never" unless it is to say "Never Give Up." -=-=-=-=-=--=-=-=-=-=- * Generated by TagZilla 0.066 * http://tagzilla.mozdev.org *

Feb. 25, 2007

Wine and XP Themes

by Andrew J. Barr

I would like to use the XP ClearLooks theme that is available to make Wine apps blend in with my GNOME desktop. However, it seems that using themes in Wine makes it rather slow. Is this a known problem, is there a workaround of some kind, a registry setting or a patch, or is it best just not to use themes with Wine right now? I am running Wine 0.9.31. According to a Google search, there seem to be scattered reports of this problem but no diagnosis or solution. Regards, Andrew Barr (cc'd replies requested)

Feb. 25, 2007

Re: msi: Add full JScript/VBScript support and partial expandable OLE automation support. [PATCH 3/3]

by Misha Koshelev

On Sun, 2007-02-25 at 13:00 +0000, Robert Shearman wrote: > Misha Koshelev wrote: > > +/* Macros to get pointer to AutomationObject) from the other VTables. */ > > > > Typo with extra ")" here. > > > +HRESULT WINAPI SessionImpl_Invoke( > > + AutomationObject* This, > > + DISPID dispIdMember, > > + REFIID riid, > > + LCID lcid, > > + WORD wFlags, > > + DISPPARAMS* pDispParams, > > + VARIANT* pVarResult, > > + EXCEPINFO* pExcepInfo, > > + UINT* puArgErr) > > +{ > > + WCHAR szString[MAX_MSI_STRING]; > > + DWORD dwLen = MAX_MSI_STRING; > > + IDispatch *iDispatch = NULL; > > + MSIHANDLE msiHandle; > > + LANGID langId; > > + UINT ret; > > + INSTALLSTATE iInstalled, iAction; > > > > Some error checking here would be good, like you do in > AutomationObject_Invoke. > Well perhaps there is a little confusion here as these functions are actually always called from _within_ AutomationObject_Invoke, hence the error checking is already done. I did this as there is quite a few objects to implement and to save writing the same code over and over I thought this would be a good idea. Do you think I should rename these functions to something else so it is more clear that they are not actually called directly through an IDispatch interface but rather from an AutomationObject? > > + > > + switch (dispIdMember) > > + { > > > ... > > +/* > > + * AutomationObject - "base" class for all automation objects so we don't have to repeat functions. Just > > + * need to implement Invoke function for each dispinterface and pass the new function > > + * to create_automation_object. > > + */ > > + > > +typedef struct { > > + /* > > + * VTables - We provide IDispatch, IProvideClassInfo, IProvideClassInfo2, IProvideMultipleClassInfo > > + */ > > + const IDispatchVtbl *lpVtbl; > > + const IProvideClassInfoVtbl *lpvtblIProvideClassInfo; > > + const IProvideClassInfo2Vtbl *lpvtblIProvideClassInfo2; > > + const IProvideMultipleClassInfoVtbl *lpvtblIProvideMultipleClassInfo; > > + > > + /* Object reference count */ > > + LONG ref; > > + > > + /* Clsid for this class and it's appropriate ITypeInfo object */ > > + LPCLSID clsid; > > + ITypeInfo *iTypeInfo; > > + > > + /* The MSI handle of the current object */ > > + MSIHANDLE msiHandle;; > > + > > + /* A function that is called from IDispatch::Invoke, specific to this type of object */ > > + LPVOID funcInvoke; > > +} AutomationObject; > > > > You shouldn't need to expose the implementation details of > AutomationObject outside of automation.c. > > > + > > +/* This is the function that one needs to call to create an automation object. */ > > +extern HRESULT create_automation_object(MSIHANDLE msiHandle, IUnknown *pUnkOuter, LPVOID *ppObj, REFIID clsid, LPVOID funcInvoke); > > > > It is dangerous to use LPVOID as the type to pass a function in. > > > + > > +/* We need to expose these functions because our IActiveScriptSite calls it */ > > +extern HRESULT WINAPI LoadTypeInfo(IDispatch *iface, ITypeInfo **pptinfo, REFIID clsid, LCID lcid); > > +extern HRESULT WINAPI SessionImpl_Invoke(AutomationObject*,DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*); > > + > > +/* Disp Ids > > + * (not complete, look in msiserver.idl to add more) */ > > +typedef enum { > > + RecordDispId_StringData=1, > > + RecordDispId_IntegerData, > > + RecordDispId_SetStream, > > + RecordDispId_ReadStream, > > + RecordDispId_FieldCount, > > + RecordDispId_IsNull, > > + RecordDispId_DataSize, > > + RecordDispId_ClearData, > > + RecordDispId_FormatText > > +} RecordDispId; > > + > > +typedef enum { > > + ViewDispId_Execute=1, > > + ViewDispId_Fetch, > > + ViewDispId_Modify, > > + ViewDispId_Close, > > + ViewDispId_ColumnInfo, > > + ViewDispId_GetError > > +} ViewDispId; > > + > > +typedef enum { > > + DatabaseDispId_DatabaseState=1, > > + DatabaseDispId_SummaryInformation, > > + DatabaseDispId_OpenView, > > + DatabaseDispId_Commit, > > + DatabaseDispId_PrimaryKeys, > > + DatabaseDispId_Import, > > + DatabaseDispId_Export, > > + DatabaseDispId_Merge, > > + DatabaseDispId_GenerateTransform, > > + DatabaseDispId_ApplyTransform, > > + DatabaseDispId_EnableUIPreview, > > + DatabaseDispId_TablePersistent, > > + DatabaseDispId_CreateTransformSummaryInfo > > +} DatabaseDispId; > > + > > +typedef enum { > > + SessionDispId_Installer=1, > > + SessionDispId_Property, > > + SessionDispId_Language, > > + SessionDispId_Mode, > > + SessionDispId_Database, > > + SessionDispId_SourcePath, > > + SessionDispId_TargetPath, > > + SessionDispId_DoAction, > > + SessionDispId_Sequence, > > + SessionDispId_EvaluateCondition, > > + SessionDispId_FormatRecord, > > + SessionDispId_Message, > > + SessionDispId_FeatureCurrentState, > > + SessionDispId_FeatureRequestState, > > + SessionDispId_FeatureValidStates, > > + SessionDispId_FeatureCost, > > + SessionDispId_ComponentCurrentState, > > + SessionDispId_ComponentRequestState, > > + SessionDispId_SetInstallLevel, > > + SessionDispId_VerifyDiskSpace, > > + SessionDispId_ProductProperty, > > + SessionDispId_FeatureInfo, > > + SessionDispId_ComponentCost > > +} SessionDispId; > > > > See dlls/oleaut32/tests/tmarshal_dispids.h and > dlls/oleaut32/tests/tmarshal.idl for how to use DISPIDs properly. > > > +typedef struct { > > + IActiveScriptSite lpVtbl; > > + AutomationObject *session; > > > > You don't actually access this as anything other than an IDispatch > object, so you might as well change to "IDispatch *session". > > > +LPCWSTR read_script_from_file(LPCWSTR szFile, INT type) > > > > Should be static. > > > +/* JScript or VBScript? */ > > +LPCWSTR progid_from_type(INT type) > > > > Should also be static. > > > + > > +/* > > + * Call a script. This is our meat and potatoes. > > + * - Currently, since the function is relatively new, it will always end up returning S_OK. > > + * Think of it like a bonus feature, we can run the script - great. If we have a problem, > > + * we are no worse off than if this function had not been called. > > + */ > > +DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR filename, LPCWSTR function, LPCWSTR action) > > +{ > > + LPCWSTR script = NULL, progId = NULL; > > + HRESULT hr; > > + IActiveScript *iActiveScript = NULL; > > + IActiveScriptParse *iActiveScriptParse = NULL; > > > > I haven't seen this variable notation style before. In Hungarian > notation "p" is used instead of "i" to show a pointer to an object > exposing the interface declared. > Other comments sound good, I will make appropriate changes. I think I will make patch 2 the scripting functions with a dummy call_script that just does a TRACE, and then patch 3 will apply automation and scripting. Misha

Feb. 25, 2007

mingw linking problem

by Stefan Leichter

Hello, i'm trying to build wine/its dlls with mingw. This fail for some dlls at the linking, eg. comdlg32.dll misses the imports _IID_IContextMenu, _IID_IShellFolder, _IID_IPersistFolder2, _IID_IShellBrowser, _IID_ICommDlgBrowser, _IID_IShellView, _SID_STopLevelBrowser My investigations are showing that mingw has the missing imports in libshell32.a., but the linker links against wine's shell32.dll. The missing symbols are also in wine's libuuid.a, but this is not used because the linker does not see the file. When i extend the linker call with -L../../dlls/uuid i can link the comdlg32.dll successfully.. I have tried to find the symbols with strings on my win2k box, but the symbols are not there. So the first question is: What is the correct way to build the dll? The second question when we agreed on the first one is: Can someone please fix configure/Makefile.in to work properly . Thanks Stefan

Feb. 25, 2007

Re: [2/2] user32: do not call NULL message callback

by Robert Shearman

Fabian Bieler wrote: > @@ -8894,23 +8894,20 @@ static void test_nullCallback(void) > HWND hwnd; > MSG msg; > > - if(0) > - { > - hwnd = CreateWindowExA(0, "TestWindowClass", "Test overlapped", WS_OVERLAPPEDWINDOW, > - 100, 100, 200, 200, 0, 0, 0, NULL); > - ok (hwnd != 0, "Failed to create overlapped window\n"); > + hwnd = CreateWindowExA(0, "TestWindowClass", "Test overlapped", WS_OVERLAPPEDWINDOW, > + 100, 100, 200, 200, 0, 0, 0, NULL); > + ok (hwnd != 0, "Failed to create overlapped window\n"); > > - ShowWindow(hwnd, SW_SHOW); > - UpdateWindow( hwnd ); > + ShowWindow(hwnd, SW_SHOW); > + UpdateWindow( hwnd ); > > - SendMessageCallbackA(hwnd,WM_NULL,0,0,NULL,0); > + SendMessageCallbackA(hwnd,WM_NULL,0,0,NULL,0); > > - while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); > + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); > > - ok(1, "\n"); > + ok(1, "\n"); > > - DestroyWindow(hwnd); > - } > + DestroyWindow(hwnd); > } > > START_TEST(msg) > You might as well add the test and fix the bug in one patch since the second patch is no shorter due to all of the whitespace changes. -- Rob Shearman

Feb. 25, 2007

Re: wine and msys rxvt.exe

by Robert Shearman

Wesley Parish wrote: > I installed msys a couple of years back, and decided to test rxvt.exe: > > bash-3.1$ wine .wine/drive_c/msys/1.0/bin/rxvt.exe > libGL warning: 3D driver claims to not support visual 0x4b > fixme:netapi32:NetWkstaUserGetInfo Level 1 processing is partially implemented > fixme:advapi:LsaOpenPolicy ((null),0x68f478,0x00000001,0x68f494) stub > fixme:advapi:LsaClose (0xcafe) stub > fixme:advapi:LsaOpenPolicy ((null),0x68f488,0x000f0fff,0x68f484) stub > fixme:netbios:NetServerEnum Stub ((null) 101 0x68ef04 -1 0x68ef08 0x68ef0c 8 > L"DOMAIN" (nil)) > fixme:advapi:LsaClose (0xcafe) stub > fixme:netapi32:NetUserGetInfo Level 3 is not implemented > fixme:netapi32:NetUserGetInfo Level 3 is not implemented > failed to load libX11.dllbash-3.1$ > > bash-3.1$ wine --version > wine-0.9.29 > > Those are the error messages. > > My version of wine is a little old. Have the fixme's been fixed in the latest > wine? > What is the program supposed to do? -- Rob Shearman

Feb. 25, 2007

Re: a big fan (now with bad news)

by Robert Shearman

Joris Huizer wrote: > Aww... yes, I'm seeing that too > According the the wine application database > (http://appdb.winehq.org/appview.php?iVersionId=469) some settings > help it get a bit further, but it reports: "Microsoft Internet > Explorer has encountered a problem and needs to close. We are sorry > for the inconvenience." > (With a "debug" button) > > With these messages: > > fixme:shell:StopWatchMode () stub! > fixme:shdocvw:IEWinMain "" 10 > fixme:ole:CoResumeClassObjects stub > err:module:DelayLoadFailureHook failed to delay load > urlmon.dll.CreateURLMoniker > wine: Call from 0x7b842138 to unimplemented function > urlmon.dll.CreateURLMoniker, aborting > fixme:imm:ImmDisableIME (-1): stub > fixme:advapi:RegisterEventSourceW ((null),L"Microsoft Internet > Explorer"): stub > fixme:advapi:ReportEventA > (0xcafe4242,0x0001,0x0000,0x000003e8,(nil),0x0005,0x00000050,0x632f6ec0,0x632f6a84): > stub > fixme:advapi:ReportEventW > (0xcafe4242,0x0001,0x0000,0x000003e8,(nil),0x0005,0x00000050,0x161400,0x632f6a84): > stub > err:eventlog:ReportEventW L"iexplore.exe" > err:eventlog:ReportEventW L"6.0.2800.1106" > err:eventlog:ReportEventW L"" > err:eventlog:ReportEventW L"0.0.0.0" > err:eventlog:ReportEventW L"00000000" > fixme:advapi:DeregisterEventSource (0xcafe4242) stub > fixme:wininet:InternetGetConnectedState always returning LAN connection. > > Hitting "debug" crashes as an unimplemented function in urlmon is > called - that seems weird, as it should be using the native version of > urlmon... oh well > > I guess you need to use ies4linux to get a working IE for now. > I had it installed as some program thought it needed it - hadn't > noticed it didn't actually run This is a list for discussion of wine development. I suggest you continue the discussion on wine-users. P.S. You might want to pay attention to the appdb entry that you linked to, especially the bit about setting DLLs to use native versions. -- Rob Shearman

Feb. 25, 2007

Re: msi: Add full JScript/VBScript support and partial expandable OLE automation support. [PATCH 3/3]

by Robert Shearman

Misha Koshelev wrote: > +/* Macros to get pointer to AutomationObject) from the other VTables. */ > Typo with extra ")" here. > +HRESULT WINAPI SessionImpl_Invoke( > + AutomationObject* This, > + DISPID dispIdMember, > + REFIID riid, > + LCID lcid, > + WORD wFlags, > + DISPPARAMS* pDispParams, > + VARIANT* pVarResult, > + EXCEPINFO* pExcepInfo, > + UINT* puArgErr) > +{ > + WCHAR szString[MAX_MSI_STRING]; > + DWORD dwLen = MAX_MSI_STRING; > + IDispatch *iDispatch = NULL; > + MSIHANDLE msiHandle; > + LANGID langId; > + UINT ret; > + INSTALLSTATE iInstalled, iAction; > Some error checking here would be good, like you do in AutomationObject_Invoke. > + > + switch (dispIdMember) > + { > ... > +/* > + * AutomationObject - "base" class for all automation objects so we don't have to repeat functions. Just > + * need to implement Invoke function for each dispinterface and pass the new function > + * to create_automation_object. > + */ > + > +typedef struct { > + /* > + * VTables - We provide IDispatch, IProvideClassInfo, IProvideClassInfo2, IProvideMultipleClassInfo > + */ > + const IDispatchVtbl *lpVtbl; > + const IProvideClassInfoVtbl *lpvtblIProvideClassInfo; > + const IProvideClassInfo2Vtbl *lpvtblIProvideClassInfo2; > + const IProvideMultipleClassInfoVtbl *lpvtblIProvideMultipleClassInfo; > + > + /* Object reference count */ > + LONG ref; > + > + /* Clsid for this class and it's appropriate ITypeInfo object */ > + LPCLSID clsid; > + ITypeInfo *iTypeInfo; > + > + /* The MSI handle of the current object */ > + MSIHANDLE msiHandle;; > + > + /* A function that is called from IDispatch::Invoke, specific to this type of object */ > + LPVOID funcInvoke; > +} AutomationObject; > You shouldn't need to expose the implementation details of AutomationObject outside of automation.c. > + > +/* This is the function that one needs to call to create an automation object. */ > +extern HRESULT create_automation_object(MSIHANDLE msiHandle, IUnknown *pUnkOuter, LPVOID *ppObj, REFIID clsid, LPVOID funcInvoke); > It is dangerous to use LPVOID as the type to pass a function in. > + > +/* We need to expose these functions because our IActiveScriptSite calls it */ > +extern HRESULT WINAPI LoadTypeInfo(IDispatch *iface, ITypeInfo **pptinfo, REFIID clsid, LCID lcid); > +extern HRESULT WINAPI SessionImpl_Invoke(AutomationObject*,DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*); > + > +/* Disp Ids > + * (not complete, look in msiserver.idl to add more) */ > +typedef enum { > + RecordDispId_StringData=1, > + RecordDispId_IntegerData, > + RecordDispId_SetStream, > + RecordDispId_ReadStream, > + RecordDispId_FieldCount, > + RecordDispId_IsNull, > + RecordDispId_DataSize, > + RecordDispId_ClearData, > + RecordDispId_FormatText > +} RecordDispId; > + > +typedef enum { > + ViewDispId_Execute=1, > + ViewDispId_Fetch, > + ViewDispId_Modify, > + ViewDispId_Close, > + ViewDispId_ColumnInfo, > + ViewDispId_GetError > +} ViewDispId; > + > +typedef enum { > + DatabaseDispId_DatabaseState=1, > + DatabaseDispId_SummaryInformation, > + DatabaseDispId_OpenView, > + DatabaseDispId_Commit, > + DatabaseDispId_PrimaryKeys, > + DatabaseDispId_Import, > + DatabaseDispId_Export, > + DatabaseDispId_Merge, > + DatabaseDispId_GenerateTransform, > + DatabaseDispId_ApplyTransform, > + DatabaseDispId_EnableUIPreview, > + DatabaseDispId_TablePersistent, > + DatabaseDispId_CreateTransformSummaryInfo > +} DatabaseDispId; > + > +typedef enum { > + SessionDispId_Installer=1, > + SessionDispId_Property, > + SessionDispId_Language, > + SessionDispId_Mode, > + SessionDispId_Database, > + SessionDispId_SourcePath, > + SessionDispId_TargetPath, > + SessionDispId_DoAction, > + SessionDispId_Sequence, > + SessionDispId_EvaluateCondition, > + SessionDispId_FormatRecord, > + SessionDispId_Message, > + SessionDispId_FeatureCurrentState, > + SessionDispId_FeatureRequestState, > + SessionDispId_FeatureValidStates, > + SessionDispId_FeatureCost, > + SessionDispId_ComponentCurrentState, > + SessionDispId_ComponentRequestState, > + SessionDispId_SetInstallLevel, > + SessionDispId_VerifyDiskSpace, > + SessionDispId_ProductProperty, > + SessionDispId_FeatureInfo, > + SessionDispId_ComponentCost > +} SessionDispId; > See dlls/oleaut32/tests/tmarshal_dispids.h and dlls/oleaut32/tests/tmarshal.idl for how to use DISPIDs properly. > +typedef struct { > + IActiveScriptSite lpVtbl; > + AutomationObject *session; > You don't actually access this as anything other than an IDispatch object, so you might as well change to "IDispatch *session". > +LPCWSTR read_script_from_file(LPCWSTR szFile, INT type) > Should be static. > +/* JScript or VBScript? */ > +LPCWSTR progid_from_type(INT type) > Should also be static. > + > +/* > + * Call a script. This is our meat and potatoes. > + * - Currently, since the function is relatively new, it will always end up returning S_OK. > + * Think of it like a bonus feature, we can run the script - great. If we have a problem, > + * we are no worse off than if this function had not been called. > + */ > +DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR filename, LPCWSTR function, LPCWSTR action) > +{ > + LPCWSTR script = NULL, progId = NULL; > + HRESULT hr; > + IActiveScript *iActiveScript = NULL; > + IActiveScriptParse *iActiveScriptParse = NULL; > I haven't seen this variable notation style before. In Hungarian notation "p" is used instead of "i" to show a pointer to an object exposing the interface declared. -- Rob Shearman

Feb. 25, 2007

Re: msi: Add handlers for JScript/VBScript actions that call one script function. [PATCH 2/3]

by Robert Shearman

Misha Koshelev wrote: > All > actual script implementation is left (for the next patch) in the > call_script function. Patches should attempt to be atomic changes that compile and pass all tests without another patch needing to be applied on top. I suggest you implement automation.c and the associated header file in patch 2 and combine this patch with the rest of patch 3. > +static UINT HANDLE_CustomType37_38(MSIPACKAGE *package, LPCWSTR source, > + LPCWSTR target, const INT type, LPCWSTR action) > +{ > ... > + if (GetTempFileNameW(fmt, f1, 0, tmp_file) == 0) > ... > + info = do_msidbCustomActionTypeScript( package, type, tmp_file, NULL, action ); > + > + return wait_thread_handle( info ); > +} > + > +static UINT HANDLE_CustomType5_6(MSIPACKAGE *package, LPCWSTR source, > + LPCWSTR target, const INT type, LPCWSTR action) > +{ > ... > + r = store_binary_to_temp(package, source, tmp_file); > ... > + info = do_msidbCustomActionTypeScript( package, type, tmp_file, target, action ); > + > + return wait_thread_handle( info ); > +} > + > +static UINT HANDLE_CustomType21_22(MSIPACKAGE *package, LPCWSTR source, > + LPCWSTR target, const INT type, LPCWSTR action) > +{ > ... > + info = do_msidbCustomActionTypeScript( package, type, file->TargetPath, target, action ); > + > + return wait_thread_handle( info ); > +} > + > +static UINT HANDLE_CustomType53_54(MSIPACKAGE *package, LPCWSTR source, > + LPCWSTR target, const INT type, LPCWSTR action) > +{ > ... > + if (GetTempFileNameW(fmt, f1, 0, tmp_file) == 0) > ... > + info = do_msidbCustomActionTypeScript( package, type, tmp_file, NULL, action ); > + > + return wait_thread_handle( info ); > +} > It would seem simpler here to just open the file here for the one case that has an external file and just pass in the LPWSTR script for all cases. -- Rob Shearman

Feb. 25, 2007

Re: wine and msys rxvt.exe

by L. Rahyen

Sunday February 25 2007 07:52、Wesley Parish さんは書きました: > I installed msys a couple of years back, and decided to test rxvt.exe: > > bash-3.1$ wine .wine/drive_c/msys/1.0/bin/rxvt.exe > libGL warning: 3D driver claims to not support visual 0x4b > fixme:netapi32:NetWkstaUserGetInfo Level 1 processing is partially > implemented fixme:advapi:LsaOpenPolicy > ((null),0x68f478,0x00000001,0x68f494) stub fixme:advapi:LsaClose (0xcafe) > stub > fixme:advapi:LsaOpenPolicy ((null),0x68f488,0x000f0fff,0x68f484) stub > fixme:netbios:NetServerEnum Stub ((null) 101 0x68ef04 -1 0x68ef08 0x68ef0c > 8 L"DOMAIN" (nil)) > fixme:advapi:LsaClose (0xcafe) stub > fixme:netapi32:NetUserGetInfo Level 3 is not implemented > fixme:netapi32:NetUserGetInfo Level 3 is not implemented > failed to load libX11.dllbash-3.1$ > > bash-3.1$ wine --version > wine-0.9.29 > > Those are the error messages. > > My version of wine is a little old. Have the fixme's been fixed in the > latest wine? Fixmes doesn't mean problems if there is no problems. This is rule of thumb. If you want to get help please tell what problems you see when trying to run the software. And if you can give a link to download demo version of the software (or full version if it's free).

Feb. 25, 2007

wine and msys rxvt.exe

by Wesley Parish

I installed msys a couple of years back, and decided to test rxvt.exe: bash-3.1$ wine .wine/drive_c/msys/1.0/bin/rxvt.exe libGL warning: 3D driver claims to not support visual 0x4b fixme:netapi32:NetWkstaUserGetInfo Level 1 processing is partially implemented fixme:advapi:LsaOpenPolicy ((null),0x68f478,0x00000001,0x68f494) stub fixme:advapi:LsaClose (0xcafe) stub fixme:advapi:LsaOpenPolicy ((null),0x68f488,0x000f0fff,0x68f484) stub fixme:netbios:NetServerEnum Stub ((null) 101 0x68ef04 -1 0x68ef08 0x68ef0c 8 L"DOMAIN" (nil)) fixme:advapi:LsaClose (0xcafe) stub fixme:netapi32:NetUserGetInfo Level 3 is not implemented fixme:netapi32:NetUserGetInfo Level 3 is not implemented failed to load libX11.dllbash-3.1$ bash-3.1$ wine --version wine-0.9.29 Those are the error messages. My version of wine is a little old. Have the fixme's been fixed in the latest wine? thanks Wesley Parish -- Clinersterton beademung, with all of love - RIP James Blish ----- Mau e ki, he aha te mea nui? You ask, what is the most important thing? Maku e ki, he tangata, he tangata, he tangata. I reply, it is people, it is people, it is people.

Feb. 25, 2007

Re: Success with enhanced cd's... kind of

by Ben Hodgetts (Enverex)

This isn't an Ubuntu bug, it's a Gnome bug, it's been like this for as far as I remember (years). Ex Dan Kegel wrote: > I noticed that my copy of "No!" by "They Might Be Giants" > is an "enhanced cd", so I inserted it into my Ubuntu Dapper > laptop. Ubuntu only noticed the audio tracks, so I had to > actually use the commandline to mount the data tracks: > sudo mount -oro,loop -tiso9660 /dev/cdrom /mnt > After that it went fine; wine was able to run the flash > app on the disc. > > Looks like others have complained about this, e.g. > http://ubuntuforums.org/showthread.php?p=2143161 > but I didn't see any bug reports about it, so I filed > https://launchpad.net/ubuntu/+bug/87663 > - Dan >

Feb. 24, 2007

Re: a big fan (now with bad news)

by Joris Huizer

Aww... yes, I'm seeing that too According the the wine application database (http://appdb.winehq.org/appview.php?iVersionId=469) some settings help it get a bit further, but it reports: "Microsoft Internet Explorer has encountered a problem and needs to close. We are sorry for the inconvenience." (With a "debug" button) With these messages: fixme:shell:StopWatchMode () stub! fixme:shdocvw:IEWinMain "" 10 fixme:ole:CoResumeClassObjects stub err:module:DelayLoadFailureHook failed to delay load urlmon.dll.CreateURLMoniker wine: Call from 0x7b842138 to unimplemented function urlmon.dll.CreateURLMoniker, aborting fixme:imm:ImmDisableIME (-1): stub fixme:advapi:RegisterEventSourceW ((null),L"Microsoft Internet Explorer"): stub fixme:advapi:ReportEventA (0xcafe4242,0x0001,0x0000,0x000003e8,(nil),0x0005,0x00000050,0x632f6ec0,0x632f6a84): stub fixme:advapi:ReportEventW (0xcafe4242,0x0001,0x0000,0x000003e8,(nil),0x0005,0x00000050,0x161400,0x632f6a84): stub err:eventlog:ReportEventW L"iexplore.exe" err:eventlog:ReportEventW L"6.0.2800.1106" err:eventlog:ReportEventW L"" err:eventlog:ReportEventW L"0.0.0.0" err:eventlog:ReportEventW L"00000000" fixme:advapi:DeregisterEventSource (0xcafe4242) stub fixme:wininet:InternetGetConnectedState always returning LAN connection. Hitting "debug" crashes as an unimplemented function in urlmon is called - that seems weird, as it should be using the native version of urlmon... oh well I guess you need to use ies4linux to get a working IE for now. I had it installed as some program thought it needed it - hadn't noticed it didn't actually run Jeffrey Sabarese <core5fedora(a)gmail.com> wrote: Hi Joris, Thanks again for corresponding with me on this. (i realize there's much text here, so please take you time, get to it when you can...) for the link, just think: "this dude is such a 'NOVICE'!! he really should take more 'NOTES'!!!..." get it? novicenotes? hee hee then a text search (upper right) of WinE ie will get you there, undoubtedly. but that's not why i am writing. i wanted to let you know that the "genuine" installer, http://www.microsoft.com/windows/ie/ie6/downloads/critical/ie6sp1/default.m… did not succeed in placing a useable software on the system. it seemed to "install" just fine, but launching it: [ wine '/home/user/.wine/drive_c/Program Files/Internet Explorer/iexplore.exe' ] brings up a window w/ nothing but "white space". as if it "wants" to launch, but doesn't quite get there. when ie was installed via "ies4linux", i DID experience a similar activity, but only if i launched IE via WinE application link, for example, if i linked to IE from... say EditPlus, as an external browser, i would get the same: a window w/ nothing in it-- as you might see after an app has crashed, the window's still up, but no screen-updating, so you get a "frozen" image, or white screen. so, the only time i've ever seen it look "right" myself was using the "non-standard" ies4linux launcher, as i've illustrated specifically, here some time ago (showing the 3 versions of IE in that package): http://digisquirrel.blogspot.com/2006/08/fiddlers-three.html please understand that i want to install it the proper, WinE developers' recommended way, so this is why i continue to research the subject (and continue to probably annoy you, for which i apologize). What might i be doing wrong? i noticed in my blog entry-- (a different one this time) http://novicenotes.com/2006/08/04/ie_on_linux_wine/ where i discussed DCOM98.EXE . i haven't actively installed that component this time-- so unless it came down w/ the MS installer, might i need to have that installed as well? any other feedback you have on this subject is appreciated. perhaps you have URL w/ the preferred, WinE dev's method? (assuming it's "okay [legal]" to do the MS installer) thank you for your generous help!! --Jeff Sabarese PS. I apologize if it's been an invasion-- i thought i mailed to the "list" last time, but it looks like i sent just to you last time? (and i know i sent only to you this time, so if you wish to forward to the list, please do so. i have a real problem w/ being not-concise [as you've noticed, i'm sure], so i tried to spare the other members for now. sorry i can't seem to shorten things more than i do). On 2/24/07, Joris Huizer wrote: > I think I don't have it anymore, though I'd like to > see - though I'm pretty sure you got it covered well, > like before. > > regards, > > Joris > > > > --- Jeffrey Sabarese wrote: > > > hey there! thanks for the valuable lesson learned > > here! > > > > btw-- i changed my web log info , per > > recommendations i received in > > this mail conversation. if you still have the link > > and care to see > > it-- you'll see that i've now got the wineHQ URL > > there, and a > > recommendation about IE6 should install properly > > :) > > > > On 2/23/07, Joris Huizer > > wrote: > > > > > > --- Jeffrey Sabarese > > wrote: > > > > > > > > > > > I tried [ yum remove wine ], and then [yum > > install > > > > wine] which went > > > > without a hitch, but there's no change in my > > Primary > > > > User (the broken > > > > one) > > > > HOWEVER, WinE continues to run perfectly under > > other > > > > user accounts, and ROOT. > > > > > > > > > > The wine configuration is in ~/.wine > > > Remove/rename it for a fresh start. Wine will > > > automatically recreate the ~/.wine directory with > > > required contents for normal functionality (but > > then > > > you need to do installation of every program > > again) > > > > > > > > > > > > > > > ____________________________________________________________________________________ > > > Yahoo! Music Unlimited > > > Access over 1 million songs. > > > http://music.yahoo.com/unlimited > > > > > > > > > > > > > > > -- > > /* ************************************************ > > */ > > Quanta+ Web Development IDE: > > http://quanta.kdewebdev.org/ > > Quanta+ Wiki: > > http://tinyurl.com/3dzqxk > > Other Quanta Tips: > > http://invisiblepixels.org/progs/quanta.html > > /* ************************************************ > > */ > > > > > > > ____________________________________________________________________________________ > Looking for earth-friendly autos? > Browse Top Cars by "Green Rating" at Yahoo! Autos' Green Center. > http://autos.yahoo.com/green_center/ > -- /* ************************************************ */ Quanta+ Web Development IDE: http://quanta.kdewebdev.org/ Quanta+ Wiki: http://tinyurl.com/3dzqxk Other Quanta Tips: http://invisiblepixels.org/progs/quanta.html /* ************************************************ */ --------------------------------- Need Mail bonding? Go to the Yahoo! Mail Q&A for great tips from Yahoo! Answers users.

Feb. 24, 2007

Success with enhanced cd's... kind of

by Dan Kegel

I noticed that my copy of "No!" by "They Might Be Giants" is an "enhanced cd", so I inserted it into my Ubuntu Dapper laptop. Ubuntu only noticed the audio tracks, so I had to actually use the commandline to mount the data tracks: sudo mount -oro,loop -tiso9660 /dev/cdrom /mnt After that it went fine; wine was able to run the flash app on the disc. Looks like others have complained about this, e.g. http://ubuntuforums.org/showthread.php?p=2143161 but I didn't see any bug reports about it, so I filed https://launchpad.net/ubuntu/+bug/87663 - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

Feb. 24, 2007

RE: xcopy try 2

by Ann & Jason Edmeades

Hi Detlef, (again) >Configure.ac - I included that because another 'regular' developer who >added a dll recently added it (See:) > http://www.winehq.org/pipermail/wine-patches/2007-February/036243.html) >I'll leave it in for that reason unless there's a big problem with it (I >always thought you were supposed to send in configure.ac but not configure) I stand corrected - tools\make_makefiles does that update for me as well as the others :-) Jason

Feb. 24, 2007

RE: xcopy try 2

by Ann & Jason Edmeades

Hi Detlef, Firstly thanks for taking the time to comment on this... Configure.ac - I included that because another 'regular' developer who added a dll recently added it (See:) http://www.winehq.org/pipermail/wine-patches/2007-February/036243.html) I'll leave it in for that reason unless there's a big problem with it (I always thought you were supposed to send in configure.ac but not configure) >+EXTRADEFS = -DUNICODE >There is no need for that define. >Remove that line to get a warning for all ANSI-Functions, that >missed the "W" and >+ if (GetFullPathName(suppliedsource, MAX_PATH, >"W" missing: => GetFullPathNameW >(More Functions in various locations and >WIN32_FIND_DATA => WIN32_FIND_DATAW) I disagree here - I don't think we should be coding with explicit W and A method names, that's the whole point of the define, and when you look through the MSDN it's the main symbol name which is used all the time, the W and A ones are side effects of the implementation of the definitions. It also mirrors what is used by e.g. oleview, wineconsole and winefile. >+C_SRCS = \ Yes - my mistake, I'll fix that and resubmit it in try 3 >+/* Prototypes */ >This can be avoided completly, when you rearange your functions >(so main() is then the last function in the file) It can, but I also believed that putting prototypes was good programming practice. Why would we not want them as they are harmless? They are easy enough to remove, I just wanted justification. >+ printf("Invalid number of parameters - Use xcopy /? for help\n"); >The text should be read from the resources, so it can be localized . >You should convert the UNICODE-Message with WideCharToMultiByte. >When the output-handle is the console, printing UNICODE-messages >avoid converting the message twice (xcopy and kernel32) You wanted the patch small, remember :-) Lets leave that as something for a later patch - I just want to get the infrastructure in first, then fix up some of the other parameters, localization, help etc - Its something which is trivial to do. >This is wrong. tested with: "xcopy file1 file2 file3" Yes, I'll also fix that in the try 3 resubmit (and your suggested solution is fine). The code as it stands certainly isn't perfect especially as I am just trying to put the minimum in to be functional, and some other error checking may also be missing. >(ToDo-Reminder: "xcopy file1 name_not_found" => is "name_not_found" a file or a directory) Its already in there (another string to be localized though!) - See middle of XCOPY_ProcessDestParm. >Thanks for your work. It's pretty good as start! Thanks - its all pretty simple, and I am surprised how little code it is! Jason

Feb. 24, 2007

Re: New wintest executable is there (but there are some issues due to introduction of skip)

by Wagner Ferenc

Paul Vriens <paul.vriens.wine(a)gmail.com> writes: > It doesn't make use of the skip-count as that will mean fixing up a > lot more. If somebody could have a look at the attached patch? Looks good. The already submitted report files could be moved from the data dir back into the queue on the web server as http://cvs.winehq.org/cvsweb/tools/winetest/README tries to explain. (The original directories can be removed afterwards.) -- Regards, Feri.

Feb. 24, 2007

Re: dplay: directplay should initialize session Guid patch + conformance tests

by H. Verbeet

On 24/02/07, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > Use > > todo_wine ok(memcmp(&sessionDesc.guidInstance,&zeroGuid,16),"Session guid not > initialized"); > Afaik the proper way is to use IsEqualGUID() rather than memcmp().

Feb. 24, 2007

Re: dplay: directplay should initialize session Guid patch + conformance tests

by Paul Vriens

Alessandro Pignotti wrote: > On Saturday 24 February 2007 19:31, Stefan Dösinger wrote: > >> todo_wine ok(memcmp(&sessionDesc.guidInstance,&zeroGuid,16),"Session guid >> not initialized"); >> >> For tests which are known to fail > > This version of the patch follows Stefan's advice. > > > > ------------------------------------------------------------------------ > > diff --git a/configure.ac b/configure.ac > index 672dd78..4ef4e23 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1587,6 +1587,7 @@ dlls/dnsapi/Makefile > dlls/dnsapi/tests/Makefile > dlls/dplay/Makefile > dlls/dplayx/Makefile > +dlls/dplayx/tests/Makefile > dlls/dpnet/Makefile > dlls/dpnhpast/Makefile > dlls/dsound/Makefile > diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c > index f5c630a..475e59c 100644 > --- a/dlls/dplayx/dplay.c > +++ b/dlls/dplayx/dplay.c > @@ -2828,6 +2828,8 @@ static HRESULT WINAPI DP_SecureOpen > > This->dp2->bHostInterface = TRUE; > > + //Initializing session GUID > + CoCreateGuid(&(lpsd->guidInstance)); > hr = DP_SetSessionDesc( This, lpsd, 0, TRUE, bAnsi ); > if( FAILED( hr ) ) > { > diff --git a/dlls/dplayx/tests/Makefile.in b/dlls/dplayx/tests/Makefile.in > new file mode 100644 > index 0000000..02007d1 > --- /dev/null > +++ b/dlls/dplayx/tests/Makefile.in > @@ -0,0 +1,14 @@ > +TOPSRCDIR = @top_srcdir@ > +TOPOBJDIR = ../../.. > +SRCDIR = @srcdir@ > +VPATH = @srcdir@ > +TESTDLL = dplayx.dll > +IMPORTS = kernel32 ole32 dxguid > +EXTRALIBS = > + > +CTESTS = \ > + dplayx.c > + > +(a)MAKE_TEST_RULES@ > + > +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend > diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c > new file mode 100644 > index 0000000..ba96125 > --- /dev/null > +++ b/dlls/dplayx/tests/dplayx.c > @@ -0,0 +1,55 @@ > +#include <wine/test.h> > +#include <dplay.h> > + > +BOOL validSP=0; > + > +BOOL FAR PASCAL EnumConnectionsCallback(LPCGUID lpguidSP, LPVOID lpConnection, > + DWORD dwConnectionSize, LPCDPNAME lpName, DWORD dwFlags, > + LPVOID lpContext) > +{ > + if(!memcmp(lpguidSP,&DPSPGUID_TCPIP,16)) > + { > + //I'm forcing TCP/IP Sevice provider > + HRESULT hr=IDirectPlayX_InitializeConnection((LPDIRECTPLAY4)lpContext,lpConnection,0); > + todo_wine > + { > + ok(SUCCEEDED(hr),"It's not possible to initialize TCP/IP service provider\n"); > + } > + if(SUCCEEDED(hr)) > + validSP=1; > + > + return FALSE; > + } > + return TRUE; > +} > + > +START_TEST(dplayx) > +{ > + LPDIRECTPLAY4 pDP = NULL; > + GUID appGuid; > + GUID zeroGuid; > + DPSESSIONDESC2 sessionDesc; > + CoInitialize(NULL); > + CoCreateGuid(&appGuid); > + CoCreateInstance(&CLSID_DirectPlay,NULL, CLSCTX_ALL, > + &IID_IDirectPlay4A,(VOID**)&pDP); > + IDirectPlayX_EnumConnections(pDP,&appGuid,EnumConnectionsCallback, > + pDP,0); > + if(validSP) > + { > + bzero(&sessionDesc,sizeof(DPSESSIONDESC2)); > + bzero(&zeroGuid,16); > + sessionDesc.dwSize=sizeof(DPSESSIONDESC2); > + sessionDesc.dwFlags=DPSESSION_CLIENTSERVER; > + memcpy(&sessionDesc.guidApplication,&appGuid,16); > + sessionDesc.lpszSessionNameA="DPlay conformance test"; > + sessionDesc.dwMaxPlayers=10; > + sessionDesc.dwCurrentPlayers=0; > + sessionDesc.guidInstance=CLSID_DirectPlay; > + IDirectPlayX_Open(pDP,&sessionDesc,DPOPEN_CREATE); > + todo_wine ok(memcmp(&sessionDesc.guidInstance,&zeroGuid,16),"Session guid not initialized"); > + } > + IDirectPlayX_Release(pDP); > + CoUninitialize(); > + > +} > > > ------------------------------------------------------------------------ > > Hi, no clue about dplayx but: - there are some C++ style comments, please use C-style - there is no copyright/license information Cheers, Paul.

Feb. 24, 2007

Re: dplay: directplay should initialize session Guid patch + conformance tests

by Stefan Dösinger

Am Samstag 24 Februar 2007 17:25 schrieb Alessandro Pignotti: > Hi everyone, > the directx sdk says that directplay has to initialize sesison guid in > SESSIONDESC2 struct that is passed by the application with the Open call. > This patch adresses that issue and includes proper conformance test. > It should be noted that the tests works under windows, but not yet under > wine, because it has not a working directplay service provider > implementation and it's not possible to mix builtin dplayx with native > service provider (i'm working on a patch to tha problem too) Use todo_wine ok(memcmp(&sessionDesc.guidInstance,&zeroGuid,16),"Session guid not initialized"); For tests which are known to fail

Feb. 24, 2007

Re: [PATCH] user32: do not call NULL message callback

by Felix Nawothnig

Fabian Bieler wrote: > The only way I know of to test this behavior would be to pass a NULL pointer > as callback. Naturally this results in a segfault without this patch. Is this > okay for a testcase? Use if(0) instead of todo_wine then (and let the second patch, which fixes the bug, remove the if(0)).

Feb. 24, 2007

Re: [PATCH] user32: do not call NULL message callback

by Fabian Bieler

On Saturday 24 February 2007 17:30, you wrote: > Fabian Bieler wrote: > > Windows silently ignores NULL pointers supplied to SendMessageCallback as > > callback function. > > A testcase would be nice. > > Felix The only way I know of to test this behavior would be to pass a NULL pointer as callback. Naturally this results in a segfault without this patch. Is this okay for a testcase?

Feb. 24, 2007

Re: [PATCH] user32: do not call NULL message callback

by Felix Nawothnig

Fabian Bieler wrote: > Windows silently ignores NULL pointers supplied to SendMessageCallback as > callback function. A testcase would be nice. Felix

Feb. 24, 2007

Re: New wintest executable is there (but there are some issues due to introduction of skip)

by Felix Nawothnig

And while we're at it, there seems to be some misconfiguration of the httpd (for quite some time), as the following URL generates an 500 Internal Server Error: http://test.winehq.org/data/200702241000/2003_W2K3-SE-IE7/ntdll:error.txt

Feb. 24, 2007

Re: include/d3d9types.h: Remove Size from D3DVOLUME_DESC

by Stefan Dösinger

Am Samstag 24 Februar 2007 13:27 schrieb H. Verbeet: > On 24/02/07, Rok Mandeljc <rok.mandeljc(a)email.si> wrote: > > According to both MSDN and wine's d3d9 sources, Size was removed from > > D3DVOLUME_DESC in DX9. This patch seems to have fixed crash in > > d3dx9_30.dll at NeverWinter Nights 2 startup (I assume it was due to > > wrong offset of Width, Height and Depth due to Size's presence). > > > > Regards, > > Rok > > Nice find, this fixes some stack corruption in a couple of applications. Yeah, we've been hunting some rouge memory corruption since weeks, but we didn't suspect a problem with our headers :-) good catch :-)

Feb. 24, 2007

Re: kernel32: Set object security on process object in CreateProcess.

by Vitaliy Margolen

Robert Shearman wrote: > Vitaliy Margolen wrote: >> + >> + /* set process security */ >> + if (ret && psa && psa->lpSecurityDescriptor) >> + { >> + NTSTATUS status; >> + >> + status = NtSetSecurityObject( info->hProcess, >> DACL_SECURITY_INFORMATION, >> + psa->lpSecurityDescriptor ); >> + ret = status == STATUS_SUCCESS; >> + if (!ret) SetLastError( RtlNtStatusToDosError( status ) ); >> + } >> + >> > > It would be better to pass the security descriptor (or just the DACL if > you would prefer) in the new_process call. You should be able to change > the security structure validation functions to return the number of > bytes used. Therefore, you should be able to put the security data > before the other variable data in the new_process call. I've discussed this with Alexandre on IRC and we agreed on using NtSetSecurityObject instead. The problem is we need to send all parts of the SD (as it's need to be validated) and one more SD (for thread). The total number of data would be more then maximum of 5. > Also, I think several tests in advapi32 should succeed after this patch > is applied so you will need to patch that too. Yes thank you. I totally forgot about that. Vitaliy.

Feb. 24, 2007

Re: New wintest executable is there (but there are some issues due to introduction of skip)

by Paul Vriens

Paul Vriens wrote: > Hi, > > as of today there's a new winetest executable available at the usual place: > > http://www.astro.gla.ac.uk/users/paulm/WRT/CrossBuilt/ > > There is however an issue with the generated reports. It looks like this > is introduced when the 'skip' thingy was added to the test > infrastructure. I'm currently going through the perl scripts but have no > fix yet. Most likely we have to patch the 'dissect' script at line 158: > > } elsif (s/^($test: (\d+) tests executed, (\d+) marked as todo, > (\d+) failures?\.)\r?$/$1/) { > > The previous lines were like: > > advapi32:crypt start dlls/advapi32/tests/crypt.c 1.31 > crypt: 69 tests executed, 0 marked as todo, 0 failures. > advapi32:crypt done (0) > > now it's: > > advapi32:crypt start dlls/advapi32/tests/crypt.c 1.31 > crypt: 69 tests executed (0 marked as todo, 0 failures), 0 skipped. > advapi32:crypt done (0) > > Anybody? > > Cheers, > > Paul. > > Hi, the attached patch should fix the 'dissect' script and retains backwards compatibility (if needed). It doesn't make use of the skip-count as that will mean fixing up a lot more. If somebody could have a look at the attached patch? Cheers, Paul.

Feb. 24, 2007

Re: test.winehq.com status

by Felix Nawothnig

Hi. A new crossbuild appeared today but the site shows all tests failing. See http://test.winehq.org/data/200702241000/ Felix

Feb. 24, 2007

New wintest executable is there (but there are some issues due to introduction of skip)

by Paul Vriens

Hi, as of today there's a new winetest executable available at the usual place: http://www.astro.gla.ac.uk/users/paulm/WRT/CrossBuilt/ There is however an issue with the generated reports. It looks like this is introduced when the 'skip' thingy was added to the test infrastructure. I'm currently going through the perl scripts but have no fix yet. Most likely we have to patch the 'dissect' script at line 158: } elsif (s/^($test: (\d+) tests executed, (\d+) marked as todo, (\d+) failures?\.)\r?$/$1/) { The previous lines were like: advapi32:crypt start dlls/advapi32/tests/crypt.c 1.31 crypt: 69 tests executed, 0 marked as todo, 0 failures. advapi32:crypt done (0) now it's: advapi32:crypt start dlls/advapi32/tests/crypt.c 1.31 crypt: 69 tests executed (0 marked as todo, 0 failures), 0 skipped. advapi32:crypt done (0) Anybody? Cheers, Paul.

Feb. 24, 2007

Re: ANN: Wiki upgrade

by Saulius Krasuckas

* On Thu, 15 Feb 2007, Dimi Paun wrote: > We finished upgrading the wiki to MoinMoin 1.5.7. > Please let me know if you encounter any problems. I've tried some searching on it, and it reports: Title Search: "ntoskrnl" 0 results out of about 1472 pages. (0.06 seconds) I guess it's searching only through titles of the pages. Could it be made to check all content of a page also, please? Thanks.

Feb. 24, 2007

Re: configure: Break single-line ac_config_files list into multiple lines.

by Saulius Krasuckas

* On Sat, 24 Feb 2007, Marcus Meissner wrote: > * On Sat, Feb 24, 2007 at 02:15:29PM +0200, Saulius Krasuckas wrote: > > And I am not sure what stops us from keeping "ac_config_files" list > > multiline, so merging in future could be automatical. > > The problem is that configure is automatically generated from > configure.ac. Well, fair enough. Can its generator be reconfigured then? :)

Feb. 24, 2007

Re: include/d3d9types.h: Remove Size from D3DVOLUME_DESC

by H. Verbeet

On 24/02/07, Rok Mandeljc <rok.mandeljc(a)email.si> wrote: > According to both MSDN and wine's d3d9 sources, Size was removed from > D3DVOLUME_DESC in DX9. This patch seems to have fixed crash in d3dx9_30.dll at NeverWinter Nights 2 startup (I assume it was due to wrong offset of Width, Height and Depth due to Size's presence). > > Regards, > Rok > Nice find, this fixes some stack corruption in a couple of applications.

Feb. 24, 2007

configure: Break single-line ac_config_files list into multiple lines.

by Saulius Krasuckas

This long line breaks automated rebasing of one of testing branches on (namely ntoskrnl) on my box every time a new dll or program is added. That's because I need to merge conflict for this line by my hand. And I am not sure what stops us from keeping "ac_config_files" list multiline, so merging in future could be automatical. --- configure | 326 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 325 insertions(+), 1 deletions(-) diff --git a/configure b/configure index fb9c11f..67f1942 100755 --- a/configure +++ b/configure @@ -20427,7 +20427,331 @@ MAKE_TEST_RULES=dlls/Maketest.rules MAKE_PROG_RULES=programs/Makeprog.rules -ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Makeimplib.rules dlls/Maketest.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/activeds/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/advpack/Makefile dlls/advpack/tests/Makefile dlls/amstream/Makefile dlls/atl/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/browseui/Makefile dlls/browseui/tests/Makefile dlls/cabinet/Makefile dlls/cabinet/tests/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/clusapi/Makefile dlls/comcat/Makefile dlls/comcat/tests/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/comdlg32/Makefile dlls/comdlg32/tests/Makefile dlls/compstui/Makefile dlls/credui/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/cryptnet/Makefile dlls/ctl3d32/Makefile dlls/d3d8/Makefile dlls/d3d8/tests/Makefile dlls/d3d9/Makefile dlls/d3d9/tests/Makefile dlls/d3dim/Makefile dlls/d3drm/Makefile dlls/d3dx8/Makefile dlls/d3dxof/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/ddrawex/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput/tests/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dnsapi/Makefile dlls/dnsapi/tests/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnet/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxdiagn/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile dlls/dxguid/Makefile dlls/gdi32/Makefile dlls/gdi32/tests/Makefile dlls/glu32/Makefile dlls/gphoto2.ds/Makefile dlls/hhctrl.ocx/Makefile dlls/hid/Makefile dlls/hlink/Makefile dlls/hlink/tests/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imaadp32.acm/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/infosoft/Makefile dlls/infosoft/tests/Makefile dlls/inseng/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/itss/Makefile dlls/itss/tests/Makefile dlls/kernel32/Makefile dlls/kernel32/tests/Makefile dlls/localspl/Makefile dlls/localspl/tests/Makefile dlls/lz32/Makefile dlls/lz32/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/mciavi32/Makefile dlls/mcicda/Makefile dlls/mciseq/Makefile dlls/mciwave/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/mprapi/Makefile dlls/msacm32.drv/Makefile dlls/msacm32/Makefile dlls/msacm32/tests/Makefile dlls/msadp32.acm/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/mscoree/Makefile dlls/msdmo/Makefile dlls/msftedit/Makefile dlls/msg711.acm/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys.ocx/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvcrtd/tests/Makefile dlls/msvfw32/Makefile dlls/msvidc32/Makefile dlls/mswsock/Makefile dlls/msxml3/Makefile dlls/msxml3/tests/Makefile dlls/nddeapi/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/ntdsapi/Makefile dlls/objsel/Makefile dlls/odbc32/Makefile dlls/odbccp32/Makefile dlls/odbccp32/tests/Makefile dlls/ole32/Makefile dlls/ole32/tests/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli32/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr32/Makefile dlls/opengl32/Makefile dlls/powrprof/Makefile dlls/psapi/Makefile dlls/psapi/tests/Makefile dlls/pstorec/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/quartz/tests/Makefile dlls/query/Makefile dlls/rasapi32/Makefile dlls/resutils/Makefile dlls/riched20/Makefile dlls/riched20/tests/Makefile dlls/riched32/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/sane.ds/Makefile dlls/secur32/Makefile dlls/secur32/tests/Makefile dlls/security/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/serialui/tests/Makefile dlls/setupapi/Makefile dlls/setupapi/tests/Makefile dlls/sfc/Makefile dlls/sfc_os/Makefile dlls/shdoclc/Makefile dlls/shdocvw/Makefile dlls/shdocvw/tests/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/snmpapi/tests/Makefile dlls/spoolss/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/svrapi/Makefile dlls/tapi32/Makefile dlls/twain_32/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user32/Makefile dlls/user32/tests/Makefile dlls/userenv/Makefile dlls/usp10/Makefile dlls/usp10/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/uxtheme/tests/Makefile dlls/vdhcp.vxd/Makefile dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/w32skrnl/Makefile dlls/winealsa.drv/Makefile dlls/winearts.drv/Makefile dlls/wineaudioio.drv/Makefile dlls/winecoreaudio.drv/Makefile dlls/winecrt0/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/wineesd.drv/Makefile dlls/winejack.drv/Makefile dlls/winejoystick.drv/Makefile dlls/winemp3.acm/Makefile dlls/winenas.drv/Makefile dlls/wineoss.drv/Makefile dlls/wineps.drv/Makefile dlls/winequartz.drv/Makefile dlls/winex11.drv/Makefile dlls/wing32/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/tests/Makefile dlls/winnls32/Makefile dlls/winspool.drv/Makefile dlls/winspool.drv/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wintrust/tests/Makefile dlls/wldap32/Makefile dlls/wnaspi32/Makefile dlls/wow32/Makefile dlls/ws2_32/Makefile dlls/ws2_32/tests/Makefile dlls/wsock32/Makefile dlls/wtsapi32/Makefile documentation/Makefile fonts/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/clock/Makefile programs/cmd/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/eject/Makefile programs/expand/Makefile programs/explorer/Makefile programs/hh/Makefile programs/icinfo/Makefile programs/iexplore/Makefile programs/msiexec/Makefile programs/notepad/Makefile programs/oleview/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile programs/wordpad/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile" +ac_config_files="$ac_config_files \ + Make.rules \ + dlls/Makedll.rules \ + dlls/Makeimplib.rules \ + dlls/Maketest.rules \ + programs/Makeprog.rules \ + Makefile \ + dlls/Makefile \ + dlls/activeds/Makefile \ + dlls/advapi32/Makefile \ + dlls/advapi32/tests/Makefile \ + dlls/advpack/Makefile \ + dlls/advpack/tests/Makefile \ + dlls/amstream/Makefile \ + dlls/atl/Makefile \ + dlls/avicap32/Makefile \ + dlls/avifil32/Makefile \ + dlls/browseui/Makefile \ + dlls/browseui/tests/Makefile \ + dlls/cabinet/Makefile \ + dlls/cabinet/tests/Makefile \ + dlls/capi2032/Makefile \ + dlls/cards/Makefile \ + dlls/cfgmgr32/Makefile \ + dlls/clusapi/Makefile \ + dlls/comcat/Makefile \ + dlls/comcat/tests/Makefile \ + dlls/comctl32/Makefile \ + dlls/comctl32/tests/Makefile \ + dlls/comdlg32/Makefile \ + dlls/comdlg32/tests/Makefile \ + dlls/compstui/Makefile \ + dlls/credui/Makefile \ + dlls/crtdll/Makefile \ + dlls/crypt32/Makefile \ + dlls/crypt32/tests/Makefile \ + dlls/cryptdll/Makefile \ + dlls/cryptnet/Makefile \ + dlls/ctl3d32/Makefile \ + dlls/d3d8/Makefile \ + dlls/d3d8/tests/Makefile \ + dlls/d3d9/Makefile \ + dlls/d3d9/tests/Makefile \ + dlls/d3dim/Makefile \ + dlls/d3drm/Makefile \ + dlls/d3dx8/Makefile \ + dlls/d3dxof/Makefile \ + dlls/dbghelp/Makefile \ + dlls/dciman32/Makefile \ + dlls/ddraw/Makefile \ + dlls/ddraw/tests/Makefile \ + dlls/ddrawex/Makefile \ + dlls/devenum/Makefile \ + dlls/dinput/Makefile \ + dlls/dinput/tests/Makefile \ + dlls/dinput8/Makefile \ + dlls/dmband/Makefile \ + dlls/dmcompos/Makefile \ + dlls/dmime/Makefile \ + dlls/dmloader/Makefile \ + dlls/dmscript/Makefile \ + dlls/dmstyle/Makefile \ + dlls/dmsynth/Makefile \ + dlls/dmusic/Makefile \ + dlls/dmusic32/Makefile \ + dlls/dnsapi/Makefile \ + dlls/dnsapi/tests/Makefile \ + dlls/dplay/Makefile \ + dlls/dplayx/Makefile \ + dlls/dpnet/Makefile \ + dlls/dpnhpast/Makefile \ + dlls/dsound/Makefile \ + dlls/dsound/tests/Makefile \ + dlls/dswave/Makefile \ + dlls/dxdiagn/Makefile \ + dlls/dxerr8/Makefile \ + dlls/dxerr9/Makefile \ + dlls/dxguid/Makefile \ + dlls/gdi32/Makefile \ + dlls/gdi32/tests/Makefile \ + dlls/glu32/Makefile \ + dlls/gphoto2.ds/Makefile \ + dlls/hhctrl.ocx/Makefile \ + dlls/hid/Makefile \ + dlls/hlink/Makefile \ + dlls/hlink/tests/Makefile \ + dlls/iccvid/Makefile \ + dlls/icmp/Makefile \ + dlls/ifsmgr.vxd/Makefile \ + dlls/imaadp32.acm/Makefile \ + dlls/imagehlp/Makefile \ + dlls/imm32/Makefile \ + dlls/infosoft/Makefile \ + dlls/infosoft/tests/Makefile \ + dlls/inseng/Makefile \ + dlls/iphlpapi/Makefile \ + dlls/iphlpapi/tests/Makefile \ + dlls/itss/Makefile \ + dlls/itss/tests/Makefile \ + dlls/kernel32/Makefile \ + dlls/kernel32/tests/Makefile \ + dlls/localspl/Makefile \ + dlls/localspl/tests/Makefile \ + dlls/lz32/Makefile \ + dlls/lz32/tests/Makefile \ + dlls/mapi32/Makefile \ + dlls/mapi32/tests/Makefile \ + dlls/mciavi32/Makefile \ + dlls/mcicda/Makefile \ + dlls/mciseq/Makefile \ + dlls/mciwave/Makefile \ + dlls/midimap/Makefile \ + dlls/mlang/Makefile \ + dlls/mlang/tests/Makefile \ + dlls/mmdevldr.vxd/Makefile \ + dlls/monodebg.vxd/Makefile \ + dlls/mpr/Makefile \ + dlls/mprapi/Makefile \ + dlls/msacm32.drv/Makefile \ + dlls/msacm32/Makefile \ + dlls/msacm32/tests/Makefile \ + dlls/msadp32.acm/Makefile \ + dlls/mscms/Makefile \ + dlls/mscms/tests/Makefile \ + dlls/mscoree/Makefile \ + dlls/msdmo/Makefile \ + dlls/msftedit/Makefile \ + dlls/msg711.acm/Makefile \ + dlls/mshtml/Makefile \ + dlls/mshtml/tests/Makefile \ + dlls/msi/Makefile \ + dlls/msi/tests/Makefile \ + dlls/msimg32/Makefile \ + dlls/msisys.ocx/Makefile \ + dlls/msnet32/Makefile \ + dlls/msrle32/Makefile \ + dlls/msvcrt/Makefile \ + dlls/msvcrt/tests/Makefile \ + dlls/msvcrt20/Makefile \ + dlls/msvcrt40/Makefile \ + dlls/msvcrtd/Makefile \ + dlls/msvcrtd/tests/Makefile \ + dlls/msvfw32/Makefile \ + dlls/msvidc32/Makefile \ + dlls/mswsock/Makefile \ + dlls/msxml3/Makefile \ + dlls/msxml3/tests/Makefile \ + dlls/nddeapi/Makefile \ + dlls/netapi32/Makefile \ + dlls/netapi32/tests/Makefile \ + dlls/newdev/Makefile \ + dlls/ntdll/Makefile \ + dlls/ntdll/tests/Makefile \ + dlls/ntdsapi/Makefile \ + dlls/objsel/Makefile \ + dlls/odbc32/Makefile \ + dlls/odbccp32/Makefile \ + dlls/odbccp32/tests/Makefile \ + dlls/ole32/Makefile \ + dlls/ole32/tests/Makefile \ + dlls/oleacc/Makefile \ + dlls/oleaut32/Makefile \ + dlls/oleaut32/tests/Makefile \ + dlls/olecli32/Makefile \ + dlls/oledlg/Makefile \ + dlls/olepro32/Makefile \ + dlls/olesvr32/Makefile \ + dlls/opengl32/Makefile \ + dlls/powrprof/Makefile \ + dlls/psapi/Makefile \ + dlls/psapi/tests/Makefile \ + dlls/pstorec/Makefile \ + dlls/qcap/Makefile \ + dlls/quartz/Makefile \ + dlls/quartz/tests/Makefile \ + dlls/query/Makefile \ + dlls/rasapi32/Makefile \ + dlls/resutils/Makefile \ + dlls/riched20/Makefile \ + dlls/riched20/tests/Makefile \ + dlls/riched32/Makefile \ + dlls/rpcrt4/Makefile \ + dlls/rpcrt4/tests/Makefile \ + dlls/rsabase/Makefile \ + dlls/rsabase/tests/Makefile \ + dlls/rsaenh/Makefile \ + dlls/rsaenh/tests/Makefile \ + dlls/sane.ds/Makefile \ + dlls/secur32/Makefile \ + dlls/secur32/tests/Makefile \ + dlls/security/Makefile \ + dlls/sensapi/Makefile \ + dlls/serialui/Makefile \ + dlls/serialui/tests/Makefile \ + dlls/setupapi/Makefile \ + dlls/setupapi/tests/Makefile \ + dlls/sfc/Makefile \ + dlls/sfc_os/Makefile \ + dlls/shdoclc/Makefile \ + dlls/shdocvw/Makefile \ + dlls/shdocvw/tests/Makefile \ + dlls/shell32/Makefile \ + dlls/shell32/tests/Makefile \ + dlls/shfolder/Makefile \ + dlls/shlwapi/Makefile \ + dlls/shlwapi/tests/Makefile \ + dlls/snmpapi/Makefile \ + dlls/snmpapi/tests/Makefile \ + dlls/spoolss/Makefile \ + dlls/stdole2.tlb/Makefile \ + dlls/stdole32.tlb/Makefile \ + dlls/sti/Makefile \ + dlls/strmiids/Makefile \ + dlls/svrapi/Makefile \ + dlls/tapi32/Makefile \ + dlls/twain_32/Makefile \ + dlls/unicows/Makefile \ + dlls/url/Makefile \ + dlls/urlmon/Makefile \ + dlls/urlmon/tests/Makefile \ + dlls/user32/Makefile \ + dlls/user32/tests/Makefile \ + dlls/userenv/Makefile \ + dlls/usp10/Makefile \ + dlls/usp10/tests/Makefile \ + dlls/uuid/Makefile \ + dlls/uxtheme/Makefile \ + dlls/uxtheme/tests/Makefile \ + dlls/vdhcp.vxd/Makefile \ + dlls/vdmdbg/Makefile \ + dlls/version/Makefile \ + dlls/version/tests/Makefile \ + dlls/vmm.vxd/Makefile \ + dlls/vnbt.vxd/Makefile \ + dlls/vnetbios.vxd/Makefile \ + dlls/vtdapi.vxd/Makefile \ + dlls/vwin32.vxd/Makefile \ + dlls/w32skrnl/Makefile \ + dlls/winealsa.drv/Makefile \ + dlls/winearts.drv/Makefile \ + dlls/wineaudioio.drv/Makefile \ + dlls/winecoreaudio.drv/Makefile \ + dlls/winecrt0/Makefile \ + dlls/wined3d/Makefile \ + dlls/winedos/Makefile \ + dlls/wineesd.drv/Makefile \ + dlls/winejack.drv/Makefile \ + dlls/winejoystick.drv/Makefile \ + dlls/winemp3.acm/Makefile \ + dlls/winenas.drv/Makefile \ + dlls/wineoss.drv/Makefile \ + dlls/wineps.drv/Makefile \ + dlls/winequartz.drv/Makefile \ + dlls/winex11.drv/Makefile \ + dlls/wing32/Makefile \ + dlls/wininet/Makefile \ + dlls/wininet/tests/Makefile \ + dlls/winmm/Makefile \ + dlls/winmm/tests/Makefile \ + dlls/winnls32/Makefile \ + dlls/winspool.drv/Makefile \ + dlls/winspool.drv/tests/Makefile \ + dlls/wintab32/Makefile \ + dlls/wintrust/Makefile \ + dlls/wintrust/tests/Makefile \ + dlls/wldap32/Makefile \ + dlls/wnaspi32/Makefile \ + dlls/wow32/Makefile \ + dlls/ws2_32/Makefile \ + dlls/ws2_32/tests/Makefile \ + dlls/wsock32/Makefile \ + dlls/wtsapi32/Makefile \ + documentation/Makefile \ + fonts/Makefile \ + include/Makefile \ + libs/Makefile \ + libs/port/Makefile \ + libs/wine/Makefile \ + libs/wpp/Makefile \ + loader/Makefile \ + programs/Makefile \ + programs/clock/Makefile \ + programs/cmd/Makefile \ + programs/cmdlgtst/Makefile \ + programs/control/Makefile \ + programs/eject/Makefile \ + programs/expand/Makefile \ + programs/explorer/Makefile \ + programs/hh/Makefile \ + programs/icinfo/Makefile \ + programs/iexplore/Makefile \ + programs/msiexec/Makefile \ + programs/notepad/Makefile \ + programs/oleview/Makefile \ + programs/progman/Makefile \ + programs/regedit/Makefile \ + programs/regsvr32/Makefile \ + programs/rpcss/Makefile \ + programs/rundll32/Makefile \ + programs/start/Makefile \ + programs/taskmgr/Makefile \ + programs/uninstaller/Makefile \ + programs/view/Makefile \ + programs/wineboot/Makefile \ + programs/winebrowser/Makefile \ + programs/winecfg/Makefile \ + programs/wineconsole/Makefile \ + programs/winedbg/Makefile \ + programs/winefile/Makefile \ + programs/winemenubuilder/Makefile \ + programs/winemine/Makefile \ + programs/winepath/Makefile \ + programs/winetest/Makefile \ + programs/winevdm/Makefile \ + programs/winhelp/Makefile \ + programs/winver/Makefile \ + programs/wordpad/Makefile \ + server/Makefile \ + tools/Makefile \ + tools/widl/Makefile \ + tools/winebuild/Makefile \ + tools/winedump/Makefile \ + tools/winegcc/Makefile \ + tools/wmc/Makefile \ + tools/wrc/Makefile" cat >confcache <<\_ACEOF -- 1.4.4.2

Feb. 24, 2007

Re: configure: Break single-line ac_config_files list into multiple lines.

by Marcus Meissner

On Sat, Feb 24, 2007 at 02:31:25PM +0200, Saulius Krasuckas wrote: > * On Sat, 24 Feb 2007, Marcus Meissner wrote: > > * On Sat, Feb 24, 2007 at 02:15:29PM +0200, Saulius Krasuckas wrote: > > > And I am not sure what stops us from keeping "ac_config_files" list > > > multiline, so merging in future could be automatical. > > > > The problem is that configure is automatically generated from > > configure.ac. > > Well, fair enough. Can its generator be reconfigured then? :) After some experimenting, yes. We can write multiple AC_CONFIG_FILES and they will all get their own line in configure. Ciao, Marcus

Feb. 24, 2007

Re: configure: Break single-line ac_config_files list into multiple lines.

by H. Verbeet

On 24/02/07, Saulius Krasuckas <saulius.krasuckas(a)ieee.org> wrote: > This long line breaks automated rebasing of one of testing branches on > (namely ntoskrnl) on my box every time a new dll or program is added. > That's because I need to merge conflict for this line by my hand. > > And I am not sure what stops us from keeping "ac_config_files" list > multiline, so merging in future could be automatical. > > --- > configure | 326 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- > 1 files changed, 325 insertions(+), 1 deletions(-) > configure is a generated file.

Feb. 24, 2007

Re: configure: Break single-line ac_config_files list into multiple lines.

by Marcus Meissner

On Sat, Feb 24, 2007 at 02:15:29PM +0200, Saulius Krasuckas wrote: > This long line breaks automated rebasing of one of testing branches on > (namely ntoskrnl) on my box every time a new dll or program is added. > That's because I need to merge conflict for this line by my hand. > > And I am not sure what stops us from keeping "ac_config_files" list > multiline, so merging in future could be automatical. The problem is that configure is automatically generated from configure.ac. Ciao, Marcus

Feb. 24, 2007

Re: winex11.drv: Catch and report screen resolution change errors.

by Stefan Dösinger

Am Samstag 24 Februar 2007 07:17 schrieb Vitaliy Margolen: > > winex11.drv: Catch and report screen resolution change errors. > > This patch brakes Half-life based games in virtual desktop. Yes, I saw the same with moto racer 2 yesterday. I will send a patch to re-enable color depth faking for virtual desktops.

Feb. 24, 2007

Re: dbghelp: Match the crc for debug link files in elf_locate_debug_link so that we get the correct debug file before trying to parse it.

by Eric Pouech

Eric Pouech a écrit : > Robert Shearman a écrit : >> Eric Pouech wrote: >>> Robert Shearman a écrit : >>>> >>>> Keep the debuglink elf_file_map mapped until after >>>> elf_new_public_symbols is called, otherwise we could use unmapped >>>> memory. >>> >>> this is still not the full valid solution... what should be done is: >>> when we search for a given section, we should look first in the >>> original .so, then, if not found, in the .gnu_debuglink one... >>> your patch only covers the case where all relevant information is to >>> be found in the .gnu_debuglink file, which is not guaranteed >> >> And that should be easier for an interested person to do after this >> patch is applied, right? I was just interested in getting rid of >> bogus crc errors when using winedbg. >> > first, it's not exactly what your patch is entirely about... your > patch ensures that the newly .gnu_debuglink mapped file is present for > symbols resolution... and the bogus CRC errors come from the fact that > we have an ERR for that, were it should be a WARN... a user could have > different versions of the debug info files > secondly, the correct fix will require a rewrite of the mapping > algorithm itself, which is rather orthogonal to what you did > my reco would simply to downgrade the ERR to a WARN if you don't want > to go into the full fix > A+ > Rob, Peter as you both were looking for solution to public symbols hashing in .gnu_link files, the attached patches should fix it could you test them to ensure that they really fix it ? (order to apply patches: 1/ dbghelp-elf-map, 2/ dbghelp-elf-alternate, 3/ dbghelp-elf-link-alternate) A+ [DbgHelp]: allowed to add an alternate file_map for an ELF file (where to From: Eric Pouech <eric.pouech(a)wanadoo.fr> look for its debug information) --- dlls/dbghelp/elf_module.c | 37 ++++++++++++++++++++++++------------- 1 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index b0cc90c..41a37f9 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -115,6 +115,7 @@ struct elf_file_map unsigned with_crc; unsigned long crc; const char* shstrtab; + struct elf_file_map* alternate; /* another ELF file (linked to this one) */ }; struct elf_section_map @@ -167,6 +168,7 @@ static const char* elf_map_section(struc * elf_find_section * * Finds a section by name (and type) into memory from an ELF file + * or its alternate if any */ static BOOL elf_find_section(struct elf_file_map* fmap, const char* name, unsigned sht, struct elf_section_map* esm) @@ -179,15 +181,19 @@ static BOOL elf_find_section(struct elf_ fmap->shstrtab = elf_map_section(&hdr_esm); if (fmap->shstrtab == ELF_NO_MAP) return FALSE; } - for (i = 0; i < fmap->elfhdr.e_shnum; i++) + while (fmap) { - if (strcmp(fmap->shstrtab + fmap->sect[i].shdr.sh_name, name) == 0 && - (sht == SHT_NULL || sht == fmap->sect[i].shdr.sh_type)) + for (i = 0; i < fmap->elfhdr.e_shnum; i++) { - esm->fmap = fmap; - esm->sidx = i; - return TRUE; + if (strcmp(fmap->shstrtab + fmap->sect[i].shdr.sh_name, name) == 0 && + (sht == SHT_NULL || sht == fmap->sect[i].shdr.sh_type)) + { + esm->fmap = fmap; + esm->sidx = i; + return TRUE; + } } + fmap = fmap->alternate; } return FALSE; } @@ -257,6 +263,7 @@ static BOOL elf_map_file(const WCHAR* fi fmap->fd = -1; fmap->with_crc = 0; fmap->shstrtab = ELF_NO_MAP; + fmap->alternate = NULL; /* check that the file exists, and that the module hasn't been loaded yet */ if (stat(filename, &statbuf) == -1 || S_ISDIR(statbuf.st_mode)) goto done; @@ -312,16 +319,20 @@ done: */ static void elf_unmap_file(struct elf_file_map* fmap) { - if (fmap->fd != -1) + while (fmap) { - struct elf_section_map esm; - esm.fmap = fmap; - for (esm.sidx = 0; esm.sidx < fmap->elfhdr.e_shnum; esm.sidx++) + if (fmap->fd != -1) { - elf_unmap_section(&esm); + struct elf_section_map esm; + esm.fmap = fmap; + for (esm.sidx = 0; esm.sidx < fmap->elfhdr.e_shnum; esm.sidx++) + { + elf_unmap_section(&esm); + } + HeapFree(GetProcessHeap(), 0, fmap->sect); + close(fmap->fd); } - HeapFree(GetProcessHeap(), 0, fmap->sect); - close(fmap->fd); + fmap = fmap->alternate; } } [DbgHelp]: now handling the .gnu_debuglink files with the newly added From: Eric Pouech <eric.pouech(a)wanadoo.fr> alternate mechanism --- dlls/dbghelp/elf_module.c | 118 +++++++++++++++++++-------------------------- 1 files changed, 51 insertions(+), 67 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 41a37f9..4c5e53a 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -112,8 +112,6 @@ struct elf_file_map const char* mapped; }* sect; int fd; - unsigned with_crc; - unsigned long crc; const char* shstrtab; struct elf_file_map* alternate; /* another ELF file (linked to this one) */ }; @@ -261,7 +259,6 @@ static BOOL elf_map_file(const WCHAR* fi WideCharToMultiByte(CP_UNIXCP, 0, filenameW, -1, filename, len, NULL, NULL); fmap->fd = -1; - fmap->with_crc = 0; fmap->shstrtab = ELF_NO_MAP; fmap->alternate = NULL; @@ -851,10 +848,18 @@ #define UPDC32(octet,crc) (crc_32_tab[(( #undef UPDC32 } -static BOOL elf_load_debug_info_from_map(struct module* module, - struct elf_file_map* fmap, - struct pool* pool, - struct hash_table* ht_symtab); +static BOOL elf_check_debug_link(const WCHAR* file, struct elf_file_map* fmap, DWORD crc) +{ + BOOL ret; + if (!elf_map_file(file, fmap)) return FALSE; + if (!(ret = crc == calc_crc32(fmap))) + { + WARN("Bad CRC for file %s (got %08x while expecting %08x)\n", + debugstr_w(file), calc_crc32(fmap), crc); + elf_unmap_file(fmap); + } + return ret; +} /****************************************************************** * elf_locate_debug_link @@ -875,20 +880,24 @@ static BOOL elf_load_debug_info_from_map * is the global debug file directory, and execdir has been turned * into a relative path)." (from GDB manual) */ -static WCHAR* elf_locate_debug_link(const char* filename, const WCHAR* loaded_file, - struct elf_file_map* fmap_link) +static BOOL elf_locate_debug_link(struct elf_file_map* fmap, const char* filename, + const WCHAR* loaded_file, DWORD crc) { static const WCHAR globalDebugDirW[] = {'/','u','s','r','/','l','i','b','/','d','e','b','u','g','/'}; static const WCHAR dotDebugW[] = {'.','d','e','b','u','g','/'}; const size_t globalDebugDirLen = sizeof(globalDebugDirW) / sizeof(WCHAR); size_t filename_len; - WCHAR* p; + WCHAR* p = NULL; WCHAR* slash; + struct elf_file_map* fmap_link = NULL; + + fmap_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*fmap_link)); + if (!fmap_link) return FALSE; filename_len = MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, NULL, 0); p = HeapAlloc(GetProcessHeap(), 0, (globalDebugDirLen + strlenW(loaded_file) + 6 + 1 + filename_len + 1) * sizeof(WCHAR)); - if (!p) return FALSE; + if (!p) goto found; /* we prebuild the string with "execdir" */ strcpyW(p, loaded_file); @@ -897,33 +906,34 @@ static WCHAR* elf_locate_debug_link(cons /* testing execdir/filename */ MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, slash, filename_len); - if (elf_map_file(p, fmap_link)) goto found; - - HeapValidate(GetProcessHeap(), 0, 0); + if (elf_check_debug_link(p, fmap_link, crc)) goto found; /* testing execdir/.debug/filename */ memcpy(slash, dotDebugW, sizeof(dotDebugW)); MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, slash + sizeof(dotDebugW) / sizeof(WCHAR), filename_len); - if (elf_map_file(p, fmap_link)) goto found; + if (elf_check_debug_link(p, fmap_link, crc)) goto found; /* testing globaldebugdir/execdir/filename */ memmove(p + globalDebugDirLen, p, (slash - p) * sizeof(WCHAR)); memcpy(p, globalDebugDirW, globalDebugDirLen * sizeof(WCHAR)); slash += globalDebugDirLen; MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, slash, filename_len); - if (elf_map_file(p, fmap_link)) goto found; + if (elf_check_debug_link(p, fmap_link, crc)) goto found; /* finally testing filename */ - if (elf_map_file(slash, fmap_link)) goto found; + if (elf_check_debug_link(slash, fmap_link, crc)) goto found; - HeapFree(GetProcessHeap(), 0, p); WARN("Couldn't locate or map %s\n", filename); - return NULL; + HeapFree(GetProcessHeap(), 0, p); + HeapFree(GetProcessHeap(), 0, fmap_link); + return FALSE; found: TRACE("Located debug information file %s at %s\n", filename, debugstr_w(p)); - return p; + HeapFree(GetProcessHeap(), 0, p); + fmap->alternate = fmap_link; + return TRUE; } /****************************************************************** @@ -932,10 +942,8 @@ found: * Parses a .gnu_debuglink section and loads the debug info from * the external file specified there. */ -static BOOL elf_debuglink_parse (struct module* module, - struct pool* pool, - struct hash_table* ht_symtab, - const BYTE* debuglink) +static BOOL elf_debuglink_parse(struct elf_file_map* fmap, struct module* module, + const BYTE* debuglink) { /* The content of a debug link section is: * 1/ a NULL terminated string, containing the file name for the @@ -943,28 +951,11 @@ static BOOL elf_debuglink_parse (struct * 2/ padding on 4 byte boundary * 3/ CRC of the linked ELF file */ - BOOL ret = FALSE; const char* dbg_link = (char*)debuglink; - struct elf_file_map fmap_link; - WCHAR* link_file; + DWORD crc; - link_file = elf_locate_debug_link(dbg_link, module->module.LoadedImageName, &fmap_link); - - if (link_file) - { - fmap_link.crc = *(const DWORD*)(dbg_link + ((DWORD_PTR)(strlen(dbg_link) + 4) & ~3)); - fmap_link.with_crc = 1; - ret = elf_load_debug_info_from_map(module, &fmap_link, pool, - ht_symtab); - if (ret) - strcpyW(module->module.LoadedPdbName,link_file); - else - WARN("Couldn't load debug information from %s\n", debugstr_w(link_file)); - elf_unmap_file(&fmap_link); - HeapFree(GetProcessHeap(), 0, link_file); - } - - return ret; + crc = *(const DWORD*)(dbg_link + ((DWORD_PTR)(strlen(dbg_link) + 4) & ~3)); + return elf_locate_debug_link(fmap, dbg_link, module->module.LoadedImageName, crc); } /****************************************************************** @@ -997,14 +988,6 @@ static BOOL elf_load_debug_info_from_map {NULL, 0, 0, 0} }; - if (fmap->with_crc && (fmap->crc != calc_crc32(fmap))) - { - ERR("Bad CRC for module %s (got %08x while expecting %08lx)\n", - debugstr_w(module->module.LoadedImageName), calc_crc32(fmap), fmap->crc); - /* we don't tolerate mis-matched files */ - return FALSE; - } - module->module.SymType = SymExport; /* create a hash table for the symtab */ @@ -1017,6 +1000,22 @@ static BOOL elf_load_debug_info_from_map debug_line_sect, debug_loclist_sect; struct elf_section_map debuglink_sect; + /* if present, add the .gnu_debuglink file as an alternate to current one */ + if (elf_find_section(fmap, ".gnu_debuglink", SHT_NULL, &debuglink_sect)) + { + const BYTE* dbg_link; + + dbg_link = (const BYTE*)elf_map_section(&debuglink_sect); + if (dbg_link != ELF_NO_MAP) + { + lret = elf_debuglink_parse(fmap, module, dbg_link); + if (!lret) + WARN("Couldn't load linked debug file for %s\n", + debugstr_w(module->module.ModuleName)); + ret = ret || lret; + } + elf_unmap_section(&debuglink_sect); + } if (elf_find_section(fmap, ".stab", SHT_NULL, &stab_sect) && elf_find_section(fmap, ".stabstr", SHT_NULL, &stabstr_sect)) { @@ -1083,21 +1082,6 @@ static BOOL elf_load_debug_info_from_map elf_unmap_section(&debug_line_sect); elf_unmap_section(&debug_loclist_sect); } - if (elf_find_section(fmap, ".gnu_debuglink", SHT_NULL, &debuglink_sect)) - { - const BYTE* dbg_link; - - dbg_link = (const BYTE*)elf_map_section(&debuglink_sect); - if (dbg_link != ELF_NO_MAP) - { - lret = elf_debuglink_parse(module, pool, ht_symtab, dbg_link); - if (!lret) - WARN("Couldn't load linked debug file for %s\n", - debugstr_w(module->module.ModuleName)); - ret = ret || lret; - } - elf_unmap_section(&debuglink_sect); - } } if (strstrW(module->module.ModuleName, S_ElfW) || !strcmpW(module->module.ModuleName, S_WineLoaderW)) [DbgHelp]: rewrote the ELF section mapper for better data encapsulation From: Eric Pouech <eric.pouech(a)wanadoo.fr> --- dlls/dbghelp/elf_module.c | 273 +++++++++++++++++++++++---------------------- 1 files changed, 137 insertions(+), 136 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 7758199..b0cc90c 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -114,6 +114,13 @@ struct elf_file_map int fd; unsigned with_crc; unsigned long crc; + const char* shstrtab; +}; + +struct elf_section_map +{ + struct elf_file_map* fmap; + unsigned sidx; }; struct symtab_elt @@ -137,21 +144,52 @@ struct elf_thunk_area * * Maps a single section into memory from an ELF file */ -static const char* elf_map_section(struct elf_file_map* fmap, int sidx) +static const char* elf_map_section(struct elf_section_map* esm) { unsigned pgsz = getpagesize(); unsigned ofst, size; - if (sidx < 0 || sidx >= fmap->elfhdr.e_shnum || - fmap->sect[sidx].shdr.sh_type == SHT_NOBITS) + if (esm->sidx < 0 || esm->sidx >= esm->fmap->elfhdr.e_shnum || + esm->fmap->sect[esm->sidx].shdr.sh_type == SHT_NOBITS) return ELF_NO_MAP; + /* align required information on page size (we assume pagesize is a power of 2) */ - ofst = fmap->sect[sidx].shdr.sh_offset & ~(pgsz - 1); - size = ((fmap->sect[sidx].shdr.sh_offset + - fmap->sect[sidx].shdr.sh_size + pgsz - 1) & ~(pgsz - 1)) - ofst; - fmap->sect[sidx].mapped = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fmap->fd, ofst); - if (fmap->sect[sidx].mapped == ELF_NO_MAP) return ELF_NO_MAP; - return fmap->sect[sidx].mapped + (fmap->sect[sidx].shdr.sh_offset & (pgsz - 1)); + ofst = esm->fmap->sect[esm->sidx].shdr.sh_offset & ~(pgsz - 1); + size = ((esm->fmap->sect[esm->sidx].shdr.sh_offset + + esm->fmap->sect[esm->sidx].shdr.sh_size + pgsz - 1) & ~(pgsz - 1)) - ofst; + esm->fmap->sect[esm->sidx].mapped = mmap(NULL, size, PROT_READ, MAP_PRIVATE, + esm->fmap->fd, ofst); + if (esm->fmap->sect[esm->sidx].mapped == ELF_NO_MAP) return ELF_NO_MAP; + return esm->fmap->sect[esm->sidx].mapped + (esm->fmap->sect[esm->sidx].shdr.sh_offset & (pgsz - 1)); +} + +/****************************************************************** + * elf_find_section + * + * Finds a section by name (and type) into memory from an ELF file + */ +static BOOL elf_find_section(struct elf_file_map* fmap, const char* name, + unsigned sht, struct elf_section_map* esm) +{ + unsigned i; + + if (fmap->shstrtab == ELF_NO_MAP) + { + struct elf_section_map hdr_esm = {fmap, fmap->elfhdr.e_shstrndx}; + fmap->shstrtab = elf_map_section(&hdr_esm); + if (fmap->shstrtab == ELF_NO_MAP) return FALSE; + } + for (i = 0; i < fmap->elfhdr.e_shnum; i++) + { + if (strcmp(fmap->shstrtab + fmap->sect[i].shdr.sh_name, name) == 0 && + (sht == SHT_NULL || sht == fmap->sect[i].shdr.sh_type)) + { + esm->fmap = fmap; + esm->sidx = i; + return TRUE; + } + } + return FALSE; } /****************************************************************** @@ -159,32 +197,41 @@ static const char* elf_map_section(struc * * Unmaps a single section from memory */ -static void elf_unmap_section(struct elf_file_map* fmap, int sidx) +static void elf_unmap_section(struct elf_section_map* esm) { - if (sidx >= 0 && sidx < fmap->elfhdr.e_shnum && fmap->sect[sidx].mapped != ELF_NO_MAP) + if (esm->sidx >= 0 && esm->sidx < esm->fmap->elfhdr.e_shnum && esm->fmap->sect[esm->sidx].mapped != ELF_NO_MAP) { unsigned pgsz = getpagesize(); unsigned ofst, size; - ofst = fmap->sect[sidx].shdr.sh_offset & ~(pgsz - 1); - size = ((fmap->sect[sidx].shdr.sh_offset + - fmap->sect[sidx].shdr.sh_size + pgsz - 1) & ~(pgsz - 1)) - ofst; - if (munmap((char*)fmap->sect[sidx].mapped, size) < 0) + ofst = esm->fmap->sect[esm->sidx].shdr.sh_offset & ~(pgsz - 1); + size = ((esm->fmap->sect[esm->sidx].shdr.sh_offset + + esm->fmap->sect[esm->sidx].shdr.sh_size + pgsz - 1) & ~(pgsz - 1)) - ofst; + if (munmap((char*)esm->fmap->sect[esm->sidx].mapped, size) < 0) WARN("Couldn't unmap the section\n"); - fmap->sect[sidx].mapped = ELF_NO_MAP; + esm->fmap->sect[esm->sidx].mapped = ELF_NO_MAP; } } +static void elf_end_find(struct elf_file_map* fmap) +{ + struct elf_section_map esm; + + esm.fmap = fmap; esm.sidx = fmap->elfhdr.e_shstrndx; + elf_unmap_section(&esm); + fmap->shstrtab = ELF_NO_MAP; +} + /****************************************************************** * elf_get_map_size * * Get the size of an ELF section */ -static inline unsigned elf_get_map_size(struct elf_file_map* fmap, int sidx) +static inline unsigned elf_get_map_size(struct elf_section_map* esm) { - if (sidx < 0 || sidx >= fmap->elfhdr.e_shnum) + if (esm->sidx < 0 || esm->sidx >= esm->fmap->elfhdr.e_shnum) return 0; - return fmap->sect[sidx].shdr.sh_size; + return esm->fmap->sect[esm->sidx].shdr.sh_size; } /****************************************************************** @@ -209,6 +256,7 @@ static BOOL elf_map_file(const WCHAR* fi fmap->fd = -1; fmap->with_crc = 0; + fmap->shstrtab = ELF_NO_MAP; /* check that the file exists, and that the module hasn't been loaded yet */ if (stat(filename, &statbuf) == -1 || S_ISDIR(statbuf.st_mode)) goto done; @@ -266,10 +314,11 @@ static void elf_unmap_file(struct elf_fi { if (fmap->fd != -1) { - int i; - for (i = 0; i < fmap->elfhdr.e_shnum; i++) + struct elf_section_map esm; + esm.fmap = fmap; + for (esm.sidx = 0; esm.sidx < fmap->elfhdr.e_shnum; esm.sidx++) { - elf_unmap_section(fmap, i); + elf_unmap_section(&esm); } HeapFree(GetProcessHeap(), 0, fmap->sect); close(fmap->fd); @@ -302,7 +351,7 @@ int elf_is_in_thunk_area(unsigned long a */ static void elf_hash_symtab(struct module* module, struct pool* pool, struct hash_table* ht_symtab, struct elf_file_map* fmap, - int symtab_idx, struct elf_thunk_area* thunks) + struct elf_thunk_area* thunks) { int i, j, nsym; const char* strp; @@ -311,12 +360,16 @@ static void elf_hash_symtab(struct modul const char* ptr; const Elf32_Sym* symp; struct symtab_elt* ste; + struct elf_section_map esm, esm_str; - symp = (const Elf32_Sym*)elf_map_section(fmap, symtab_idx); - strp = elf_map_section(fmap, fmap->sect[symtab_idx].shdr.sh_link); - if (symp == ELF_NO_MAP || strp == ELF_NO_MAP) return; + if (!elf_find_section(fmap, ".symtab", SHT_SYMTAB, &esm) && + !elf_find_section(fmap, ".dynsym", SHT_DYNSYM, &esm)) return; + if ((symp = (const Elf32_Sym*)elf_map_section(&esm)) == ELF_NO_MAP) return; + esm_str.fmap = fmap; + esm_str.sidx = fmap->sect[esm.sidx].shdr.sh_link; + if ((strp = elf_map_section(&esm_str)) == ELF_NO_MAP) return; - nsym = elf_get_map_size(fmap, symtab_idx) / sizeof(*symp); + nsym = elf_get_map_size(&esm) / sizeof(*symp); for (j = 0; thunks[j].symname; j++) thunks[j].rva_start = thunks[j].rva_end = 0; @@ -922,12 +975,6 @@ static BOOL elf_load_debug_info_from_map struct hash_table* ht_symtab) { BOOL ret = FALSE, lret; - const char* shstrtab; - int i; - int symtab_sect, dynsym_sect, stab_sect, stabstr_sect; - int debug_sect, debug_str_sect, debug_abbrev_sect; - int debug_line_sect, debug_loclist_sect; - int debuglink_sect; struct elf_thunk_area thunks[] = { {"__wine_spec_import_thunks", THUNK_ORDINAL_NOTYPE, 0, 0}, /* inter DLL calls */ @@ -947,77 +994,32 @@ static BOOL elf_load_debug_info_from_map return FALSE; } - /* - * Next, we need to find a few of the internal ELF headers within - * this thing. We need the main executable header, and the section - * table. - */ - shstrtab = elf_map_section(fmap, fmap->elfhdr.e_shstrndx); - if (shstrtab == ELF_NO_MAP) return FALSE; - - symtab_sect = dynsym_sect = stab_sect = stabstr_sect = -1; - debug_sect = debug_str_sect = debug_abbrev_sect = -1; - debug_line_sect = debug_loclist_sect = -1; - debuglink_sect = -1; - - for (i = 0; i < fmap->elfhdr.e_shnum; i++) - { - if (strcmp(shstrtab + fmap->sect[i].shdr.sh_name, ".stab") == 0) - stab_sect = i; - if (strcmp(shstrtab + fmap->sect[i].shdr.sh_name, ".stabstr") == 0) - stabstr_sect = i; - if (strcmp(shstrtab + fmap->sect[i].shdr.sh_name, ".debug_info") == 0) - debug_sect = i; - if (strcmp(shstrtab + fmap->sect[i].shdr.sh_name, ".debug_str") == 0) - debug_str_sect = i; - if (strcmp(shstrtab + fmap->sect[i].shdr.sh_name, ".debug_abbrev") == 0) - debug_abbrev_sect = i; - if (strcmp(shstrtab + fmap->sect[i].shdr.sh_name, ".debug_line") == 0) - debug_line_sect = i; - if (strcmp(shstrtab + fmap->sect[i].shdr.sh_name, ".debug_loc") == 0) - debug_loclist_sect = i; - if (strcmp(shstrtab + fmap->sect[i].shdr.sh_name, ".gnu_debuglink") == 0) - debuglink_sect = i; - if ((strcmp(shstrtab + fmap->sect[i].shdr.sh_name, ".symtab") == 0) && - (fmap->sect[i].shdr.sh_type == SHT_SYMTAB)) - symtab_sect = i; - if ((strcmp(shstrtab + fmap->sect[i].shdr.sh_name, ".dynsym") == 0) && - (fmap->sect[i].shdr.sh_type == SHT_DYNSYM)) - dynsym_sect = i; - } - elf_unmap_section(fmap, fmap->elfhdr.e_shstrndx); - shstrtab = NULL; - - if (symtab_sect == -1) - { - /* if we don't have a symtab but a dynsym, process the dynsym - * section instead. It'll contain less (relevant) information, - * but it'll be better than nothing - */ - if (dynsym_sect == -1) return FALSE; - symtab_sect = dynsym_sect; - } - module->module.SymType = SymExport; /* create a hash table for the symtab */ - elf_hash_symtab(module, pool, ht_symtab, fmap, symtab_sect, thunks); + elf_hash_symtab(module, pool, ht_symtab, fmap, thunks); if (!(dbghelp_options & SYMOPT_PUBLICS_ONLY)) { - if (stab_sect != -1 && stabstr_sect != -1) + struct elf_section_map stab_sect, stabstr_sect; + struct elf_section_map debug_sect, debug_str_sect, debug_abbrev_sect, + debug_line_sect, debug_loclist_sect; + struct elf_section_map debuglink_sect; + + if (elf_find_section(fmap, ".stab", SHT_NULL, &stab_sect) && + elf_find_section(fmap, ".stabstr", SHT_NULL, &stabstr_sect)) { const char* stab; const char* stabstr; - stab = elf_map_section(fmap, stab_sect); - stabstr = elf_map_section(fmap, stabstr_sect); + stab = elf_map_section(&stab_sect); + stabstr = elf_map_section(&stabstr_sect); if (stab != ELF_NO_MAP && stabstr != ELF_NO_MAP) { /* OK, now just parse all of the stabs. */ lret = stabs_parse(module, module->elf_info->elf_addr, - stab, elf_get_map_size(fmap, stab_sect), - stabstr, elf_get_map_size(fmap, stabstr_sect)); + stab, elf_get_map_size(&stab_sect), + stabstr, elf_get_map_size(&stabstr_sect)); if (lret) /* and fill in the missing information for stabs */ elf_finish_stabs_info(module, ht_symtab); @@ -1026,11 +1028,10 @@ static BOOL elf_load_debug_info_from_map ret = ret || lret; } else lret = FALSE; - elf_unmap_section(fmap, stab_sect); - elf_unmap_section(fmap, stabstr_sect); - + elf_unmap_section(&stab_sect); + elf_unmap_section(&stabstr_sect); } - if (debug_sect != -1) + if (elf_find_section(fmap, ".debug_info", SHT_NULL, &debug_sect)) { /* Dwarf 2 debug information */ const BYTE* dw2_debug; @@ -1041,36 +1042,41 @@ static BOOL elf_load_debug_info_from_map TRACE("Loading Dwarf2 information for %s\n", module->module_name); - dw2_debug = (const BYTE*) elf_map_section(fmap, debug_sect); - dw2_debug_abbrev = (const BYTE*) elf_map_section(fmap, debug_abbrev_sect); - dw2_debug_str = (const BYTE*) elf_map_section(fmap, debug_str_sect); - dw2_debug_line = (const BYTE*) elf_map_section(fmap, debug_line_sect); - dw2_debug_loclist = (const BYTE*) elf_map_section(fmap, debug_loclist_sect); + elf_find_section(fmap, ".debug_str", SHT_NULL, &debug_str_sect); + elf_find_section(fmap, ".debug_abbrev", SHT_NULL, &debug_abbrev_sect); + elf_find_section(fmap, ".debug_line", SHT_NULL, &debug_line_sect); + elf_find_section(fmap, ".debug_loc", SHT_NULL, &debug_loclist_sect); + + dw2_debug = (const BYTE*)elf_map_section(&debug_sect); + dw2_debug_abbrev = (const BYTE*)elf_map_section(&debug_abbrev_sect); + dw2_debug_str = (const BYTE*)elf_map_section(&debug_str_sect); + dw2_debug_line = (const BYTE*)elf_map_section(&debug_line_sect); + dw2_debug_loclist = (const BYTE*)elf_map_section(&debug_loclist_sect); if (dw2_debug != ELF_NO_MAP && dw2_debug_abbrev != ELF_NO_MAP && dw2_debug_str != ELF_NO_MAP) { /* OK, now just parse dwarf2 debug infos. */ lret = dwarf2_parse(module, module->elf_info->elf_addr, thunks, - dw2_debug, elf_get_map_size(fmap, debug_sect), - dw2_debug_abbrev, elf_get_map_size(fmap, debug_abbrev_sect), - dw2_debug_str, elf_get_map_size(fmap, debug_str_sect), - dw2_debug_line, elf_get_map_size(fmap, debug_line_sect), - dw2_debug_loclist, elf_get_map_size(fmap, debug_loclist_sect)); + dw2_debug, elf_get_map_size(&debug_sect), + dw2_debug_abbrev, elf_get_map_size(&debug_abbrev_sect), + dw2_debug_str, elf_get_map_size(&debug_str_sect), + dw2_debug_line, elf_get_map_size(&debug_line_sect), + dw2_debug_loclist, elf_get_map_size(&debug_loclist_sect)); if (!lret) WARN("Couldn't correctly read stabs\n"); ret = ret || lret; } - elf_unmap_section(fmap, debug_sect); - elf_unmap_section(fmap, debug_abbrev_sect); - elf_unmap_section(fmap, debug_str_sect); - elf_unmap_section(fmap, debug_line_sect); - elf_unmap_section(fmap, debug_loclist_sect); + elf_unmap_section(&debug_sect); + elf_unmap_section(&debug_abbrev_sect); + elf_unmap_section(&debug_str_sect); + elf_unmap_section(&debug_line_sect); + elf_unmap_section(&debug_loclist_sect); } - if (debuglink_sect != -1) + if (elf_find_section(fmap, ".gnu_debuglink", SHT_NULL, &debuglink_sect)) { const BYTE* dbg_link; - dbg_link = (const BYTE*) elf_map_section(fmap, debuglink_sect); + dbg_link = (const BYTE*)elf_map_section(&debuglink_sect); if (dbg_link != ELF_NO_MAP) { lret = elf_debuglink_parse(module, pool, ht_symtab, dbg_link); @@ -1079,7 +1085,7 @@ static BOOL elf_load_debug_info_from_map debugstr_w(module->module.ModuleName)); ret = ret || lret; } - elf_unmap_section(fmap, debuglink_sect); + elf_unmap_section(&debuglink_sect); } } if (strstrW(module->module.ModuleName, S_ElfW) || @@ -1163,7 +1169,6 @@ static BOOL elf_load_file(struct process { BOOL ret = FALSE; struct elf_file_map fmap; - int i; TRACE("Processing elf file '%s' at %08lx\n", debugstr_w(filename), load_offset); @@ -1185,33 +1190,29 @@ static BOOL elf_load_file(struct process if (elf_info->flags & ELF_INFO_DEBUG_HEADER) { - const char* shstrtab = elf_map_section(&fmap, fmap.elfhdr.e_shstrndx); - if (shstrtab == ELF_NO_MAP) goto leave; - for (i = 0; i < fmap.elfhdr.e_shnum; i++) + struct elf_section_map esm; + + if (elf_find_section(&fmap, ".dynamic", SHT_DYNAMIC, &esm)) { - if (strcmp(shstrtab + fmap.sect[i].shdr.sh_name, ".dynamic") == 0 && - fmap.sect[i].shdr.sh_type == SHT_DYNAMIC) - { - Elf32_Dyn dyn; - char* ptr = (char*)fmap.sect[i].shdr.sh_addr; - unsigned long len; + Elf32_Dyn dyn; + char* ptr = (char*)fmap.sect[esm.sidx].shdr.sh_addr; + unsigned long len; - do + do + { + if (!ReadProcessMemory(pcs->handle, ptr, &dyn, sizeof(dyn), &len) || + len != sizeof(dyn)) + goto leave; + if (dyn.d_tag == DT_DEBUG) { - if (!ReadProcessMemory(pcs->handle, ptr, &dyn, sizeof(dyn), &len) || - len != sizeof(dyn)) - goto leave; - if (dyn.d_tag == DT_DEBUG) - { - elf_info->dbg_hdr_addr = dyn.d_un.d_ptr; - break; - } - ptr += sizeof(dyn); - } while (dyn.d_tag != DT_NULL); - if (dyn.d_tag == DT_NULL) goto leave; - } + elf_info->dbg_hdr_addr = dyn.d_un.d_ptr; + break; + } + ptr += sizeof(dyn); + } while (dyn.d_tag != DT_NULL); + if (dyn.d_tag == DT_NULL) goto leave; } - elf_unmap_section(&fmap, fmap.elfhdr.e_shstrndx); + elf_end_find(&fmap); } if (elf_info->flags & ELF_INFO_MODULE) # This series applies on GIT commit a52c2c0dfe3deaa872fe10c751447844e73dcdef dbghelp-elf-map dbghelp-elf-alternate dbghelp-elf-link-alternate

Feb. 24, 2007

Re: [6/13]D3D: Index buffer fixes

by Mirek

Stefan Dösinger napsal(a): > Am Freitag 23 Februar 2007 21:44 schrieb Mirek: >> Thanks! This patch fixed Oblivion and even Flatout 2! > Cool. > > I wonder why disabling index buffer vbos entirely didn't fix flatout 2 :-O > I sense that there will be some more regressions on cards that do not support > vbos. Yes, it is realy strange, I tested it twice with same results. But now i tried it again, I first run 3D setup for Flatout 2, and after that game starts without any problems only with return; added in CreateIndexBufferVBO(). So it looks like it should work on cards without fbo. Mirek

Feb. 24, 2007

Re: xcopy try 2

by David Laight

On Sat, Feb 24, 2007 at 01:00:06AM +0100, Detlef Riekenberg wrote: > > +C_SRCS = \ > + xcopy.c > > Spaces are wrong before the filename. You must use TAB in makefiles That is a contiuation line, IIRC the whitespace at the start of the continued line should be discarded (and can be space/tab anyway). David -- David Laight: david(a)l8s.co.uk

Feb. 24, 2007

Re: winex11.drv: Catch and report screen resolution change errors.

by Vitaliy Margolen

> winex11.drv: Catch and report screen resolution change errors. This patch brakes Half-life based games in virtual desktop. Vitaliy.

Feb. 24, 2007

Re: Update on msi JScript/VBScript support functions

by Misha Koshelev

Ok nevermind about the IE6 requirement. Windows Script 5.6 needs mfc42.dll to install properly, that is all that is required with my patch for Vector NTI then: 1. Copy mfc42.dll to .wine/drive_c/windows/system32 2. Run the Vector NTI installer Yay, down from like 20 steps :) Misha

Feb. 23, 2007

Re: Update on msi JScript/VBScript support functions

by Misha Koshelev

On Fri, 2007-02-23 at 19:22 -0600, Misha Koshelev wrote: > On Fri, 2007-02-23 at 19:20 -0600, Misha Koshelev wrote: > > Hi, just wanted to update everybody on my work with this, sorry I have > > not been good at replying to personal emails lately. I am not currently > > attaching any code but will clean things up and then submit my patches > > to wine-patches soon. > > > > So, the good news is that, as a proof of concept, I have gotten the > > Vector NTI installer to work successfully, which requires the JScript > > functionality. Specifically, this tests custom actions 5/6 and 37/38, > > there are two other sets that would be nice to test (but it is all the > > same script handler so it should work). > > > > Also, to make this work, I had to implement the OLE automation > > interface. Now, I have not implemented the entire interface yet, but I > > have made the entire .tlb file for this and made a framework which makes > > implementing everything fairly straightforward (and everything is a > > wrapper around the existing MSI database functions, so there is no > > actual functionality, it is just adding new cases to the switch > > statements that call the MSI database functions appropriately). > > > > Basically, because of the MSI design where everything that is an object > > has an MSIHANDLE, I have made one Automation Object that each specific > > object "inherits" from by implementing its invoke function (minus basic > > parameter checking, etc. which is all done by the automation object) and > > passing it to create_automation_object with its CLSID. It is pretty easy > > to implement more functions, and I will try to keep on adding more, > > probably as patches that I will periodically send to wine-patches. > > > > Anyhow, look for my first patches in the next couple of days. > > > > Misha > > Almost forgot, one big caveat is right now for some reason Microsoft > Script 5.6 does not install properly on wine either (bummer), it looks > for some Scriptable.Dictionary (I am writing this from memory) object, > doesn't find it, and then doesn't want to run the script, so currently > one needs to install IE6 first to get Microsoft Script to work properly. > But in any case IE6 < IE6+native MSI which was required before, and I > think tracking down the Microsoft Script installation problem should not > be too bad. > > Misha Okay, even though I said no code yet I actually didn't have that much cleaning to do, and here are the patches I am thinking of submitting. I would like to test these with an MSI file that has the other two scripting custom action types (script in an installed file and script in a property, already tested script in an MSI binary and script in the target field of the custom action table) though. Let me know what ppl think. Also, just to comment on the IE6 requirement with the Microsoft Script 5.6, it actually is not just a requirement of my patches to the wine MSI, but is required by native MSI as well, at least to install Vector NTI (native MSI complains about scripting and does not finish installing if I install Microsoft Script from the MS website or with the MS script that it comes bundled with and installed; however ,with IE6 it installs fine, and, as I said previously, there is something about a missing Dictionary entry in the registry in the logs, so I will have to look into it). In any case, the first patch can be applied by itself, but the other two must be applied together. Look at the bottom of automation.c to see how easy it will be to fill in all the other OLE automation functions (easy but a little tedious, mostly because of time checking things on MSDN; also QA is hard to do as all the tests would have to be wine_todo since wine has no native scripting engine) - I think these would be separate patches though. Anyhow, let me stress that these patches fix bug #7357 and possibly other installer bugs that require scripting or allow them to be easily fixed by implementing a few more OLE automation functions (when an unhandled function is called this triggers a FIXME with the function name and CLSID of the object, and as I mentioned they are all wrappers around already implemented functions anyway). Misha

Feb. 23, 2007

Re: Update on msi JScript/VBScript support functions

by Misha Koshelev

On Fri, 2007-02-23 at 19:20 -0600, Misha Koshelev wrote: > Hi, just wanted to update everybody on my work with this, sorry I have > not been good at replying to personal emails lately. I am not currently > attaching any code but will clean things up and then submit my patches > to wine-patches soon. > > So, the good news is that, as a proof of concept, I have gotten the > Vector NTI installer to work successfully, which requires the JScript > functionality. Specifically, this tests custom actions 5/6 and 37/38, > there are two other sets that would be nice to test (but it is all the > same script handler so it should work). > > Also, to make this work, I had to implement the OLE automation > interface. Now, I have not implemented the entire interface yet, but I > have made the entire .tlb file for this and made a framework which makes > implementing everything fairly straightforward (and everything is a > wrapper around the existing MSI database functions, so there is no > actual functionality, it is just adding new cases to the switch > statements that call the MSI database functions appropriately). > > Basically, because of the MSI design where everything that is an object > has an MSIHANDLE, I have made one Automation Object that each specific > object "inherits" from by implementing its invoke function (minus basic > parameter checking, etc. which is all done by the automation object) and > passing it to create_automation_object with its CLSID. It is pretty easy > to implement more functions, and I will try to keep on adding more, > probably as patches that I will periodically send to wine-patches. > > Anyhow, look for my first patches in the next couple of days. > > Misha Almost forgot, one big caveat is right now for some reason Microsoft Script 5.6 does not install properly on wine either (bummer), it looks for some Scriptable.Dictionary (I am writing this from memory) object, doesn't find it, and then doesn't want to run the script, so currently one needs to install IE6 first to get Microsoft Script to work properly. But in any case IE6 < IE6+native MSI which was required before, and I think tracking down the Microsoft Script installation problem should not be too bad. Misha

Feb. 23, 2007

Update on msi JScript/VBScript support functions

by Misha Koshelev

Hi, just wanted to update everybody on my work with this, sorry I have not been good at replying to personal emails lately. I am not currently attaching any code but will clean things up and then submit my patches to wine-patches soon. So, the good news is that, as a proof of concept, I have gotten the Vector NTI installer to work successfully, which requires the JScript functionality. Specifically, this tests custom actions 5/6 and 37/38, there are two other sets that would be nice to test (but it is all the same script handler so it should work). Also, to make this work, I had to implement the OLE automation interface. Now, I have not implemented the entire interface yet, but I have made the entire .tlb file for this and made a framework which makes implementing everything fairly straightforward (and everything is a wrapper around the existing MSI database functions, so there is no actual functionality, it is just adding new cases to the switch statements that call the MSI database functions appropriately). Basically, because of the MSI design where everything that is an object has an MSIHANDLE, I have made one Automation Object that each specific object "inherits" from by implementing its invoke function (minus basic parameter checking, etc. which is all done by the automation object) and passing it to create_automation_object with its CLSID. It is pretty easy to implement more functions, and I will try to keep on adding more, probably as patches that I will periodically send to wine-patches. Anyhow, look for my first patches in the next couple of days. Misha

Feb. 23, 2007

Re: [1/2] comctl32: add WM_PAINT message sequence tests

by James Hawkins

On 2/23/07, Felix Nawothnig <flexo(a)holycrap.org> wrote: > James Hawkins wrote: > > If you're subclassing the header control and checking messages from > > the header control, then you need to add another message sequence, > > HEADER_SEQ_INDEX. > > Problem is I need to test whether the header msgs are sent between the > WM_PAINT and WM_NOTIFY of the listview - right now the > WM_PAINT/WM_NCPAINT/WM_ERASEBKGND _are_ sent - just not in between but > after WM_PAINT processing (which causes the flickering). > > I agree that the "hdr" flag is kinda hackish, any idea how to properly > abstract away what I'm trying to do? > Patch is attached. If you send it in to wine-patches, you need to put both our names in the Changelog. -- James Hawkins

Feb. 23, 2007

Re: xcopy try 2

by Detlef Riekenberg

On Fr, 2007-02-23 at 16:44 +0000, Ann & Jason Edmeades wrote: Looks nice, but a view over the code result in some more comments: --- a/configure.ac +++ b/configure.ac Not needed, when sending the Patch (and that line causes already an offset, when patching wine) "tools/make_makefiles" takes care of all required changes and when Alexandre commit your Patch, the changes from make_makefiles and autoconf are included in the commit. +EXTRADEFS = -DUNICODE There is no need for that define. Remove that line to get a warning for all ANSI-Functions, that missed the "W" +C_SRCS = \ + xcopy.c Spaces are wrong before the filename. You must use TAB in makefiles +/* Prototypes */ This can be avoided completly, when you rearange your functions (so main() is then the last function in the file) + printf("Invalid number of parameters - Use xcopy /? for help\n"); The text should be read from the resources, so it can be localized . You should convert the UNICODE-Message with WideCharToMultiByte. When the output-handle is the console, printing UNICODE-messages avoid converting the message twice (xcopy and kernel32) > + if (*argvW[0] != '/') { > + if (suppliedsource[0] == 0x00) { > + lstrcpyW(suppliedsource, *argvW); > + } else { > + lstrcpyW(supplieddestination, *argvW); > + } This is wrong. tested with: "xcopy file1 file2 file3" Your code would copy file1 to file3, while w2k fails with "Unzulässige Parameteranzahl" (Invalid number of parameters) I suggest to initialize supplieddestination as empty string and copy the arg to supplieddestination only, when it is emtpy. When supplieddestination was not empty, quit with the error. You need to fill supplieddestination with the default "." before /* Trace out the supplied information */, when it is still empty at that location. + if (flags & OPT_SIMULATE) { + printf("%d file(s) would be copied\n", filesCopied); + } else { + printf("%d file(s) copied\n", filesCopied); + } As Above: Format-Pattern from the resource and WriteFile() + if (GetFullPathName(suppliedsource, MAX_PATH, "W" missing: => GetFullPathNameW (More Functions in various locations and WIN32_FIND_DATA => WIN32_FIND_DATAW) I did not test the code very much, but I think, you did. (ToDo-Reminder: "xcopy file1 name_not_found" => is "name_not_found" a file or a directory) Thanks for your work. It's pretty good as start! -- By by ... Detlef

Feb. 23, 2007

Re: [1/2] comctl32: add WM_PAINT message sequence tests

by Felix Nawothnig

James Hawkins wrote: > If you're subclassing the header control and checking messages from > the header control, then you need to add another message sequence, > HEADER_SEQ_INDEX. Problem is I need to test whether the header msgs are sent between the WM_PAINT and WM_NOTIFY of the listview - right now the WM_PAINT/WM_NCPAINT/WM_ERASEBKGND _are_ sent - just not in between but after WM_PAINT processing (which causes the flickering). I agree that the "hdr" flag is kinda hackish, any idea how to properly abstract away what I'm trying to do? Felix

Feb. 23, 2007

Message spy log viewer

by Felix Nawothnig

Hi. I just figured I never told anyone (did I?) - a while ago I wrote a Ruby/GTK2 tool to parse +message logs (along with other channels mixed in) and display them in a treeview - makes debugging message related problems much easier. I suppose others wrote similar scripts for their own use - but maybe someone will find it useful nevertheless: http://users.holycrap.org/flexo/spy.rb Use like: $ WINEDEBUG="+message" wine foo.exe 2>log $ ruby spy.rb log Felix

Feb. 23, 2007

Re: [1/2] comctl32: add WM_PAINT message sequence tests

by James Hawkins

On 2/23/07, Felix Nawothnig <flexo(a)holycrap.org> wrote: > Passed on XP SP2. > --- > dlls/comctl32/tests/listview.c | 209 > +++++++++++++++++++++++++++++++++++++++- > dlls/comctl32/tests/msg.c | 3 + > dlls/comctl32/tests/msg.h | 3 +- > 3 files changed, 211 insertions(+), 4 deletions(-) > This is wrong: +static LRESULT WINAPI header_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + struct subclass_info *info = (struct subclass_info *)GetWindowLongA(hwnd, GWL_USERDATA); + static long defwndproc_counter = 0; + LRESULT ret; + struct message msg; + + trace("header: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam); + + msg.message = message; + msg.flags = sent|wparam|lparam|hdr; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(sequences, LISTVIEW_SEQ_INDEX, &msg); + + defwndproc_counter++; + ret = CallWindowProcA(info->oldproc, hwnd, message, wParam, lParam); + defwndproc_counter--; + return ret; +} If you're subclassing the header control and checking messages from the header control, then you need to add another message sequence, HEADER_SEQ_INDEX. --- a/dlls/comctl32/tests/msg.c +++ b/dlls/comctl32/tests/msg.c @@ -158,6 +158,9 @@ void ok_sequence_(struct msg_sequence ** ok_(file, line) ((expected->flags & winevent_hook) == (actual->flags & winevent_hook), "%s: the msg 0x%04x should have been sent by a winevent hook\n", context, expected->message); + ok_(file, line) ((expected->flags & hdr) == (actual->flags & hdr), + "%s: the msg 0x%04x should have been sent by the header control\n", + context, expected->message); expected++; actual++; } msg.c is the message sequence testing code abstracted...keyword is abstraction. Nothing in msg.c should know anything about specific types of controls. -- James Hawkins

Feb. 23, 2007

Re: Sound problems with Alice

by Ben Hodgetts (Enverex)

Please use bugs.winehq.org for things like this, not the mailing list. It's a bug and should be reported so it can be fixed, it will just get lost or ignored on the mailing list. Ex. gslink wrote: > In the past I have always used the demo version of the game Alice to > test Wine. Recently I loaded a Wine installation and found the game > had no sound. After considerable testing it appears that about a year > ago a change was made in Wine that killed the sound. Has anyone else > had this problem and does it affect anything else? On my loads most > other things seem to have sound. > >

Feb. 23, 2007

Re: [6/13]D3D: Index buffer fixes

by Stefan Dösinger

Am Freitag 23 Februar 2007 21:44 schrieb Mirek: > Thanks! This patch fixed Oblivion and even Flatout 2! Cool. I wonder why disabling index buffer vbos entirely didn't fix flatout 2 :-O I sense that there will be some more regressions on cards that do not support vbos.

Feb. 23, 2007

Re: [6/13]D3D: Index buffer fixes

by Mirek

Thanks! This patch fixed Oblivion and even Flatout 2! Mirek Stefan Dösinger napsal(a): > Am Freitag 23 Februar 2007 21:20 schrieb Mirek: >> Stefan Dösinger napsal(a): >>> Am Mittwoch 21 Februar 2007 00:22 schrieb Mirek: >>>> Some games are still broken with latest 13 patches from your tree. >>>> Oblivion still hangs while loading game and Flatout 2 crashed after 2 >>>> seconds with this output: >>> Can you try to add a return; at the beginning of CreateIndexBufferVBO() >>> in dlls/wined3d/device.c, before the ENTER_GL()? If that does not fix the >>> regressions then some different patches added other breakage. >> Hi, regression in Flatout 2 is bigger i should do regression testing and >> find patch which broke start of game, this doesn't fix it, but Oblivion >> with this hack works without problems (23.02.2007 CVS). >> >> Mirek > Can you test the attached patch with oblivion? > > > > ------------------------------------------------------------------------ > > From faa5d7a0b710ded8f49db6337eb880cc4cd05e8b Mon Sep 17 00:00:00 2001 > From: Stefan Doesinger <stefan(a)codeweavers.com> > Date: Fri, 23 Feb 2007 17:16:56 +0100 > Subject: [PATCH] WineD3D: Index buffer creation adjustments > > Index buffer creation changes the bound gl buffer, thus the state has to > be dirtified, simmilar to locking > > In an error case the function returned without calling LEAVE_GL() > --- > dlls/wined3d/device.c | 8 ++++++-- > 1 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c > index b1e9c2d..500a857 100644 > --- a/dlls/wined3d/device.c > +++ b/dlls/wined3d/device.c > @@ -447,6 +447,11 @@ static void CreateIndexBufferVBO(IWineD3DDeviceImpl *This, IWineD3DIndexBufferIm > GLenum error, glUsage; > TRACE("Creating VBO for Index Buffer %p\n", object); > > + /* The following code will modify the ELEMENT_ARRAY_BUFFER binding, make sure it is > + * restored on the next draw > + */ > + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_INDEXBUFFER); > + > ENTER_GL(); > while(glGetError()); > > @@ -454,8 +459,7 @@ static void CreateIndexBufferVBO(IWineD3DDeviceImpl *This, IWineD3DIndexBufferIm > error = glGetError(); > if(error != GL_NO_ERROR || object->vbo == 0) { > ERR("Creating a vbo failed, continueing without vbo for this buffer\n"); > - object->vbo = 0; > - return; > + goto out; > } > > GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, object->vbo));

Feb. 23, 2007

Re: [6/13]D3D: Index buffer fixes

by Stefan Dösinger

Am Freitag 23 Februar 2007 21:20 schrieb Mirek: > Stefan Dösinger napsal(a): > > Am Mittwoch 21 Februar 2007 00:22 schrieb Mirek: > >> Some games are still broken with latest 13 patches from your tree. > >> Oblivion still hangs while loading game and Flatout 2 crashed after 2 > >> seconds with this output: > > > > Can you try to add a return; at the beginning of CreateIndexBufferVBO() > > in dlls/wined3d/device.c, before the ENTER_GL()? If that does not fix the > > regressions then some different patches added other breakage. > > Hi, regression in Flatout 2 is bigger i should do regression testing and > find patch which broke start of game, this doesn't fix it, but Oblivion > with this hack works without problems (23.02.2007 CVS). > > Mirek Can you test the attached patch with oblivion?

Feb. 23, 2007

Re: msi: Free the data for type msidbCustomActionTypeContinue custom actions after DllThread executes

by James Hawkins

On 2/23/07, James Hawkins <truiken(a)gmail.com> wrote: > Hi, > > This fixes bug 7461. http://bugs.winehq.org/show_bug.cgi?id=7461 > > Changelog: > * Free the data for type msidbCustomActionTypeContinue custom actions > after DllThread executes. > > dlls/msi/custom.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > Please ignore this patch. It's not exactly correct. -- James Hawkins

Feb. 23, 2007

Re: [6/13]D3D: Index buffer fixes

by Mirek

Stefan Dösinger napsal(a): > Am Mittwoch 21 Februar 2007 00:22 schrieb Mirek: >> Some games are still broken with latest 13 patches from your tree. >> Oblivion still hangs while loading game and Flatout 2 crashed after 2 >> seconds with this output: > Can you try to add a return; at the beginning of CreateIndexBufferVBO() in > dlls/wined3d/device.c, before the ENTER_GL()? If that does not fix the > regressions then some different patches added other breakage. > Hi, regression in Flatout 2 is bigger i should do regression testing and find patch which broke start of game, this doesn't fix it, but Oblivion with this hack works without problems (23.02.2007 CVS). Mirek

Feb. 23, 2007

RE: unicoding xcopy - question on wcschr

by Ann & Jason Edmeades

For reference: 'obviously'... adding this line to the makefile solves it MODCFLAGS = -fno-builtin (Copied from msvcrt\tests) Jason

Feb. 23, 2007

Re: [6/13]D3D: Index buffer fixes

by Stefan Dösinger

Am Mittwoch 21 Februar 2007 00:22 schrieb Mirek: > Some games are still broken with latest 13 patches from your tree. > Oblivion still hangs while loading game and Flatout 2 crashed after 2 > seconds with this output: Can you try to add a return; at the beginning of CreateIndexBufferVBO() in dlls/wined3d/device.c, before the ENTER_GL()? If that does not fix the regressions then some different patches added other breakage.

Feb. 23, 2007

unicoding xcopy - question on wcschr

by Ann & Jason Edmeades

Hi, Trying to convert my xcopy to Unicode proved simple on windows, but when putting into wine has proved more interesting. Most of the wide string calls are like lstrcmpW and they all work fine, but I really need the Unicode equivalent to strchr and strrchr. As far as I can tell my only option is wcschr. If I build as-is, I get errors saying wcschr is implicitly defined but the link etc is all ok (from a url http://fgouget.free.fr/wine/PrgApps/Chap7.shtml#filerev it implies this is because I am using the GNU C headers, and they don't define it in string.h). Grepping the source, I can only find a hit inside the msvcrt/string.h or wchar.h. If I add to the makefile EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt, to ensure I pick up the wine headers, I now get warnings like: ./../include/msvcrt/ctype.h:72: warning: conflicting types for built-in function 'iswalnum' How do I #include / link a program using this function? It all just worked under windows :-) Jason

Feb. 23, 2007

Re: Progress in implementation of Direct3D

by Stefan Dösinger

> http://headline.czela.net/Mirek/wine/ > > or via IP: http://62.240.181.87/Mirek/wine/ Hey, cool screenshots :-)

Feb. 23, 2007

Re: 0.9.31 not suitable for gaming

by Stefan Dösinger

Am Donnerstag 22 Februar 2007 16:46 schrieb Stefan Dösinger: > That said, this is a Direct3D7 application, where the window setup is done > BEFORE creating the Direct3D device(which calls Init3D in wined3d). So I > gather that SetupFullscreenWindow should not be called during Init3D in the > d3d7 case because the window and fullscreen setting are not changed. > Setting window parameters there may cause signals to be sent to the > application that cause crashes in the app. So I think the question is why > SetupFullscreenWindow is called at all. I have to correct myself, Init3D is not called when the application creates the Direct3DDevice7, it is called when a primary surface with 3D capatiblities is created(or any caps when the opengl ddraw renderer is selected).

Feb. 23, 2007

Sound problems with Alice

by gslink

In the past I have always used the demo version of the game Alice to test Wine. Recently I loaded a Wine installation and found the game had no sound. After considerable testing it appears that about a year ago a change was made in Wine that killed the sound. Has anyone else had this problem and does it affect anything else? On my loads most other things seem to have sound.

Feb. 23, 2007

Re: How complete will Wine ever be for older apps?

by Damjan Jovanovic

On 2/22/07, Juan Lang <juan_lang(a)yahoo.com> wrote: > > I'm just trying to build up a picture in my head of whether there > > will come a day when Wine users can pick an app designed for a > > previous generation of Windows and expect it to work flawlessly > > (ignoring things that try to manipulate the hardware directly, I > > suppose)? Or will there always be incompatibilities? > > There will (likely) always be incompatibilities. Wine development has > always been driven by app compatibility - someone picks an app and tries > to run it, and tries to fix problems they come across. We don't aim for > feature completeness - Windows is far, far too big to replicate with the > resources we have. So, some apps (the ones developers have worked on, and > likely others) will work quite well, while others (those that haven't been > worked on) may not work as well. Many older apps do work well on wine. In fact, older apps usually work better than the newer ones. We don't need to replicate all of Windows for apps to work properly - just enough. Only a relatively small amount of functionality is required - look at NTDLL, only a tiny fraction of its 1000 or so functions are implemented at the moment, as few are needed. Look at what Microsoft did for Windows Vista: a year or so ago, the application compatibility was only 40% or so (there was a joke that wine runs more apps than Vista :-), and in that year, it's been improved so much that most apps work. The same can be done, and is being done, for wine. > --Juan Damjan

Feb. 23, 2007

RE: a big fan (now with bad news)

by Joris Huizer

--- Jeffrey Sabarese <core5fedora(a)gmail.com> wrote: > > I tried [ yum remove wine ], and then [yum install > wine] which went > without a hitch, but there's no change in my Primary > User (the broken > one) > HOWEVER, WinE continues to run perfectly under other > user accounts, and ROOT. > The wine configuration is in ~/.wine Remove/rename it for a fresh start. Wine will automatically recreate the ~/.wine directory with required contents for normal functionality (but then you need to do installation of every program again) ____________________________________________________________________________________ Yahoo! Music Unlimited Access over 1 million songs. http://music.yahoo.com/unlimited

Feb. 23, 2007

Re: winex11.drv: Set the refresh rate for the virtual desktop to 60

by H. Verbeet

On 23/02/07, Marcus Meissner <meissner(a)suse.de> wrote: > On Fri, Feb 23, 2007 at 10:55:21AM +0100, H. Verbeet wrote: > > On 23/02/07, Alexandre Julliard <julliard(a)winehq.org> wrote: > > >In what case would you need to configure this? Can't we simply > > >hardcode a couple of standard values? > > > > > Mostly for broken games that want specific values :-) > > But yeah, hardcoding standard values probably goes a long way. > > The RandR extension might help here too. Not for virtual desktop mode. Normal fullscreen mode works fine as long as your xorg.conf is setup properly, but virtual desktop currently reports 0 for the refresh rate. Unless you're suggesting getting a list of resolutions and refresh rates from XRandR?

Feb. 23, 2007

Re: winex11.drv: Set the refresh rate for the virtual desktop to 60

by Marcus Meissner

On Fri, Feb 23, 2007 at 10:55:21AM +0100, H. Verbeet wrote: > On 23/02/07, Alexandre Julliard <julliard(a)winehq.org> wrote: > >In what case would you need to configure this? Can't we simply > >hardcode a couple of standard values? > > > Mostly for broken games that want specific values :-) > But yeah, hardcoding standard values probably goes a long way. The RandR extension might help here too. Ciao, Marcus

Feb. 23, 2007

Re: winex11.drv: Set the refresh rate for the virtual desktop to 60

by H. Verbeet

On 23/02/07, Alexandre Julliard <julliard(a)winehq.org> wrote: > In what case would you need to configure this? Can't we simply > hardcode a couple of standard values? > Mostly for broken games that want specific values :-) But yeah, hardcoding standard values probably goes a long way.

Feb. 23, 2007

Re: winex11.drv: Set the refresh rate for the virtual desktop to 60

by Alexandre Julliard

"H. Verbeet" <hverbeet(a)gmail.com> writes: > On 23/02/07, Jan Zerebecki <jan.wine(a)zerebecki.de> wrote: >> From: Jan Zerebecki <jan.wine(a)zerebecki.de> >> Changelog: >> winex11.drv: Set the refresh rate for the virtual desktop to 60 >> instead of 0. If HKCU\Software\Wine\X11 Driver\FakeRefreshRate is >> set, it is interpreted as a comma delimited list of refresh rates >> to use instead. >> --- > Perhaps there should be a winecfg option for this, together with the > one that already exists for the resolution. In what case would you need to configure this? Can't we simply hardcode a couple of standard values? -- Alexandre Julliard julliard(a)winehq.org

Feb. 23, 2007

RE: a big fan (now with bad news)

by Jeffrey Sabarese

hello there! thanks to all of you who replied to my inquiry about "ies4linux" vs compatibility w/ such "Windows-native" apps as Bradbury "TopStyle", HomeSite, etc... As Joris stated, IE6 sp1 is available at the MS site. I downloaded my own copy, but i haven't tried it yet because i think i "ruined" my WinE this evening. HOW? as my UserID (NOT as root), i "re installed" the [.reg] files in the ies4linux "faux directories" (as in a command such as :: [ wine '../win.reg' ]) . I tried [ yum remove wine ], and then [yum install wine] which went without a hitch, but there's no change in my Primary User (the broken one) HOWEVER, WinE continues to run perfectly under other user accounts, and ROOT. My QUESTION: How do i "restore" my WinE to a working state for my UserID? (because only UserID is affected) I wish to not destroy my Program Files while "repairing" WinE around it--- if possible. >From the primary UserID only, i can NOT launch [ winecfg.exe ] for example in terminal, or anything WinE that i can tell. ([while root, and other users were apparently not affected]) please help me to restore my "existing" Program files setup, if possible. it is no "tragedy" if i can not, but i'd like to try. in any event-- i do need to know how to "restore" it, maintaining program files or not. thank you!! best regards, -JS. On 2/21/07, SorinN <nemes.sorin(a)gmail.com> wrote: > Indeed - ies4linux - don't use Wine folders - on other words - it use > winelib but is on other place, where TopStyle and other windows > programs don't know to look. I will try to talk with it's developer to > suggest him to use an existing Wine installation ( is Wine exist > already ). > > > > 2007/2/19, Jeffrey Sabarese <core5fedora(a)gmail.com>: > > hi there! I have to wonder if i don't use WinE more than the "average" > > Fedora Core 5 user. I am forever trying to figure out how to run my > > old Windows apps here in the linux environment, using your incredible > > software. > > -- /* ************************************************ */ Quanta+ Web Development IDE: http://quanta.kdewebdev.org/ Quanta+ Wiki: http://tinyurl.com/3dzqxk Other Quanta Tips: http://invisiblepixels.org/progs/quanta.html /* ************************************************ */

Feb. 23, 2007

Re: winex11.drv: Set the refresh rate for the virtual desktop to 60

by Jan Zerebecki

On Fri, Feb 23, 2007 at 09:35:27AM +0100, H. Verbeet wrote: > On 23/02/07, Jan Zerebecki <jan.wine(a)zerebecki.de> wrote: > >winex11.drv: Set the refresh rate for the virtual desktop to 60 > >instead of 0. If HKCU\Software\Wine\X11 Driver\FakeRefreshRate is > >set, it is interpreted as a comma delimited list of refresh rates > >to use instead. > Perhaps there should be a winecfg option for this, together with the > one that already exists for the resolution. I don't think so. The only use is to make games happy that require a certain refresh rate (which is broken behaviour). If any require a refresh rate besides 60 we should extend the default value. So in the end the option would be of no use for the normal user. Jan

Feb. 23, 2007

Re: winex11.drv: Set the refresh rate for the virtual desktop to 60

by H. Verbeet

On 23/02/07, Jan Zerebecki <jan.wine(a)zerebecki.de> wrote: > From: Jan Zerebecki <jan.wine(a)zerebecki.de> > Changelog: > winex11.drv: Set the refresh rate for the virtual desktop to 60 > instead of 0. If HKCU\Software\Wine\X11 Driver\FakeRefreshRate is > set, it is interpreted as a comma delimited list of refresh rates > to use instead. > --- Perhaps there should be a winecfg option for this, together with the one that already exists for the resolution.

Feb. 23, 2007

Re: xcopy support try 1...

by Nick Law

Can somebody update the latest version number in AppDB to 0.9.31 Thanks Nick

Feb. 22, 2007

Re: xcopy support try 1...

by Detlef Riekenberg

On Do, 2007-02-22 at 21:52 +0000, Ann & Jason Edmeades wrote: > Firstly, I am not sure I have included everything correctly to define a new > directory in the build tree, With git, you only need to add all the new files to the Index ("git-update-index --add programs/xcopy/Makefile.in" as Example) and only that changes should be send. tools/make_makefiles does the rest, so you compile and test your new app. > I have only implemented the basics, Converting to unicode later is much harder. I suggest to use UNICODE from the begining. An example UNICODE console app is "programs/msiexec/*" When you really want to have also an ansi-version (for DOS or win9x as example), you can use TCHAR and test your app with and without "#define UNICODE". UNICODE is prefered and you avoid converting a lot of data, when the app is running. > which is file and subdirectory > copying plus the simple reporting information. The Patch would be even smaller, when you do no copy at all or just do a Filecopy without recursion / Parameter-Parsing (wildcards ) > + * According to http://www.microsoft.com/technet/archive/msdos/comm8.mspx?mfr=true Please remove that ref. Many URLs are a dead link really fast. -- By by ... Detlef

Feb. 22, 2007

Re: ntdll: implement NtAllocateLocallyUniqueId with server call

by Robert Shearman

Juan Lang wrote: > This introduces a warning in trace.c about dump_luid being undeclared. > trace.c seems to be at least partially generated, so I wasn't sure about > sending a patch for it. Let me know how I should handle that and I'll fix > it up. > Hi Juan, dump_luid needs to be in trace.c. As you say, it is partially generated: > /* Everything below this line is generated automatically by > tools/make_requests > */ > /* ### make_requests begin ### */ So just put dump_luid above that line and it'll be fine. -- Rob Shearman

Feb. 22, 2007

Re: 0.9.31 not suitable for gaming

by Detlef Riekenberg

On Mi, 2007-02-21 at 20:31 +0100, Pavel Troller wrote: > Where is SetWindowPos located ? You can find a function with "findfunc" detlef(a)p4:~/wine.cvs/src$ tools/findfunc SetWindowPos dlls/user32/winpos.c:BOOL WINAPI SetWindowPos( and also dlls/winex11.drv/winpos.c:BOOL X11DRV_SetWindowPos -- By by ... Detlef

Feb. 22, 2007

Re: wine.inf: Update the timezone information.

by Francois Gouget

Uwe Bonnes wrote: [...] > How do internaltional version of Windows get the localized names of the > pletora of timezones? Apparently the registry keys and values themselves are translated, at least in NT4. That does not seem scalable at all so I don't know if that's still the approach they use. -- Francois Gouget fgouget(a)codeweavers.com

Feb. 22, 2007

Re: How complete will Wine ever be for older apps?

by Juan Lang

> I'm just trying to build up a picture in my head of whether there > will come a day when Wine users can pick an app designed for a > previous generation of Windows and expect it to work flawlessly > (ignoring things that try to manipulate the hardware directly, I > suppose)? Or will there always be incompatibilities? There will (likely) always be incompatibilities. Wine development has always been driven by app compatibility - someone picks an app and tries to run it, and tries to fix problems they come across. We don't aim for feature completeness - Windows is far, far too big to replicate with the resources we have. So, some apps (the ones developers have worked on, and likely others) will work quite well, while others (those that haven't been worked on) may not work as well. --Juan ____________________________________________________________________________________ TV dinner still cooling? Check out "Tonight's Picks" on Yahoo! TV. http://tv.yahoo.com/

Feb. 22, 2007

Re: WineConf 2007 Fundraiser proposal

by Tom Wickline

On 2/21/07, Tom Wickline <twickline(a)gmail.com> wrote: > > Comments and suggestions are at this time highly suggested! We could have a small WPF "Guidelines" and spell out what we intend to spend any raised funds on/for.. Trying to answer the tough questions at hand! Here is a rough suggestion, please feel free to comment on it! (Q) What will the funds that I donate be spent on? (A) All WPF funds will go toward the goal of the Wine project being a self sufficient entity, from time to time we will need to purchase new servers and have maintenance done on our existing servers. We can also help subsidize the purchase of documentation and programming tools for core developers. But the bulk of the funds will be spent on a yearly conference for developers. (Q) What will the funds that are generated through adsence be spent on? (A) The above answer! (Q) Who is in charge of the WPF funds and distribution? (A) Jeremy White CEO and potentate of CodeWeavers (Q) What role will the WPF play in the conference? (A) The WPF will rent conference facilities, pay for one group meal, and one group outing for social conversation and comradery, sponsor travel expenses for core Wine developers. (Q) Who is eligible for conference sponsorship? (A) The top twenty core developers by lines of code committed to the git tree (Q) How often is eligibility reviewed? (A) On a yearly basis (Q) Who is in charge of the guidelines and how are changes made to it. (A) Changes can only be made by a consciences of the core developers and Jeremy White the overseer of the WPF. ----- The above suggestions and comments are my personal thoughts and suggestions, they should in no way be meant as a consciences or goals set by or of the Wine project. > > Tom >

Feb. 22, 2007

Re: kernel32: Set object security on process object in CreateProcess.

by Robert Shearman

Vitaliy Margolen wrote: > + > + /* set process security */ > + if (ret && psa && psa->lpSecurityDescriptor) > + { > + NTSTATUS status; > + > + status = NtSetSecurityObject( info->hProcess, DACL_SECURITY_INFORMATION, > + psa->lpSecurityDescriptor ); > + ret = status == STATUS_SUCCESS; > + if (!ret) SetLastError( RtlNtStatusToDosError( status ) ); > + } > + > It would be better to pass the security descriptor (or just the DACL if you would prefer) in the new_process call. You should be able to change the security structure validation functions to return the number of bytes used. Therefore, you should be able to put the security data before the other variable data in the new_process call. Also, I think several tests in advapi32 should succeed after this patch is applied so you will need to patch that too. -- Rob Shearman

Feb. 22, 2007

Re: 0.9.31 not suitable for gaming

by Stefan Dösinger

Am Donnerstag 22 Februar 2007 16:15 schrieb H. Verbeet: > On 22/02/07, Pavel Troller <patrol(a)sinus.cz> wrote: > > OK, never mind. I can continue debugging tonight, just now the machine is > > occupied by my son and his friend :-). I will look at SetWindowPos(). > > Could you tell me in which file its source is ? > > That's in dlls/user32/winpos.c, but I'm not sure how likely it is for > the problem to be in there. I do not think that the problem is in SetWindowPos. I think the problem is in wined3d, either some bad parameter to SetWindowPos or maybe SetWindowPos causes signals to be sent that native d3d does not send. That said, this is a Direct3D7 application, where the window setup is done BEFORE creating the Direct3D device(which calls Init3D in wined3d). So I gather that SetupFullscreenWindow should not be called during Init3D in the d3d7 case because the window and fullscreen setting are not changed. Setting window parameters there may cause signals to be sent to the application that cause crashes in the app. So I think the question is why SetupFullscreenWindow is called at all.

Feb. 22, 2007

How complete will Wine ever be for older apps?

by Jules Richardson

Sort of an open-ended question to developers :) It's obvious that Wine functionality will always lag behind Windows releases somewhat. But how accurate / complete do people think it will eventually be against older Windows releases? Is much development work even still being done on things that don't quite work as expected within apps that were current at the time of say NT4? I'm just trying to build up a picture in my head of whether there will come a day when Wine users can pick an app designed for a previous generation of Windows and expect it to work flawlessly (ignoring things that try to manipulate the hardware directly, I suppose)? Or will there always be incompatibilities? cheers Jules

Feb. 22, 2007

Re: 0.9.31 not suitable for gaming

by H. Verbeet

On 22/02/07, Pavel Troller <patrol(a)sinus.cz> wrote: > OK, never mind. I can continue debugging tonight, just now the machine is > occupied by my son and his friend :-). I will look at SetWindowPos(). Could you > tell me in which file its source is ? That's in dlls/user32/winpos.c, but I'm not sure how likely it is for the problem to be in there.

Feb. 22, 2007

Re: 0.9.31 not suitable for gaming

by Pavel Troller

Hi! > Am Donnerstag 22 Februar 2007 15:04 schrieb Pavel Troller: > > So I commented out the SetWindowPos() call in ..._SetupFullscreenWindow > > (on lines 1251&2 of the today's source) and... voilla, the game starts and > > runs perfectly. My son has verified it and didn't find any problems. > Yeah, the SetWindowPos isn't required for all games. One game that needs it is > Gothic 2. > > It is strange that SetWindowPos crashed. Can you check that window is > valid(i.e. not NULL)? And would it be possible that the immediately following ShowWindow(window, TRUE) wouldn't fail too ? > > TRACE("window is %p\n", window); > > > Because I didn't read anything from Stefan for a while, I'll wait a bit > > more and then I'll create a bugzilla record for it. > > Is it ok ? > I was away the last day on a small LAN party with friends, thats why I didn't > reply. OK, never mind. I can continue debugging tonight, just now the machine is occupied by my son and his friend :-). I will look at SetWindowPos(). Could you tell me in which file its source is ? With regards, Pavel Troller

Feb. 22, 2007

Re: 0.9.31 not suitable for gaming

by Stefan Dösinger

Am Donnerstag 22 Februar 2007 15:04 schrieb Pavel Troller: > So I commented out the SetWindowPos() call in ..._SetupFullscreenWindow > (on lines 1251&2 of the today's source) and... voilla, the game starts and > runs perfectly. My son has verified it and didn't find any problems. Yeah, the SetWindowPos isn't required for all games. One game that needs it is Gothic 2. It is strange that SetWindowPos crashed. Can you check that window is valid(i.e. not NULL)? TRACE("window is %p\n", window); > Because I didn't read anything from Stefan for a while, I'll wait a bit > more and then I'll create a bugzilla record for it. > Is it ok ? I was away the last day on a small LAN party with friends, thats why I didn't reply.

Feb. 22, 2007

Re: 0.9.31 not suitable for gaming

by Pavel Troller

> > On 21/02/07, Pavel Troller <patrol(a)sinus.cz> wrote: > > > The last trace which appeared in the log is 2683, so > > >IWineD3DDevice_CreateAdditionalSwapChain() didn't return. I'm going bananas > > >from those names; where the hell this one grows :-) ? grep, as obvious, > > >shows > > >its calls only. > > IWineD3DDeviceImpl_CreateAdditionalSwapChain() in dlls/wined3d/device.c. > > IWineD3DDevice_CreateAdditionalSwapChain is actually a macro defined > > in include/wine/wined3d_interface.h. > > > Thanks, > traced a few calls deeper. Now I'm standing at > > static void WINAPI IWineD3DDeviceImpl_SetupFullscreenWindow(IWineD3DDevice *iface, HWND window) { > IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; > > LONG style, exStyle; > /* Don't do anything if an original style is stored. > * That shouldn't happen > */ > TRACE("(%p): Setting up window %p for exclusive mode\n", This, window); > if (This->style || This->exStyle) { > ERR("(%p): Want to change the window parameters of HWND %p, but " > "another style is stored for restoration afterwards\n", This, window); > } > > /* Get the parameters and save them */ > style = GetWindowLongW(window, GWL_STYLE); > exStyle = GetWindowLongW(window, GWL_EXSTYLE); > This->style = style; > This->exStyle = exStyle; > > /* Filter out window decorations */ > style &= ~WS_CAPTION; > style &= ~WS_THICKFRAME; > exStyle &= ~WS_EX_WINDOWEDGE; > exStyle &= ~WS_EX_CLIENTEDGE; > > /* Make sure the window is managed, otherwise we won't get keyboard input */ > style |= WS_POPUP | WS_SYSMENU; > > TRACE("Old style was %08x,%08x, setting to %08x,%08x\n", > This->style, This->exStyle, style, exStyle); > TRACE("1184\n"); > SetWindowLongW(window, GWL_STYLE, style); > SetWindowLongW(window, GWL_EXSTYLE, exStyle); > TRACE("1187\n"); > /* Inform the window about the update. */ > SetWindowPos(window, HWND_TOP, 0, 0, > This->ddraw_width, This->ddraw_height, SWP_FRAMECHANGED); > TRACE("1191\n"); > ShowWindow(window, TRUE); > TRACE("1193\n"); > } > > The last trace executed is 1187, which looks that SetWindowPos doesn't return. > Should I trace even more deep, or is anybody getting an idea, what can be wrong > here ? > Where is SetWindowPos located ? > > With regards, Pavel Troller > Hi! Because I had to restore working wine, I did the following: 1) Restored original files 2) Pulled today's version 3) Compiled and verified ... Fallout tactics still didn't start with the obvious symptoms. So I commented out the SetWindowPos() call in ..._SetupFullscreenWindow (on lines 1251&2 of the today's source) and... voilla, the game starts and runs perfectly. My son has verified it and didn't find any problems. Then he tried HL2 and it seems also fully functional. So... The bug is still there, but my workaround fixes it for me and I didn't find any drawbacks (trying a lot of programs I'm using like IDA and some special telco programs). Because I didn't read anything from Stefan for a while, I'll wait a bit more and then I'll create a bugzilla record for it. Is it ok ? With regards, Pavel Troller

Feb. 22, 2007

Re: [DSOUND] Implement a locking mechanism

by M.B. Lankhorst

Robert Reif wrote: > You shouldn't need to make any changes to direct sound. You just need > to remove the flag DSDDESC_DONTNEEDPRIMARYLOCK from alsa and make the > necessary changes in alsa. The direct sound hardware primary buffer > locking support is already in primary.c. You are right, partially, primary.c already has support for it, but that is only used when the application chooses to write to the primary buffer directly, in most cases the primary buffer is only used directly by the directsound mixer, and that's the case this patch is trying to handle. However the problem I have right now is that I miss some magic values so sound is a bit cumbersome, maybe someone with knowledge of dsound knows what I should put in there and be able to help me out a little. Maarten PS: CC to people you address in your emails, not everyone receives messages from wine-devel mailing lists.

Feb. 22, 2007

Re: WineConf 2007 Fundraiser proposal

by Scott Ritchie

On Wed, 2007-02-21 at 21:11 -0500, Tom Wickline wrote: > Should the Wine project join the adsence network? > With our high google page rank we are practically guaranteed to rake > in a mint :D > Interesting note: our most likely sponsor is going to be a company involved with wine (the food item). Even though we have nothing to do with one-another, the ranking obtained by googling a term containing "wine" is certainly highly prized. Thanks, Scott Ritchie

Feb. 21, 2007

Re: message sequence testing - message flags

by Dmitry Timoshkov

"Lei Zhang" <thestig(a)google.com> wrote: > In dlls/user32/tests/msg.c, there's the following enum: > > typedef enum { > sent=0x1, > posted=0x2, > parent=0x4, > wparam=0x8, > lparam=0x10, > defwinproc=0x20, > beginpaint=0x40, > optional=0x80, > hook=0x100, > winevent_hook=0x200 > } msg_flags_t; > > Can someone explain what these flags mean? I'd expect it should be obvious. Use the source Lei! :-) > parent A message sent by a parent > defwinproc A message resulted from a DefWindowProc call > beginpaint A message resulted from of a BeginPaint call > hook A message sent by a hook > winevent_hook A message sent by a winevent hook -- Dmitry.

Feb. 21, 2007

WineConf 2007 Fundraiser proposal

by Tom Wickline

Hello Everyone, On February 14th I made a suggestion on the wine-conf mailing list that we should have a annual Fund Raiser to help raise funds for our annual Conference. http://www.winehq.org/pipermail/wineconf/2007-February/000397.html Jeremy replied with his thoughts/suggestions and some back ground info on how the WPF funds have helped in the past. http://www.winehq.org/pipermail/wineconf/2007-February/000403.html >From this, I cobbled together a extremely rough Donations page.. Keep in mind this is still very much a work in progress and the language within it needs major revisions. http://www.winehq.org/pipermail/wineconf/2007-February/000425.html The current discussion is now on whether or not a $1,000 donation is sufficient for a front page listing for one year since our search rank in so high. Dan suggested that we join adsence, and I replied that I had already suggested this in the past. http://www.winehq.org/pipermail/wineconf/2007-February/000437.html At this point there are many undecided questions about the original suggestion of us having a fund raiser, as well as if we should join adsence. If you have a opinion on this subject we would like (even suggest) that you to air them at this time before decisions are made. http://www.winehq.org/pipermail/wineconf/2007-February/000440.html Questions: Should we have a annual fundraiser to help with conference expenses? Thus far the consciences is Yes. What is a realistic goal? I believe $10,000 is very doable. What amount should we receive for a front page listing 'gold sponsor'? Is $10,000 to much or to small of a amount? If we decide on $10,000 the goal should be revised to about $25,000 Should the Wine project join the adsence network? With our high google page rank we are practically guaranteed to rake in a mint :D Comments and suggestions are at this time highly suggested! Tom

Feb. 21, 2007

Re: [DSOUND] Implement a locking mechanism

by Robert Reif

Maarten Lankhorst wrote: >[DSOUND] Implement a locking mechanism > >Attempt to implement locking in dsounds mixer. > >Sadly horribly broken, I'm posting this in the hope someone knows what >magic values to fill in at the first "if (lock)" .. I really have no clue. > >As stated before it is required to be used with previous winealsa patch. > >Right now it also calls Unlock with lockamount as argument, this should >probably be changed to how much is actually written to (frag), but that >part doesn't really matter much I think, it's more important to get the >first Lock() right. > > You shouldn't need to make any changes to direct sound. You just need to remove the flag DSDDESC_DONTNEEDPRIMARYLOCK from alsa and make the necessary changes in alsa. The direct sound hardware primary buffer locking support is already in primary.c.

Feb. 21, 2007

message sequence testing - message flags

by Lei Zhang

Hi, In dlls/user32/tests/msg.c, there's the following enum: typedef enum { sent=0x1, posted=0x2, parent=0x4, wparam=0x8, lparam=0x10, defwinproc=0x20, beginpaint=0x40, optional=0x80, hook=0x100, winevent_hook=0x200 } msg_flags_t; Can someone explain what these flags mean? parent defwinproc beginpaint hook winevent_hook - Lei

Feb. 21, 2007

Re: wine.inf: Update the timezone information.

by Uwe Bonnes

>>>>> "Francois" == Francois Gouget <fgouget(a)codeweavers.com> writes: Francois> --- I have used two sources to update Wine's timezone data: ... Francois> The display name was set to the Olson database ids and I have Francois> kept it that way as it seems to match what is displayed on Francois> Linux. Wherever we used old names I switched to the new names Francois> as specified in the Olson database. Francois> We still have a few differences with the Windows data and in a Francois> few instances I diverged from the CLDR mapping to tzids. I Francois> will now summarize all these differences in bug 7295. How do internaltional version of Windows get the localized names of the pletora of timezones? -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

Feb. 21, 2007

Re: 0.9.31 not suitable for gaming

by Pavel Troller

> On 21/02/07, Pavel Troller <patrol(a)sinus.cz> wrote: > > The last trace which appeared in the log is 2683, so > >IWineD3DDevice_CreateAdditionalSwapChain() didn't return. I'm going bananas > >from those names; where the hell this one grows :-) ? grep, as obvious, > >shows > >its calls only. > IWineD3DDeviceImpl_CreateAdditionalSwapChain() in dlls/wined3d/device.c. > IWineD3DDevice_CreateAdditionalSwapChain is actually a macro defined > in include/wine/wined3d_interface.h. > Thanks, traced a few calls deeper. Now I'm standing at static void WINAPI IWineD3DDeviceImpl_SetupFullscreenWindow(IWineD3DDevice *iface, HWND window) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; LONG style, exStyle; /* Don't do anything if an original style is stored. * That shouldn't happen */ TRACE("(%p): Setting up window %p for exclusive mode\n", This, window); if (This->style || This->exStyle) { ERR("(%p): Want to change the window parameters of HWND %p, but " "another style is stored for restoration afterwards\n", This, window); } /* Get the parameters and save them */ style = GetWindowLongW(window, GWL_STYLE); exStyle = GetWindowLongW(window, GWL_EXSTYLE); This->style = style; This->exStyle = exStyle; /* Filter out window decorations */ style &= ~WS_CAPTION; style &= ~WS_THICKFRAME; exStyle &= ~WS_EX_WINDOWEDGE; exStyle &= ~WS_EX_CLIENTEDGE; /* Make sure the window is managed, otherwise we won't get keyboard input */ style |= WS_POPUP | WS_SYSMENU; TRACE("Old style was %08x,%08x, setting to %08x,%08x\n", This->style, This->exStyle, style, exStyle); TRACE("1184\n"); SetWindowLongW(window, GWL_STYLE, style); SetWindowLongW(window, GWL_EXSTYLE, exStyle); TRACE("1187\n"); /* Inform the window about the update. */ SetWindowPos(window, HWND_TOP, 0, 0, This->ddraw_width, This->ddraw_height, SWP_FRAMECHANGED); TRACE("1191\n"); ShowWindow(window, TRUE); TRACE("1193\n"); } The last trace executed is 1187, which looks that SetWindowPos doesn't return. Should I trace even more deep, or is anybody getting an idea, what can be wrong here ? Where is SetWindowPos located ? With regards, Pavel Troller

Feb. 21, 2007

Re: 0.9.31 not suitable for gaming

by H. Verbeet

On 21/02/07, Pavel Troller <patrol(a)sinus.cz> wrote: > The last trace which appeared in the log is 2683, so > IWineD3DDevice_CreateAdditionalSwapChain() didn't return. I'm going bananas > from those names; where the hell this one grows :-) ? grep, as obvious, shows > its calls only. IWineD3DDeviceImpl_CreateAdditionalSwapChain() in dlls/wined3d/device.c. IWineD3DDevice_CreateAdditionalSwapChain is actually a macro defined in include/wine/wined3d_interface.h.

Feb. 21, 2007

Re: 0.9.31 not suitable for gaming

by Pavel Troller

> On 21/02/07, Pavel Troller <patrol(a)sinus.cz> wrote: > >I'm a bit confusd because I failed to find the code for > >D3DCB_CreateAdditionalSwapChain(), I found only its call in device.c and > >its > >definition in wined3d_interface.h. > That's D3D7CB_CreateAdditionalSwapChain() in dlls/ddraw/ddraw.c > Hi! OK, thanks, found it now. I've modified its code by inserting many traces: { ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, device); IParentImpl *object = NULL; HRESULT res = D3D_OK; IWineD3DSwapChain *swapchain; TRACE("(%p) call back\n", device); TRACE("$$$$ 2672\n"); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IParentImpl)); TRACE("$$$$ 2674\n"); if (NULL == object) { FIXME("Allocation of memory failed\n"); *ppSwapChain = NULL; return DDERR_OUTOFVIDEOMEMORY; } TRACE("$$$$ 2681\n"); ICOM_INIT_INTERFACE(object, IParent, IParent_Vtbl); TRACE("$$$$ 2683\n"); object->ref = 1; res = IWineD3DDevice_CreateAdditionalSwapChain(This->wineD3DDevice, pPresentationParameters, &swapchain, (IUnknown*) ICOM_INTERFACE(object, IParent), D3D7CB_CreateRenderTarget, D3D7CB_CreateDepthStencilSurface); TRACE("$$$$ 2692\n"); if (res != D3D_OK) { FIXME("(%p) call to IWineD3DDevice_CreateAdditionalSwapChain failed\n", This); HeapFree(GetProcessHeap(), 0 , object); *ppSwapChain = NULL; } else { TRACE("2701\n"); *ppSwapChain = swapchain; object->child = (IUnknown *) swapchain; } TRACE("$$$$ Returning\n"); return res; } The last trace which appeared in the log is 2683, so IWineD3DDevice_CreateAdditionalSwapChain() didn't return. I'm going bananas from those names; where the hell this one grows :-) ? grep, as obvious, shows its calls only. With regards, Pavel Troller

Feb. 21, 2007

Re: 0.9.31 not suitable for gaming

by H. Verbeet

On 21/02/07, Pavel Troller <patrol(a)sinus.cz> wrote: > I'm a bit confusd because I failed to find the code for > D3DCB_CreateAdditionalSwapChain(), I found only its call in device.c and its > definition in wined3d_interface.h. That's D3D7CB_CreateAdditionalSwapChain() in dlls/ddraw/ddraw.c

Feb. 21, 2007

Re: 0.9.31 not suitable for gaming

by Pavel Troller

> > You can do the following: > > -> Run the game in winedbg and see if it catches the execption and gives a > > backtrace and crash position > There is no such exception, at least winedbg doesn't catch any. Is a special > action (command etc.) Oops. Unfinished mail sent. I meant: Is a special action (command etc.) necessary to enable exception catching in winedbg ? Pavel

Feb. 21, 2007