Release 980413
Sun Apr 12 12:22:23 1997 Andreas Mohr <100.30936@germany.net>
* [files/drive.c]
Fixed "no free space" problem with partition sizes between 1 and 2 GB
(cluster_sectors may not exceed 0x40).
* [windows/msgbox.c] [if1632/user.spec] [include/windows.h]
Implemented MessageBoxIndirect16, corrected MSGBOXPARAMS16.
* [loader/task.c]
DOS environment strings may never exceed 127 chars
-> truncate Unix environment strings if necessary.
Sun Apr 12 02:51:44 1998 Dimitrie O. Paun <dimi@mail.cs.toronto.edu>
* [files/*.c]
All fprintf statements were converted to appropriate debug
messages.
* [tools/find_debug_channels]
Updated comments at the beginning of the file.
Sat Apr 11 15:27:21 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [loader/module.c] [loader/task.c] [scheduler/process.c]
Moved some code around to prepare the ground for CreateProcess().
* [memory/environ.c] [loader/task.c]
Moved Win32 environment strings functions to environ.c.
Unified Win16 and Win32 environment management.
* [scheduler/handle.c] [scheduler/k32obj.c] [scheduler/*.c]
Implemented handle inheritance and DuplicateHandle().
* [scheduler/thread.c]
Create a 16-bit stack for all threads.
* [windows/dialog.c]
Implemented DIALOGEX resource format.
Fri Apr 10 20:21:51 1998 Marcus Meissner <marcus@mud.de>
* [configure.in][include/acconfig.h][*/*][multimedia/*]
Cleaned up the OSS detection stuff, added some more checks for
headerfiles/functions.
Removed a lot of OS specific #ifdefs.
Lots of dependend multimedia cleanups.
* [loader/pe_image.c]
Enhanced comment, added missing reference count increase.
* [ole/compobj.c]
Replaced broken StringFromGUID2 by working one.
* [misc/winsock.c]
SO_LINGER uses unsigned 16 bit in Win16 and Win32, but unsigned
int (32bit) for UNIX.
* [memory/global.c]
Allow realloc for lockcount 1 too.
Fri Apr 10 15:27:34 1998 Morten Welinder <terra@diku.dk>
* [graphics/x11drv/text.c]
Handle control characters in trace. Ignore terminating newline.
* [multimedia/init.c]
(MULTIMEDIA_Init): Correct allocations.
* [tools/examine-relay]
Tidy up.
* [windows/syscolor.c]
Change highlight colour from lightblue to lightgray. This
looks correct for menus.
Fri Apr 10 01:49:58 1998 Douglas Ridgway <ridgway@winehq.com>
* [configure.in] [Make.rules.in]
Add check for c2man before using it.
Fri Apr 10 02:59:21 1998 Douglas Ridgway <ridgway@winehq.com>
* [DEVELOPERS-HINTS]
Simple description of adding API calls.
* [include/wintypes.h] [include/windows.h]
Get rid of Winelib16, avoid declaring some illegal functions in
Winelib, add prototypes for some enhanced metafile functions, fix
GetTextExtentPoint32 declarations.
* [relay32/gdi32.spec] [objects/enhmetafile.c]
Cosmetic and functional improvements.
* [include/wincon.h] [programs/view/*]
Fixes, improved compatibility with native compilers.
Thu Apr 9 15:48:49 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de>
* [win32/kernel32.c]
Implemented FT_Thunk / FT_Prolog / FT_Exit / FT_PrologPrime.
Fixed Common32ThkLS thunk function.
* [tools/build.c] [relay32/relay386.c] [if1632/relay.c]
Changed relay code to allow register functions to modify stack layout.
* [memory/selector.c]
Implemented AllocMappedBuffer / FreeMappedBuffer.
* [relay32/kernel32.spec] [if1632/kernel.spec] [win32/ordinals.c]
Added names for undocumented functions.
* [loader/module.c]
Bugfix: LoadLibrary16 should *not* silently load 32-bit DLL.
Thu Apr 9 03:54:58 1998 Jim Peterson <jspeter@birch.ee.vt.edu>
* [windows/keyboard.c]
Fix an erroneous test in TranslateAccelerator{16,32} for the end
of the accelerator table.
Thu Apr 8 20:36:28 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
* [misc/crtdll.c]
Implement getenv.
* [misc/commdlg.c]
Make Get[Save/Open]FileName work in most situations.
* [misc/lstr.c]
Use wvsprintf32A instead of vsprintf in FormatMessage32X
* [misc/version]
Make NT3.50 a recognised version
* [graphics/x11drv/graphics.c]
Change the algorithme to draw arcs
* [loader/resource.c]
Return an empty buffer in LoadString32A if no resource found.
* [win32/code_page.c]
Try harder to get the right size in MultiByteToWideChar.
* [win32/process.c]
Call WinExec32 for CreateProcess32A.
* [windows/user.c]
Install default Int0 Handler in InitApp().
Thu Apr 8 19:29:48 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de>
* [misc/imagelist.c]
Preliminary fix for drawing selected images.
Various improvements.
* [controls/progress.c][include/progress.c][include/commctrl.h]
Added progress bar messages and styles for IE4.01 (dll version 4.72)
compatibility.
Fixed led size problem.
* [controls/updown.c][include/commctrl.h]
Added UDM_GETRANGE32 and UDM_SETRANGE32.
* [objects/oembitmaps.c][include/windows.h][include/bitmaps/*]
Added Win95 icons and fixed Win95 cursor and restore button bug.
Now they should be visible. Sorry!!!
* [relay32/comctl32.spec]
Added most missing function names.
Tue Apr 6 18:48:36 1998 Matthew Becker <mbecker@glasscity.net>
* [objects/font.c] [if1632/gdi.spec]
GetOutlineTextMetrics: stub
* [objects/text.c]
GetTextCharset should just call GetTextCharsetInfo.
* [misc/mpr.c] [relay32/mpr.spec]
WNetCachePassword: stub
* [scheduler/thread.c] [relay32/user32.spec]
AttachThreadInput: stub
Updated documentation.
* [objects/palette.c]
Updated documentation.
Tue Mar 31 17:06:30 1998 James Juran <jrj120@psu.edu>
* [*/*.c]
Finished fixing USER32 ordinal numbers in function documentation.
Mon Mar 30 20:27:38 1998 Morten Welinder <terra@diku.dk>
* [misc/debugstr.c] [include/debugstr.h]
Moved _dumpstr from relay32/relay386.c. Improved control
character handling.
* [msdos/int21.c]
Implement 215E00 -- get machine name.
* [windows/winpos.c]
SetWindowPos32: Make an extra sync when mapping managed
windows. This makes sure the reconfigure event has been
handled. See Mshearts' what's-your-name window.
Mon Mar 30 01:13:50 1998 Alexander V. Lukyanov <lav@long.yar.ru>
* [Makefile.in]
Install includes from TOPSRCDIR.
diff --git a/files/file.c b/files/file.c
index 1d6b97e..721f11a 100644
--- a/files/file.c
+++ b/files/file.c
@@ -89,8 +89,9 @@
(*file)->unix_name = NULL;
(*file)->type = FILE_TYPE_DISK;
- handle = HANDLE_Alloc( &(*file)->header, FILE_ALL_ACCESS | GENERIC_READ |
- GENERIC_WRITE | GENERIC_EXECUTE /*FIXME*/, FALSE );
+ handle = HANDLE_Alloc( PROCESS_Current(), &(*file)->header,
+ FILE_ALL_ACCESS | GENERIC_READ |
+ GENERIC_WRITE | GENERIC_EXECUTE /*FIXME*/, TRUE );
/* If the allocation failed, the object is already destroyed */
if (handle == INVALID_HANDLE_VALUE32) *file = NULL;
return handle;
@@ -187,7 +188,8 @@
*/
static FILE_OBJECT *FILE_GetFile( HFILE32 handle )
{
- return (FILE_OBJECT *)HANDLE_GetObjPtr( handle, K32OBJ_FILE, 0 /*FIXME*/ );
+ return (FILE_OBJECT *)HANDLE_GetObjPtr( PROCESS_Current(), handle,
+ K32OBJ_FILE, 0 /*FIXME*/ );
}
@@ -359,7 +361,7 @@
return ret;
/* Do not silence this please. It is a critical error. -MM */
- fprintf(stderr, "FILE_Open: Couldn't open device '%s'!\n",path);
+ ERR(file, "Couldn't open device '%s'!\n",path);
DOS_ERROR( ER_FileNotFound, EC_NotFound, SA_Abort, EL_Disk );
return HFILE_ERROR32;
@@ -389,7 +391,7 @@
if (DOSFS_IsDevice( path ))
{
- fprintf(stderr, "FILE_Create: cannot create DOS device '%s'!\n", path);
+ WARN(file, "cannot create DOS device '%s'!\n", path);
DOS_ERROR( ER_AccessDenied, EC_NotFound, SA_Abort, EL_Disk );
return INVALID_HANDLE_VALUE32;
}
@@ -579,13 +581,12 @@
*/
HFILE32 FILE_Dup( HFILE32 hFile )
{
- FILE_OBJECT *file;
HFILE32 handle;
TRACE(file, "FILE_Dup for handle %d\n", hFile );
- if (!(file = FILE_GetFile( hFile ))) return HFILE_ERROR32;
- handle = HANDLE_Alloc( &file->header, FILE_ALL_ACCESS /*FIXME*/, FALSE );
- FILE_ReleaseFile( file );
+ if (!DuplicateHandle( GetCurrentProcess(), hFile, GetCurrentProcess(),
+ &handle, FILE_ALL_ACCESS /* FIXME */, FALSE, 0 ))
+ handle = HFILE_ERROR32;
TRACE(file, "FILE_Dup return handle %d\n", handle );
return handle;
}
@@ -603,7 +604,8 @@
TRACE(file, "FILE_Dup2 for handle %d\n", hFile1 );
/* FIXME: should use DuplicateHandle */
if (!(file = FILE_GetFile( hFile1 ))) return HFILE_ERROR32;
- if (!HANDLE_SetObjPtr( hFile2, &file->header, 0 )) hFile2 = HFILE_ERROR32;
+ if (!HANDLE_SetObjPtr( PROCESS_Current(), hFile2, &file->header, 0 ))
+ hFile2 = HFILE_ERROR32;
FILE_ReleaseFile( file );
return hFile2;
}
@@ -624,8 +626,7 @@
!DRIVE_IsValid( toupper(drive & ~TF_FORCEDRIVE) - 'A' ))
{
drive &= ~TF_FORCEDRIVE;
- fprintf( stderr, "Warning: GetTempFileName: invalid drive %d specified\n",
- drive );
+ WARN(file, "invalid drive %d specified\n", drive );
}
if (drive & TF_FORCEDRIVE)
@@ -691,10 +692,8 @@
/* Check if we have write access in the directory */
if ((p = strrchr( full_name.long_name, '/' ))) *p = '\0';
if (access( full_name.long_name, W_OK ) == -1)
- fprintf( stderr,
- "Warning: GetTempFileName returns '%s', which doesn't seem to be writeable.\n"
- "Please check your configuration file if this generates a failure.\n",
- buffer);
+ WARN(file, "returns '%s', which doesn't seem to be writeable.\n",
+ buffer);
}
TRACE(file, "returning %s\n", buffer );
return unique ? unique : num;
@@ -745,8 +744,7 @@
if (mode & OF_REOPEN) name = ofs->szPathName;
if (!name) {
- fprintf(stderr, "ERROR: FILE_DoOpenFile() called with `name' set to NULL ! Please debug.\n");
-
+ ERR(file, "called with `name' set to NULL ! Please debug.\n");
return HFILE_ERROR32;
}
@@ -930,7 +928,8 @@
BOOL32 result = FALSE;
TRACE( file, "%d %p %d\n", handle, buffer, count);
- if (!(ptr = HANDLE_GetObjPtr( handle, K32OBJ_UNKNOWN, 0))) return -1;
+ if (!(ptr = HANDLE_GetObjPtr( PROCESS_Current(), handle,
+ K32OBJ_UNKNOWN, 0))) return -1;
if (K32OBJ_OPS(ptr)->read)
result = K32OBJ_OPS(ptr)->read(ptr, buffer, count, &numWritten, NULL);
K32OBJ_DecCount( ptr );
@@ -992,12 +991,12 @@
if (highword && *highword)
{
- fprintf( stderr, "SetFilePointer: 64-bit offsets not supported yet\n");
+ FIXME(file, "64-bit offsets not supported yet\n");
SetLastError( ERROR_INVALID_PARAMETER );
return 0xffffffff;
}
TRACE(file, "handle %d offset %ld origin %ld\n",
- hFile, distance, method );
+ hFile, distance, method );
if (!(file = FILE_GetFile( hFile ))) return 0xffffffff;
switch(method)
@@ -1143,7 +1142,8 @@
}
}
- if (!(ioptr = HANDLE_GetObjPtr( handle, K32OBJ_UNKNOWN, 0 )))
+ if (!(ioptr = HANDLE_GetObjPtr( PROCESS_Current(), handle,
+ K32OBJ_UNKNOWN, 0 )))
return HFILE_ERROR32;
if (K32OBJ_OPS(ioptr)->write)
status = K32OBJ_OPS(ioptr)->write(ioptr, buffer, count, &result, NULL);
@@ -1276,7 +1276,7 @@
if (DOSFS_IsDevice( path ))
{
- fprintf(stderr, "DeleteFile: cannot remove DOS device '%s'!\n", path);
+ WARN(file, "cannot remove DOS device '%s'!\n", path);
DOS_ERROR( ER_FileNotFound, EC_NotFound, SA_Abort, EL_Disk );
return FALSE;
}
@@ -1347,7 +1347,7 @@
LPVOID ret;
if (size_high || offset_high)
- fprintf( stderr, "FILE_mmap: offsets larger than 4Gb not supported\n");
+ FIXME(file, "offsets larger than 4Gb not supported\n");
if (!file)
{
@@ -1420,7 +1420,7 @@
int FILE_munmap( LPVOID start, DWORD size_high, DWORD size_low )
{
if (size_high)
- fprintf( stderr, "FILE_munmap: offsets larger than 4Gb not supported\n");
+ FIXME(file, "offsets larger than 4Gb not supported\n");
return munmap( start, size_low );
}
@@ -1470,8 +1470,7 @@
else /* fn2 == NULL means delete source */
if (flag & MOVEFILE_DELAY_UNTIL_REBOOT) {
if (flag & MOVEFILE_COPY_ALLOWED) {
- fprintf( stderr,
- "MoveFileEx32A: Illegal flag\n");
+ WARN(file, "Illegal flag\n");
DOS_ERROR( ER_GeneralFailure, EC_SystemFailure, SA_Abort,
EL_Unknown );
return FALSE;
@@ -1480,11 +1479,8 @@
Perhaps we should queue these command and execute it
when exiting... What about using on_exit(2)
*/
- fprintf( stderr,"MoveFileEx32A: Please delete file %s\n",
- full_name1.long_name);
- fprintf( stderr," when Wine has finished\n");
- fprintf( stderr," like \"rm %s\"\n",
- full_name1.long_name);
+ FIXME(file, "Please delete file '%s' when Wine has finished\n",
+ full_name1.long_name);
return TRUE;
}
else if (unlink( full_name1.long_name ) == -1)
@@ -1499,13 +1495,9 @@
Perhaps we should queue these command and execute it
when exiting... What about using on_exit(2)
*/
- fprintf( stderr,"MoveFileEx32A: Please move existing file %s\n"
- ,full_name1.long_name);
- fprintf( stderr," to file %s\n"
- ,full_name2.long_name);
- fprintf( stderr," when Wine has finished\n");
- fprintf( stderr," like \" mv %s %s\"\n",
- full_name1.long_name,full_name2.long_name);
+ FIXME(file,"Please move existing file '%s' to file '%s'"
+ "when Wine has finished\n",
+ full_name1.long_name, full_name2.long_name);
return TRUE;
}