January 2002 - Wine-devel - list.winehq.org

Re: A new SDL back-end we've been toying with
by Steven Edwards 29 Jan '02

29 Jan '02

> > You might want to take a look at microwindows if > you > > want GDI/framebuffer > > However, keep in mind that Microwindows can be had > at > either MPL and GPL licenses. True, but you might be able to get them relicense certain parts for wine. __________________________________________________ Do You Yahoo!? Great stuff seeking new owners in Yahoo! Auctions! http://auctions.yahoo.com

1 0

FW: Prob with freetype...
by Medland, Bill 29 Jan '02

29 Jan '02

-----Original Message----- From: Medland, Bill Sent: Tuesday, January 29, 2002 2:22 PM To: 'Meths' Subject: RE: Prob with freetype... Mentioned it this morning (sort of). Michael Stefaniuc upgraded to freetype 2.0.3 and that worked. I just cheated; I inserted the following lines into freetype.c to get it compiled; Index: wine/dlls/gdi/freetype.c =================================================================== RCS file: /home/wine/wine/dlls/gdi/freetype.c,v retrieving revision 1.4 diff -u -r1.4 freetype.c --- wine/dlls/gdi/freetype.c 2002/01/29 03:02:51 1.4 +++ wine/dlls/gdi/freetype.c 2002/01/29 20:29:42 @@ -56,6 +56,12 @@ #endif #ifdef HAVE_FREETYPE_FTTRIGON_H #include <freetype/fttrigon.h> +#else +/* Just a hack to get it to compile without upgrading my freetype */ +typedef FT_Fixed FT_Angle; +inline FT_Fixed FT_Sin(FT_Angle a) {return 0;} +inline FT_Fixed FT_Cos(FT_Angle a) {return 65536;} +inline FT_Vector_Rotate(FT_Vector *v, FT_Angle a) {return;} #endif static FT_Library library = 0; Bill > -----Original Message----- > From: Meths [mailto:meths(a)btinternet.com] > Sent: Tuesday, January 29, 2002 1:27 PM > To: wine-devel(a)winehq.com > Subject: Prob with freetype... > > > Hiya, > > Didn't see anyone mention this so... > > When compiling CVS tonight... > > gcc -c -I. -I. -I../../include -I../../include > -I/usr/include/freetype2 > -g -O2 -Wall -mpreferred-stack-boundary=2 -fPIC -D__WINE__ > -D_REENTRANT > -I/usr/X11R6/include -o freetype.o freetype.c > freetype.c: In function `WineEngGetGlyphOutline': > freetype.c:947: `FT_Angle' undeclared (first use in this function) > freetype.c:947: (Each undeclared identifier is reported only once > freetype.c:947: for each function it appears in.) > freetype.c:947: parse error before `angle' > freetype.c:993: `angle' undeclared (first use in this function) > freetype.c:1003: warning: implicit declaration of function > `FT_Vector_Rotate' > freetype.c:1059: warning: implicit declaration of function `FT_Cos' > freetype.c:1060: warning: implicit declaration of function `FT_Sin' > make[2]: *** [freetype.o] Error 1 > make[2]: Leaving directory `/root/cvs_root/wine/dlls/gdi' > make[1]: *** [gdi/libgdi32.so] Error 2 > make[1]: Leaving directory `/root/cvs_root/wine/dlls' > make: *** [dlls] Error 2 > > Compilation failed, aborting install. > > Meths > > >

1 0

GetNearestColor Fix
by Dave Hawkes 29 Jan '02

29 Jan '02

Fix for GetNearestColor so it returns the true color rather than the system palette if the device does not support a palette (ie > 256 colors). This not quite what the Windows SDK docs say, but it's what happens in practice... Dave Hawkes

1 0

DOSfs - further work ?
by Keith Matthews 29 Jan '02

29 Jan '02

While this is not critical, or even a large amount of work, I noticed when playing around with the floppy media problem that wine does not attempt to mount either a floppy or CD to display the contents. Was this intentional does anyone remember ? If not does anyone have reservations about trying to enable it? -- Keith Matthews Frequentous Consultants - Linux Services, Oracle development & database administration

1 0

Patch that broke SetFileAttributes
by Jukka Heinonen 29 Jan '02

29 Jan '02

Fallout II requires that a certain file is located on a CDROM drive. For some reason it checks this using SetFileAttributes, which is supposed to fail on readonly drives. This used to work until the following patch broke this behaviour (message continues after the patch): Index: file.c =================================================================== RCS file: /home/wine/wine/win32/file.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- file.c 2001/05/14 20:09:39 1.26 +++ file.c 2001/05/18 23:18:25 1.27 @@ -104,7 +104,7 @@ { FILE_SetDosError(); MESSAGE("Wine ERROR: Couldn't set file attributes for existing file \"%s\". Check permissions or set VFAT \"quiet\" flag !\n", full_name.long_name); - return FALSE; + return TRUE; } return TRUE; } The above patch obviously breaks Windows compatibility (and likely has a bug related to FILE_SetDosError). I would like to suggest that this patch is either removed or replaced with a patch that includes a C comment that properly documents reasons for this deliberate incompatibility and that either only affects non-CDROM drives or drives configured using some magic flag in Wine configuration file. -- Jukka Heinonen <http://www.iki.fi/jhei/>

4 8

system directory selection
by Brian Elliott 29 Jan '02

29 Jan '02

Hi folks, I just installed WINE for the first time and had some trouble getting dlls to load until I set the "system" option to my Win2k partition's system32 directory in wine.conf. Auto discovery of the proper system directory for wine.conf by wineinstall seems like a useful thing for new users. Would it be useful if I put together a small patch to the wineconf program so that running wineinstall will select the right system directory for configuration? Also, is it correct to assume that if a system32 subdirectory exists under the winnt or windows directory that it should be set given preference in wine.conf as the system directory? Thanks, Brian _________________________________________________________ Do You Yahoo!? Get your free @yahoo.com address at http://mail.yahoo.com

3 2

To which freetype should I upgrade? 2.0.6 or earlier
by Bill Medland 29 Jan '02

29 Jan '02

and while we are on the subject what is the philosophy on ifdefing header files? (I have freetype 2.0.1 from RedHat 7.1 so this morning's build failed because I don't have the trig stuff.) If we test for a header file and only include it if it is present should we be putting similar ifdefs around the code that required the header and providing alternatives when it is not present, or specifying that it NEEDS to exist? Bill

2 1

A new SDL back-end we've been toying with
by Gavriel State 29 Jan '02

29 Jan '02

Hi everyone, We just put this together for some testing, and thought that someone might find it handy. I'm not submitting it to wine-patches, since we haven't tested it on the most recent winehq tree, but it should be pretty easy to integrate in. It's not 100% complete by any means, but it has both GDI bitmap and DDraw support. We can vouch that it runs some of the DDraw samples, but beyond that, who knows. That said, the SDL driver should be a useful alternative to the ttydrv for testing purposes. -Gav -- Gavriel State, CEO TransGaming Technologies Inc. http://www.transgaming.com gav(a)transgaming.com

6 8

Re: Driver critical section changes from CW
by Gerard Patel 29 Jan '02

29 Jan '02

At 10:11 AM 1/29/02 +0100, you wrote: >Running the program The 4th Coming after updating >today, >results into these messages : >fixme:win32:SetCriticalSectionSpinCount >critsection=0x7ff063b8: spincount=1000 not supported <snip> This patch is not yet applied, it can hardly be responsible. See documentation/cvs-regression for the complete procedure to make sure a particular patch has caused a regression. Gerard

1 0

Driver critical section changes from CW
by Duane Clark 29 Jan '02

29 Jan '02

Modified files: dlls/gdi : driver.c loader : module.c Log message: Codeweavers Replace Rtl...PebLock with Rtl...CriticalSection. Slight change to library loading. Index: dlls/gdi/driver.c =================================================================== RCS file: /home/wine/wine/dlls/gdi/driver.c,v retrieving revision 1.6 diff -u -r1.6 driver.c --- dlls/gdi/driver.c 2001/09/14 01:00:57 1.6 +++ dlls/gdi/driver.c 2002/01/26 15:02:42 @@ -27,8 +27,8 @@ static struct graphics_driver *first_driver; static struct graphics_driver *display_driver; static const DC_FUNCTIONS *win16_driver; +static CRITICAL_SECTION driver_section = CRITICAL_SECTION_INIT( "driver_section" ); - /********************************************************************** * create_driver * @@ -207,13 +207,13 @@ HMODULE module; struct graphics_driver *driver; - RtlAcquirePebLock(); + RtlEnterCriticalSection( &driver_section ); /* display driver is a special case */ if (!strcasecmp( name, "display" )) { driver = load_display_driver(); - RtlReleasePebLock(); + RtlLeaveCriticalSection( &driver_section ); return &driver->funcs; } @@ -224,7 +224,7 @@ if (driver->module == module) { driver->count++; - RtlReleasePebLock(); + RtlLeaveCriticalSection( &driver_section ); return &driver->funcs; } } @@ -233,19 +233,19 @@ if (!(module = LoadLibraryA( name ))) { if (!win16_driver) win16_driver = WIN16DRV_Init(); - RtlReleasePebLock(); + RtlLeaveCriticalSection( &driver_section ); return win16_driver; } if (!(driver = create_driver( module ))) { FreeLibrary( module ); - RtlReleasePebLock(); + RtlLeaveCriticalSection( &driver_section ); return NULL; } TRACE( "loaded driver %p for %s\n", driver, name ); - RtlReleasePebLock(); + RtlLeaveCriticalSection( &driver_section ); return &driver->funcs; } @@ -259,7 +259,7 @@ { struct graphics_driver *driver; - RtlAcquirePebLock(); + RtlEnterCriticalSection( &driver_section ); if (funcs != win16_driver) { for (driver = first_driver; driver; driver = driver->next) @@ -267,7 +267,7 @@ if (!driver) ERR( "driver not found, trouble ahead\n" ); driver->count++; } - RtlReleasePebLock(); + RtlLeaveCriticalSection( &driver_section ); return funcs; } @@ -281,7 +281,7 @@ { struct graphics_driver *driver; - RtlAcquirePebLock(); + RtlEnterCriticalSection( &driver_section ); if (funcs == win16_driver) goto done; @@ -300,7 +300,7 @@ FreeLibrary( driver->module ); HeapFree( GetProcessHeap(), 0, driver ); done: - RtlReleasePebLock(); + RtlLeaveCriticalSection( &driver_section ); } Index: loader/module.c =================================================================== RCS file: /home/wine/wine/loader/module.c,v retrieving revision 1.145 diff -u -r1.145 module.c --- loader/module.c 2002/01/18 18:58:08 1.145 +++ loader/module.c 2002/01/26 15:02:43 @@ -29,6 +29,8 @@ static int free_lib_count; /* recursion depth of FreeLibrary calls */ static int process_detaching; /* set on process detach to avoid deadlocks with thread detach */ +static CRITICAL_SECTION loader_section = CRITICAL_SECTION_INIT( "loader_section" ); + /*********************************************************************** * wait_input_idle * @@ -176,9 +178,13 @@ BOOL retv = TRUE; int i; - RtlAcquirePebLock(); + RtlEnterCriticalSection( &loader_section ); - if (!wm) wm = exe_modref; + if (!wm) + { + wm = exe_modref; + PE_InitTls(); + } assert( wm ); /* prevent infinite recursion in case of cyclical dependencies */ @@ -221,7 +227,7 @@ TRACE("(%s,%p) - END\n", wm->modname, lpReserved ); done: - RtlReleasePebLock(); + RtlLeaveCriticalSection( &loader_section ); return retv; } @@ -236,7 +242,7 @@ { WINE_MODREF *wm; - RtlAcquirePebLock(); + RtlEnterCriticalSection( &loader_section ); if (bForceDetach) process_detaching = 1; do { @@ -258,7 +264,7 @@ } } while ( wm ); - RtlReleasePebLock(); + RtlLeaveCriticalSection( &loader_section ); } /************************************************************************* @@ -276,8 +282,10 @@ if (process_detaching) return; /* FIXME: there is still a race here */ - RtlAcquirePebLock(); + RtlEnterCriticalSection( &loader_section ); + PE_InitTls(); + for ( wm = MODULE_modref_list; wm; wm = wm->next ) if ( !wm->next ) break; @@ -292,7 +300,7 @@ MODULE_InitDLL( wm, DLL_THREAD_ATTACH, lpReserved ); } - RtlReleasePebLock(); + RtlLeaveCriticalSection( &loader_section ); } /************************************************************************* @@ -310,7 +318,7 @@ if (process_detaching) return; /* FIXME: there is still a race here */ - RtlAcquirePebLock(); + RtlEnterCriticalSection( &loader_section ); for ( wm = MODULE_modref_list; wm; wm = wm->next ) { @@ -322,7 +330,7 @@ MODULE_InitDLL( wm, DLL_THREAD_DETACH, lpReserved ); } - RtlReleasePebLock(); + RtlLeaveCriticalSection( &loader_section ); } /**************************************************************************** @@ -335,7 +343,7 @@ WINE_MODREF *wm; BOOL retval = TRUE; - RtlAcquirePebLock(); + RtlEnterCriticalSection( &loader_section ); wm = MODULE32_LookupHMODULE( hModule ); if ( !wm ) @@ -343,7 +351,7 @@ else wm->flags |= WINE_MODREF_NO_DLL_CALLS; - RtlReleasePebLock(); + RtlLeaveCriticalSection( &loader_section ); return retval; } @@ -1231,13 +1239,13 @@ { WINE_MODREF *wm; - RtlAcquirePebLock(); + RtlEnterCriticalSection( &loader_section ); lpFileName[0] = 0; if ((wm = MODULE32_LookupHMODULE( hModule ))) lstrcpynA( lpFileName, wm->filename, size ); - RtlReleasePebLock(); + RtlLeaveCriticalSection( &loader_section ); TRACE("%s\n", lpFileName ); return strlen(lpFileName); } @@ -1284,7 +1292,18 @@ NULL, OPEN_EXISTING, 0, 0 ); if (hFile != INVALID_HANDLE_VALUE) { - hmod = PE_LoadImage( hFile, filename, flags ); + DWORD type; + MODULE_GetBinaryType( hFile, filename, &type ); + if (type == SCS_32BIT_BINARY) + { + HANDLE mapping = CreateFileMappingA( hFile, NULL, PAGE_READONLY, + 0, 0, NULL ); + if (mapping) + { + hmod = (HMODULE)MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); + CloseHandle( mapping ); + } + } CloseHandle( hFile ); } if (hmod) return (HMODULE)((ULONG_PTR)hmod + 1); @@ -1293,7 +1312,7 @@ /* Fallback to normal behaviour */ } - RtlAcquirePebLock(); + RtlEnterCriticalSection( &loader_section ); wm = MODULE_LoadLibraryExA( libname, hfile, flags ); if ( wm ) @@ -1307,7 +1326,7 @@ } } - RtlReleasePebLock(); + RtlLeaveCriticalSection( &loader_section ); return wm ? wm->module : 0; } @@ -1381,7 +1400,7 @@ if ( !filename ) return NULL; *filename = 0; /* Just in case we don't set it before goto error */ - RtlAcquirePebLock(); + RtlEnterCriticalSection( &loader_section ); if ((flags & LOAD_WITH_ALTERED_SEARCH_PATH) && FILE_contains_path(libname)) { @@ -1459,7 +1478,7 @@ HeapFree ( GetProcessHeap(), 0, (LPSTR)libdir ); libdir = NULL; } - RtlReleasePebLock(); + RtlLeaveCriticalSection( &loader_section ); HeapFree ( GetProcessHeap(), 0, filename ); return pwm; } @@ -1511,7 +1530,7 @@ HeapFree ( GetProcessHeap(), 0, (LPSTR)libdir ); libdir = NULL; } - RtlReleasePebLock(); + RtlLeaveCriticalSection( &loader_section ); SetLastError( err ); /* restore last error */ HeapFree ( GetProcessHeap(), 0, filename ); return pwm; @@ -1527,7 +1546,7 @@ HeapFree ( GetProcessHeap(), 0, (LPSTR)libdir ); libdir = NULL; } - RtlReleasePebLock(); + RtlLeaveCriticalSection( &loader_section ); WARN("Failed to load module '%s'; error=0x%08lx\n", filename, GetLastError()); HeapFree ( GetProcessHeap(), 0, filename ); return NULL; @@ -1634,13 +1653,13 @@ return TRUE; } - RtlAcquirePebLock(); + RtlEnterCriticalSection( &loader_section ); free_lib_count++; if ((wm = MODULE32_LookupHMODULE( hLibModule ))) retv = MODULE_FreeLibrary( wm ); free_lib_count--; - RtlReleasePebLock(); + RtlLeaveCriticalSection( &loader_section ); return retv; } @@ -1818,13 +1837,13 @@ else TRACE_(win32)("(%08lx,%p)\n",(DWORD)hModule,function); - RtlAcquirePebLock(); + RtlEnterCriticalSection( &loader_section ); if ((wm = MODULE32_LookupHMODULE( hModule ))) { retproc = wm->find_export( wm, function, snoop ); if (!retproc) SetLastError(ERROR_PROC_NOT_FOUND); } - RtlReleasePebLock(); + RtlLeaveCriticalSection( &loader_section ); return retproc; }

2 2