Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-02 02:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[0.4.7][SETUPAPI] Apply fix for CORE-12616 PR-408

Browse source 
This fixes a regression introduced in SVN r73442 == git
7e9b3d61c0
Our setup created undesired temporary files and left them
in the temp folder. Also we saw a slight one-time-increase
in memory consumption.

This patch was the work of Carlo Bramini
He proposed the fix on 2016-12-30 already.

I ported this fix from 0.4.8-RC-22-g
dba2f743c5
which is what we used successfully from 0.4.8rls-0.4.10rls
but does NOT reflect the latest additions yet to restore
lastError that were added by Pierre in
0.4.11-dev-643-g
8236bb8f38
but even without that few additional lines the patch did
100% what it promised: fixing CORE-12616
This commit is contained in:
Joachim Henze 2020-10-02 19:37:03 +02:00
parent ca2308d54c
commit be84e3f4e5
1 changed files with 32 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
dll/win32/setupapi/queue.c
View file

@ -987,24 +987,23 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
{
BOOL rc = FALSE;
BOOL docopy = TRUE;
WCHAR TempFile[MAX_PATH];
#ifdef __REACTOS__
INT hSource, hTemp;
OFSTRUCT OfStruct;
WCHAR TempPath[MAX_PATH];
WCHAR TempFile[MAX_PATH];
LONG lRes;
#endif
TRACE("copy %s to %s style 0x%x\n",debugstr_w(source),debugstr_w(target),style);
#ifdef __REACTOS__
/* Get a temp file name */
if (!GetTempPathW(sizeof(TempPath) / sizeof(WCHAR), TempPath))
if (!GetTempPathW(ARRAYSIZE(TempPath), TempPath))
{
ERR("GetTempPathW error\n");
return FALSE;
}
if (!GetTempFileNameW(TempPath, L"", 0, TempFile))
{
ERR("GetTempFileNameW(%s) error\n", debugstr_w(TempPath));
return FALSE;
}
/* Try to open the source file */
hSource = LZOpenFileW((LPWSTR)source, &OfStruct, OF_READ);
@ -1014,26 +1013,47 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
return FALSE;
}
if (!GetTempFileNameW(TempPath, L"", 0, TempFile))
{
ERR("GetTempFileNameW(%s) error\n", debugstr_w(TempPath));
/* Close the source handle */
LZClose(hSource);
return FALSE;
}
/* Extract the compressed file to a temp location */
hTemp = LZOpenFileW(TempFile, &OfStruct, OF_CREATE);
if (hTemp < 0)
{
DWORD dwLastError = GetLastError();
ERR("LZOpenFileW(2) error %d %s\n", (int)hTemp, debugstr_w(TempFile));
/* Close the source handle */
LZClose(hSource);
/* Restore error condition triggered by LZOpenFileW */
SetLastError(dwLastError);
/* Delete temp file if an error is signaled */
DeleteFileW(TempFile);
return FALSE;
}
LZCopy(hSource, hTemp);
lRes = LZCopy(hSource, hTemp);
LZClose(hSource);
LZClose(hTemp);
if (lRes < 0)
{
ERR("LZCopy error %d (%s, %s)\n", (int)lRes, debugstr_w(source), debugstr_w(TempFile));
/* Delete temp file if copy was not successful */
DeleteFileW(TempFile);
return FALSE;
}
#endif
/* before copy processing */
if (style & SP_COPY_REPLACEONLY)
{