Changeset 2535 for trunk/src

Timestamp:

Jan 27, 2000, 10:51:17 PM (26 years ago)

Author:

sandervl

Message:

added fs check export

Location:

trunk/src/kernel32

Files:

• KERNEL32.DEF (modified) (2 diffs)
• exceptions.cpp (modified) (3 diffs)
• oslibdos.cpp (modified) (2 diffs)

trunk/src/kernel32/KERNEL32.DEF

@@ -1 @@
-; $Id: KERNEL32.DEF,v 1.65 2000-01-13 20:09:09 sandervl Exp $
+; $Id: KERNEL32.DEF,v 1.66 2000-01-27 21:51:16 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -1072 +1072 @@
 
     IsExeStarted__Fv     @2001
-
-   GetDisplayCodepage__Fv                  @3000
-   GetWindowsCodepage__Fv                  @3001
+    CheckCurFS           @2002
+
+    GetDisplayCodepage__Fv                  @3000
+    GetWindowsCodepage__Fv                  @3001
+

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.31 2000-01-02 22:09:01 sandervl Exp $ */
+/* $Id: exceptions.cpp,v 1.32 2000-01-27 21:51:16 sandervl Exp $ */
 
 /*
@@ -1077 +1077 @@
  PEXCEPTIONREGISTRATIONRECORD pExceptRec = (PEXCEPTIONREGISTRATIONRECORD)exceptframe;
 
-  pExceptRec->prev_structure   = (PEXCEPTIONREGISTRATIONRECORD)-1;
+  pExceptRec->prev_structure   = (PEXCEPTIONREGISTRATIONRECORD)0;
   pExceptRec->ExceptionHandler = OS2ExceptionHandler;
 
@@ -1111 +1111 @@
 }
 
+int _System CheckCurFS()
+{
+ USHORT sel = RestoreOS2FS();
+ PEXCEPTIONREGISTRATIONRECORD pExceptRec;
+
+    if(sel == 0x150b) {
+        SetFS(sel);
+        return FALSE;
+    }
+    pExceptRec = (PEXCEPTIONREGISTRATIONRECORD)QueryExceptionChain();
+    if(pExceptRec->ExceptionHandler != OS2ExceptionHandler) {
+        SetFS(sel);
+        return FALSE;
+    }
+    SetFS(sel);
+    return TRUE;
+}
+
 /*****************************************************************************
  * Name      : void ReplaceExceptionHandler

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.16 2000-01-21 22:38:53 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.17 2000-01-27 21:51:17 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -377 +377 @@
   case OSLIB_SEARCHENV:
   {
-        char *env = getenv(path);
-        if(env == NULL)
-                return 0;
-
-        while(*env != '=') env++;
-        env++;
-        while(*env == ' ') env++;
-        if(DosSearchPath(SEARCH_IGNORENETERRS | SEARCH_ENVIRONMENT, env,
+        if(DosSearchPath(SEARCH_IGNORENETERRS | SEARCH_ENVIRONMENT, path,
                          name, full_name, length_fullname) != 0) {
                 return 0;