Fix Windows enumeration for non-WDDM devices via HKR (#178)

* Fix non-WDDM enumeration

Always try HKR enumeration irrespective of
DXGK enumeration status.
Currently, we fallback to HKR enumeration
only if DXGK enumeration fails.
For platforms with non-WDDM devices,
DXGK fails to see WDDM adapters.
If one platform with WDDM adapters is enumerated
successfully via DXGK, the other platform with
no WDDM adapters fails to get enumerated.
Using HKR path unconditionally allows such
platforms to be enumerated.

While at it, also fix memory leak due to
not freeing library handle in some cases.

* Fix status and error messaging in enumeration.

Fix status tracking and error messaging
in Windows enumeration after recent change.

* Bump up OpenCL ICD Loader version

Bump up OpenCL ICD loader version
to 3.0.3 after recent fix to
Windows enumeration logic.

* Fix status return for Windows enumeration.

While trying to fix error trace prints,
overall status returned changed to status
of last enumeration.
Use separate variable for individual status,
but keep original logic to combine overall status
and return the same.

Author: nikhiljnv

loader/windows/OpenCL.rc

@@ -20,7 +20,7 @@
 
 #define OPENCL_ICD_LOADER_VERSION_MAJOR 3
 #define OPENCL_ICD_LOADER_VERSION_MINOR 0
-#define OPENCL_ICD_LOADER_VERSION_REV   2
+#define OPENCL_ICD_LOADER_VERSION_REV   3
 
 #ifdef RC_INVOKED
 

loader/windows/icd_windows.c

@@ -108,25 +108,33 @@ void adapterFree(WinAdapter *pWinAdapter)
 BOOL CALLBACK khrIcdOsVendorsEnumerate(PINIT_ONCE InitOnce, PVOID Parameter, PVOID *lpContext)
 {
     LONG result;
-    BOOL status = FALSE;
+    BOOL status = FALSE, currentStatus = FALSE;
     const char* platformsName = "SOFTWARE\\Khronos\\OpenCL\\Vendors";
     HKEY platformsKey = NULL;
     DWORD dwIndex;
 
     khrIcdVendorsEnumerateEnv();
 
-    status |= khrIcdOsVendorsEnumerateDXGK();
-    if (!status)
+    currentStatus = khrIcdOsVendorsEnumerateDXGK();
+    status |= currentStatus;
+    if (!currentStatus)
     {
         KHR_ICD_TRACE("Failed to load via DXGK interface on RS4, continuing\n");
-        status |= khrIcdOsVendorsEnumerateHKR();
-        if (!status)
-        {
-            KHR_ICD_TRACE("Failed to enumerate HKR entries, continuing\n");
-        }
     }
 
-    status |= khrIcdOsVendorsEnumerateAppPackage();
+    currentStatus = khrIcdOsVendorsEnumerateHKR();
+    status |= currentStatus;
+    if (!currentStatus)
+    {
+        KHR_ICD_TRACE("Failed to enumerate HKR entries, continuing\n");
+    }
+
+    currentStatus = khrIcdOsVendorsEnumerateAppPackage();
+    status |= currentStatus;
+    if (!currentStatus)
+    {
+        KHR_ICD_TRACE("Failed to enumerate App package entry, continuing\n");
+    }
 
     KHR_ICD_TRACE("Opening key HKLM\\%s...\n", platformsName);
     result = RegOpenKeyExA(
@@ -218,8 +226,8 @@ BOOL CALLBACK khrIcdOsVendorsEnumerate(PINIT_ONCE InitOnce, PVOID Parameter, PVO
                 }
                 pFactory->lpVtbl->Release(pFactory);
             }
-            FreeLibrary(hDXGI);
         }
+        FreeLibrary(hDXGI);
     }
 
     // Go through the list again, putting any remaining adapters at the end of the list in an undefined order