Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-04 11:01:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SETUPAPI] add support for LZ compressed files. fixes ATI Radeon driver installation by inf CORE-10000

Browse source 
svn path=/trunk/; revision=68659
This commit is contained in:
Christoph von Wittich 2015-08-10 10:52:21 +00:00
parent c1d8c92be3
commit e0e3c56ecb
2 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

26
reactos/dll/win32/setupapi/queue.c
View file

@ -984,9 +984,27 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
{ {
BOOL rc = FALSE; BOOL rc = FALSE;
BOOL docopy = TRUE; BOOL docopy = TRUE;
WCHAR TempFile[MAX_PATH];
INT hSource, hTemp;
OFSTRUCT OfStruct;
WCHAR TempPath[MAX_PATH];
TRACE("copy %s to %s style 0x%x\n",debugstr_w(source),debugstr_w(target),style); TRACE("copy %s to %s style 0x%x\n",debugstr_w(source),debugstr_w(target),style);
hSource = LZOpenFileW((LPWSTR)source, &OfStruct, OF_READ);
if (hSource < 0)
return FALSE;
/* Get a temp file name */
GetTempPathW(sizeof(TempPath) / sizeof(WCHAR), TempPath);
GetTempFileNameW(TempPath, L"", 0, TempFile);
/* Extract the compressed file to a temp location */
hTemp = LZOpenFileW(TempFile, &OfStruct, OF_CREATE);
LZCopy(hSource, hTemp);
LZClose(hSource);
LZClose(hTemp);
/* before copy processing */ /* before copy processing */
if (style & SP_COPY_REPLACEONLY) if (style & SP_COPY_REPLACEONLY)
{ {
@ -1010,9 +1028,9 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
* we just basically unconditionally replace the builtin versions. * we just basically unconditionally replace the builtin versions.
*/ */
if ((GetFileAttributesW(target) != INVALID_FILE_ATTRIBUTES) && if ((GetFileAttributesW(target) != INVALID_FILE_ATTRIBUTES) &&
(GetFileAttributesW(source) != INVALID_FILE_ATTRIBUTES)) (GetFileAttributesW(TempFile) != INVALID_FILE_ATTRIBUTES))
{ {
VersionSizeSource = GetFileVersionInfoSizeW((LPWSTR)source,&zero); VersionSizeSource = GetFileVersionInfoSizeW(TempFile,&zero);
VersionSizeTarget = GetFileVersionInfoSizeW((LPWSTR)target,&zero); VersionSizeTarget = GetFileVersionInfoSizeW((LPWSTR)target,&zero);
} }
@ -1032,7 +1050,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
VersionSource = HeapAlloc(GetProcessHeap(),0,VersionSizeSource); VersionSource = HeapAlloc(GetProcessHeap(),0,VersionSizeSource);
VersionTarget = HeapAlloc(GetProcessHeap(),0,VersionSizeTarget); VersionTarget = HeapAlloc(GetProcessHeap(),0,VersionSizeTarget);
ret = GetFileVersionInfoW((LPWSTR)source,0,VersionSizeSource,VersionSource); ret = GetFileVersionInfoW(TempFile,0,VersionSizeSource,VersionSource);
if (ret) if (ret)
ret = GetFileVersionInfoW((LPWSTR)target, 0, VersionSizeTarget, ret = GetFileVersionInfoW((LPWSTR)target, 0, VersionSizeTarget,
VersionTarget); VersionTarget);
@ -1107,7 +1125,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
if (docopy) if (docopy)
{ {
rc = CopyFileW(source,target,FALSE); rc = MoveFileExW(TempFile,target,MOVEFILE_REPLACE_EXISTING);
TRACE("Did copy... rc was %i\n",rc); TRACE("Did copy... rc was %i\n",rc);
} }

1
reactos/dll/win32/setupapi/setupapi_private.h
View file

@ -41,6 +41,7 @@
#include <setupapi.h> #include <setupapi.h>
#include <softpub.h> #include <softpub.h>
#include <mscat.h> #include <mscat.h>
#include <lzexpand.h>
#include <shlobj.h> #include <shlobj.h>
#include <wine/unicode.h> #include <wine/unicode.h>
#define NTOS_MODE_USER #define NTOS_MODE_USER