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

setupapi: Improve the stub for SetupQueryInfOriginalFileInformation 

to return information for OriginalCatalogName based on information in
the installed inf file.
This commit is contained in:
Rob Shearman 2007-05-08 16:37:43 +01:00 committed by Alexandre Julliard
parent 672a611379
commit 04fada9035
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/setupapi/query.c
View File

@ -652,8 +652,12 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationW(
PSP_ORIGINAL_FILE_INFO_W OriginalFileInfo) PSP_ORIGINAL_FILE_INFO_W OriginalFileInfo)
{ {
LPCWSTR inf_name; LPCWSTR inf_name;
LPCWSTR inf_path;
HINF hinf;
static const WCHAR wszVersion[] = { 'V','e','r','s','i','o','n',0 };
static const WCHAR wszCatalogFile[] = { 'C','a','t','a','l','o','g','F','i','l','e',0 };
FIXME("(%p, %d, %p, %p): stub\n", InfInformation, InfIndex, FIXME("(%p, %d, %p, %p): semi-stub\n", InfInformation, InfIndex,
AlternativePlatformInfo, OriginalFileInfo); AlternativePlatformInfo, OriginalFileInfo);
if (OriginalFileInfo->cbSize != sizeof(*OriginalFileInfo)) if (OriginalFileInfo->cbSize != sizeof(*OriginalFileInfo))
@ -662,18 +666,30 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationW(
return ERROR_INVALID_USER_BUFFER; return ERROR_INVALID_USER_BUFFER;
} }
inf_path = (LPWSTR)&InfInformation->VersionData[0];
/* FIXME: we should get OriginalCatalogName from CatalogFile line in /* FIXME: we should get OriginalCatalogName from CatalogFile line in
* the original inf file and cache it, but that would require building a * the original inf file and cache it, but that would require building a
* .pnf file. */ * .pnf file. */
OriginalFileInfo->OriginalCatalogName[0] = '\0'; hinf = SetupOpenInfFileW(inf_path, NULL, INF_STYLE_WIN4, NULL);
if (!hinf) return FALSE;
if (!SetupGetLineTextW(NULL, hinf, wszVersion, wszCatalogFile,
OriginalFileInfo->OriginalCatalogName,
sizeof(OriginalFileInfo->OriginalCatalogName)/sizeof(OriginalFileInfo->OriginalCatalogName[0]),
NULL))
{
OriginalFileInfo->OriginalCatalogName[0] = '\0';
}
SetupCloseInfFile(hinf);
/* FIXME: not quite correct as we just return the same file name as /* FIXME: not quite correct as we just return the same file name as
* destination (copied) inf file, not the source (original) inf file. * destination (copied) inf file, not the source (original) inf file.
* to fix it properly would require building a .pnf file */ * to fix it properly would require building a .pnf file */
/* file name is stored in VersionData field of InfInformation */ /* file name is stored in VersionData field of InfInformation */
inf_name = strrchrW((LPWSTR)&InfInformation->VersionData[0], '\\'); inf_name = strrchrW(inf_path, '\\');
if (inf_name) inf_name++; if (inf_name) inf_name++;
else inf_name = (LPWSTR)&InfInformation->VersionData[0]; else inf_name = inf_path;
strcpyW(OriginalFileInfo->OriginalInfName, inf_name); strcpyW(OriginalFileInfo->OriginalInfName, inf_name);