ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

setupapi: Convert InfSpec to unicode if SearchControl is not 

INFINFO_INF_SPEC_IS_HINF.
This commit is contained in:
James Hawkins 2006-02-09 12:12:11 +01:00 committed by Alexandre Julliard
parent a633e22bdd
commit a1141ee764
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/setupapi/query.c
View File

@ -63,16 +63,29 @@ static BOOL fill_inf_info(HINF inf, PSP_INF_INFORMATION buffer, DWORD size, DWOR
/*********************************************************************** /***********************************************************************
* SetupGetInfInformationA (SETUPAPI.@) * SetupGetInfInformationA (SETUPAPI.@)
* *
* BUGS
* If SearchControl is anything other than INFINFO_INF_SPEC_IS_HINF,
* then InfSpec needs to be converted to unicode.
*/ */
BOOL WINAPI SetupGetInfInformationA(LPCVOID InfSpec, DWORD SearchControl, BOOL WINAPI SetupGetInfInformationA(LPCVOID InfSpec, DWORD SearchControl,
PSP_INF_INFORMATION ReturnBuffer, PSP_INF_INFORMATION ReturnBuffer,
DWORD ReturnBufferSize, PDWORD RequiredSize) DWORD ReturnBufferSize, PDWORD RequiredSize)
{ {
return SetupGetInfInformationW(InfSpec, SearchControl, ReturnBuffer, LPWSTR inf = (LPWSTR)InfSpec;
DWORD len;
BOOL ret;
if (InfSpec && SearchControl >= INFINFO_INF_NAME_IS_ABSOLUTE)
{
len = lstrlenA(InfSpec) + 1;
inf = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, InfSpec, -1, inf, len);
}
ret = SetupGetInfInformationW(inf, SearchControl, ReturnBuffer,
ReturnBufferSize, RequiredSize); ReturnBufferSize, RequiredSize);
if (SearchControl >= INFINFO_INF_NAME_IS_ABSOLUTE)
HeapFree(GetProcessHeap(), 0, inf);
return ret;
} }
/*********************************************************************** /***********************************************************************