Changeset 299

Timestamp:

Jul 13, 1999, 12:39:16 PM (26 years ago)

Author:

sandervl

Message:

* empty log message *

Location:

trunk

Files:

• include/os2wrap.h (modified) (3 diffs)
• src/kernel32/Fileio.cpp (modified) (2 diffs)
• src/kernel32/exceptions.cpp (modified) (3 diffs)

trunk/include/os2wrap.h

@@ -1 @@
-/* $Id: os2wrap.h,v 1.6 1999-06-26 18:24:22 sandervl Exp $ */
+/* $Id: os2wrap.h,v 1.7 1999-07-13 10:39:16 sandervl Exp $ */
 #ifndef __OS2WRAP_H__
 #define __OS2WRAP_H__
@@ -950 +950 @@
 #define DosSearchPath _DosSearchPath
 
+inline ULONG  _DosError(ULONG error)
+{
+ ULONG yyrc;
+ USHORT sel = RestoreOS2FS();
+
+    yyrc = DosError(error);
+    SetFS(sel);
+
+    return yyrc;
+} 
+
+#undef  DosError
+#define DosError _DosError
+
 #endif
 #ifdef INCL_DOSDEVICES
@@ -1462 +1476 @@
 
 #endif
+
 #ifdef INCL_DOSSESMGR
 inline ULONG _DosQueryAppType(PCSZ a, PULONG b)

trunk/src/kernel32/Fileio.cpp

@@ -1 @@
-/* $Id: Fileio.cpp,v 1.6 1999-06-17 18:21:42 phaller Exp $ */
+/* $Id: Fileio.cpp,v 1.7 1999-07-13 10:38:33 sandervl Exp $ */
 
 /*
@@ -368 +368 @@
 DWORD WIN32API GetFileAttributesA(LPCSTR lpszFileName)
 {
- DWORD rc;
+ DWORD rc, error;
 
     rc = O32_GetFileAttributes((LPSTR)lpszFileName);
+#if 0 // need more tests, maybe there is also a better way to hide simulated b:
+    if(rc == -1 && lpszFileName != NULL && !strnicmp(lpszFileName, "B:", 2))
+    {
+      error = GetLastError();
+      if(error = ERROR_DISK_CHANGE)
+        SetLastError(ERROR_NOT_READY);
+      else
+        SetLastError(error);
+    }
+#endif
     dprintf(("KERNEL32:  GetFileAttributes of %s returned %d\n", lpszFileName, rc));
     return(rc);

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.6 1999-07-06 09:49:45 phaller Exp $ */
+/* $Id: exceptions.cpp,v 1.7 1999-07-13 10:38:33 sandervl Exp $ */
 
 /*
@@ -45 +45 @@
  *
  */
+#define INCL_MISC
 #define INCL_BASE
 #include <os2wrap.h>                     //Odin32 OS/2 api wrappers
@@ -81 +82 @@
 UINT WIN32API SetErrorMode(UINT fuErrorMode)
 {
- UINT oldmode = CurrentErrorMode;
+  UINT oldmode = CurrentErrorMode;
 
   dprintf(("KERNEL32: SetErrorMode(%08xh)\n",
            fuErrorMode));
-
   CurrentErrorMode = fuErrorMode;
+
+  if(fuErrorMode & SEM_FAILCRITICALERRORS || fuErrorMode & SEM_NOOPENFILEERRORBOX)
+    DosError(FERR_DISABLEHARDERR);
+  else
+    DosError(FERR_ENABLEHARDERR);
+
+  // SEM_NOGPFAULTERRORBOX  and SEM_NOALIGNMENTFAULTEXCEPT --> UnhandledExceptionFilter()
 
   return(oldmode);
 }
-
 
 /*****************************************************************************