Changeset 14604 in vbox

Timestamp:

Nov 25, 2008 10:05:30 PM (16 years ago)

Author:

vboxsync

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

39905

Message:

Runtime: Understand COM error codes from VirtualBox.xidl in %Rhrc.

Location:

trunk/src/VBox

Files:

• Main/idl/VirtualBox.xidl (modified) (3 diffs)
• Runtime/Makefile.kmk (modified) (3 diffs)
• Runtime/common/err/errmsgvboxcom.xsl (added)
• Runtime/common/err/errmsgxpcom.cpp (modified) (1 diff)
• Runtime/win/errmsgwin.cpp (modified) (1 diff)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -49 +49 @@
  *    (Main API TypeLib block for the WiX installer)
  *
+ * 8. src/VBox/Runtime/common/err/errmsgvboxcom.xsl =>
+ *    out/<platform>/obj/src/VBox/Runtime/errmsgvboxcomdata.h
+ *    (<result> extraction for %Rhrc the format specifier)
+ *
      Copyright (C) 2006-2007 Sun Microsystems, Inc.
 
@@ -258 +262 @@
   </descGroup>
 
+  <!--
+    Note that src/VBox/Runtime/common/err/errmsgvboxcom.xsl will ignore
+    everything in <result>/<desc> after (and including) the first dot, so express
+    the matter of the error code in the first sentence and keep it short.
+  -->
+
   <result name="VBOX_E_OBJECT_NOT_FOUND" value="0x80BB0001">
     <desc>
@@ -293 +303 @@
     </desc>
   </result>
+
+  <!--
+    Note that src/VBox/Runtime/common/err/errmsgvboxcom.xsl will ignore
+    everything in <result>/<desc> after (and including) the first dot, so express
+    the matter of the error code in the first sentence and keep it short.
+  -->
 
   <descGroup/>

trunk/src/VBox/Runtime/Makefile.kmk

@@ -84 +84 @@
         $(IPRT_OUT_DIR)/errmsgdata.h \
         $(IPRT_OUT_DIR)/errmsgcomdata.h \
+        $(IPRT_OUT_DIR)/errmsgvboxcomdata.h \
         $(IPRT_OUT_DIR)/Doxyfile.iprt \
         $(IPRT_OUT_DIR)/Doxyfile.iprt.dep \
@@ -1433 +1434 @@
 common/err/errmsg.cpp_INCS = $(IPRT_OUT_DIR)
 
-win/errmsgwin.cpp_DEPS = $(IPRT_OUT_DIR)/errmsgcomdata.h
+common/err/errmsgxpcom.cpp_DEPS = $(IPRT_OUT_DIR)/errmsgvboxcomdata.h
+common/err/errmsgxpcom.cpp_INCS = $(IPRT_OUT_DIR)
+
+win/errmsgwin.cpp_DEPS = $(IPRT_OUT_DIR)/errmsgcomdata.h $(IPRT_OUT_DIR)/errmsgvboxcomdata.h
 win/errmsgwin.cpp_INCS = $(IPRT_OUT_DIR)
 
@@ -1462 +1466 @@
         $(QUIET)$(REDIRECT) -wo $@ -- $(SED) -f $< $(filter %.h,$^)
 
+$(IPRT_OUT_DIR)/errmsgvboxcomdata.h: \
+                $(VBOX_PATH_RUNTIME_SRC)/common/err/errmsgvboxcom.xsl \
+                $(VBOX_PATH_RUNTIME_SRC)/../Main/idl/VirtualBox.xidl \
+                | $$(dir $$@)
+        $(call MSG_GENERATE,,$@,$(filter %.xidl,$^))
+        $(VBOX_XSLTPROC) -o $@ $< $(filter %.xidl,$^)
 
 #

trunk/src/VBox/Runtime/common/err/errmsgxpcom.cpp

@@ -107 +107 @@
     MY_ERR("NS_SUCCESS_FILE_DIRECTORY_EMPTY",       "NS_SUCCESS_FILE_DIRECTORY_EMPTY",              UINT32_C(0x00520001)),
 
+#include "errmsgvboxcomdata.h"
+
     { NULL, NULL, 0 }
 #undef MY_ERR

trunk/src/VBox/Runtime/win/errmsgwin.cpp

@@ -49 +49 @@
 {
 #include "errmsgcomdata.h"
+#include "errmsgvboxcomdata.h"
     { NULL, NULL, 0 }
 };