Changeset 10478 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Jul 10, 2008 4:20:44 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

33151

Message:

Guest Lib R3: More IOCTL handling for Windows (not tested yet!).

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxGuestR3LibMisc.cpp (modified) (4 diffs)

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

@@ -98 +98 @@
         VBoxGuestR3LibTime.cpp \
         VBoxGuestR3LibVideo.cpp
-ifeq ($(KBUILD_TARGET),win) ## @todo get rid of this hack.
- VBoxGuestR3Lib_SOURCES   = VBoxGuestR3Lib.cpp
+ifeq ($(KBUILD_TARGET),win) ## @todo get rid of this hack (as soon as it's all implemented / #defined).
+ VBoxGuestR3Lib_SOURCES   = \
+        VBoxGuestR3Lib.cpp \
+        VBoxGuestR3LibMisc.cpp
 endif
 

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

@@ -54 +54 @@
 VBGLR3DECL(int) VbglR3WriteLog(const char *pch, size_t cb)
 {
+    int rc = VINF_SUCCESS;
+
+#if defined(RT_OS_WINDOWS)
+
+    rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_LOG(cb), (char *)pch, cb);
+#else
+
     /*
      * *BSD does not accept more than 4KB per ioctl request,
@@ -59 +66 @@
      */
 #define STEP 2048
-    int rc = VINF_SUCCESS;
     for (size_t off = 0; off < cb && RT_SUCCESS(rc); off += STEP)
     {
@@ -66 +72 @@
     }
 #undef STEP
+#endif
     return rc;
 }
@@ -79 +86 @@
 VBGLR3DECL(int) VbglR3CtlFilterMask(uint32_t fOr, uint32_t fNot)
 {
+
+#if defined(RT_OS_WINDOWS)
+
+    /* @todo Not yet implemented. */
+    return VINF_SUCCESS;
+#else
+
     VBoxGuestFilterMaskInfo Info;
     Info.u32OrMask = fOr;
     Info.u32NotMask = fNot;
     return vbglR3DoIOCtl(VBOXGUEST_IOCTL_CTL_FILTER_MASK, &Info, sizeof(Info));
+#endif
 }