mirror of
https://github.com/reactos/reactos.git
synced 2025-04-22 13:10:39 +00:00
[ADVPACK] Sync with Wine Staging 1.7.37. CORE-9246
svn path=/trunk/; revision=66626
This commit is contained in:
parent
e0770c3e3a
commit
c46d40ad2f
3 changed files with 6 additions and 6 deletions
|
@ -665,7 +665,7 @@ HRESULT WINAPI TranslateInfStringA(LPCSTR pszInfFilename, LPCSTR pszInstallSecti
|
||||||
dwBufferSize, NULL, NULL);
|
dwBufferSize, NULL, NULL);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
res = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
|
res = E_NOT_SUFFICIENT_BUFFER;
|
||||||
}
|
}
|
||||||
|
|
||||||
HeapFree(GetProcessHeap(), 0, bufferW);
|
HeapFree(GetProcessHeap(), 0, bufferW);
|
||||||
|
@ -725,7 +725,7 @@ HRESULT WINAPI TranslateInfStringW(LPCWSTR pszInfFilename, LPCWSTR pszInstallSec
|
||||||
pszBuffer, dwBufferSize, pdwRequiredSize))
|
pszBuffer, dwBufferSize, pdwRequiredSize))
|
||||||
{
|
{
|
||||||
if (dwBufferSize < *pdwRequiredSize)
|
if (dwBufferSize < *pdwRequiredSize)
|
||||||
hret = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
|
hret = E_NOT_SUFFICIENT_BUFFER;
|
||||||
else
|
else
|
||||||
hret = SPAPI_E_LINE_NOT_FOUND;
|
hret = SPAPI_E_LINE_NOT_FOUND;
|
||||||
}
|
}
|
||||||
|
@ -782,7 +782,7 @@ HRESULT WINAPI TranslateInfStringExA(HINF hInf, LPCSTR pszInfFilename,
|
||||||
dwBufferSize, NULL, NULL);
|
dwBufferSize, NULL, NULL);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
res = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
|
res = E_NOT_SUFFICIENT_BUFFER;
|
||||||
}
|
}
|
||||||
|
|
||||||
HeapFree(GetProcessHeap(), 0, bufferW);
|
HeapFree(GetProcessHeap(), 0, bufferW);
|
||||||
|
@ -840,7 +840,7 @@ HRESULT WINAPI TranslateInfStringExW(HINF hInf, LPCWSTR pszInfFilename,
|
||||||
pszBuffer, dwBufferSize, pdwRequiredSize))
|
pszBuffer, dwBufferSize, pdwRequiredSize))
|
||||||
{
|
{
|
||||||
if (dwBufferSize < *pdwRequiredSize)
|
if (dwBufferSize < *pdwRequiredSize)
|
||||||
return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
|
return E_NOT_SUFFICIENT_BUFFER;
|
||||||
|
|
||||||
return SPAPI_E_LINE_NOT_FOUND;
|
return SPAPI_E_LINE_NOT_FOUND;
|
||||||
}
|
}
|
||||||
|
|
|
@ -554,7 +554,7 @@ static LPSTR convert_file_list(LPCSTR FileList, DWORD *dwNumFiles)
|
||||||
szConvertedList[dwLen - 1] = '\0';
|
szConvertedList[dwLen - 1] = '\0';
|
||||||
|
|
||||||
/* empty list */
|
/* empty list */
|
||||||
if (!lstrlenA(szConvertedList))
|
if (!szConvertedList[0])
|
||||||
{
|
{
|
||||||
HeapFree(GetProcessHeap(), 0, szConvertedList);
|
HeapFree(GetProcessHeap(), 0, szConvertedList);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -51,7 +51,7 @@ reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.7.37
|
||||||
|
|
||||||
reactos/dll/win32/activeds # Synced to Wine-1.7.27
|
reactos/dll/win32/activeds # Synced to Wine-1.7.27
|
||||||
reactos/dll/win32/actxprxy # Synced to Wine-1.7.27
|
reactos/dll/win32/actxprxy # Synced to Wine-1.7.27
|
||||||
reactos/dll/win32/advpack # Synced to Wine-1.7.27
|
reactos/dll/win32/advpack # Synced to WineStaging-1.7.37
|
||||||
reactos/dll/win32/atl # Synced to Wine-1.7.27
|
reactos/dll/win32/atl # Synced to Wine-1.7.27
|
||||||
reactos/dll/win32/atl80 # Synced to Wine-1.7.27
|
reactos/dll/win32/atl80 # Synced to Wine-1.7.27
|
||||||
reactos/dll/win32/atl100 # Synced to Wine-1.7.27
|
reactos/dll/win32/atl100 # Synced to Wine-1.7.27
|
||||||
|
|
Loading…
Reference in a new issue