Release 970804
Sun Aug 3 14:03:43 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [documentation/Makefile.in]
Create links for files included from wine.texinfo.
* [wine.man]
Moved to documentation dir.
* [if1632/builtin.c]
Made SYSTEM.DLL always loaded by default.
* [loader/signal.c] [if1632/signal.c]
Split signal.c in generic/emulator-specific parts.
* [misc/system.c] [if1632/thunk.c]
Implemented system timer functions.
Fixed InquireSystem parameters.
* [msdos/ioports.c]
Defined inb/outb functions to avoid including asm/io.h.
Use the right instruction for word and dword direct access.
* [multimedia/mmsystem.c]
Fixed CallTo16 usage.
Sat Aug 2 13:05:23 1997 Andreas Mohr <100.30936@germany.net>
* [controls/edit.c]
When text is inserted into a newly created editline, the caret
is placed after the text. Should be placed before the text. Fixed.
* [files/file.c]
Removed O_TRUNC flag from OF_WRITE mode in _lopen32().
According to doc _lopen() never truncates files.
* [if1632/user.spec] [misc/comm.c]
Added stub for EnableCommNotification().
* [misc/ver.c]
Fixed problem with VerQueryValue*() running over end of name table
in rare cases.
* [msdos/int21.c]
Enhanced ioctlGetDeviceInfo() to correctly return the current drive.
* [multimedia/joystick.c] [windows/message.c]
Added joystick support !!!
Needs Linux >= 2.1.45 or joystick-0.8.0.tar.gz.
Fri Aug 1 18:02:09 1997 Morten Welinder <terra@diku.dk>
* [if1632/user32.spec]
Define DrawAnimatedRects32.
* [graphics/painting.c]
(DrawAnimatedRects32): Create stub.
* [misc/registry.c]
Cope with NULL class in RegQueryInfoKey32A.
* [if1632/user32.spec]
Add GetMenuItemInfo32[AW].
* [controls/menu.c]
(InsertMenu32A): Upgrade flags to 8 hex-digits.
(MENUEX_ParseResource): First shot at implementation.
(LoadMenuIndirect32A): Handle extended menus.
(GetMenuItemInfo32[AW]): First shot at implementation.
* [include/windows.h]
Define MFT_*, MFS_*, MIIM_* macros. Define MENUITEMINFO[AW]
structures and pointers.
* [Makefile.in]
(etags): Add TAGS as target.
* [if1632/comctl32.spec]
Use Windows 95's ordinals. Add a few missing stubs.
Thu Jul 31 14:01:13 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [objects/color.c]
Fix for 16 color mode of XFree.
* [if1632/kernel32.spec][win32/ordinals.c]
Moved/added some ordinal only exported functions from kernel32.dll
(mostly thunking preparation stuff).
Wed Jul 30 09:16:38 1997 John Harvey <john@division.co.uk>
* [graphics/win16drv/init.c] [include/win16drv.h]
Escape(SETABORTPROC) returns success to keep pbrush.exe happy.
Escape(NEXTBAND) implemented to make HP PCL printer driver work in
word. Stub for PATBLT added to start work on printing more than
text.
Mon Jul 28 13:14:28 1997 Victor Schneider <vischne@ibm.net>
* [libtest/expand.c]
New Winelib test program.
Wed Jul 23 09:37:13 1997 Adrian Harvey <adrian@select.com.au>
* [tools/build.c] [tools/build-spec.txt] [if1632/kernel.spec]
[if1632/user.spec]
Added ability to set filename wine considers the built-in DLLs
to be in to something other than name.DLL with new "file" key
in .spec files.
Made kernel filename KRNL386.EXE (some programs use this name
explicitly - ChemOffice install now starts up).
Made user filename USER.EXE (just to be tidy).
Sun Jul 20 23:51:02 1997 David A. Cuthbert <dacut@henry.ece.cmu.edu>
* [controls/menu.c] [misc/tweak.c] [include/tweak.h]
Fixed MENU_KeyLeft and MENU_KeyRight to handle multiple-column
menus. Misc menu drawing issues for Win95 tweaks fixed. Misc
warnings fixed.
* [loader/module.c]
Spaces are now permitted in file/path names on the command line.
If multiple matches can be made, the preferred match is the
path/file with fewer spaces.
Tue Jul 29 02:21:15 1997 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [misc/compobj.c]
Added CLSIDFromString and StringFromCLSID.
diff --git a/msdos/ioports.c b/msdos/ioports.c
index 4c9ebf9..1668963 100644
--- a/msdos/ioports.c
+++ b/msdos/ioports.c
@@ -10,20 +10,15 @@
fix that, I guess.
*/
-#ifdef linux
#include <ctype.h>
-#include <unistd.h>
-#include <asm/io.h>
-#include <string.h>
-#include "options.h"
-#endif
-
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <time.h>
+#include <unistd.h>
#include "windows.h"
+#include "options.h"
#include "stddebug.h"
-/* #define DEBUG_INT */
#include "debug.h"
static BYTE cmosaddress;
@@ -40,9 +35,18 @@
0x1b, 0x7b, 0x21, 0x00, 0x00, 0x00, 0x05, 0x5f
};
-#ifdef linux
-char do_direct_port_access = 0;
-char port_permissions[0x10000];
+#if defined(linux) && defined(__i386__)
+# define DIRECT_IO_ACCESS
+#else
+# undef DIRECT_IO_ACCESS
+#endif /* linux && __i386__ */
+
+#ifdef DIRECT_IO_ACCESS
+static char do_direct_port_access = 0;
+static char port_permissions[0x10000];
+
+#define IO_READ 1
+#define IO_WRITE 2
#endif
/**********************************************************************
@@ -52,8 +56,8 @@
/* set_IO_permissions(int val1, int val)
* Helper function for IO_port_init
*/
-#ifdef linux
-void set_IO_permissions(int val1, int val, char rw)
+#ifdef DIRECT_IO_ACCESS
+static void set_IO_permissions(int val1, int val, char rw)
{
int j;
if (val1 != -1) {
@@ -76,7 +80,7 @@
* Helper function for IO_port_init
*/
-void do_IO_port_init_read_or_write(char* temp, char rw)
+static void do_IO_port_init_read_or_write(char* temp, char rw)
{
int val, val1, i, len;
if (!strcasecmp(temp, "all")) {
@@ -126,32 +130,64 @@
}
}
-#endif
+static __inline__ BYTE inb( WORD port )
+{
+ BYTE b;
+ __asm__ __volatile__( "inb %w1,%0" : "=a" (b) : "d" (port) );
+ return b;
+}
+
+static __inline__ WORD inw( WORD port )
+{
+ WORD w;
+ __asm__ __volatile__( "inw %w1,%0" : "=a" (w) : "d" (port) );
+ return w;
+}
+
+static __inline__ DWORD inl( WORD port )
+{
+ DWORD dw;
+ __asm__ __volatile__( "inl %w1,%0" : "=a" (dw) : "d" (port) );
+ return dw;
+}
+
+static __inline__ void outb( BYTE value, WORD port )
+{
+ __asm__ __volatile__( "outb %b0,%w1" : : "a" (value), "d" (port) );
+}
+
+static __inline__ void outw( WORD value, WORD port )
+{
+ __asm__ __volatile__( "outw %w0,%w1" : : "a" (value), "d" (port) );
+}
+
+static __inline__ void outl( DWORD value, WORD port )
+{
+ __asm__ __volatile__( "outl %0,%w1" : : "a" (value), "d" (port) );
+}
+
+#endif /* DIRECT_IO_ACCESS */
void IO_port_init()
{
-#ifdef linux
+#ifdef DIRECT_IO_ACCESS
char temp[1024];
- memset(port_permissions, 0, sizeof(port_permissions));
- do_direct_port_access = 0;
-
/* Can we do that? */
if (!iopl(3)) {
iopl(0);
PROFILE_GetWineIniString( "ports", "read", "*",
temp, sizeof(temp) );
- do_IO_port_init_read_or_write(temp, 1);
+ do_IO_port_init_read_or_write(temp, IO_READ);
PROFILE_GetWineIniString( "ports", "write", "*",
temp, sizeof(temp) );
- do_IO_port_init_read_or_write(temp, 2);
+ do_IO_port_init_read_or_write(temp, IO_WRITE);
}
-
-
-#endif
+#endif /* DIRECT_IO_ACCESS */
}
+
/**********************************************************************
* IO_inport
*/
@@ -160,43 +196,50 @@
DWORD res = 0;
BYTE b;
-#ifdef linux
- if (do_direct_port_access) iopl(3);
+#ifdef DIRECT_IO_ACCESS
+ if (do_direct_port_access)
+ {
+ /* Make sure we have access to the whole range */
+ int i;
+ for (i = 0; i < count; i++)
+ if (!(port_permissions[port+i] & IO_READ)) break;
+ if (i == count)
+ {
+ iopl(3);
+ switch(count)
+ {
+ case 1: res = inb( port ); break;
+ case 2: res = inw( port ); break;
+ case 4: res = inl( port ); break;
+ default:
+ fprintf( stderr, "IO_inport: invalid count %d\n", count);
+ }
+ iopl(0);
+ return res;
+ }
+ }
#endif
dprintf_int(stddeb, "IO: %d bytes from port 0x%02x ", count, port );
while (count-- > 0)
{
-#ifdef linux
- if(port_permissions[port] & 1) {
- b = inb(port);
- } else
-#endif
- {
- switch (port)
- {
- case 0x70:
- b = cmosaddress;
- break;
- case 0x71:
- b = cmosimage[cmosaddress & 0x3f];
- break;
- default:
- fprintf( stderr,
- "Direct I/O read attempted "
- "from port %x\n", port);
- b = 0xff;
- break;
- }
- }
-
- port++;
- res = (res << 8) | b;
+ switch (port)
+ {
+ case 0x70:
+ b = cmosaddress;
+ break;
+ case 0x71:
+ b = cmosimage[cmosaddress & 0x3f];
+ break;
+ default:
+ fprintf( stderr, "Direct I/O read attempted from port %x\n", port);
+ b = 0xff;
+ break;
+ }
+ port++;
+ res = (res << 8) | b;
}
-#ifdef linux
- if (do_direct_port_access) iopl(0);
-#endif
dprintf_int(stddeb, "( 0x%lx )\n", res );
return res;
}
@@ -212,37 +255,47 @@
dprintf_int( stddeb, "IO: 0x%lx (%d bytes) to port 0x%02x\n",
value, count, port );
-#ifdef linux
- if (do_direct_port_access) iopl(3);
+#ifdef DIRECT_IO_ACCESS
+ if (do_direct_port_access)
+ {
+ /* Make sure we have access to the whole range */
+ int i;
+ for (i = 0; i < count; i++)
+ if (!(port_permissions[port+i] & IO_WRITE)) break;
+ if (i == count)
+ {
+ iopl(3);
+ switch(count)
+ {
+ case 1: outb( LOBYTE(value), port ); break;
+ case 2: outw( LOWORD(value), port ); break;
+ case 4: outl( value, port ); break;
+ default:
+ fprintf( stderr, "IO_outport: invalid count %d\n", count);
+ }
+ iopl(0);
+ return;
+ }
+ }
#endif
while (count-- > 0)
{
b = value & 0xff;
value >>= 8;
-#ifdef linux
- if (port_permissions[port] & 2) {
- outb(b, port);
- } else
-#endif
- {
- switch (port)
- {
- case 0x70:
- cmosaddress = b & 0x7f;
- break;
- case 0x71:
- cmosimage[cmosaddress & 0x3f] = b;
- break;
- default:
- fprintf( stderr, "Direct I/O write attempted "
- "to port %x\n", port );
- break;
- }
- }
+ switch (port)
+ {
+ case 0x70:
+ cmosaddress = b & 0x7f;
+ break;
+ case 0x71:
+ cmosimage[cmosaddress & 0x3f] = b;
+ break;
+ default:
+ fprintf( stderr, "Direct I/O write attempted "
+ "to port %x\n", port );
+ break;
+ }
port++;
}
-#ifdef linux
- if (do_direct_port_access) iopl(0);
-#endif
}
