Changeset 1144

Timestamp:

Oct 5, 1999, 9:24:27 PM (26 years ago)

Author:

phaller

Message:

Fix: NT/W94 crash when accessing a file named 'aux.*'

Location:

trunk/src/winmm

Files:

• aux.cpp (deleted)
• aux.h (deleted)
• auxiliary.cpp (added)
• auxiliary.h (added)
• auxos2.cpp (modified) (2 diffs)
• initterm.cpp (modified) (2 diffs)
• makefile (modified) (4 diffs)

trunk/src/winmm/auxos2.cpp

@@ -1 @@
-/* $Id: auxos2.cpp,v 1.5 1999-08-19 18:46:04 phaller Exp $ */
+/* $Id: auxos2.cpp,v 1.6 1999-10-05 19:24:00 phaller Exp $ */
 
 /*
@@ -27 +27 @@
 #include "unicode.h"
 
-#include "aux.h"
+#include "auxiliary.h"
 
 ULONG auxDeviceId = -1;

trunk/src/winmm/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.6 1999-09-15 23:26:10 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.7 1999-10-05 19:24:00 phaller Exp $ */
 
 /*
@@ -36 +36 @@
 #include <win32type.h>
 #include <odinlx.h>
-#include "aux.h"
+#include "auxiliary.h"
 
 

trunk/src/winmm/makefile

@@ -1 @@
-# $Id: makefile,v 1.10 1999-09-18 15:56:38 sandervl Exp $
+# $Id: makefile,v 1.11 1999-10-05 19:24:00 phaller Exp $
 
 #
@@ -23 +23 @@
 
 OBJS =  os2timer.obj waveout.obj dwaveout.obj time.obj \
-        wavein.obj aux.obj auxos2.obj mixer.obj \
+        wavein.obj auxiliary.obj auxos2.obj mixer.obj \
         midi.obj irtmidi.obj midistrm.obj initterm.obj mci.obj joy.obj \
         mmio.obj driver.obj playsound.obj joyos2.obj
@@ -57 +57 @@
 joy.obj:        joy.cpp joyos2.h
 mmio.obj:       mmio.cpp
-aux.obj:        aux.cpp  aux.h
-auxos2.obj:     auxos2.cpp aux.h
+auxiliary.obj:  auxiliary.cpp  auxiliary.h
+auxos2.obj:     auxos2.cpp auxiliary.h
 midi.obj:       midi.cpp midi.hpp  irtmidi.hpp
 midistrm.obj:   midistrm.cpp midi.hpp   irtmidi.hpp
@@ -64 +64 @@
 dwaveout.obj:   dwaveout.cpp dwaveout.h $(PDWIN32_INCLUDE)\vmutex.h
 time.obj:       time.cpp
-initterm.obj:   initterm.cpp aux.h
+initterm.obj:   initterm.cpp auxiliary.h
 playsound.obj:  playsound.cpp
 joyos2.obj:     joyos2.cpp joyos2.h