dumpcap: fix capture library version display on Windows

Ensure to call load_wpcap() berfore building the version info string.

Bug: 16108
Change-Id: Ida7ecf6ad5186f816e1bf33902a0ae70f7f36b40
Reviewed-on: https://code.wireshark.org/review/34719
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 11 insertions, 13 deletions

diff --git a/dumpcap.c b/dumpcap.c
index 367a71ff8f..e15a796aed 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -4666,10 +4666,6 @@ main(int argc, char *argv[])
 
     cmdarg_err_init(dumpcap_cmdarg_err, dumpcap_cmdarg_err_cont);
 
-    /* Initialize the version information. */
-    ws_init_version_info("Dumpcap (Wireshark)", NULL, get_dumpcap_compiled_info,
-                         get_dumpcap_runtime_info);
-
 #ifdef _WIN32
     create_app_running_mutex();
 
@@ -4678,8 +4674,19 @@ main(int argc, char *argv[])
      * or g_module_open.
      */
     ws_init_dll_search_path();
+
+    /* Load wpcap if possible. Do this before collecting the run-time version information */
+    load_wpcap();
+
+    /* ... and also load the packet.dll from wpcap */
+    /* XXX - currently not required, may change later. */
+    /*wpcap_packet_load();*/
 #endif
 
+    /* Initialize the version information. */
+    ws_init_version_info("Dumpcap (Wireshark)", NULL, get_dumpcap_compiled_info,
+                         get_dumpcap_runtime_info);
+
 #ifdef HAVE_BPF_IMAGE
 #define OPTSTRING_d "d"
 #else
@@ -4805,15 +4812,6 @@ main(int argc, char *argv[])
     global_ld.saved_shb = NULL;
     global_ld.saved_idbs = g_array_new(FALSE, TRUE, sizeof(saved_idb_t));
 
-#ifdef _WIN32
-    /* Load wpcap if possible. Do this before collecting the run-time version information */
-    load_wpcap();
-
-    /* ... and also load the packet.dll from wpcap */
-    /* XXX - currently not required, may change later. */
-    /*wpcap_packet_load();*/
-#endif
-
     err_msg = ws_init_sockets();
     if (err_msg != NULL)
     {