Changeset 83744 in vbox for trunk/src/VBox/Runtime

Timestamp:

Apr 17, 2020 11:30:40 AM (5 years ago)

Author:

vboxsync

Message:

IPRT: Sort windows error messages so we can look them up using binary searching. Also addressed VC++ 14.1 warnings there. [build fix] bugref:8489

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (3 diffs)
• win/errmsgwin-sorter.cpp (modified) (1 diff)
• win/errmsgwin.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -127 +127 @@
 OTHER_CLEAN += \
         $(IPRT_OUT_DIR)/errmsgdata.h \
-        $(IPRT_OUT_DIR)/errmsgcomdata.h \
+        $(IPRT_OUT_DIR)/errmsgwindata.h \
+        $(IPRT_OUT_DIR)/errmsgwindata-sorted.h \
+        $(IPRT_OUT_DIR)/errmsgwindata-sorted.h.ts \
         $(IPRT_OUT_DIR)/errmsgvboxcomdata.h \
         $(IPRT_OUT_DIR)/errmsgvboxcomdata.h.ts \
@@ -3671 +3673 @@
         $(QUIET)$(REDIRECT) -wo $@ -- $(SED) -f $< $(filter %.h,$^)
 
-$(IPRT_OUT_DIR)/errmsgcomdata.h: \
+$(IPRT_OUT_DIR)/errmsgwindata.h: \
                 $(VBOX_PATH_RUNTIME_SRC)/common/err/errmsgcom.sed \
                 $$(PATH_SDK_$(VBOX_WINPSDK)_INC)/WinError.h \
@@ -3700 +3702 @@
 win/errmsgwin-sorter.cpp_INCS = $(IPRT_OUT_DIR)
 win/errmsgwin-sorter.cpp_DEPS = \
-        $(IPRT_OUT_DIR)/errmsgcomdata.h \
+        $(IPRT_OUT_DIR)/errmsgwindata.h \
         $(IPRT_OUT_DIR)/errmsgvboxcomdata.h
 

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

@@ -60 +60 @@
 {
 #if !defined(IPRT_NO_ERROR_DATA) && !defined(DOXYGEN_RUNNING)
-# include "errmsgcomdata.h"
+# include "errmsgwindata.h"
 # if defined(VBOX) && !defined(IN_GUEST)
 #  include "errmsgvboxcomdata.h"

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

@@ -40 +40 @@
 *********************************************************************************************************************************/
 /** Array of messages.
- * The data is generated by a sed script.
+ * The data is generated by sed scripts and sorted by errmsgwin-sorter.cpp.
  */
-static const RTWINERRMSG  g_aStatusMsgs[] =
+static const RTWINERRMSG    g_aStatusMsgs[] =
 {
-#include "errmsgwindata-sorted.h"
+#if !defined(IPRT_NO_ERROR_DATA) && !defined(DOXYGEN_RUNNING)
+# include "errmsgwindata-sorted.h"
+#else
+    { "Success.", "ERROR_SUCCESS", 0 },
+#endif
 };