nfq/darkmagic.c

@@ -998,8 +998,6 @@ static bool AdapterID2Name(const GUID *guid,char *name,DWORD name_len)
 	HKEY hkNetworkCards,hkCard;
 	DWORD dwIndex,dwLen;
 	bool bRet = false;
-	WCHAR namew[128];
-	DWORD namew_len;
 
 	if (name_len<2) return false;
 
@@ -1026,12 +1024,11 @@ static bool AdapterID2Name(const GUID *guid,char *name,DWORD name_len)
 						val[dwLen]='\0';
 						if (!strcmp(val,sguid))
 						{
-							namew_len = sizeof(namew)-sizeof(WCHAR);
-							if ((w_win32_error = RegQueryValueExW(hkCard,L"Description",NULL,NULL,(LPBYTE)namew,&namew_len)) == ERROR_SUCCESS)
+							name_len--;
+							if ((w_win32_error = RegQueryValueExA(hkCard,"Description",NULL,NULL,name,&name_len)) == ERROR_SUCCESS)
 							{
-								namew[namew_len/sizeof(WCHAR)]=L'\0';
-								if (WideCharToMultiByte(CP_UTF8, 0, namew, -1, name, name_len, NULL, NULL))
-									bRet = true;
+								name[name_len]='\0';
+								bRet = true;
 							}
 						}
 					}