From 3c02f314002dff675a8262b71a00548ff3d89af9 Mon Sep 17 00:00:00 2001 From: Slawomir Cygan Date: Thu, 25 Jan 2018 13:51:17 +0100 Subject: loader: link with OneCore umbrella library This change makes loader use OneCore umbrella[2] library, common to all Windows 10 devices and required with for Universal Windows drivers[1]. As this change may not be compatible with previous versions of Windows, it's enabled via CMAKE option: -DENABLE_WIN10_ONECORE=1 [2] https://msdn.microsoft.com/en-us/library/windows/desktop/mt654039(v=vs.85).aspx [1] https://docs.microsoft.com/en-us/windows-hardware/drivers/develop/getting-started-with-universal-drivers Change-Id: Ib677face131ab2edb3e8cd2f764fe4e0ca44cecc --- loader/loader.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'loader/loader.c') diff --git a/loader/loader.c b/loader/loader.c index 543b9657..dcb2ef1e 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -543,11 +543,11 @@ out: // *reg_data contains a string list of filenames as pointer. // When done using the returned string list, the caller should free the pointer. VkResult loaderGetDeviceRegistryFiles(const struct loader_instance *inst, char **reg_data, PDWORD reg_data_size, LPCTSTR value_name) { - static const wchar_t* softwareComponentGUID = L"{5c4c3332-344d-483c-8739-259e934c9cc8}"; - static const wchar_t* displayGUID = L"{4d36e968-e325-11ce-bfc1-08002be10318}"; + static const wchar_t *softwareComponentGUID = L"{5c4c3332-344d-483c-8739-259e934c9cc8}"; + static const wchar_t *displayGUID = L"{4d36e968-e325-11ce-bfc1-08002be10318}"; const ULONG flags = CM_GETIDLIST_FILTER_CLASS | CM_GETIDLIST_FILTER_PRESENT; - - wchar_t childGuid[MAX_GUID_STRING_LEN + 2]; // +2 for brackets {} + + wchar_t childGuid[MAX_GUID_STRING_LEN + 2]; // +2 for brackets {} ULONG childGuidSize = sizeof(childGuid); DEVINST devID = 0, childID = 0; @@ -579,7 +579,6 @@ VkResult loaderGetDeviceRegistryFiles(const struct loader_instance *inst, char * } while (CM_Get_Device_ID_ListW(displayGUID, pDeviceNames, deviceNamesSize, flags) == CR_BUFFER_SMALL); if (pDeviceNames) { - for (wchar_t *deviceName = pDeviceNames; *deviceName; deviceName += wcslen(deviceName) + 1) { CONFIGRET status = CM_Locate_DevNodeW(&devID, deviceName, CM_LOCATE_DEVNODE_NORMAL); if (CR_SUCCESS != status) { -- cgit v1.2.3