Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 15:43:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix setupapi setupcab winetest. (Samuel Serapion)

Browse source 
svn path=/trunk/; revision=48044
This commit is contained in:
Daniel Reimer 2010-07-14 17:18:49 +00:00
parent a67f202e5e
commit 585c3a511e
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
reactos/dll/win32/setupapi/setupcab.c
View file

@ -518,7 +518,7 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved,
SC_HSC_A my_hsc; SC_HSC_A my_hsc;
ERF erf; ERF erf;
CHAR pszCabinet[MAX_PATH], pszCabPath[MAX_PATH], *p; CHAR pszCabinet[MAX_PATH], pszCabPath[MAX_PATH], *p = NULL;
DWORD fpnsize; DWORD fpnsize;
BOOL ret; BOOL ret;
@ -529,6 +529,12 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved,
if (! LoadCABINETDll()) if (! LoadCABINETDll())
return FALSE; return FALSE;
if (!CabinetFile)
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
memset(&my_hsc, 0, sizeof(SC_HSC_A)); memset(&my_hsc, 0, sizeof(SC_HSC_A));
pszCabinet[0] = '\0'; pszCabinet[0] = '\0';
pszCabPath[0] = '\0'; pszCabPath[0] = '\0';
@ -584,7 +590,7 @@ BOOL WINAPI SetupIterateCabinetW(PCWSTR CabinetFile, DWORD Reserved,
UINT len; UINT len;
SC_HSC_W my_hsc; SC_HSC_W my_hsc;
ERF erf; ERF erf;
WCHAR pszCabPathW[MAX_PATH], *p; WCHAR pszCabPathW[MAX_PATH], *p = NULL;
DWORD fpnsize; DWORD fpnsize;
BOOL ret; BOOL ret;
@ -594,7 +600,11 @@ BOOL WINAPI SetupIterateCabinetW(PCWSTR CabinetFile, DWORD Reserved,
if (!LoadCABINETDll()) if (!LoadCABINETDll())
return FALSE; return FALSE;
if (!CabinetFile) return FALSE; if (!CabinetFile)
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
memset(&my_hsc, 0, sizeof(SC_HSC_W)); memset(&my_hsc, 0, sizeof(SC_HSC_W));