Changeset 78086 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/unpacker

Timestamp:

Apr 10, 2019 12:48:21 PM (6 years ago)

Author:

vboxsync

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

129942

Message:

GuestHost/OpenGL,HostServices/SharedOpenGL: More Windows build fixes

Location:

trunk/src/VBox/HostServices/SharedOpenGL/unpacker

Files:

• unpack.py (modified) (2 diffs)
• unpack_extend.py (modified) (2 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/unpacker/unpack.py

@@ -172 +172 @@
     # Verify that the provided buffer length is what we expect.
     packet_length = apiutil.PacketLength( params )
-    print("\tif(!DATA_POINTER_CHECK(%d))" % packet_length);
-    print("\t{");
-    print("\t\tcrError(\"crUnpack%s: parameters out of range\");" % func_name);
-    print("\t\treturn;");
-    print("\t}");
+    if packet_length > 0:
+        print("\tif(!DATA_POINTER_CHECK(%d))" % packet_length);
+        print("\t{");
+        print("\t\tcrError(\"crUnpack%s: parameters out of range\");" % func_name);
+        print("\t\treturn;");
+        print("\t}");
 
     vector_func = apiutil.VectorFunction(func_name)
@@ -340 +341 @@
             # Verify that the provided buffer length is what we expect.
             packet_length = apiutil.PacketLength( params )
-            print("\tif(!DATA_POINTER_CHECK(%d))" % packet_length);
-            print("\t{");
-            print("\t\tcrError(\"crUnpack%s: parameters out of range\");" % func_name);
-            print("\t\treturn;");
-            print("\t}");
+            if packet_length > 0:
+                print("\tif(!DATA_POINTER_CHECK(%d))" % packet_length);
+                print("\t{");
+                print("\t\tcrError(\"crUnpack%s: parameters out of range\");" % func_name);
+                print("\t\treturn;");
+                print("\t}");
 
             MakeNormalCall( return_type, func_name, params, 8 )

trunk/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_extend.py

@@ -18 +18 @@
 #define UNPACK_EXTEND_H 1
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 """)
 
@@ -31 +35 @@
 
 print("""
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 """)