Changeset 3192 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib

Timestamp:

Jun 21, 2007 3:44:41 AM (18 years ago)

Author:

vboxsync

Message:

Make it build on OS/2.

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• Makefile.kmk (modified) (2 diffs)
• SysHlp.cpp (modified) (4 diffs)
• SysHlp.h (modified) (1 diff)
• VBoxCalls.c (modified) (10 diffs)
• VBoxCalls.h (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk

@@ -40 +40 @@
         VBoxGuestLibBaseLinux
  endif
+endif
+ifdef VBOX_WITH_OS2_ADDITIONS
+ LIBRARIES += \
+        VBoxGuestLibOS2 \
+        VBoxGuestLibBaseOS2
 endif
 
@@ -105 +110 @@
 
 
+#
+# VBoxGuestLibOS2
+#
+VBoxGuestLibOS2_TEMPLATE  = VBOXR0DRV
+VBoxGuestLibOS2_SOURCES   = $(SOURCES_GUESTLIB)
+VBoxGuestLibOS2_INCS      = $(VBoxGuestLib_INCS)
+VBoxGuestLibOS2_DEFS      = VBOX_HGCM LOG_TO_BACKDOOR IN_GUEST_R0 IN_GUEST
+
+
+#
+# VBoxGuestLibBaseOS2
+#
+VBoxGuestLibBaseOS2_TEMPLATE = VBOXR0DRV
+VBoxGuestLibBaseOS2_SOURCES  = $(SOURCES_GUESTLIBBASE)
+VBoxGuestLibBaseOS2_INCS     = $(VBoxGuestLib_INCS)
+VBoxGuestLibBaseOS2_DEFS     = VBOX_HGCM VBGL_VBOXGUEST LOG_TO_BACKDOOR IN_GUEST_R0 IN_GUEST
+
+
 include $(PATH_KBUILD)/subfooter.kmk
 

trunk/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp

@@ -125 +125 @@
     Log(("vbglDriverOpen VBoxGuest failed with ntstatus=%x\n", rc));
     return rc;
-#else
+
+#elif defined (__LINUX__)
     void *opaque;
 
@@ -135 +136 @@
     pDriver->opaque = opaque;
     return VINF_SUCCESS;
+
+#elif defined (__OS2__)
+    return VERR_NOT_IMPLEMENTED;
+
+#else
+# error "Port me"
 #endif
 }
@@ -179 +186 @@
 
     return NT_SUCCESS(rc)? VINF_SUCCESS: VERR_VBGL_IOCTL_FAILED;
-#else
+
+#elif defined (__LINUX__)
     return vboxadd_cmc_call (pDriver->opaque, u32Function, pvData);
+
+#elif defined (__OS2__)
+    return VERR_NOT_IMPLEMENTED;
+
+#else
+# error "Port me"
 #endif
 }
@@ -189 +203 @@
     Log(("vbglDriverClose pDeviceObject=%x\n", pDriver->pDeviceObject));
     ObDereferenceObject (pDriver->pFileObject);
-#else
+
+#elif defined (__LINUX__)
     vboxadd_cmc_close (pDriver->opaque);
+
+#elif defined (__OS2__)
+    
+
+#else
+# error "Port me"
 #endif
 }

trunk/src/VBox/Additions/common/VBoxGuestLib/SysHlp.h

@@ -52 +52 @@
     PDEVICE_OBJECT pDeviceObject;
     PFILE_OBJECT pFileObject;
-#else /* !__WIN__ */
+#elif defined (__LINUX__)
     void *opaque;
-#endif /* !__WIN__ */
+#elif defined (__OS2__)
+    uint32_t placeholder;
+#else
+# error "Port me"
+#endif
 } VBGLDRIVER;
 

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxCalls.c

@@ -32 +32 @@
 #include <iprt/time.h>
 #include <iprt/path.h>
+#include <iprt/string.h>
 
 #define SHFL_CPARMS_SET_UTF8 0
@@ -41 +42 @@
     (a)->cParms      = SHFL_CPARMS_##b
 
-#ifdef __linux__
-# include <linux/string.h>
+#ifndef __WIN__
 # define RtlZeroMemory(a, b) memset (a, 0, b)
 #endif
@@ -182 +182 @@
 
 DECLVBGL(int) vboxCallMapFolder(PVBSFCLIENT pClient, PSHFLSTRING szFolderName,
-                      PVBSFMAP pMap)
+                                PVBSFMAP pMap)
 {
     int rc = VINF_SUCCESS;
@@ -237 +237 @@
 
 DECLVBGL(int) vboxCallCreate (PVBSFCLIENT pClient, PVBSFMAP pMap,
-                    PSHFLSTRING pParsedPath, PSHFLCREATEPARMS pCreateParms)
+                              PSHFLSTRING pParsedPath, PSHFLCREATEPARMS pCreateParms)
 {
     /** @todo copy buffers to physical or mapped memory. */
@@ -297 +297 @@
 
 DECLVBGL(int) vboxCallRemove (PVBSFCLIENT pClient, PVBSFMAP pMap,
-                    PSHFLSTRING pParsedPath, uint32_t flags)
+                              PSHFLSTRING pParsedPath, uint32_t flags)
 {
     int rc = VINF_SUCCESS;
@@ -329 +329 @@
 
 DECLVBGL(int) vboxCallRename (PVBSFCLIENT pClient, PVBSFMAP pMap,
-                    PSHFLSTRING pSrcPath, PSHFLSTRING pDestPath, uint32_t flags)
+                              PSHFLSTRING pSrcPath, PSHFLSTRING pDestPath, uint32_t flags)
 {
     int rc = VINF_SUCCESS;
@@ -364 +364 @@
 
 DECLVBGL(int) vboxCallRead(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,
-                 uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer)
+                           uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer)
 {
     int rc = VINF_SUCCESS;
@@ -399 +399 @@
 
 DECLVBGL(int) vboxCallWrite(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,
-                  uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer)
+                            uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer)
 {
     int rc = VINF_SUCCESS;
@@ -514 +514 @@
 
 DECLVBGL(int) vboxCallFSInfo(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,
-                   uint32_t flags, uint32_t *pcbBuffer, PSHFLDIRINFO pBuffer)
+                             uint32_t flags, uint32_t *pcbBuffer, PSHFLDIRINFO pBuffer)
 {
     int rc = VINF_SUCCESS;
@@ -549 +549 @@
 
 DECLVBGL(int) vboxCallLock(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,
-                 uint64_t offset, uint64_t cbSize, uint32_t fLock)
+                           uint64_t offset, uint64_t cbSize, uint32_t fLock)
 {
     int rc = VINF_SUCCESS;

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxCalls.h

@@ -86 +86 @@
 #define DRIVE_FLAG_WRITE_PROTECTED (0x4)
 
-#ifndef __linux__
+#ifdef __WIN__
 /** Device extension structure for each drive letter we created. */
 typedef struct _VBSFDRIVE
@@ -112 +112 @@
 } VBSFDRIVE;
 typedef VBSFDRIVE *PVBSFDRIVE;
-#endif
+#endif /* __WIN__ */
 
 /* forward decl */