X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Finit.c;h=de7d6f24a9e065c2e378e935a8c180ccbad9755b;hb=4582426202ad6ac6539305dae2c0b70016f014f4;hp=e8bc93710e7a82e3f0ca386e6c22de578f4e555c;hpb=eeef8fed3e6bd34c553ee8cb16d5fc1b703120af;p=pciutils.git

diff --git a/lib/init.c b/lib/init.c
index e8bc937..de7d6f2 100644
--- a/lib/init.c
+++ b/lib/init.c
@@ -76,6 +76,16 @@ static struct pci_methods *pci_methods[PCI_ACCESS_MAX] = {
 #else
   NULL,
 #endif
+#ifdef PCI_HAVE_PM_WIN32_CFGMGR32
+  &pm_win32_cfgmgr32,
+#else
+  NULL,
+#endif
+#ifdef PCI_HAVE_PM_WIN32_SYSDBG
+  &pm_win32_sysdbg,
+#else
+  NULL,
+#endif
 };
 
 // If PCI_ACCESS_AUTO is selected, we probe the access methods in this order
@@ -90,6 +100,8 @@ static int probe_sequence[] = {
   PCI_ACCESS_DARWIN,
   PCI_ACCESS_SYLIXOS_DEVICE,
   PCI_ACCESS_HURD,
+  PCI_ACCESS_WIN32_CFGMGR32,
+  PCI_ACCESS_WIN32_SYSDBG,
   // Low-level methods poking the hardware directly
   PCI_ACCESS_I386_TYPE1,
   PCI_ACCESS_I386_TYPE2,
@@ -202,7 +214,10 @@ pci_init_name_list_path(struct pci_access *a)
       len = GetModuleFileNameA(NULL, path, MAX_PATH+1);
       sep = (len > 0) ? strrchr(path, '\\') : NULL;
       if (len == 0 || len == MAX_PATH+1 || !sep || MAX_PATH-(size_t)(sep+1-path) < sizeof(PCI_IDS))
-        free(path);
+        {
+          free(path);
+          pci_set_name_list_path(a, PCI_IDS, 0);
+        }
       else
         {
           memcpy(sep+1, PCI_IDS, sizeof(PCI_IDS));