September 2008 - Wine-devel

Re: [PATCH] buffer overflow checking for string functions
by Rob Shearman 04 Sep '08

04 Sep '08

2008/9/4 Marcus Meissner <marcus(a)jet.franken.de>: > +#ifndef STATUS_STACK_BUFFER_OVERRUN > +# define STATUS_STACK_BUFFER_OVERRUN 0xC0000409 > +#endif > +#ifndef EH_NONCONTINUABLE > +# define EH_NONCONTINUABLE 0x01 > +#endif These defines are not used. Either use them or remove them, but I would recommend removing them to keep the namespace clean. -- Rob Shearman

2 1

RE: Fix for patchwatcher error in my 16 vertex shader type
by Stefan Dösinger 04 Sep '08

04 Sep '08

Well, the patch is still wrong conceptually. See my description in the bug report how to fix it properly > -----Original Message----- > From: wine-patches-bounces(a)winehq.org [mailto:wine-patches- > bounces(a)winehq.org] On Behalf Of Chris Ahrendt > Sent: Thursday, September 04, 2008 7:58 AM > To: wine-patches(a)winehq.org > Subject: Fix for patchwatcher error in my 16 vertex shader type > > This fixes the patchwatcher failure in my last submission of this fix. > This is not a total implementation of the 16 vertex shaders. > It is an assumption that no type checking for the 2 other vertex shader > calls are needed (short and int) and can be called with the current > implementation of 4 parms. This seems to work without adding the two > opengl calls.

1 0

Re: [PATCH 3/6] shell32: add tests for SHAppBarMessage
by Alexandre Julliard 04 Sep '08

04 Sep '08

Vincent Povirk <vincent(a)codeweavers.com> writes: > +/* process messages for 1 second */ > +static void do_events(void) > +{ > + MSG msg; > + UINT_PTR timerid; > + > + timerid = SetTimer(NULL, 0, 1000, NULL); > + while (GetMessageW(&msg, NULL, 0, 0) && > + !(msg.message == WM_TIMER && msg.hwnd == NULL && msg.wParam == timerid)) > + { > + TranslateMessage(&msg); > + DispatchMessageW(&msg); > + } > + > + KillTimer(NULL, timerid); You shouldn't do it that way, it makes the test much slower than necessary. If you really have to wait for async events you should use something like flush_events() in the message tests, though in this case it doesn't seem necessary at all since you don't check the resulting messages. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: ntdll/file: Add sub-second resolution to NtQueryInformationFile
by Detlef Riekenberg 04 Sep '08

04 Sep '08

On So, 2008-08-17 at 19:03 +0200, Michael Karcher wrote: > --- > configure | 303 > +++++++++++++++++++++++++++++++++++++++++++++++++++ You should never include autogenerated code in a Patch. This will reduce the risk, that your Patch does not apply after a different Patch was commited. -- By by ... Detlef

6 5

wineboot: Basic RunOnceEx support
by Johan Dahlin 04 Sep '08

04 Sep '08

Just enough to make ie6 setup work. I'm not receiving list mail, please CC me when replying. Johan diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index cdbab2e..3be7e22 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wineboot.exe APPMODE = -mconsole -IMPORTS = uuid advapi32 kernel32 ntdll +IMPORTS = uuid advapi32 ole32 kernel32 ntdll DELAYIMPORTS = setupapi shell32 shlwapi version user32 C_SRCS = \ diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 717a175..4a91c37 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -86,6 +86,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(wineboot); #define MAX_LINE_LENGTH (2*MAX_PATH+2) +typedef HRESULT (*DLLREGISTER) (void); +typedef HRESULT (*DLLINSTALL) (BOOL,LPCWSTR); + extern BOOL shutdown_close_windows( BOOL force ); extern void kill_processes( BOOL kill_desktop ); @@ -157,6 +160,65 @@ done: return ret; } +static VOID *LoadProc(WCHAR* strDllW, const char* procName, HMODULE* DllHandle) +{ + VOID* (*proc)(void); + + *DllHandle = LoadLibraryExW(strDllW, 0, LOAD_WITH_ALTERED_SEARCH_PATH); + if(!*DllHandle) + { + WINE_TRACE("LoadLibraryEx failed %s\n", + wine_dbgstr_w(strDllW)); + return NULL; + } + proc = (VOID *) GetProcAddress(*DllHandle, procName); + if (!proc) + { + WINE_TRACE("GetProcAddress failed (%s -> %s)\n", + wine_dbgstr_w(strDllW), procName); + FreeLibrary(*DllHandle); + return NULL; + } + return proc; +} + +static int RunDllRegisterServer(WCHAR* strDll) +{ + DLLREGISTER pfRegister = NULL; + HRESULT hr; + HMODULE DllHandle = NULL; + + pfRegister = LoadProc(strDll, "DllRegisterServer", &DllHandle); + + if (!pfRegister) + return -1; + + hr = pfRegister(); + + if(DllHandle) + FreeLibrary(DllHandle); + + return hr; +} + +static HRESULT RunDllInstall(WCHAR *strDll, BOOL install, WCHAR *command_line) +{ + DLLINSTALL pfInstall = NULL; + HRESULT hr; + HMODULE DllHandle = NULL; + + pfInstall = LoadProc(strDll, "DllInstall", &DllHandle); + + if (!pfInstall) + return -1; + + hr = pfInstall(install, command_line); + + if(DllHandle) + FreeLibrary(DllHandle); + return hr; +} + /* Performs the rename operations dictated in %SystemRoot%\Wininit.ini. * Returns FALSE if there was an error, or otherwise if all is ok. */ @@ -526,6 +588,197 @@ end: return res==ERROR_SUCCESS; } +static BOOL ProcessRunOnceExKey(HKEY hkRunEntry) +{ + DWORD i; + DWORD res; + DWORD nMaxCmdLine=0, nMaxValue=0; + WCHAR *szCmdLine=NULL; + WCHAR *szValue=NULL; + static const WCHAR KEY_DLLREGISTERSERVER[]={ + 'D','l','l','R','e','g','i','s','t','e','r','S','e','r','v','e','r',0}; + static const WCHAR KEY_DLLINSTALL[]={ + 'D','l','l','I','n','s','t','a','l','l',0}; + + if( (res=RegQueryInfoKeyW( hkRunEntry, NULL, NULL, NULL, NULL, NULL, NULL, &i, &nMaxValue, + &nMaxCmdLine, NULL, NULL ))!=ERROR_SUCCESS ) + goto end; + + + if( (szCmdLine=HeapAlloc(GetProcessHeap(),0,nMaxCmdLine))==NULL ) + { + WINE_ERR("Couldn't allocate memory for the commands to be executed\n"); + + res=ERROR_NOT_ENOUGH_MEMORY; + goto end; + } + + if( (szValue=HeapAlloc(GetProcessHeap(),0,(++nMaxValue)*sizeof(*szValue)))==NULL ) + { + WINE_ERR("Couldn't allocate memory for the value names\n"); + + res=ERROR_NOT_ENOUGH_MEMORY; + goto end; + } + + while( i>0 ) + { + DWORD nValLength=nMaxValue, nDataLength=nMaxCmdLine; + DWORD type; + WCHAR *first, *second, *third; /* | separated parts of the entry */ + WCHAR pipe[] = {'|',0}; + i--; + + if( (res=RegEnumValueW( hkRunEntry, i, szValue, &nValLength, 0, &type, + (LPBYTE)szCmdLine, &nDataLength ))!=ERROR_SUCCESS ) + { + WINE_ERR("Couldn't read in value %d - %d\n", i, res ); + break; + } + + if (strlenW(szValue) == 0) + { + WINE_TRACE("Processing %s entries\n", wine_dbgstr_w( szCmdLine )); + continue; + } + + if( type!=REG_SZ ) + { + WINE_ERR("Incorrect type of value #%d (%d)\n", i, type ); + continue; + } + + if( (res=RegDeleteValueW( hkRunEntry, szValue ))!=ERROR_SUCCESS ) + { + WINE_ERR("Couldn't delete value - %d, %d. Running command anyways.\n", i, res ); + } + + if ((first = strstrW(szCmdLine, pipe)) != NULL) + { + WCHAR *value = first + strlenW(pipe); + HRESULT retval; + if (strncmpW(value, KEY_DLLREGISTERSERVER, + strlenW(KEY_DLLREGISTERSERVER)) == 0) + { + DWORD len; + WCHAR *cmd; + len = strlenW(szCmdLine) - strlenW(first) + strlenW(pipe); + cmd = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * len); + if (cmd == NULL) + goto end; + + if (lstrcpynW(cmd, szCmdLine, len)) + { + WINE_TRACE("DllRegisterServer %s\n", wine_dbgstr_w(cmd)); + retval = RunDllRegisterServer(cmd); + WINE_TRACE("DllRegisterServer returned %d\n", retval); + } + HeapFree(GetProcessHeap(), 0, cmd); + } + else if (strncmpW(value, KEY_DLLINSTALL, + strlenW(KEY_DLLINSTALL)) == 0) + { + WCHAR *filename, *arg = NULL; + WCHAR install = FALSE; + HRESULT retval; + DWORD filenameLength, argLength; + + /* filename|DllInstall + * filename|DllInstall|i,arg + * filename|DllInstall|I,arg + * FIXME: is i=FALSE,I=TRUE or the reverse? + */ + second = strstrW(first + strlenW(pipe), pipe); + if (second == NULL) + filenameLength = strlenW(szCmdLine) - strlenW(first) + strlenW(pipe); + else if ((third = strstrW(second, pipe)) != NULL) + { + filenameLength = strlenW(szCmdLine) - strlenW(first) + strlenW(pipe); + install = *(second + strlenW(pipe)); + + argLength = strlenW(third) - strlenW(pipe) - 1; + filename = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * argLength); + lstrcpynW(arg, third + strlenW(pipe) + 2, argLength); + } + + filename = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * filenameLength); + lstrcpynW(filename, szCmdLine, filenameLength); + + WINE_TRACE("DllInstall (%s, %d, %s)\n", + wine_dbgstr_w(filename), + install == 'i', + wine_dbgstr_w(arg)); + retval = RunDllInstall(filename, install == 'i', arg); + WINE_TRACE("DllInstall returned %d\n", retval); + HeapFree( GetProcessHeap(), 0, filename ); + if (arg) + HeapFree( GetProcessHeap(), 0, arg ); + } + } else { + if( (res=runCmd(szCmdLine, NULL, TRUE, FALSE ))==INVALID_RUNCMD_RETURN ) + { + WINE_ERR("Error running cmd #%d (%d)\n", i, GetLastError() ); + } + } + } + end: + HeapFree( GetProcessHeap(), 0, szValue ); + HeapFree( GetProcessHeap(), 0, szCmdLine ); + + return res; +} + +static BOOL ProcessRunOnceEx( HKEY hkRoot ) +{ + static const WCHAR WINKEY_NAME[]={'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n', '\\', + 'R','u','n','O','n','c','e','E','x',0}; + HKEY hkRunOnceEx, hkRunEntry; + DWORD res; + DWORD i; + + WINE_TRACE("processing RunOnceEx entries under %s\n", hkRoot==HKEY_LOCAL_MACHINE ? "HKLM" : "HKCU"); + + if (RegOpenKeyExW( hkRoot, WINKEY_NAME, 0, KEY_ALL_ACCESS, &hkRunOnceEx ) != ERROR_SUCCESS) + return TRUE; + + i = 0; + while( 1 ) + { + WCHAR szKeyName[2048]; + + res = RegEnumKeyW( hkRunOnceEx, i, szKeyName, 2048); + if ( res==ERROR_NO_MORE_ITEMS ) + break; + else if( res!=ERROR_SUCCESS ) + { + WINE_ERR("Couldn't read in value %d - %d\n", i, res ); + break; + } + i++; + + if (RegOpenKeyExW( hkRunOnceEx, szKeyName, 0, KEY_ALL_ACCESS, &hkRunEntry ) != ERROR_SUCCESS) + return TRUE; + + ProcessRunOnceExKey( hkRunEntry ); + + RegCloseKey( hkRunEntry ); + + if( (res=RegDeleteKeyW( hkRunOnceEx, szKeyName ))!=ERROR_SUCCESS ) + { + WINE_ERR("Couldn't delete key - %s, %d. Running command anyways.\n", + wine_dbgstr_w( szKeyName ), res ); + } + } + if( hkRunOnceEx!=NULL ) + RegCloseKey( hkRunOnceEx ); + + WINE_TRACE("done\n"); + + return res==ERROR_SUCCESS; +} + /* * WFP is Windows File Protection, in NT5 and Windows 2000 it maintains a cache * of known good dlls and scans through and replaces corrupted DLLs with these @@ -824,6 +1077,8 @@ int main( int argc, char *argv[] ) HANDLE event; SECURITY_ATTRIBUTES sa; + OleInitialize(NULL); + GetWindowsDirectoryW( windowsdir, MAX_PATH ); if( !SetCurrentDirectoryW( windowsdir ) ) WINE_ERR("Cannot set the dir to %s (%d)\n", wine_dbgstr_w(windowsdir), GetLastError() ); @@ -875,6 +1130,8 @@ int main( int argc, char *argv[] ) ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNONCE], TRUE, TRUE ); + ProcessRunOnceEx( HKEY_LOCAL_MACHINE ); + if (!init && !restart) { ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUN], FALSE, FALSE );

2 2

Re: [PATCH] annotate with allocation size attribute
by Alexandre Julliard 04 Sep '08

04 Sep '08

Marcus Meissner <marcus(a)jet.franken.de> writes: > --- a/include/windef.h > +++ b/include/windef.h > @@ -49,6 +49,12 @@ extern "C" { > #define _WIN64 > #endif > > +#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 4) > +#define ALLOC_SIZE(x) __attribute__((__alloc_size__(x))) > +#else > +#define ALLOC_SIZE(x) > +#endif Since this is an exported header you should use a name that is less likely to conflict with user macros, something like __WINE_ALLOC_SIZE. -- Alexandre Julliard julliard(a)winehq.org

1 0

intermittent ddraw/visual crash
by Dan Kegel 04 Sep '08

04 Sep '08

I'm seeing a crash occasionally in ddraw/tests/visual.c on hardy, with a cheap PNY 8500 GT 512MB PCIe nvidia card. (Hrm. http://www.overclockersclub.com/reviews/8500gt/11.htm has a review that says "stay away from this one", maybe I shouldn't have gone for the cheapest card.) Out of 200 runs, I saw two instances of the crash. Anyone seen this before? http://kegel.com/wine/patchwatcher/results/869.log ../../../tools/runtest -q -P wine -M ddraw.dll -T ../../.. -p ddraw_test.exe.so visual.c && touch visual.ok fixme:d3d:IWineD3DImpl_FillGLCaps OpenGL implementation supports 32 vertex samplers and 32 total samplers fixme:d3d:IWineD3DImpl_FillGLCaps Expected vertex samplers + MAX_TEXTURES(=8) > combined_samplers fixme:win:EnumDisplayDevicesW ((null),0,0x32ed78,0x00000000), stub! fixme:d3d:WineD3D_ChoosePixelFormat Add OpenGL context recreation support to SetDepthStencilSurface fixme:d3d_draw:drawPrimitive Using software emulation because manual fog coordinates are provided fixme:d3d:WineD3D_ChoosePixelFormat Add OpenGL context recreation support to SetDepthStencilSurface fixme:d3d:WineD3D_ChoosePixelFormat Add OpenGL context recreation support to SetDepthStencilSurface wine: Unhandled page fault on read access to 0x0000015c at address 0x611048ce (thread 0013), starting debugger... Unhandled exception: page fault on read access to 0x0000015c in 32-bit code (0x611048ce). Register dump: CS:0073 SS:007b DS:007b ES:007b FS:0033 GS:003b EIP:611048ce ESP:0032e3e0 EBP:ffffffff EFLAGS:00010246( - 00 -RIZP1) EAX:00000000 EBX:61ab2000 ECX:7c0a7ca0 EDX:00000000 ESI:7c0a7ca0 EDI:7c0a7ca0 Stack dump: 0x0032e3e0: 61ab2000 61b57008 61ac7840 0001ffff 0x0032e3f0: 0032e428 601ea4f0 012c7160 7c07dcb8 0x0032e400: 00000001 00000024 00000002 7c07dcb0 0x0032e410: 601e2e24 beef0003 bfef1f69 602c5ff4 0x0032e420: 0032e5db 0032e448 601e409d 0032e46c 0x0032e430: 0032e59c 0032e5db 0032e58c 602c5ff4 Backtrace: 0x611048ce: movl 0x15c(%eax),%eax http://kegel.com/wine/patchwatcher/results/857.log ../../../tools/runtest -q -P wine -M ddraw.dll -T ../../.. -p ddraw_test.exe.so visual.c && touch visual.ok fixme:d3d:IWineD3DImpl_FillGLCaps OpenGL implementation supports 32 vertex samplers and 32 total samplers fixme:d3d:IWineD3DImpl_FillGLCaps Expected vertex samplers + MAX_TEXTURES(=8) > combined_samplers fixme:win:EnumDisplayDevicesW ((null),0,0x32ed78,0x00000000), stub! fixme:d3d:WineD3D_ChoosePixelFormat Add OpenGL context recreation support to SetDepthStencilSurface wine: Unhandled page fault on read access to 0x0000015c at address 0x611048ce (thread 0013), starting debugger... Unhandled exception: page fault on read access to 0x0000015c in 32-bit code (0x611048ce). Register dump: CS:0073 SS:007b DS:007b ES:007b FS:0033 GS:003b EIP:611048ce ESP:0032e500 EBP:ffffffff EFLAGS:00010246( - 00 -RIZP1) EAX:00000000 EBX:61ab2000 ECX:7c0a6370 EDX:00000000 ESI:7c0a6370 EDI:7c0a6370 Stack dump: 0x0032e500: 61ab2000 61b57008 61ac7840 0001ffff 0x0032e510: 0032e548 601ea4f0 012c7160 7c072010 0x0032e520: 00000001 00000024 7c097560 602a82f5 0x0032e530: 601e2e24 602c7190 bfef1ac2 602c5ff4 0x0032e540: 0032e6fb 0032e568 601e409d 0032e58c 0x0032e550: 0032e6bc 0032e6fb 0032e6ac 602c5ff4 Backtrace: 0x611048ce: movl 0x15c(%eax),%eax

2 1

Re: [2/2] WineD3D: Make the srgb write flag bigger
by Vitaliy Margolen 04 Sep '08

04 Sep '08

Stefan Dösinger wrote: > > ------------------------------------------------------------------------ > > Apparently gcc pads the structure size to DWORD alignment, which > leaves 3 padding bytes which trigger differences in the memset. > This fixes memory "leaks" in the fragment pipeline replacement > without needing a memset You should add a note to the source about this. Or someone might change the size of this structure and the old bug will return. However the best way to fix this problem would be to pack this structure: #include <pshpack1.h> struct ffp_settings { ... }; #include <poppack.h> Vitaliy.

2 2

Re: AcceptEx Patch set Sep.4
by Scott Lindeneau 03 Sep '08

03 Sep '08

I have tried to make this new patch set as clean as possible. The previous set made numerous changes to many parts of the wineserver. This set attempts to only make modifications to the sock.c functions. Most of it is simply added functionality which is, in my opinion, required to have a correct implementation of AcceptEx. As far as I know, if wine is going to handle simultaneous connections the accept functionality of AcceptEx must be built into the wineserver and not into the dll's. If the dll's only use existing wineserver functions and async commands then connections will be missed due to a race condition between the wineserver threads and the dll user threads. If necessary I can provide proof of concept code for this. I placed the conformance tests at the end of the patch series because I do not know how to correctly use the todo_wine{} brackets in this particular case, and I don't particularly feel like breaking down and rewriting the conformance tests at this point in time.

1 0

Re: wined3d: fix a memory leak and a performance regression in gen_arbfp_ffp_shader
by Henri Verbeet 03 Sep '08

03 Sep '08

2008/9/3 Jeff Zaroyko <jeffzaroyko(a)gmail.com>: > Please ignore the previous patch sent two days ago, this one fixes a > performance regression as well as removing the memory leak. > > -Jeff > Do you have some kind of benchmark data for this change? I don't think allocating relatively large buffers like that on the stack is a good idea. If it does make a lot of difference in terms of performance, it probably makes sense to allocate the buffer in arbfp_alloc() instead and just reuse it. In that case it probably also makes sense to do that for the ARB and GLSL shader backends as well.

4 3