wine-devel

wine-devel@winehq.org

3 participants
84400 discussions

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

Fwd: Total Annihilation
by Daniel Davis 29 Jan '02

29 Jan '02

Hi guys, I sent this to the wine-users list but didn't get any response so I thought maybe you could answer this. I am simply trying to figure out why Total Annihilation keeps terminating with a code 21. I would prefer to know where the list of errors is so that I can solve these on my own without needing to pester people all the time. :-) Daniel ---------- Forwarded Message ---------- Subject: Total Annihilation Date: Sun, 27 Jan 2002 13:40:38 -0500 From: Daniel Davis <planetes(a)cfl.rr.com> To: wine-users(a)winehq.com Hi everyone, I just started tinkering with wine on my system and everytime I try to run Total Annihilation it dies with a return (error) code 21. Is there a list of return codes anywhere in wine that can help me determine where this program and any others I try to run in the future are dying? Daniel -------------------------------------------------------

3 3

Sooo quiet...
by Dimitrie O. Paun 28 Jan '02

28 Jan '02

... I feel like starting a flamewar, just to get some traffic on this list :) Speaking of which, I figured I should rattle Alexandre's cage :) So here I go: Wine's been around for 8 (_eight_) years (how time flies)! It is my understanding that we're approaching the 1.0 status. I say, let's change the versioning scheme, just to give the outside world a feeling of progress. Really, I think the current scheme kindda hurts us on a PR level. We can start with something like 0.90.0. This should give us plenty numbers to the upcoming 1.0, don't you think? -- Dimi.

3 3

Compilation error
by Christian Schmitt 28 Jan '02

28 Jan '02

Hello, i have a strange problem compiling the newest wine version (20020122). The compilation process stops with an error message concerning freetype: make[2]: Entering directory `/usr/src/wine-20020122/dlls/gdi' gcc -c -I. -I. -I../../include -I../../include -I/usr/local/include/freetype2 -g -O2 -Wall -fno-strength-reduce -mpreferred-stack-boundary=2 -fPIC -D__WINE__ -D_REENTRANT -I/usr/X11R6/include -o freetype.o freetype.c freetype.c:56: parse error before `library' freetype.c:56: warning: type defaults to `int' in declaration of `library' freetype.c:56: warning: data definition has no type or storage class freetype.c:74: parse error before `FT_Face' freetype.c:74: warning: no semicolon at end of struct or union freetype.c: In function `AddFontFileToList': freetype.c:81: `FT_Face' undeclared (first use in this function) freetype.c:81: (Each undeclared identifier is reported only once freetype.c:81: for each function it appears in.) freetype.c:81: parse error before `ft_face' freetype.c:89: warning: implicit declaration of function `FT_New_Face' freetype.c:89: `ft_face' undeclared (first use in this function) freetype.c:94: warning: implicit declaration of function `FT_IS_SFNT' freetype.c:95: warning: implicit declaration of function `FT_Done_Face' freetype.c:138: `FT_STYLE_FLAG_ITALIC' undeclared (first use in this function) freetype.c:139: `FT_STYLE_FLAG_BOLD' undeclared (first use in this function) freetype.c: In function `WineEngInit': freetype.c:193: warning: implicit declaration of function `FT_Init_FreeType' freetype.c: At top level: freetype.c:230: parse error before `OpenFontFile' freetype.c:231: warning: return-type defaults to `int' freetype.c: In function `OpenFontFile': freetype.c:232: `FT_Error' undeclared (first use in this function) freetype.c:232: parse error before `err' freetype.c:233: `TT_OS2' undeclared (first use in this function) freetype.c:233: `pOS2' undeclared (first use in this function) freetype.c:233: warning: statement with no effect freetype.c:234: `FT_Face' undeclared (first use in this function) freetype.c:234: parse error before `ft_face' freetype.c:237: `err' undeclared (first use in this function) freetype.c:237: `ft_face' undeclared (first use in this function) freetype.c:243: warning: implicit declaration of function `FT_Get_Sfnt_Table' freetype.c:243: `ft_sfnt_os2' undeclared (first use in this function) freetype.c:262: `ppem' undeclared (first use in this function) freetype.c:267: warning: implicit declaration of function `FT_Set_Pixel_Sizes' freetype.c: In function `WineEngCreateFontInstance': freetype.c:288: dereferencing pointer to incomplete type freetype.c:289: dereferencing pointer to incomplete type freetype.c:317: dereferencing pointer to incomplete type freetype.c: In function `WineEngAddRefFont': freetype.c:330: dereferencing pointer to incomplete type freetype.c:331: warning: control reaches end of non-void function freetype.c: In function `WineEngDecRefFont': freetype.c:339: dereferencing pointer to incomplete type freetype.c:342: dereferencing pointer to incomplete type freetype.c: In function `GetEnumStructs': freetype.c:353: dereferencing pointer to incomplete type freetype.c:355: dereferencing pointer to incomplete type freetype.c:356: dereferencing pointer to incomplete type freetype.c: In function `WineEngGetGlyphOutline': freetype.c:469: `FT_Face' undeclared (first use in this function) freetype.c:469: parse error before `ft_face' freetype.c:470: `FT_UInt' undeclared (first use in this function) freetype.c:472: `FT_Bitmap' undeclared (first use in this function) freetype.c:472: parse error before `ft_bitmap' freetype.c:478: `glyph_index' undeclared (first use in this function) freetype.c:480: warning: implicit declaration of function `FT_Get_Char_Index' freetype.c:480: `ft_face' undeclared (first use in this function) freetype.c:482: warning: implicit declaration of function `FT_Load_Glyph' freetype.c:482: `FT_LOAD_DEFAULT' undeclared (first use in this function) freetype.c:494: `ft_glyph_format_outline' undeclared (first use in this function) freetype.c:506: `ft_bitmap' undeclared (first use in this function) freetype.c:509: `ft_pixel_mode_mono' undeclared (first use in this function) freetype.c:512: warning: implicit declaration of function `FT_Outline_Translate'freetype.c:517: warning: implicit declaration of function `FT_Outline_Get_Bitmap' freetype.c: In function `WineEngGetTextMetrics': freetype.c:531: `FT_Face' undeclared (first use in this function) freetype.c:531: parse error before `ft_face' freetype.c:532: `TT_OS2' undeclared (first use in this function) freetype.c:532: `pOS2' undeclared (first use in this function) freetype.c:532: warning: statement with no effect freetype.c:533: `TT_HoriHeader' undeclared (first use in this function) freetype.c:533: `pHori' undeclared (first use in this function) freetype.c:533: warning: statement with no effect freetype.c:534: `FT_Fixed' undeclared (first use in this function) freetype.c:534: parse error before `x_scale' freetype.c:536: `x_scale' undeclared (first use in this function) freetype.c:536: `ft_face' undeclared (first use in this function) freetype.c:537: `y_scale' undeclared (first use in this function) freetype.c:539: `ft_sfnt_os2' undeclared (first use in this function) freetype.c:545: `ft_sfnt_hhea' undeclared (first use in this function) freetype.c:558: warning: implicit declaration of function `FT_MulFix' freetype.c:581: `FT_STYLE_FLAG_ITALIC' undeclared (first use in this function) freetype.c:586: warning: implicit declaration of function `FT_IS_FIXED_WIDTH' freetype.c:587: warning: implicit declaration of function `FT_IS_SCALABLE' freetype.c: In function `WineEngGetOutlineTextMetrics': freetype.c:602: `FT_Face' undeclared (first use in this function) freetype.c:602: parse error before `ft_face' freetype.c:604: `TT_OS2' undeclared (first use in this function) freetype.c:604: `pOS2' undeclared (first use in this function) freetype.c:604: warning: statement with no effect freetype.c:605: `TT_HoriHeader' undeclared (first use in this function) freetype.c:605: `pHori' undeclared (first use in this function) freetype.c:605: warning: statement with no effect freetype.c:606: `FT_Fixed' undeclared (first use in this function) freetype.c:606: parse error before `x_scale' freetype.c:613: `ft_face' undeclared (first use in this function) freetype.c:615: `family_nameW' undeclared (first use in this function) freetype.c:621: `style_nameW' undeclared (first use in this function) freetype.c:648: `x_scale' undeclared (first use in this function) freetype.c:649: `y_scale' undeclared (first use in this function) freetype.c:651: `ft_sfnt_os2' undeclared (first use in this function) freetype.c:658: `ft_sfnt_hhea' undeclared (first use in this function) freetype.c:704: `cp' undeclared (first use in this function) freetype.c:714: `spaceW' undeclared (first use in this function) freetype.c: In function `WineEngGetFontData': freetype.c:785: `FT_Face' undeclared (first use in this function) freetype.c:785: parse error before `ft_face' freetype.c:786: `TT_Face' undeclared (first use in this function) freetype.c:787: `SFNT_Interface' undeclared (first use in this function) freetype.c:787: `sfnt' undeclared (first use in this function) freetype.c:787: warning: statement with no effect freetype.c:788: parse error before `len' freetype.c:789: `FT_Error' undeclared (first use in this function) freetype.c:791: `ft_face' undeclared (first use in this function) freetype.c:794: `tt_face' undeclared (first use in this function) freetype.c:794: parse error before `ft_face' freetype.c:795: parse error before `)' freetype.c:798: `len' undeclared (first use in this function) freetype.c:807: `err' undeclared (first use in this function) make[2]: *** [freetype.o] Error 1 make[2]: Leaving directory `/usr/src/wine-20020122/dlls/gdi' make[1]: *** [gdi/libgdi32.so] Error 2 make[1]: Leaving directory `/usr/src/wine-20020122/dlls' make: *** [dlls] Error 2 Compilation failed, aborting install. I don't know what to do to solve this problem. I tried "./configure --disable-freetype" to no avail. I use Xfree86 4.1.0 (self compiled) on a Debian 2.2r2 system. Can anybody help me with this issue? I need a way to disable freetype or another solution. I hope somebody can help me. Bye Chris -- Linux - Cause life is too short for reboots

2 1

Re: CodeWeaver's patches
by Gerard Patel 28 Jan '02

28 Jan '02

At 01:57 AM 1/28/02 -0500, you wrote: >I have finished doing that with one exception: the ListView. This one will >require a lot more work due to the fact that it was extensively modified. >I will work on the listview.c file this week, as I have some of my own >changes that I need to cleanup and submit, as well as CW's changes. Speaking of listview, I have issues with your last changes : notification is broken. I can see it with Eudora 4, but I have a test app in Python that I can send you if you want. I attach the changes I did to get Eudora working again Note that the change in notify() is unrelated, I just noticed the problem when searching the notification problem. Also the following change - if (*ppszText == NULL) - *lpLVItem->pszText = '\0'; is not related to your changes, this was broken a very long time ago. It's just that it makes listview work again for columns > 0. If you think to send your changes soon, maybe you could use my changes or implement them to your liking. Else I can send them myself (if you don't object to my changes), as you prefer. Gerard

2 1

DOSfs - removable media drives.
by Keith Matthews 28 Jan '02

28 Jan '02

I noticed earlier today that DOSfs is not correctly handling removable media drives. In particular floppies will get a permissions error message regardless of the actual permissions if there is no media in the drive. Presumeably Jazz type drives would do the same. I have made the assumption that the fact that there is no media in the drive needs to be stored and have added a new value to the drive flags for this. If someone knows better that it cannot be used or clashes with something I have not spotted then please say so. ================================================================ Index: files/drive.c =================================================================== RCS file: /home/wine/wine/files/drive.c,v retrieving revision 1.64 diff -u -u -r1.64 drive.c --- files/drive.c 2002/01/13 01:44:00 1.64 +++ files/drive.c 2002/01/28 16:41:26 @@ -7,6 +7,7 @@ * Label & serial number read support. * (c) 1999 Petr Tomasek <tomasek(a)etf.cuni.cz> * (c) 2000 Andreas Mohr (changes) + * (c) 2002 Keith Matthews (changes) * */ @@ -508,21 +509,95 @@ #define DRIVE_SUPER 96 int fd; off_t offs; + struct stat dev_data; + uid_t user; + gid_t group; if (memset(buff,0,DRIVE_SUPER)!=buff) return -1; - if ((fd=open(DOSDrives[drive].device,O_RDONLY)) == -1) + + if (!DOSDrives[drive].device) { - struct stat st; - if (!DOSDrives[drive].device) - ERR("No device configured for drive %c: !\n", 'A'+drive); - else - ERR("Couldn't open device '%s' for drive %c: ! (%s)\n", DOSDrives[drive].device, 'A'+drive, - (stat(DOSDrives[drive].device, &st)) ? - "not available or symlink not valid ?" : "no permission"); - ERR("Can't read drive volume info ! Either pre-set it or make sure the device to read it from is accessible !\n"); + ERR("No Device Configured for drive %c: !\n",'A'+drive); PROFILE_UsageWineIni(); return -1; } + + if (( stat(DOSDrives[drive].device,&dev_data)) == -1) + { + if (errno == ENOENT || errno == ENOTDIR || errno == ELOOP || errno == ENAMETOOLONG ) + { + ERR("Device ('%s) Configured for drive %c: is not a valid device path!\n",DOSDrives[drive].device,'A'+drive); + } else if ( errno == EACCES ) + ERR("Permissions problem on device for drive %c: !\n", 'A'+drive); + PROFILE_UsageWineIni(); + return -1; + } else + { + user = getuid(); + group = getgid(); + if ( user == dev_data.st_uid) + { + /* We are running as the device owner - check those perms */ + if ( (dev_data.st_mode & S_IRUSR) == 0 ) + { + /* owner does not have read perms - stupid but */ + ERR("Permissions problem on device for drive %c: - user does not have read access !\n", 'A'+drive); + PROFILE_UsageWineIni(); + return -1; + } + } else if ( group == dev_data.st_gid ) + { + if ( (dev_data.st_mode & S_IRGRP) == 0 ) + { + /* group does not have read perms */ + ERR("Permissions problem on device for drive %c: - group does not have read access !\n", 'A'+drive); + PROFILE_UsageWineIni(); + return -1; + } + + } else if ( (dev_data.st_mode & S_IROTH) == 0 ) + { + /* not owning user or group and no perms */ + ERR("Permissions problem on device for drive %c: - effective user does not have read access !\n", 'A'+drive); + PROFILE_UsageWineIni(); + return -1; + + } + } + + if ((fd=open(DOSDrives[drive].device,O_RDONLY)) == -1) + { + if (DOSDrives[drive].type == DRIVE_REMOVABLE ) + { + /***************************************************************************** + * OK, we've checked just about everything we can, it's a removeable media + * device, so assume no media since that gives same response + * + * Wrong if not running as root and user does not have read to device but + * we've already checked for that above + * + **************************************************************************/ + + DOSDrives[drive].flags = DOSDrives[drive].flags | DRIVE_NO_MEDIA; + return 0; + +/* ++++++++++++++++ should we be down here for CD's also ? also what about Jazz drives etc ?+++++++++++++++++++++++ */ + + } else { + /**************************************************************************** + * + * Not removeable media device - must be permissions problem + * + ***************************************************************************/ + ERR("Couldn't open device '%s' for drive %c: ! (%s)\n", DOSDrives[drive].device, 'A'+drive, + "no permission"); + ERR("Can't read drive volume info ! Either pre-set it or make sure the device to read it from is accessible !\n"); + PROFILE_UsageWineIni(); + return -1; + + } + } + Index: include/drive.h =================================================================== RCS file: /home/wine/wine/include/drive.h,v retrieving revision 1.8 diff -u -u -r1.8 drive.h --- include/drive.h 2000/12/12 00:44:43 1.8 +++ include/drive.h 2002/01/28 16:41:57 @@ -19,6 +19,7 @@ #define DRIVE_CASE_PRESERVING 0x0008 /* Drive fs is case preserving */ #define DRIVE_FAIL_READ_ONLY 0x0010 /* Fail opening read-only files for writing */ #define DRIVE_READ_VOL_INFO 0x0020 /* Try to read volume info from the device? */ +#define DRIVE_NO_MEDIA 0x0040 /* no media in drive */ extern int DRIVE_Init(void); extern int DRIVE_IsValid( int drive ); -- Keith Matthews Frequentous Consultants - Linux Services, Oracle development & database administration

1 0

CodeWeaver's patches
by Dimitrie O. Paun 28 Jan '02

28 Jan '02

Hi people, As you already know, I've signed up for the task of breaking down CW's patches (office[12].diff), for the common controls (dlls/comctl32/*) I have finished doing that with one exception: the ListView. This one will require a lot more work due to the fact that it was extensively modified. I will work on the listview.c file this week, as I have some of my own changes that I need to cleanup and submit, as well as CW's changes. -- Dimi.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel