Release 940706

ChangeLog

 ----------------------------------------------------------------------
+Sun, 3 Jul 1994 20:15:56 +0100 (BST)  David Metcalfe <david@prism.demon.co.uk>
+
+	* [controls/edit.c]
+	Bug fixes and tidying up.  Preliminary tab stop support
+	(doesn't work yet).
+
+	* [windows/dialog.c]
+	Reversed order of buttons in CheckRadioButtons so that all
+	buttons are now displayed.
+
+Tue Jul  5 18:30:24 1994  Alexandre Julliard  (julliard@lamisun.epfl.ch)
+
+	* [include/options.h] [misc/main.c] [windows/win.c]
+	Removed nosaveunders option, replaced by handling
+	the CS_SAVEBITS flag.
+
+	* [windows/class.c]
+	Modified the fix for negative size in class extra bytes to
+	avoid modifying the caller's data.
+
+	* [windows/dc.c]
+	Bug fix: system font must be a proportional font.
+	Fixed a bug that caused the default pen to not be selected
+	correctly in a DC.
+
+	* [windows/graphics.c]
+	Bug fix in GRAPH_DrawArc(). Thanks to Adriano Azevedo for
+	noticing it.
+
+	* [windows/painting.c]
+	Removed incorrect selecting of default objects in BeginPaint()
+	(no longer needed because of the fix in dc.c).
+
+Jul 4, 94 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte)
+
+	* [misc/mmsystem.c]
+	* [misc/audio.c]
+	Add more code to interface '/dev/dsp'.
+
+	* New file [misc/mcicda.c]
+	Create an MCI_DEVTYPE_CD_AUDIO driver connected to '/dev/sbpcd'.
+
+	* New file [misc/mmaux.c]
+	Stubs to make a future driver connected to '/dev/mixer'.
+
+	* [windows/win.c]
+	Temporary patch to CreateWindowEx() for reseting negative
+	coordinates to 0,0 ; because 'soundrec.exe' give negative values
+	and I need it to work on MMSYSTEM ... :-)
+
+	* [miscemu/int2f.c]
+	add a stub 'do_int2f_16' (function 0x16) for DMPI server.
+
+Mon Jun 20 10:08:40 BST 1994  William Smith (wos@dcs.warwick.ac.uk)
+
+	* include/comm.h
+	New file -- some definitions that were in comm.c now need to
+	be shared with misc/dos_fs.c
+
+	* misc/comm.c
+	Some definitions moved into include/comm.h
+
+	* misc/dos_fs.c (DOS_GetEquipment):
+	Fixed error in equipment -- bitwise or of two values should
+	be used instead of logical or.  Also added code to correctly
+	report the number of serial and parallel devices.
+
+----------------------------------------------------------------------
 Mon Jun 20 14:26:41 1994  Bob Amstadt  (bob@pooh)
 
 	* [objects/bitmap.c]

controls/listbox.c

@@ -1151,7 +1151,7 @@ int ListBoxDirectory(HWND hwnd, UINT attrib, LPSTR filespec)
 		{
 			if (DOS_ValidDrive(x))
 			{
-				sprintf(temp, "[-%c-]", 'A'+x);
+				sprintf(temp, "[-%c-]", 'a'+x);
 				if ( (wRet = ListBoxAddString(hwnd, temp)) == LB_ERR)
 	    				break;
 			}		

include/comm.h

+/*
+ * Communications header
+ *
+ * 93 Erik Bos (erik@trashcan.hacktic.nl)
+ */
+
+#ifndef COMM_H
+#define COMM_H
+
+
+#define MAX_PORTS   16
+
+struct DosDeviceStruct {
+    char *devicename;   /* /dev/cua1 */
+    int fd;
+    int suspended;
+    int unget;
+    int unget_byte;
+};
+
+#endif  /* COMM_H */

include/mmsystem.h

@@ -8,6 +8,11 @@
 typedef LPSTR		    HPSTR;          /* a huge version of LPSTR */
 typedef LPCSTR			HPCSTR;         /* a huge version of LPCSTR */
 
+#define MAXWAVEDRIVERS 10
+#define MAXMIDIDRIVERS 10
+#define MAXAUXDRIVERS 10
+#define MAXMCIDRIVERS 32
+
 #define MAXPNAMELEN      32     /* max product name length (including NULL) */
 #define MAXERRORLENGTH   128    /* max error text length (including NULL) */
 
@@ -166,7 +171,7 @@ typedef WAVECALLBACK FAR *LPWAVECALLBACK;
 #define  WAVE_FORMAT_QUERY     0x0001
 #define  WAVE_ALLOWSYNC        0x0002
 
-typedef struct {
+typedef struct wavehdr_tag {
     LPSTR       lpData;                 /* pointer to locked data buffer */
     DWORD       dwBufferLength;         /* length of data buffer */
     DWORD       dwBytesRecorded;        /* used for input only */
@@ -764,8 +769,10 @@ YIELDPROC WINAPI mciGetYieldProc (UINT uDeviceID, DWORD FAR* lpdwYieldData);
 
 #define MCIERR_CUSTOM_DRIVER_BASE       (MCIERR_BASE + 256)
 
-#define MCI_OPEN                        0x0803
-#define MCI_CLOSE                       0x0804
+#define MCI_OPEN_DRIVER					0x0801
+#define MCI_CLOSE_DRIVER				0x0802
+#define MCI_OPEN						0x0803
+#define MCI_CLOSE						0x0804
 #define MCI_ESCAPE                      0x0805
 #define MCI_PLAY                        0x0806
 #define MCI_SEEK                        0x0807
@@ -1389,6 +1396,126 @@ typedef MCI_OVLY_LOAD_PARMS FAR * LPMCI_OVLY_LOAD_PARMS;
  * 		Linux MMSYSTEM Internals & Sample Audio Drivers
  */
 
+#define DRVM_INIT             100
+#define WODM_INIT             DRVM_INIT
+#define WIDM_INIT             DRVM_INIT
+#define MODM_INIT             DRVM_INIT
+#define MIDM_INIT             DRVM_INIT
+#define AUXM_INIT             DRVM_INIT
+
+#define WODM_GETNUMDEVS       3
+#define WODM_GETDEVCAPS       4
+#define WODM_OPEN             5
+#define WODM_CLOSE            6
+#define WODM_PREPARE          7
+#define WODM_UNPREPARE        8
+#define WODM_WRITE            9
+#define WODM_PAUSE            10
+#define WODM_RESTART          11
+#define WODM_RESET            12 
+#define WODM_GETPOS           13
+#define WODM_GETPITCH         14
+#define WODM_SETPITCH         15
+#define WODM_GETVOLUME        16
+#define WODM_SETVOLUME        17
+#define WODM_GETPLAYBACKRATE  18
+#define WODM_SETPLAYBACKRATE  19
+#define WODM_BREAKLOOP        20
+
+#define WIDM_GETNUMDEVS  50
+#define WIDM_GETDEVCAPS  51
+#define WIDM_OPEN        52
+#define WIDM_CLOSE       53
+#define WIDM_PREPARE     54
+#define WIDM_UNPREPARE   55
+#define WIDM_ADDBUFFER   56
+#define WIDM_START       57
+#define WIDM_STOP        58
+#define WIDM_RESET       59
+#define WIDM_GETPOS      60
+
+#define MODM_GETNUMDEVS		1
+#define MODM_GETDEVCAPS		2
+#define MODM_OPEN			3
+#define MODM_CLOSE			4
+#define MODM_PREPARE		5
+#define MODM_UNPREPARE		6
+#define MODM_DATA			7
+#define MODM_LONGDATA		8
+#define MODM_RESET          9
+#define MODM_GETVOLUME		10
+#define MODM_SETVOLUME		11
+#define MODM_CACHEPATCHES		12      
+#define MODM_CACHEDRUMPATCHES	13     
+
+#define MIDM_GETNUMDEVS  53
+#define MIDM_GETDEVCAPS  54
+#define MIDM_OPEN        55
+#define MIDM_CLOSE       56
+#define MIDM_PREPARE     57
+#define MIDM_UNPREPARE   58
+#define MIDM_ADDBUFFER   59
+#define MIDM_START       60
+#define MIDM_STOP        61
+#define MIDM_RESET       62
+
+#define AUXDM_GETNUMDEVS    3
+#define AUXDM_GETDEVCAPS    4
+#define AUXDM_GETVOLUME     5
+#define AUXDM_SETVOLUME     6
+
+#define MCI_MAX_DEVICE_TYPE_LENGTH 80
+
+#define MCI_FALSE                       (MCI_STRING_OFFSET + 19)
+#define MCI_TRUE                        (MCI_STRING_OFFSET + 20)
+
+#define MCI_FORMAT_RETURN_BASE          MCI_FORMAT_MILLISECONDS_S
+#define MCI_FORMAT_MILLISECONDS_S       (MCI_STRING_OFFSET + 21)
+#define MCI_FORMAT_HMS_S                (MCI_STRING_OFFSET + 22)
+#define MCI_FORMAT_MSF_S                (MCI_STRING_OFFSET + 23)
+#define MCI_FORMAT_FRAMES_S             (MCI_STRING_OFFSET + 24)
+#define MCI_FORMAT_SMPTE_24_S           (MCI_STRING_OFFSET + 25)
+#define MCI_FORMAT_SMPTE_25_S           (MCI_STRING_OFFSET + 26)
+#define MCI_FORMAT_SMPTE_30_S           (MCI_STRING_OFFSET + 27)
+#define MCI_FORMAT_SMPTE_30DROP_S       (MCI_STRING_OFFSET + 28)
+#define MCI_FORMAT_BYTES_S              (MCI_STRING_OFFSET + 29)
+#define MCI_FORMAT_SAMPLES_S            (MCI_STRING_OFFSET + 30)
+#define MCI_FORMAT_TMSF_S               (MCI_STRING_OFFSET + 31)
+
+#define MCI_VD_FORMAT_TRACK_S           (MCI_VD_OFFSET + 5)
+
+#define WAVE_FORMAT_PCM_S               (MCI_WAVE_OFFSET + 0)
+#define WAVE_MAPPER_S                   (MCI_WAVE_OFFSET + 1)
+
+#define MCI_SEQ_MAPPER_S                (MCI_SEQ_OFFSET + 5)
+#define MCI_SEQ_FILE_S                  (MCI_SEQ_OFFSET + 6)
+#define MCI_SEQ_MIDI_S                  (MCI_SEQ_OFFSET + 7)
+#define MCI_SEQ_SMPTE_S                 (MCI_SEQ_OFFSET + 8)
+#define MCI_SEQ_FORMAT_SONGPTR_S        (MCI_SEQ_OFFSET + 9)
+#define MCI_SEQ_NONE_S                  (MCI_SEQ_OFFSET + 10)
+#define MIDIMAPPER_S                    (MCI_SEQ_OFFSET + 11)
+
+#define MCI_RESOURCE_RETURNED       0x00010000  /* resource ID */
+#define MCI_COLONIZED3_RETURN       0x00020000  /* colonized ID, 3 bytes data */
+#define MCI_COLONIZED4_RETURN       0x00040000  /* colonized ID, 4 bytes data */
+#define MCI_INTEGER_RETURNED        0x00080000  /* integer conversion needed */
+#define MCI_RESOURCE_DRIVER         0x00100000  /* driver owns returned resource */
+
+#define MCI_NO_COMMAND_TABLE    0xFFFF
+
+#define MCI_COMMAND_HEAD        0
+#define MCI_STRING              1
+#define MCI_INTEGER             2
+#define MCI_END_COMMAND         3
+#define MCI_RETURN              4
+#define MCI_FLAG                5
+#define MCI_END_COMMAND_LIST    6
+#define MCI_RECT                7
+#define MCI_CONSTANT            8
+#define MCI_END_CONSTANT        9
+
+#define MAKEMCIRESOURCE(wRet, wRes) MAKELRESULT((wRet), (wRes))
+
 typedef struct {
 	DWORD   	dwCallback;
 	DWORD   	dwInstance;
@@ -1397,6 +1524,56 @@ typedef struct {
 	}	PORTALLOC;
 typedef PORTALLOC FAR *LPPORTALLOC;
 
+typedef struct {
+	HWAVE			hWave;
+	LPWAVEFORMAT	lpFormat;
+	DWORD			dwCallBack;
+	DWORD			dwInstance;
+	} WAVEOPENDESC;
+typedef WAVEOPENDESC FAR *LPWAVEOPENDESC;
+
+typedef struct {
+	HMIDI			hMidi;
+	DWORD			dwCallback;
+	DWORD			dwInstance;
+	} MIDIOPENDESC;
+typedef MIDIOPENDESC FAR *LPMIDIOPENDESC;
+
+typedef struct {
+	UINT			wDelay;
+	UINT			wResolution;
+	LPTIMECALLBACK	lpFunction;
+	DWORD			dwUser;
+	UINT			wFlags;
+	} TIMEREVENT;
+typedef TIMEREVENT FAR *LPTIMEREVENT;
+
+typedef struct {
+	UINT    wDeviceID;				/* device ID */
+	LPSTR 	lpstrParams;			/* parameter string for entry in SYSTEM.INI */
+	UINT    wCustomCommandTable;	/* custom command table (0xFFFF if none) */
+									/* filled in by the driver */
+	UINT    wType;					/* driver type */
+									/* filled in by the driver */
+	} MCI_OPEN_DRIVER_PARMS;
+typedef MCI_OPEN_DRIVER_PARMS FAR * LPMCI_OPEN_DRIVER_PARMS;
+
+DWORD WINAPI mciGetDriverData(UINT uDeviceID);
+BOOL  WINAPI mciSetDriverData(UINT uDeviceID, DWORD dwData);
+UINT  WINAPI mciDriverYield(UINT uDeviceID);
+BOOL  WINAPI mciDriverNotify(HWND hwndCallback, UINT uDeviceID,
+    UINT uStatus);
+UINT  WINAPI mciLoadCommandResource(HINSTANCE hInstance,
+    LPCSTR lpResName, UINT uType);
+BOOL  WINAPI mciFreeCommandResource(UINT uTable);
+
+#define DCB_NULL		0x0000
+#define DCB_WINDOW		0x0001			/* dwCallback is a HWND */
+#define DCB_TASK		0x0002			/* dwCallback is a HTASK */
+#define DCB_FUNCTION	0x0003			/* dwCallback is a FARPROC */
+#define DCB_TYPEMASK	0x0007
+#define DCB_NOSWITCH	0x0008			/* don't switch stacks for callback */
+
 BOOL DriverCallback(DWORD dwCallBack, UINT uFlags, HANDLE hDev, 
 		WORD wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2);
 DWORD auxMessage(WORD wDevID, WORD wMsg, DWORD dwUser, 

include/options.h

@@ -15,7 +15,6 @@ struct options
     int    usePrivateMap;
     int    synchronous;
     int    nobackingstore;
-    int    nosaveunders;
     short  cmdShow;
     int    relay_debug;
     int    debug;

include/windows.h

@@ -2790,8 +2790,8 @@ Fb(void,ValidateRgn,HWND,a,HRGN,b)
 Fc(BOOL,LineTo,HDC,a,short,b,short,c)
 Fc(WORD,GetInternalWindowPos,HWND,a,LPRECT,b,LPPOINT,c)
 Fc(LONG,_llseek,INT,a,LONG,b,INT,c)
-Fc(INT,_lread,INT,a,LPSTR,b,INT,c)
-Fc(INT,_lwrite,INT,a,LPSTR,b,INT,c)
+Fc(INT,_lread,INT,a,LPSTR,b,WORD,c)
+Fc(INT,_lwrite,INT,a,LPSTR,b,WORD,c)
 Fc(int,FillRect,HDC,a,LPRECT,b,HBRUSH,c)
 Fc(DWORD,MoveTo,HDC,a,short,b,short,c)
 Fc(BOOL,CheckMenuItem,HMENU,a,WORD,b,WORD,c)

loader/main.c

@@ -264,7 +264,10 @@ int _WinMain(int argc, char **argv)
 	    strncpy(filename, Argv[0], p - Argv[0]);
 	    filename[p - Argv[0]] = '\0';
 	    strcat(WindowsPath, ";");
-	    strcat(WindowsPath, filename);
+	    if (strchr(filename, '/'))
+		    strcat(WindowsPath, GetDosFileName(filename));
+	    else
+	    	    strcat(WindowsPath, filename);
 	}
 	
 	if ((hInstMain = LoadImage(Argv[0], EXE, 1)) < 32) {

misc/Imakefile

@@ -16,7 +16,9 @@ SRCS = \
 	keyboard.c \
 	lstr.c \
 	main.c \
+	mcicda.c \
 	message.c \
+	mmaux.c \
 	mmsystem.c \
 	network.c \
 	profile.c \

misc/comm.c

@@ -18,21 +18,12 @@
 
 #include "wine.h"
 #include "windows.h"
+#include "comm.h"
 
 /* #define DEBUG_COMM /* */
 
-#define MAX_PORTS	16
-
 int commerror = 0, eventmask = 0;
 
-struct DosDeviceStruct {
-	char *devicename;	/* /dev/cua1 */
-	int fd;
-	int suspended;
-	int unget;
-	int unget_byte;
-};
-
 struct DosDeviceStruct COM[MAX_PORTS];
 struct DosDeviceStruct LPT[MAX_PORTS];
 

misc/dos_fs.c

@@ -27,6 +27,7 @@
 #include "msdos.h"
 #include "prototypes.h"
 #include "autoconf.h"
+#include "comm.h"
 
 /* #define DEBUG /* */
 
@@ -170,6 +171,11 @@ WORD DOS_GetEquipment(void)
 {
 	WORD equipment;
 	int diskdrives = 0;
+	int parallelports = 0;
+	int serialports = 0;
+	int x;
+	extern struct DosDeviceStruct COM[MAX_PORTS];
+	extern struct DosDeviceStruct LPT[MAX_PORTS];
 
 /* borrowed from Ralph Brown's interrupt lists 
 
@@ -190,6 +196,12 @@ WORD DOS_GetEquipment(void)
 		    bit      1: =1 if math co-processor
 		    bit      0: =1 if diskette available for boot
 */
+/*  Currently the only of these bits correctly set are:
+		bits 15-14 		} Added by William Owen Smith, 
+		bits 11-9		} wos@dcs.warwick.ac.uk
+		bits 7-6
+		bit  2			(always set)
+*/
 
 	if (DosDrives[0].rootdir != NULL)
 		diskdrives++;
@@ -197,8 +209,27 @@ WORD DOS_GetEquipment(void)
 		diskdrives++;
 	if (diskdrives)
 		diskdrives--;
+	
+	for (x=0; x!=MAX_PORTS; x++) {
+		if (COM[x].devicename)
+			serialports++;
+		if (LPT[x].devicename)
+			parallelports++;
+	}
+	if (serialports > 7)		/* 3 bits -- maximum value = 7 */
+		serialports=7;
+	if (parallelports > 3)		/* 2 bits -- maximum value = 3 */
+		parallelports=3;
 
-	equipment = (diskdrives << 6) || 0x02;
+	equipment = (diskdrives << 6) | (serialports << 9) | 
+		    (parallelports << 14) | 0x02;
+
+#ifdef DEBUG
+	fprintf(stderr, "DOS_GetEquipment : diskdrives = %d serialports = %d "
+			"parallelports = %d\n"
+			"DOS_GetEquipment : equipment = %d\n",
+			diskdrives, serialports, parallelports, equipment);
+#endif
 
 	return (equipment);
 }

misc/file.c

@@ -61,7 +61,7 @@ INT _lopen (LPSTR lpPathName, INT iReadWrite)
 /***************************************************************************
  _lread
  ***************************************************************************/
-INT _lread (INT hFile, LPSTR lpBuffer, INT wBytes)
+INT _lread (INT hFile, LPSTR lpBuffer, WORD wBytes)
 {
   int result;
 
@@ -81,7 +81,7 @@ INT _lread (INT hFile, LPSTR lpBuffer, INT wBytes)
 /****************************************************************************
  _lwrite
 ****************************************************************************/
-INT _lwrite (INT hFile, LPSTR lpBuffer, INT wBytes)
+INT _lwrite (INT hFile, LPSTR lpBuffer, WORD wBytes)
 {
 	int result;
 

misc/main.c

@@ -53,7 +53,6 @@ struct options Options =
     FALSE,          /* usePrivateMap */
     FALSE,          /* synchronous */
     FALSE,          /* no backing store */
-    FALSE,          /* no save unders */
     SW_SHOWNORMAL,  /* cmdShow */
     FALSE
 };
@@ -69,7 +68,6 @@ static XrmOptionDescRec optionsTable[] =
     { "-privatemap",    ".privatemap",      XrmoptionNoArg,  (caddr_t)"on" },
     { "-synchronous",   ".synchronous",     XrmoptionNoArg,  (caddr_t)"on" },
     { "-nobackingstore",".nobackingstore",  XrmoptionNoArg,  (caddr_t)"on" },
-    { "-nosaveunders",  ".nosaveunders",    XrmoptionNoArg,  (caddr_t)"on" },
     { "-spy",           ".spy",             XrmoptionSepArg, (caddr_t)NULL },
     { "-debug",         ".debug",           XrmoptionNoArg,  (caddr_t)"on" },
     { "-relaydbg",      ".relaydbg",        XrmoptionNoArg,  (caddr_t)"on" }
@@ -90,7 +88,6 @@ static XrmOptionDescRec optionsTable[] =
   "    -privatemap     Use a private color map\n" \
   "    -synchronous    Turn on synchronous display mode\n" \
   "    -nobackingstore Turn off backing store\n" \
-  "    -nosaveunders   Turn off saveunders\n" \
   "    -spy file       Turn on message spying to the specified file\n" \
   "    -relaydbg       Display call relay information\n"
 
@@ -245,8 +242,6 @@ static void MAIN_ParseOptions( int *argc, char *argv[] )
 	Options.usePrivateMap = TRUE;
     if (MAIN_GetResource( db, ".synchronous", &value ))
 	Options.synchronous = TRUE;
-    if (MAIN_GetResource( db, ".nosaveunders", &value ))
-	Options.nosaveunders = TRUE;
     if (MAIN_GetResource( db, ".nobackingstore", &value ))
 	Options.nobackingstore = TRUE;	
     if (MAIN_GetResource( db, ".relaydbg", &value ))
@@ -297,16 +292,11 @@ static void MAIN_CreateDesktop( int argc, char *argv[] )
     else
        win_attr.backing_store = Always;
 
-    if (Options.nosaveunders)
-       win_attr.save_under = FALSE;
-    else
-       win_attr.save_under = TRUE;        
-
     rootWindow = XCreateWindow( display, DefaultRootWindow(display),
 			        desktopX, desktopY, width, height, 0,
 			        CopyFromParent, InputOutput, CopyFromParent,
-			        CWEventMask | CWCursor | CWSaveUnder |
-				CWBackingStore, &win_attr );
+			        CWEventMask | CWCursor |
+			        CWBackingStore, &win_attr );
 
       /* Set window manager properties */
 

misc/mmaux.c

+/*
+ * Sample AUXILARY Wine Driver for Linux
+ *
+ * Copyright 1994 Martin Ayotte
+ */
+
+static char Copyright[] = "Copyright  Martin Ayotte, 1994";
+
+#include "stdio.h"
+#include "win.h"
+#include "user.h"
+#include "driver.h"
+#include "mmsystem.h"
+
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <linux/soundcard.h>
+
+#define SOUND_DEV "/dev/dsp"
+#define MIXER_DEV "/dev/mixer"
+
+#ifdef SOUND_VERSION
+#define IOCTL(a,b,c)		ioctl(a,b,&c)
+#else
+#define IOCTL(a,b,c)		(c = ioctl(a,b,c) )
+#endif
+
+
+/*-----------------------------------------------------------------------*/
+
+
+/**************************************************************************
+* 				AUX_GetDevCaps			[internal]
+*/
+DWORD AUX_GetDevCaps(WORD wDevID, LPAUXCAPS lpCaps, DWORD dwSize)
+{
+	int 	mixer;
+	int		volume;
+	printf("AUX_GetDevCaps(%u, %08X, %u);\n", wDevID, lpCaps, dwSize);
+	if (lpCaps == NULL) return MMSYSERR_NOTENABLED;
+	if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) {
+		printf("AUX_GetDevCaps // mixer device not available !\n");
+		return MMSYSERR_NOTENABLED;
+		}
+    if (ioctl(mixer, SOUND_MIXER_READ_LINE, &volume) == -1) {
+		printf("AUX_GetDevCaps // unable read mixer !\n");
+		return MMSYSERR_NOTENABLED;
+		}
+	close(mixer);
+	return MMSYSERR_NOERROR;
+}
+
+
+/**************************************************************************
+* 				AUX_GetVolume			[internal]
+*/
+DWORD AUX_GetVolume(WORD wDevID, DWORD dwParam)
+{
+	int 	mixer;
+	int		volume;
+	printf("AUX_GetVolume(%u, %08X);\n", wDevID, dwParam);
+	if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) {
+		printf("Linux 'AUX_GetVolume' // mixer device not available !\n");
+		return MMSYSERR_NOTENABLED;
+		}
+    if (ioctl(mixer, SOUND_MIXER_READ_LINE, &volume) == -1) {
+		printf("Linux 'AUX_GetVolume' // unable read mixer !\n");
+		return MMSYSERR_NOTENABLED;
+		}
+	close(mixer);
+	return MMSYSERR_NOERROR;
+}
+
+/**************************************************************************
+* 				AUX_SetVolume			[internal]
+*/
+DWORD AUX_SetVolume(WORD wDevID, DWORD dwParam)
+{
+	int 	mixer;
+	int		volume = 50;
+	printf("AUX_SetVolume(%u, %08X);\n", wDevID, dwParam);
+	if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) {
+		printf("Linux 'AUX_SetVolume' // mixer device not available !\n");
+		return MMSYSERR_NOTENABLED;
+		}
+    if (ioctl(mixer, SOUND_MIXER_WRITE_LINE, &volume) == -1) {
+		printf("Linux 'AUX_SetVolume' // unable set mixer !\n");
+		return MMSYSERR_NOTENABLED;
+		}
+	close(mixer);
+	return MMSYSERR_NOERROR;
+}
+
+
+/**************************************************************************
+* 				auxMessage			[sample driver]
+*/
+DWORD auxMessage(WORD wDevID, WORD wMsg, DWORD dwUser, 
+					DWORD dwParam1, DWORD dwParam2)
+{
+	printf("auxMessage(%u, %04X, %08X, %08X, %08X);\n", 
+			wDevID, wMsg, dwUser, dwParam1, dwParam2);
+	switch(wMsg) {
+		case AUXDM_GETDEVCAPS:
+			return AUX_GetDevCaps(wDevID, (LPAUXCAPS)dwParam1, dwParam2);
+		case AUXDM_GETNUMDEVS:
+			return 0L;
+		case AUXDM_GETVOLUME:
+			return AUX_GetVolume(wDevID, dwParam1);
+		case AUXDM_SETVOLUME:
+			return AUX_SetVolume(wDevID, dwParam1);
+		}
+	return MMSYSERR_NOTSUPPORTED;
+}
+
+

miscemu/int2f.c

@@ -3,6 +3,9 @@
 #include "msdos.h"
 #include "wine.h"
 
+int do_int2f_16(struct sigcontext_struct *context);
+
+
 int do_int2f(struct sigcontext_struct *context)
 {
 	switch((context->sc_eax >> 8) & 0xff)
@@ -12,17 +15,41 @@ int do_int2f(struct sigcontext_struct *context)
 		return 1;
 
 	case 0x16:
-		switch(context->sc_eax & 0xff)
-		{
-		case 0x00: /* windows enhanced mode install check */
-			   /* don't return anything as we're running in standard mode */
-			return 1;
-
-		default:
-		}
+		return do_int2f_16(context);
 
 	default:
 		IntBarf(0x2f, context);
 	};
 	return 1;
 }
+
+
+int do_int2f_16(struct sigcontext_struct *context)
+{
+	switch(context->sc_eax & 0xff) {
+		case 0x00: 
+			/* return 'major/minor' for MSWin 3.1 */
+			printf("do_int2f_16 // return 'major/minor' for MSWin 3.1 !\n");
+			context->sc_eax = 0x0310;
+			return 1;
+		case 0x86: 
+			/* operating in protected mode under DPMI */
+			printf("do_int2f_16 // operating in protected mode under DPMI !\n");
+			context->sc_eax = 0x0000;
+			return 1;
+		case 0x87: 
+			printf("do_int2f_16 // return DPMI flags !\n");
+			context->sc_eax = 0x0000;		/* DPMI Installed */
+			context->sc_ebx = 0x0001;		/* 32bits available */
+			context->sc_ecx = 0x04;			/* processor 486 */
+			context->sc_edx = 0x0100;		/* DPMI major/minor */
+			context->sc_esi = 0;			/* # of para. of DOS */
+											/* extended private data */
+			return 1;
+		default:
+			IntBarf(0x2f, context);
+		}
+	return 1;
+}
+
+

windows/class.c

@@ -91,7 +91,8 @@ ATOM RegisterClass( LPWNDCLASS class )
 {
     CLASS * newClass, * prevClassPtr;
     HCLASS handle, prevClass;
-    
+    int classExtra;
+
 #ifdef DEBUG_CLASS
     printf( "RegisterClass: wndproc=%08x hinst=%d name='%s' background %x\n", 
 	    class->lpfnWndProc, class->hInstance, class->lpszClassName,
@@ -110,20 +111,18 @@ ATOM RegisterClass( LPWNDCLASS class )
 	if (!(prevClassPtr->wc.style & CS_GLOBALCLASS)) return 0;
     }
 
-      /* bug for bug compatible */
-
-    if (class->cbClsExtra < 0) class->cbClsExtra = 0;
-    if (class->cbWndExtra < 0) class->cbWndExtra = 0;
-
       /* Create class */
 
-    handle = USER_HEAP_ALLOC( GMEM_MOVEABLE, sizeof(CLASS)+class->cbClsExtra );
+    classExtra = (class->cbClsExtra < 0) ? 0 : class->cbClsExtra;
+    handle = USER_HEAP_ALLOC( GMEM_MOVEABLE, sizeof(CLASS) + classExtra );
     if (!handle) return 0;
     newClass = (CLASS *) USER_HEAP_ADDR( handle );
-    newClass->hNext      = firstClass;
-    newClass->wMagic     = CLASS_MAGIC;
-    newClass->cWindows   = 0;  
-    newClass->wc         = *class;
+    newClass->hNext         = firstClass;
+    newClass->wMagic        = CLASS_MAGIC;
+    newClass->cWindows      = 0;  
+    newClass->wc            = *class;
+    newClass->wc.cbWndExtra = (class->cbWndExtra < 0) ? 0 : class->cbWndExtra;
+    newClass->wc.cbClsExtra = classExtra;
 
     if (newClass->wc.style & CS_GLOBALCLASS)
 	newClass->atomName = GlobalAddAtom( class->lpszClassName );
@@ -147,7 +146,7 @@ ATOM RegisterClass( LPWNDCLASS class )
 	}
     }
 
-    if (class->cbClsExtra) memset( newClass->wExtra, 0, class->cbClsExtra );
+    if (classExtra) memset( newClass->wExtra, 0, classExtra );
     firstClass = handle;
     return newClass->atomName;
 }

windows/dc.c

@@ -105,7 +105,6 @@ static void DC_InitDC( HDC hdc )
     SelectObject( hdc, dc->w.hFont );
     XSetGraphicsExposures( XT_display, dc->u.x.gc, False );
     CLIPPING_SetDeviceClipping( dc );
-    FONT_SelectObject(dc, STOCK_SYSTEM_FIXED_FONT, NULL);
 }
 
 
@@ -204,7 +203,7 @@ int DC_SetupGCForText( DC * dc )
 
     if (!dc->u.x.font.fstruct)
     {
-	FONT_SelectObject(dc, STOCK_SYSTEM_FIXED_FONT, NULL);
+	FONT_SelectObject(dc, STOCK_SYSTEM_FONT, NULL);
     }
     val.function   = DC_XROPfunction[dc->w.ROPmode-1];
     val.foreground = dc->w.textPixel;
@@ -235,6 +234,7 @@ HDC GetDCState( HDC hdc )
 #endif
 
     memcpy( &newdc->w, &dc->w, sizeof(dc->w) );
+    memcpy( &newdc->u.x.pen, &dc->u.x.pen, sizeof(dc->u.x.pen) );
     newdc->saveLevel = 0;
     newdc->w.flags |= DC_SAVED;
 

windows/dialog.c

@@ -595,13 +595,13 @@ WORD IsDlgButtonChecked( HWND hwnd, WORD id )
  */
 void CheckRadioButton( HWND hwndDlg, WORD firstID, WORD lastID, WORD checkID )
 {
-    HWND button = GetDlgItem( hwndDlg, firstID );
+    HWND button = GetDlgItem( hwndDlg, lastID );
     while (button != 0)
     {
 	WND * wndPtr = WIN_FindWndPtr( button );
 	if (!wndPtr) break;
 	SendMessage( button, BM_SETCHECK, (wndPtr->wIDmenu == checkID), 0 );
-        if (wndPtr->wIDmenu == lastID) break;
+        if (wndPtr->wIDmenu == firstID) break;
 	button = wndPtr->hwndNext;
     }
 }

windows/graphics.c

@@ -153,6 +153,8 @@ BOOL GRAPH_DrawArc( HDC hdc, int left, int top, int right, int bottom,
 			 (double)(xend-xcenter)*(bottom-top) );
     diff_angle  = end_angle - start_angle;
     if (diff_angle < 0.0) diff_angle += 2*PI;
+    if (left > right) swap_int( &left, &right );
+    if (top > bottom) swap_int( &top, &bottom );
 
     XDrawArc( display, dc->u.x.drawable, dc->u.x.gc,
 	      dc->w.DCOrgX + left, dc->w.DCOrgY + top,

windows/painting.c

@@ -45,13 +45,6 @@ HDC BeginPaint( HWND hwnd, LPPAINTSTRUCT lps )
     if (!(wndPtr->flags & WIN_ERASE_UPDATERGN)) lps->fErase = TRUE;
     else lps->fErase = !SendMessage( hwnd, WM_ERASEBKGND, lps->hdc, 0 );
 
-    /*
-     * a BeginPaint should return with these objects set by default
-     */
-    SelectObject(lps->hdc, STOCK_BLACK_PEN);
-    SelectObject(lps->hdc, STOCK_WHITE_BRUSH);
-    SelectObject(lps->hdc, STOCK_SYSTEM_FONT);
-    
     return lps->hdc;
 }
 

windows/win.c

@@ -253,7 +253,10 @@ HWND CreateWindowEx( DWORD exStyle, LPSTR className, LPSTR windowName,
 				exStyle, className, windowName, style, x, y, width, height, 
 				parent, menu, instance, data);
 #endif
-
+	/* 'soundrec.exe' has negative position ! 
+	Why ? For now, here a patch : */
+	if (x < 0) x = 0;
+	if (y < 0) y = 0;
     if (x == CW_USEDEFAULT) x = y = 0;
     if (width == CW_USEDEFAULT)
     {
@@ -366,24 +369,15 @@ HWND CreateWindowEx( DWORD exStyle, LPSTR className, LPSTR windowName,
     else
        win_attr.backing_store = Always;
 
-    if (Options.nosaveunders)
-       win_attr.save_under = FALSE;
-    else
-       win_attr.save_under = TRUE;        
-
+    win_attr.save_under = ((classPtr->wc.style & CS_SAVEBITS) != 0);
 
-    /* set the background of all windows to be white, just like
-     * MS-Windows does (hopefully!)
-     */   
-    win_attr.background_pixel = WhitePixelOfScreen(screen);
-    
     wndPtr->window = XCreateWindow( display, parentPtr->window,
 		   x + parentPtr->rectClient.left - parentPtr->rectWindow.left,
 		   y + parentPtr->rectClient.top - parentPtr->rectWindow.top,
 		   width, height, 0,
 		   CopyFromParent, InputOutput, CopyFromParent,
 		   CWEventMask | CWOverrideRedirect | CWColormap |
-		   CWSaveUnder | CWBackingStore | CWBackPixel, &win_attr );
+		   CWSaveUnder | CWBackingStore, &win_attr );
     XStoreName( display, wndPtr->window, windowName );