Changeset 780 for trunk/src/kernel32

Timestamp:

Sep 1, 1999, 9:12:23 PM (26 years ago)

Author:

phaller

Message:

Fix: header file cleanup (win32type.h)

Location:

trunk/src/kernel32

Files:

• HandleManager.cpp (modified) (7 diffs)
• hmdevice.cpp (modified) (4 diffs)
• hmdevice.h (modified) (2 diffs)
• virtual.cpp (modified) (14 diffs)

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.19 1999-08-31 23:48:36 phaller Exp $ */
+/* $Id: HandleManager.cpp,v 1.20 1999-09-01 19:12:16 phaller Exp $ */
 
 /*
@@ -83 +83 @@
   struct _HMDEVICE *pNext;                /* pointer to next device in chain */
 
-  PSZ             pszDeviceName;       /* name or alias of the pseudo-device */
+  LPSTR           pszDeviceName;       /* name or alias of the pseudo-device */
   HMDeviceHandler *pDeviceHandler;         /* handler for this pseudo-device */
 } HMDEVICE, *PHMDEVICE;
@@ -133 +133 @@
 
                         /* get appropriate device handler by the device name */
-static HMDeviceHandler*  _Optlink _HMDeviceFind(PSZ pszDeviceName);
+static HMDeviceHandler*  _Optlink _HMDeviceFind(LPSTR pszDeviceName);
 
                                /* get next free handle from the handle table */
@@ -156 +156 @@
  *****************************************************************************/
 
-static HMDeviceHandler *_HMDeviceFind (PSZ pszDeviceName)
+static HMDeviceHandler *_HMDeviceFind (LPSTR pszDeviceName)
 {
   PHMDEVICE pHMDevice;                     /* iterator over the device table */
@@ -247 +247 @@
  *****************************************************************************/
 
-DWORD   HMDeviceRegister(PSZ             pszDeviceName,
+DWORD   HMDeviceRegister(LPSTR           pszDeviceName,
                          HMDeviceHandler *pDeviceHandler)
 {
@@ -767 +767 @@
   else
   {
-    pDeviceHandler = _HMDeviceFind((PSZ)lpFileName);          /* find device */
+    pDeviceHandler = _HMDeviceFind((LPSTR)lpFileName);        /* find device */
 
     if (NULL == pDeviceHandler)                /* this name is unknown to us */
@@ -900 +900 @@
 
 
-  pDeviceHandler = _HMDeviceFind((PSZ)lpFileName);            /* find device */
+  pDeviceHandler = _HMDeviceFind((LPSTR)lpFileName);          /* find device */
   if (NULL == pDeviceHandler)                  /* this name is unknown to us */
   {

trunk/src/kernel32/hmdevice.cpp

@@ -1 @@
-/* $Id: hmdevice.cpp,v 1.7 1999-08-25 14:27:05 sandervl Exp $ */
+/* $Id: hmdevice.cpp,v 1.8 1999-09-01 19:12:17 phaller Exp $ */
 
 /*
@@ -18 +18 @@
  *****************************************************************************/
 
-#include <os2win.h>
+#include <odin.h>
+#include <win32type.h>
+#include <misc.h>
 #include "HandleManager.h"
 #include "HMDevice.h"
@@ -27 +29 @@
  *****************************************************************************/
 
+#ifndef ERROR_INVALID_FUNCTION
+#define ERROR_INVALID_FUNCTION 1
+#endif
 
 /*****************************************************************************
@@ -95 +100 @@
  * Name      : HMDeviceHandler::DuplicateHandle
  * Purpose   : dummy version
- * Parameters: 
+ * Parameters:
  *             various parameters as required
  * Variables :

trunk/src/kernel32/hmdevice.h

@@ -1 @@
-/* $Id: hmdevice.h,v 1.8 1999-08-25 14:27:06 sandervl Exp $ */
+/* $Id: hmdevice.h,v 1.9 1999-09-01 19:12:17 phaller Exp $ */
 
 /*
@@ -288 +288 @@
 
                             /* register a new device with the handle manager */
-DWORD  HMDeviceRegister(PSZ             pszDeviceName,
+DWORD  HMDeviceRegister(LPSTR           pszDeviceName,
                         HMDeviceHandler *pDeviceHandler);
 

trunk/src/kernel32/virtual.cpp

@@ -1 @@
-/* $Id: virtual.cpp,v 1.11 1999-08-27 16:51:01 sandervl Exp $ */
+/* $Id: virtual.cpp,v 1.12 1999-09-01 19:12:18 phaller Exp $ */
 
 /*
@@ -50 +50 @@
  * See CreateFileMapping32A
  */
-HANDLE WINAPI CreateFileMappingW( HFILE hFile, LPSECURITY_ATTRIBUTES attr, 
-                                      DWORD protect, DWORD size_high,  
+HANDLE WINAPI CreateFileMappingW( HFILE hFile, LPSECURITY_ATTRIBUTES attr,
+                                      DWORD protect, DWORD size_high,
                                       DWORD size_low, LPCWSTR name )
 {
@@ -107 +107 @@
               DWORD offset_low,  /* [in] Low-order 32 bits of file offset */
               DWORD count        /* [in] Number of bytes to map */
-) 
+)
 {
     return MapViewOfFileEx( mapping, access, offset_high,
@@ -129 +129 @@
               DWORD count,       /* [in] Number of bytes to map */
               LPVOID addr        /* [in] Suggested starting address for mapped view */
-) 
+)
 {
   return HMMapViewOfFileEx(handle, access, offset_high, offset_low, count, addr);
@@ -146 +146 @@
               LPCVOID base, /* [in] Start address of byte range to flush */
               DWORD cbFlush /* [in] Number of bytes in range */
-) 
+)
 {
  Win32MemMap *map;
@@ -177 +177 @@
  */
 BOOL WINAPI UnmapViewOfFile(LPVOID addr /* [in] Address where mapped view begins */
-) 
+)
 {
  Win32MemMap *map;
@@ -201 +201 @@
  *
  * Helper function to map a file to memory:
- *  name                        -       file name 
+ *  name                        -       file name
  *  [RETURN] ptr                -       pointer to mapped file
  */
@@ -208 +208 @@
     HANDLE hFile, hMapping = -1;
 
-    hFile = CreateFileW( name, GENERIC_READ, FILE_SHARE_READ, NULL, 
+    hFile = CreateFileW( name, GENERIC_READ, FILE_SHARE_READ, NULL,
                            OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, 0);
     if (hFile != INVALID_HANDLE_VALUE)
@@ -226 +226 @@
  *
  * Helper function to map a file to memory:
- *  name                        -       file name 
+ *  name                        -       file name
  *  [RETURN] ptr                -       pointer to mapped file
  */
@@ -233 +233 @@
     HANDLE hFile, hMapping = -1;
 
-    hFile = CreateFileA(name, GENERIC_READ, FILE_SHARE_READ, NULL, 
+    hFile = CreateFileA(name, GENERIC_READ, FILE_SHARE_READ, NULL,
                         OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, 0);
     if (hFile != INVALID_HANDLE_VALUE)
@@ -254 +254 @@
  PVOID Address = lpvAddress;
  ULONG flag = 0, base;
- APIRET rc;
+ DWORD rc;
 
   dprintf(("VirtualAlloc at %X; %d bytes, fAlloc %d, fProtect %d\n", (int)lpvAddress, cbSize, fdwAllocationType, fdwProtect));
@@ -360 +360 @@
 BOOL WIN32API VirtualFree(LPVOID lpvAddress, DWORD cbSize, DWORD FreeType)
 {
- APIRET rc;
+ DWORD rc;
 
   dprintf(("VirtualFree at %d; %d bytes, freetype %d\n", (int)lpvAddress, cbSize, FreeType));
@@ -390 +390 @@
                              DWORD *pfdwOldProtect)
 {
- APIRET rc;
+ DWORD rc;
  ULONG  pageFlags = 0;
  int npages;
@@ -460 +460 @@
 {
  ULONG  cbRangeSize, dAttr;
- APIRET rc;
+ DWORD rc;
 
   if(lpvAddress == NULL || pmbiBuffer == NULL || cbLength == 0) {
         return 0;
   }
-  
+
   cbRangeSize = cbLength & ~0xFFF;
   if(cbLength & 0xFFF) {