Release 970329
Fri Mar 28 14:18:32 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [misc/main.c] [ANNOUNCE]
Update the list of contributors. Please let me know if I forgot
someone.
* [controls/combo.c]
Fixed bug in CB_DIR16 handling.
Use correct text color in CBPaintText.
* [controls/listbox.c]
Fixed WM_CTLCOLOR handling.
* [windows/winproc.c]
Added translation for EM_*32 messages.
Mon Mar 24 01:31:52 1997 Steffen Moeller <moeller@mpimg-berlin-dahlem.mpg.de>
* [files/drive.c]
Added information on device and inode numbers to the DOSDRIVE
struct, using it to find DOS drives in a path even if it contains
symbolic links, eliminating annoying messages at startup.
Edited functions DRIVE_Init and rewrote DRIVE_FindDriveRoot.
Wed Mar 19 16:31:18 1997 John Harvey <john@division.co.uk>
* [graphics/win16drv/font.c] [graphics/win16drv/init.c]
[graphics/x11drv/font.c] [objects/font.c] [include/gdi.h]
[include/win16drv.h] [include/x11drv.h]
Implemented GetCharWidth via graphics drivers.
* [graphics/win16drv/Makefile.in] [graphics/win16drv/prtdrv.c]
Moved printer driver interfaces into a separate file.
* [graphics/win16drv/text.c]
Fixed bugs that seg-faulted write.
Wed Mar 19 13:52:41 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [BUGS]
Update.
* [controls/edit.c]
Removed useless parameters from a lot of functions.
* [controls/menu.c]
Improved keyboard shortcuts. Added check for entries with popup
menu in EnableMenuItem().
* [windows/winproc.c] [windows/win.c] [memory/selector.c]
Do not allocate separate thunks for new windows.
* [misc/clipboard.c] [windows/painting.c]
Fixed problems with ClipBook.
* [controls/combo.c] [controls/edit.c] [controls/listbox.c]
[controls/widgets.c] [windows/graphics.c] [windows/defdlg.c]
Combo rewrite.
* [objects/dib.c]
Slight improvements.
Wed Mar 19 11:21:17 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [misc/crtdll.c]
Added chdir/mkdir.
* [misc/ntdll.c]
Fixed some bugs, added RtlUnicodeStringToAnsiString.
* [win32/process.c]
Added initialisation of events/semaphores/mutices.
Wed Mar 19 01:55:40 1997 Ricardo R. Massaro <massaro@ime.usp.br>
* [resources/sysres_Po.rc]
Added support for Portuguese language.
Sat Mar 18 18:00:14 1997 Uwe Bonnes <bon@elektron.ikp.physik.th-darmstadt.de>
* [windows/winpos.c] [if1632/user.spec] [if1632/user32.spec]
Implemented SwitchToThisWindow().
* [misc/ver.c]
Corrected a flaw in VerInstallFile32A.
* [msdos/int21.c]
Corrected wrong number in Int21 3305
Corrected Int21 714e, implemented Int21 7160,CL=2, 7143 and 7147
Sun Mar 16 09:53:04 1997 Andreas Mohr <100.30936@germany.net>
* [loader/ne_module.c]
Fixed NE_LoadSegments() to set size to pSeg->minsize rather than
setting it to 0x10000 if pSeg->size is 0.
Thu Mar 13 12:15:00 1997 Anand Kumria <akumria@ozemail.com.au>
* [ANNOUNCE]
Added ftp.progsoc.uts.edu.au as a mirror of Wine.
* [memory/global.c]
Removed MemManInfo sizeof check.
Mon Mar 10 10:35:44 MET 1997 Sven Verdoolaege <skimo@breughel.ufsia.ac.be>
* [files/dos_fs.c]
Pick up kernel dirent on glibc systems.
* [loader/signal.c]
Pick up kernel sigaction on glibc systems.
Sat Mar 8 21:05:37 1997 Jimen Ching <jching@aloha.com>
* [debugger/stabs.c] [debugger/msc.c]
Check return value of mmap.
Fri Mar 7 05:42:03 1997 Lee Jaekil <juria@seodu.co.kr>
* [win32/code_page.c]
Added IsValidCodePage.
diff --git a/files/drive.c b/files/drive.c
index dabebf8..3fb43c1 100644
--- a/files/drive.c
+++ b/files/drive.c
@@ -43,6 +43,8 @@
DWORD serial; /* drive serial number */
DRIVETYPE type; /* drive type */
UINT32 flags; /* drive flags */
+ dev_t dev; /* unix device number */
+ ino_t ino; /* unix inode number */
} DOSDRIVE;
@@ -124,6 +126,7 @@
char name[] = "Drive A";
char path[MAX_PATHNAME_LEN];
char buffer[20];
+ struct stat drive_stat_buffer;
char *p;
DOSDRIVE *drive;
@@ -134,14 +137,28 @@
{
p = path + strlen(path) - 1;
while ((p > path) && ((*p == '/') || (*p == '\\'))) *p-- = '\0';
- if (strlen(path))
- drive->root = HEAP_strdupA( SystemHeap, 0, path );
- else
- drive->root = HEAP_strdupA( SystemHeap, 0, "/" );
+ if (!path[0]) strcpy( path, "/" );
+
+ if (stat( path, &drive_stat_buffer ))
+ {
+ fprintf( stderr, "Could not stat %s, ignoring drive %c:\n",
+ path, 'A' + i );
+ continue;
+ }
+ if (!S_ISDIR(drive_stat_buffer.st_mode))
+ {
+ fprintf( stderr, "%s is not a directory, ignoring drive %c:\n",
+ path, 'A' + i );
+ continue;
+ }
+
+ drive->root = HEAP_strdupA( SystemHeap, 0, path );
drive->dos_cwd = HEAP_strdupA( SystemHeap, 0, "" );
drive->unix_cwd = HEAP_strdupA( SystemHeap, 0, "" );
drive->type = DRIVE_GetDriveType( name );
drive->flags = 0;
+ drive->dev = drive_stat_buffer.st_dev;
+ drive->ino = drive_stat_buffer.st_ino;
/* Get the drive label */
PROFILE_GetWineIniString( name, "Label", name, drive->label, 12 );
@@ -167,9 +184,10 @@
DRIVE_CurDrive = i;
count++;
- dprintf_dosfs( stddeb, "%s: path=%s type=%s label='%s' serial=%08lx flags=%08x\n",
+ dprintf_dosfs( stddeb, "%s: path=%s type=%s label='%s' serial=%08lx flags=%08x dev=%x ino=%x\n",
name, path, DRIVE_Types[drive->type],
- drive->label, drive->serial, drive->flags );
+ drive->label, drive->serial, drive->flags,
+ (int)drive->dev, (int)drive->ino );
}
else dprintf_dosfs( stddeb, "%s: not defined\n", name );
}
@@ -252,51 +270,54 @@
* This can be used to translate a Unix path into a drive + DOS path.
* Return value is the drive, or -1 on error. On success, path is modified
* to point to the beginning of the DOS path.
- * FIXME: this only does a textual comparison of the path names, and won't
- * work well in the presence of symbolic links.
*/
int DRIVE_FindDriveRoot( const char **path )
{
+ /* idea: check at all '/' positions.
+ * If the device and inode of that path is identical with the
+ * device and inode of the current drive then we found a solution.
+ * If there is another drive pointing to a deeper position in
+ * the file tree, we want to find that one, not the earlier solution.
+ */
int drive, rootdrive = -1;
- const char *p1, *p2;
+ char buffer[MAX_PATHNAME_LEN];
+ char *next = buffer;
+ const char *p = *path;
+ struct stat st;
- dprintf_dosfs( stddeb, "DRIVE_FindDriveRoot: searching '%s'\n", *path );
- for (drive = 0; drive < MAX_DOS_DRIVES; drive++)
+ strcpy( buffer, "/" );
+ for (;;)
{
- if (!DOSDrives[drive].root ||
- (DOSDrives[drive].flags & DRIVE_DISABLED)) continue;
- p1 = *path;
- p2 = DOSDrives[drive].root;
- dprintf_dosfs( stddeb, "DRIVE_FindDriveRoot: checking %c: '%s'\n",
- 'A' + drive, p2 );
-
- while (*p2 == '/') p2++;
- if (!*p2)
+ if (stat( buffer, &st ) || !S_ISDIR( st.st_mode )) break;
+
+ /* Find the drive */
+
+ for (drive = 0; drive < MAX_DOS_DRIVES; drive++)
{
- rootdrive = drive;
- continue; /* Look if there's a better match */
+ if (!DOSDrives[drive].root ||
+ (DOSDrives[drive].flags & DRIVE_DISABLED)) continue;
+
+ if ((DOSDrives[drive].dev == st.st_dev) &&
+ (DOSDrives[drive].ino == st.st_ino))
+ {
+ rootdrive = drive;
+ *path = p;
+ }
}
- for (;;)
- {
- while ((*p1 == '\\') || (*p1 == '/')) p1++;
- while (*p2 == '/') p2++;
- while ((*p1 == *p2) && (*p2) && (*p2 != '/')) p1++, p2++;
- if (!*p2)
- {
- if (IS_END_OF_NAME(*p1)) /* OK, found it */
- {
- *path = p1;
- return drive;
- }
- }
- else if (*p2 == '/')
- {
- if (IS_END_OF_NAME(*p1))
- continue; /* Go to next path element */
- }
- break; /* No match, go to next drive */
- }
+
+ /* Get the next path component */
+
+ *next++ = '/';
+ while ((*p == '/') || (*p == '\\')) p++;
+ if (!*p) break;
+ while (!IS_END_OF_NAME(*p)) *next++ = *p++;
+ *next = 0;
}
+
+ if (rootdrive != -1)
+ dprintf_dosfs( stddeb, "DRIVE_FindDriveRoot: %s -> drive %c:, root='%s', name='%s'\n",
+ buffer, 'A' + rootdrive,
+ DOSDrives[rootdrive].root, *path );
return rootdrive;
}
