Changeset 4391 for trunk/src

Timestamp:

Oct 2, 2000, 9:03:19 PM (25 years ago)

Author:

sandervl

Message:

fixes for FS macro changes

Location:

trunk/src

Files:

• shlwapi/pathcpp.cpp (modified) (2 diffs)
• wnaspi32/winaspi32.cpp (modified) (6 diffs)

trunk/src/shlwapi/pathcpp.cpp

@@ -1 @@
-/* $Id: pathcpp.cpp,v 1.4 2000-08-24 09:32:42 sandervl Exp $ */
+/* $Id: pathcpp.cpp,v 1.5 2000-10-02 19:01:23 sandervl Exp $ */
 
 /*
@@ -41 +41 @@
 
 #include <heapstring.h>
+#include <misc.h>
 
 ODINDEBUGCHANNEL(SHLWAPI-SHELLPATH)

trunk/src/wnaspi32/winaspi32.cpp

@@ -1 @@
-/* $Id: winaspi32.cpp,v 1.10 2000-09-18 19:27:10 sandervl Exp $ */
+/* $Id: winaspi32.cpp,v 1.11 2000-10-02 19:03:19 sandervl Exp $ */
 /*
  * WNASPI routines
@@ -128 +128 @@
 
 
-static WORD ASPI_ExecScsiCmd( scsiObj *aspi, SRB_ExecSCSICmd *lpPRB, USHORT sel)
+static WORD ASPI_ExecScsiCmd( scsiObj *aspi, SRB_ExecSCSICmd *lpPRB)
 {
   int   status;
@@ -281 +281 @@
         {
           dprintf(("Post Routine (%lx) called\n", (DWORD) lpPRB->SRB_PostProc));
-          //SvL: Restore win32 FS selector
-          SetFS(sel);
           (*lpPRB->SRB_PostProc)();
-          RestoreOS2FS();
         }
         else
@@ -388 +385 @@
  *             SendASPI32Command32 (WNASPI32.1)
  */
-DWORD SendASPICommand(LPSRB lpSRB, USHORT sel)
+DWORD CDECL SendASPI32Command(LPSRB lpSRB)
 {
     DWORD dwRC;
@@ -438 +435 @@
 
           case SC_EXEC_SCSI_CMD:
-            dwRC = ASPI_ExecScsiCmd( aspi, &lpSRB->cmd, sel);
+            dwRC = ASPI_ExecScsiCmd( aspi, &lpSRB->cmd);
             break;
 
@@ -475 +472 @@
 }
 
-DWORD CDECL SendASPI32Command(LPSRB lpSRB)
-{
- DWORD yyrc;
- USHORT sel = RestoreOS2FS();
-
-    yyrc = SendASPICommand(lpSRB, sel);
-    SetFS(sel);
-
-    return yyrc;
-}
-
-
 /***********************************************************************
  *             GetASPI32DLLVersion32   (WNASPI32.3)