Changeset 705 for trunk/src/kernel32/wprocess.cpp

Timestamp:

Aug 26, 1999, 2:56:02 PM (26 years ago)

Author:

sandervl

Message:

Cleanup

File:

• trunk/src/kernel32/wprocess.cpp (modified) (19 diffs)

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.28 1999-08-25 10:28:41 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.29 1999-08-26 12:55:38 sandervl Exp $ */
 
 /*
@@ -24 +24 @@
 
 #include "exceptutil.h"
-#include "os2util.h"
+#include "oslibmisc.h"
 
 #include "console.h"
@@ -75 +75 @@
 
    //Allocate one dword to store the flat address of our TEB
-   TIBFlatPtr = (DWORD *)OS2AllocThreadLocalMemory(1);
+   TIBFlatPtr = (DWORD *)OSLibAllocThreadLocalMemory(1);
    if(TIBFlatPtr == 0) {
         dprintf(("InitializeTIB: local thread memory alloc failed!!"));
@@ -81 +81 @@
         return NULL;
    }
-   if(OS2AllocSel(PAGE_SIZE, &tibsel) == FALSE)
+   if(OSLibAllocSel(PAGE_SIZE, &tibsel) == FALSE)
    {
         dprintf(("InitializeTIB: selector alloc failed!!"));
@@ -87 +87 @@
         return NULL;
    }
-   winteb = (TEB *)OS2SelToFlat(tibsel);
+   winteb = (TEB *)OSLibSelToFlat(tibsel);
    if(winteb == NULL)
    {
@@ -99 +99 @@
 
    winteb->except      = (PVOID)-1;               /* 00 Head of exception handling chain */
-   winteb->stack_top   = (PVOID)OS2GetTIB(TIB_STACKTOP); /* 04 Top of thread stack */
-   winteb->stack_low   = (PVOID)OS2GetTIB(TIB_STACKLOW); /* 08 Stack low-water mark */
-   winteb->htask16     = (USHORT)OS2GetPIB(PIB_TASKHNDL); /* 0c Win16 task handle */
+   winteb->stack_top   = (PVOID)OSLibGetTIB(TIB_STACKTOP); /* 04 Top of thread stack */
+   winteb->stack_low   = (PVOID)OSLibGetTIB(TIB_STACKLOW); /* 08 Stack low-water mark */
+   winteb->htask16     = (USHORT)OSLibGetPIB(PIB_TASKHNDL); /* 0c Win16 task handle */
    winteb->stack_sel   = getSS();                 /* 0e 16-bit stack selector */
    winteb->self        = winteb;                  /* 18 Pointer to this structure */
@@ -115 +115 @@
    thdb->OrgTIBSel       = GetFS();
 
-   if(OS2GetPIB(PIB_TASKTYPE) == TASKTYPE_PM)
+   if(OSLibGetPIB(PIB_TASKTYPE) == TASKTYPE_PM)
    {
         thdb->flags      = 0;  //todo gui
@@ -153 +153 @@
 
         //And free our own
-        OS2FreeSel(thdb->teb_sel);
+        OSLibFreeSel(thdb->teb_sel);
    }
    else dprintf(("Already destroyed TIB"));
@@ -210 +210 @@
         delete(WinExe);
 
-  CheckVersion(Pe2lxVersion, OS2GetDllName(hinstance));
+  CheckVersion(Pe2lxVersion, OSLibGetDllName(hinstance));
 
   if(getenv("WIN32_IOPL2")) {
@@ -265 +265 @@
                 io_init1();
         }
-        name = OS2GetDllName(hinstance);
+        name = OSLibGetDllName(hinstance);
         CheckVersion(Pe2lxVersion, name);
 
@@ -362 +362 @@
     return(TRUE);
   }
-  dprintf(("KERNEL32: FreeLibrary %s %X\n", OS2GetDllName(hinstance), hinstance));
+  dprintf(("KERNEL32: FreeLibrary %s %X\n", OSLibGetDllName(hinstance), hinstance));
 
   //TODO: Not thread safe
@@ -435 +435 @@
   if (hDll == 0)
   {
-    PSZ pszName;
+    char * pszName;
 
     // remove path from the image name
-    pszName = strrchr((PSZ)lpszLibFile,
+    pszName = strrchr((char *)lpszLibFile,
                       '\\');
     if (pszName != NULL)
@@ -602 +602 @@
  DWORD rc;
 
-    dprintf(("KERNEL32:  OS2GetModuleFileNameW\n"));
+    dprintf(("KERNEL32:  OSLibGetModuleFileNameW\n"));
     rc = GetModuleFileNameA(hModule, asciifilename, nSize);
     if(rc)      AsciiToUnicode(asciifilename, lpFileName);
@@ -623 +623 @@
   }
   else {
-        strcpy(szModule, StripPath((char *)lpszModule));
+        strcpy(szModule, OSLibStripPath((char *)lpszModule));
         strupr(szModule);
         if(strstr(szModule, ".DLL")) {
@@ -647 +647 @@
                         hMod = windll->getInstanceHandle();
                 }
-                else    hMod = OS2iGetModuleHandleA( (PSZ) lpszModule);
+                else    hMod = OSLibiGetModuleHandleA((char *)lpszModule);
         }
   }
@@ -754 +754 @@
 
   dprintf(("GetVersionStruct"));
-  hinstance = OS2QueryModuleHandle(modname);
+  hinstance = OSLibQueryModuleHandle(modname);
   if(hinstance == 0) {
         dprintf(("GetVersionStruct can't find handle for %s\n", modname));
@@ -773 +773 @@
     return(FALSE);
   }
-  return OS2GetResource(hinstance, winimage->getVersionId(), verstruct, bufLength);
+  return OSLibGetResource(hinstance, winimage->getVersionId(), verstruct, bufLength);
 }
 //******************************************************************************
@@ -783 +783 @@
 
   dprintf(("GetVersionSize of %s\n", modname));
-  hinstance = OS2QueryModuleHandle(modname);
+  hinstance = OSLibQueryModuleHandle(modname);
   if(hinstance == 0) {
     dprintf(("GetVersionSize can't find handle for %s\n", modname));
@@ -803 +803 @@
         return(FALSE);
   }
-  ULONG size = OS2GetResourceSize(hinstance, winimage->getVersionId());
+  ULONG size = OSLibGetResourceSize(hinstance, winimage->getVersionId());
 
   dprintf(("Version resource size = %d, id %d\n", size, winimage->getVersionId()));