Release 980822
Sat Aug 22 17:46:19 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de>
* [include/dosexe.h] [include/module.h] [include/pe_image.h]
[include/process.h] [include/windows.h] [loader/dos/module.c]
[loader/module.c] [loader/ne/module.c] [loader/pe_image.c]
[scheduler/process.c] [win32/process.c]
Partially implemented CreateProcess32.
* [win32/device.c] [relay32/kernel32.spec] [scheduler/k32obj.c]
[misc/registry.c] [win32/file.c]
Partially implemented VxDCall (VMM registry services).
* [files/dos_fs.c]
DOSFS_FindNext made thread-safe.
* [include/sig_context.h] [include/syslevel.h] [loader/signal.c]
[scheduler/syslevel.c] [tools/build.c]
Replaced CALLTO16_Current_fs by SYSLEVEL_Win16CurrentTeb.
* [win32/kernel32.c]
Bugfix: QT_Thunk/FT_Thunk should return 'long' in DX:AX, not EAX.
* [if1632/relay.c] [relay32/builtin32.c] [windows/msgbox.c]
[msdos/int20.c] [msdos/int21.c]
Use ExitProcess instead of TASK_KillCurrentTask.
* [include/task.h] [include/thread.h] [loader/task.c]
[scheduler/thread.c] [include/queue.h] [windows/message.c]
[windows/queue.c] [windows/win.c]
Prevent Win32 threads from entering the TASK_Reschedule loop.
(Note: Win32 messaging still doesn't work correctly; this patch
is just preventing the system from crashing when Win32 threads
call messaging functions. Messages will probably still get lost.)
* [scheduler/critsection.c]
Deactivated the use of SEM_UNDO for the SYSTEM_LOCK semaphore;
for some reason, this leads to problems after threads terminate...
Sat Aug 22 15:00:00 1998 Jürgen Schmied <juergen.schmied@metronet.de>
* [include/authors.h]
New file, includes all names of the developer (former shell.c)
* [Makefile.in][configure][configure.in][dlls/Makefile.in]
[dlls/shell32/Makefile.in][shres.rc]
Created dlls/shell32 and moved the shell32 stuff in it.
Started to create internal resources.
* [dlls/shell32/*]
Split the shell32 implementation into smaller files.
New classes: IContextMenu, IExtractIcon, IShellView.
Implemented Shell_GetImageList().
shell32 links to comctl32 now dynamically so it can use
internal/external implementations.
* [documentation/internal-dll] [documentation/shell32]
New, could anybody do a spellcheck?
* [include/commctrl.h]
Many new LV constants, structures, functions.
* [controls/comctl32undoc.c]
Rewrote the DSA* functions.
* [windows/winpos.c]
SetShellWindow32, GetShellWindow32.
Sat Aug 22 14:02:15 1998 Alexander Lukyanov <lav@long.yar.ru>
* [loader/resource.c]
Mark last accelerator as such in LoadAccelerators32W.
* [relay32/shell32.spec] [misc/shell.c]
Add stubs for SHGetSpecialFolderPath[AW].
Sat Aug 22 02:07:42 1998 Adrian Harvey <adrian@select.com.au>
* [include/file.h] [file/file.c] [msdos/int21.c] [msdos/vxd.c]
[misc/lzexpand.c] [win32/kernel32.c] [documentation/filehandles]
Fixed file handle handling. Created universal HFILE16 to HFILE32
translation macro from msdos/int21 code by Ove Kaaven.
Used macro in all Win16 functions so that win32 handles are translated
to avoid DOS/Win16 stdxx handles.
Removed handle translation from int21.c where Win16 functions are
called. Changed remaining calls to use new macro names.
Documented filehandle handling and differences between win 16 & 32.
Fri Aug 21 20:32:49 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [server/process.c] [server/thread.c]
Implemented object wait queues and synchronization.
Fri Aug 21 18:40:02 1998 Huw D M Davies <daviesh@abacus.physics.ox.ac.uk>
* [graphics/psdrv/*]
DEVMODE dmPaper{Width|Length} fields are in 0.1mm.
Select a 100 pixel default font in CreateDC.
Thu Aug 20 22:47:39 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
* [objects/bitmap.c]
Handle bits=32 in SetBitmapBits32 and GetBitmapBits32.
* [msdos/int21.c]
Add handling of Int21 0A and 37.
* [misc/commdlg.c]
Use MapHModuleLS and MapHModuleSL when translating HINSTANCE16 to
HINSTANCE32 and vice versa.
* [win32/file.c]
CreateFile32A: Abort if filename == NULL.
Thu Aug 20 12:28:31 1998 Marcus Meissner <marcus@jet.franken.de>
* [*/*]
Lots of missing prototypes added, some parameter types adapted to match
SDK.
* [debugger/stabs.c]
Don't loop forever if we don't find wine or one of the libxxx.so.
* [loader/ne/module.c]
Implemented MapHModuleLS,MapHModuleSL,MapHinstLS,MapHinstSL.
* [misc/network.c]
Implemented WNetGetUser32A.
* [misc/shellord.c]
Implemented ILRemoveLastID.
* [multimedia/dsound.c]
Fixed StarCraft memory leak.
* [graphics/ddraw.c]
Removed some unnecessary simple relaying functions, tried polishing
up the Xlib implementation (still doesn't work), temp. removed Xshm
code (to be remerged with working Xlib code).
Tue Aug 18 22:29:17 1998 Ove Kaaven <ovek@arcticnet.no>
* [multimedia/mmio.c] [multimedia/mmsystem.c]
Fixed most mmio bugs, fully implementing mmioSetBuffer
buffering, ability to read memory files, and the
sndPlaySound() SND_MEMORY flag. Most mmio-using programs
now work fine.
* [include/dosexe.h] [include/miscemu.h] [include/module.h]
[loader/module.c] [loader/task.c] [msdos/dosmem.c]
Improved DOS VM flexibility and portability somewhat. (Did
I get the #ifdefs right this time, BSD-ers?)
* [msdos/int21.c]
Made "Get Current PSP address" work as expected in a DOS VM.
* [loader/dos/*]
Began improving flexibility and portability somewhat. It
should be easier to add DPMI RMCB callbacks now. The
DOS VM no longer leaves big files lying around in /tmp
after a crash.
Tue Aug 18 12:38:31 1998 Turchanov Sergey <turchanov@usa.net>
* [relay32/winmm.spec]
This patch allows WinAmp to play WAV files (at least in PCM
format).
Sun Aug 16 05:34:13 1998 Pablo Saratxaga <srtxg@chanae.alphanet.ch>
* [windows/keyboard.c]
Corrected keyboard code to properly handle keys : ? ~ and "
on non US keyboards.
Sat Aug 15 18:47:14 1998 Brian Craft <bcboy@dorothy.wanglab.brandeis.edu>
* [windows/win.c]
Fixed severe bug in EnumChildWindwos().
Thu Aug 13 21:05:35 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de>
* [controls/tooltips.c]
Fixed some bugs. Added subclassing support.
* [controls/toolbar.c]
Improved tooltip integration. Fixed some bugs.
* [controls/commctrl.c]
Changed control registration and added some documentation.
Fixed ShowHideMenuCtl.
* [controls/rebar.c][include/rebar.h][include/commctrl.h]
Improved rebar implementation (still no display).
* [controls/pager.c][include/pager.h][include/commctrl.h]
Improved pager implementation (still no display).
* [misc/imagelist.c]
Fixed a bug.
* [documentation/common_controls]
Updated.
Sun Aug 9 19:50:20 1998 James Juran <jrj120@psu.edu>
* [Makefile.in] [documentation/Makefile.in]
[programs/Makefile.in] [programs/*/Makefile.in]
Added uninstall rules, cleaned up install rules a little bit.
Sun Aug 9 13:21:35 1998 Andreas Mohr <100.30936@germany.net>
* [loader/ne/module.c] [if1632/kernel.spec]
Added the undocumented HIWORD of GetModuleHandle (hFirstModule).
* [loader/ne/segment.c]
Wine forgot to set some NE_SEGFLAGS_*.
Combined with another loader change, this fixed the
"BLINKER -- error in loading module" or ghost MessageBox problem
that about 1% of all Windows programs have.
Some BLINKER programs still don't work, though.
But I'm working on it, with great help from Blinkinc.
* [loader/task.c]
InitTask needs to decrement the SP register by two as Win95 does.
Sun Aug 9 02:41:28 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de>
* [if1632/kernel.spec] [relay32/kernel32.spec] [scheduler/syslevel.c]
[loader/main.c] [win32/ordinals.c] [include/syslevel.h]
[scheduler/Makefile.in]
Implemented Win95 'syslevel' routines (including Win16Lock).
* [if1632/relay.c] [if1632/thunk.c] [tools/build.c] [loader/task.c]
[loader/ne/segment.c] [win32/kernel32.c] [memory/selector.c]
[include/stackframe.h] [include/thread.h]
16-bit %fs handling revised. Use Win16Lock where appropriate.
* [include/thread.h] [scheduler/synchro.c] [windows/message.c]
[windows/queue.c] [win32/process.c]
Implemented MsgWaitForMultipleObjects.
* [files/change.c] [files/Makefile.in] [scheduler/k32obj.c]
[win32/newfns.c]
Implemented (dummy) file change notification objects.
* [debugger/dbg.y] [scheduler/process.c] [scheduler/thread.c]
[include/process.h] [include/thread.h]
Suspend all threads except current when hitting debugger break point.
* [objects/dib.c]
Bugfix for CreateDIBSection.
diff --git a/files/dos_fs.c b/files/dos_fs.c
index e61e8e7..fd168c4 100644
--- a/files/dos_fs.c
+++ b/files/dos_fs.c
@@ -24,6 +24,7 @@
#include "file.h"
#include "heap.h"
#include "msdos.h"
+#include "syslevel.h"
#include "debug.h"
/* Define the VFAT ioctl to get both short and long file names */
@@ -74,16 +75,6 @@
BYTE DOS_ErrorAction;
BYTE DOS_ErrorLocus;
-/* Info structure for FindFirstFile handle */
-typedef struct
-{
- LPSTR path;
- LPSTR mask;
- int drive;
- int skip;
-} FIND_FIRST_INFO;
-
-
/* Directory info for DOSFS_ReadDir */
typedef struct
{
@@ -95,6 +86,19 @@
#endif
} DOS_DIR;
+/* Info structure for FindFirstFile handle */
+typedef struct
+{
+ LPSTR path;
+ LPSTR long_mask;
+ LPSTR short_mask;
+ BYTE attr;
+ int drive;
+ int cur_pos;
+ DOS_DIR *dir;
+} FIND_FIRST_INFO;
+
+
/***********************************************************************
* DOSFS_ValidDOSName
@@ -1016,33 +1020,23 @@
return ret;
}
-
/***********************************************************************
- * DOSFS_FindNext
- *
- * Find the next matching file. Return the number of entries read to find
- * the matching one, or 0 if no more entries.
- * 'short_mask' is the 8.3 mask (in FCB format), 'long_mask' is the long
- * file name mask. Either or both can be NULL.
+ * DOSFS_FindNextEx
*/
-int DOSFS_FindNext( const char *path, const char *short_mask,
- const char *long_mask, int drive, BYTE attr,
- int skip, WIN32_FIND_DATA32A *entry )
+static int DOSFS_FindNextEx( FIND_FIRST_INFO *info, WIN32_FIND_DATA32A *entry )
{
- static DOS_DIR *dir = NULL;
- int count = 0;
- static char buffer[MAX_PATHNAME_LEN];
- static int cur_pos = 0;
- static int drive_root = 0;
- char *p;
- char dos_name[13];
+ BYTE attr = info->attr | FA_UNUSED | FA_ARCHIVE | FA_RDONLY;
+ UINT32 flags = DRIVE_GetFlags( info->drive );
+ char *p, buffer[MAX_PATHNAME_LEN];
+ const char *drive_path;
+ int drive_root;
LPCSTR long_name, short_name;
- UINT32 flags;
- BY_HANDLE_FILE_INFORMATION info;
+ BY_HANDLE_FILE_INFORMATION fileinfo;
+ char dos_name[13];
- if ((attr & ~(FA_UNUSED | FA_ARCHIVE | FA_RDONLY)) == FA_LABEL)
+ if ((info->attr & ~(FA_UNUSED | FA_ARCHIVE | FA_RDONLY)) == FA_LABEL)
{
- if (skip) return 0;
+ if (info->cur_pos) return 0;
entry->dwFileAttributes = FILE_ATTRIBUTE_LABEL;
DOSFS_UnixTimeToFileTime( (time_t)0, &entry->ftCreationTime, 0 );
DOSFS_UnixTimeToFileTime( (time_t)0, &entry->ftLastAccessTime, 0 );
@@ -1051,37 +1045,23 @@
entry->nFileSizeLow = 0;
entry->dwReserved0 = 0;
entry->dwReserved1 = 0;
- DOSFS_ToDosDTAFormat( DRIVE_GetLabel( drive ), entry->cFileName );
- strcpy( entry->cAlternateFileName, entry->cFileName );
+ DOSFS_ToDosDTAFormat( DRIVE_GetLabel( info->drive ), entry->cFileName );
+ strcpy( entry->cAlternateFileName, entry->cFileName );
+ info->cur_pos++;
return 1;
}
- /* Check the cached directory */
- if (dir && !strcmp( buffer, path ) && (cur_pos <= skip)) skip -= cur_pos;
- else /* Not in the cache, open it anew */
- {
- const char *drive_path;
- TRACE(dosfs, "cache miss, path=%s skip=%d buf=%s cur=%d\n",
- path, skip, buffer, cur_pos );
- cur_pos = skip;
- if (dir) DOSFS_CloseDir(dir);
- if (!*path) path = "/";
- if (!(dir = DOSFS_OpenDir(path))) return 0;
- drive_path = path + strlen(DRIVE_GetRoot(drive));
- while ((*drive_path == '/') || (*drive_path == '\\')) drive_path++;
- drive_root = !*drive_path;
- TRACE(dosfs, "drive_root = %d\n", drive_root);
- lstrcpyn32A( buffer, path, sizeof(buffer) - 1 );
- }
+ drive_path = info->path + strlen(DRIVE_GetRoot( info->drive ));
+ while ((*drive_path == '/') || (*drive_path == '\\')) drive_path++;
+ drive_root = !*drive_path;
+
+ lstrcpyn32A( buffer, info->path, sizeof(buffer) - 1 );
strcat( buffer, "/" );
p = buffer + strlen(buffer);
- attr |= FA_UNUSED | FA_ARCHIVE | FA_RDONLY;
- flags = DRIVE_GetFlags( drive );
- while (DOSFS_ReadDir( dir, &long_name, &short_name ))
+ while (DOSFS_ReadDir( info->dir, &long_name, &short_name ))
{
- if (skip-- > 0) continue;
- count++;
+ info->cur_pos++;
/* Don't return '.' and '..' in the root of the drive */
if (drive_root && (long_name[0] == '.') &&
@@ -1090,15 +1070,15 @@
/* Check the long mask */
- if (long_mask)
+ if (info->long_mask)
{
- if (!DOSFS_MatchLong( long_mask, long_name,
+ if (!DOSFS_MatchLong( info->long_mask, long_name,
flags & DRIVE_CASE_SENSITIVE )) continue;
}
/* Check the short mask */
- if (short_mask)
+ if (info->short_mask)
{
if (!short_name)
{
@@ -1106,27 +1086,27 @@
!(flags & DRIVE_CASE_SENSITIVE) );
short_name = dos_name;
}
- if (!DOSFS_MatchShort( short_mask, short_name )) continue;
+ if (!DOSFS_MatchShort( info->short_mask, short_name )) continue;
}
/* Check the file attributes */
lstrcpyn32A( p, long_name, sizeof(buffer) - (int)(p - buffer) );
- if (!FILE_Stat( buffer, &info ))
+ if (!FILE_Stat( buffer, &fileinfo ))
{
WARN(dosfs, "can't stat %s\n", buffer);
continue;
}
- if (info.dwFileAttributes & ~attr) continue;
+ if (fileinfo.dwFileAttributes & ~attr) continue;
/* We now have a matching entry; fill the result and return */
- entry->dwFileAttributes = info.dwFileAttributes;
- entry->ftCreationTime = info.ftCreationTime;
- entry->ftLastAccessTime = info.ftLastAccessTime;
- entry->ftLastWriteTime = info.ftLastWriteTime;
- entry->nFileSizeHigh = info.nFileSizeHigh;
- entry->nFileSizeLow = info.nFileSizeLow;
+ entry->dwFileAttributes = fileinfo.dwFileAttributes;
+ entry->ftCreationTime = fileinfo.ftCreationTime;
+ entry->ftLastAccessTime = fileinfo.ftLastAccessTime;
+ entry->ftLastWriteTime = fileinfo.ftLastWriteTime;
+ entry->nFileSizeHigh = fileinfo.nFileSizeHigh;
+ entry->nFileSizeLow = fileinfo.nFileSizeLow;
if (short_name)
DOSFS_ToDosDTAFormat( short_name, entry->cAlternateFileName );
@@ -1139,15 +1119,75 @@
TRACE(dosfs, "returning %s (%s) %02lx %ld\n",
entry->cFileName, entry->cAlternateFileName,
entry->dwFileAttributes, entry->nFileSizeLow );
- cur_pos += count;
- p[-1] = '\0'; /* Remove trailing slash in buffer */
- return count;
+ return 1;
}
- DOSFS_CloseDir( dir );
- dir = NULL;
return 0; /* End of directory */
}
+/***********************************************************************
+ * DOSFS_FindNext
+ *
+ * Find the next matching file. Return the number of entries read to find
+ * the matching one, or 0 if no more entries.
+ * 'short_mask' is the 8.3 mask (in FCB format), 'long_mask' is the long
+ * file name mask. Either or both can be NULL.
+ *
+ * NOTE: This is supposed to be only called by the int21 emulation
+ * routines. Thus, we should own the Win16Mutex anyway.
+ * Nevertheless, we explicitly enter it to ensure the static
+ * directory cache is protected.
+ */
+int DOSFS_FindNext( const char *path, const char *short_mask,
+ const char *long_mask, int drive, BYTE attr,
+ int skip, WIN32_FIND_DATA32A *entry )
+{
+ static FIND_FIRST_INFO info = { NULL };
+ LPCSTR short_name, long_name;
+ int count;
+
+ SYSLEVEL_EnterWin16Lock();
+
+ /* Check the cached directory */
+ if (!(info.dir && info.path == path && info.short_mask == short_mask
+ && info.long_mask == long_mask && info.drive == drive
+ && info.attr == attr && info.cur_pos <= skip))
+ {
+ /* Not in the cache, open it anew */
+ if (info.dir) DOSFS_CloseDir( info.dir );
+
+ info.path = (LPSTR)path;
+ info.long_mask = (LPSTR)long_mask;
+ info.short_mask = (LPSTR)short_mask;
+ info.attr = attr;
+ info.drive = drive;
+ info.cur_pos = 0;
+ info.dir = DOSFS_OpenDir( info.path );
+ }
+
+ /* Skip to desired position */
+ while (info.cur_pos < skip)
+ if (DOSFS_ReadDir( info.dir, &long_name, &short_name ))
+ info.cur_pos++;
+ else
+ break;
+
+ if (info.cur_pos == skip && DOSFS_FindNextEx( &info, entry ))
+ count = info.cur_pos - skip;
+ else
+ count = 0;
+
+ if (!count)
+ {
+ DOSFS_CloseDir( info.dir );
+ memset( &info, '\0', sizeof(info) );
+ }
+
+ SYSLEVEL_LeaveWin16Lock();
+
+ return count;
+}
+
+
/*************************************************************************
* FindFirstFile16 (KERNEL.413)
@@ -1165,11 +1205,16 @@
return INVALID_HANDLE_VALUE16;
info = (FIND_FIRST_INFO *)GlobalLock16( handle );
info->path = HEAP_strdupA( SystemHeap, 0, full_name.long_name );
- info->mask = strrchr( info->path, '/' );
- *(info->mask++) = '\0';
+ info->long_mask = strrchr( info->path, '/' );
+ *(info->long_mask++) = '\0';
+ info->short_mask = NULL;
+ info->attr = 0xff;
if (path[0] && (path[1] == ':')) info->drive = toupper(*path) - 'A';
else info->drive = DRIVE_GetCurrentDrive();
- info->skip = 0;
+ info->cur_pos = 0;
+
+ info->dir = DOSFS_OpenDir( info->path );
+
GlobalUnlock16( handle );
if (!FindNextFile16( handle, data ))
{
@@ -1222,7 +1267,6 @@
BOOL16 WINAPI FindNextFile16( HANDLE16 handle, WIN32_FIND_DATA32A *data )
{
FIND_FIRST_INFO *info;
- int count;
if (!(info = (FIND_FIRST_INFO *)GlobalLock16( handle )))
{
@@ -1230,20 +1274,19 @@
return FALSE;
}
GlobalUnlock16( handle );
- if (!info->path)
+ if (!info->path || !info->dir)
{
DOS_ERROR( ER_NoMoreFiles, EC_MediaError, SA_Abort, EL_Disk );
return FALSE;
}
- if (!(count = DOSFS_FindNext( info->path, NULL, info->mask, info->drive,
- 0xff, info->skip, data )))
+ if (!DOSFS_FindNextEx( info, data ))
{
+ DOSFS_CloseDir( info->dir ); info->dir = NULL;
HeapFree( SystemHeap, 0, info->path );
- info->path = info->mask = NULL;
+ info->path = info->long_mask = NULL;
DOS_ERROR( ER_NoMoreFiles, EC_MediaError, SA_Abort, EL_Disk );
return FALSE;
}
- info->skip += count;
return TRUE;
}
@@ -1289,6 +1332,7 @@
DOS_ERROR( ER_InvalidHandle, EC_ProgramError, SA_Abort, EL_Disk );
return FALSE;
}
+ if (info->dir) DOSFS_CloseDir( info->dir );
if (info->path) HeapFree( SystemHeap, 0, info->path );
GlobalUnlock16( handle );
GlobalFree16( handle );
