Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CABINET] Sync with Wine Staging 2.2. CORE-12823

Browse source 
a663fe94 cabinet: Set index of folder in FDICopy callback.
1f7d144 cabinet: Make Extract fail on read-only files.
af86bdc cabinet: Make Extract overwrite existing files.
3273dff cabinet: Properly initialize internal fci structure (Valgrind).

svn path=/trunk/; revision=73929
This commit is contained in:
Amine Khaldi 2017-02-26 16:00:58 +00:00
parent 520918a849
commit 42057b458d
3 changed files with 4 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/dll/win32/cabinet/cabinet_main.c
View file

@ -237,11 +237,9 @@ static INT_PTR CDECL fdi_notify_extract(FDINOTIFICATIONTYPE fdint, PFDINOTIFICAT
}
hFile = CreateFileA(szFullPath, GENERIC_READ | GENERIC_WRITE, 0, NULL,
CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL);
CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
if (hFile == INVALID_HANDLE_VALUE)
hFile = 0;
else if (node)
if (hFile != INVALID_HANDLE_VALUE && node)
node->DoExtract = FALSE;
}

19
reactos/dll/win32/cabinet/fci.c
View file

@ -1024,6 +1024,7 @@ HFCI __cdecl FCICreate(
return NULL;
}
memset(p_fci_internal, 0, sizeof(FCI_Int));
p_fci_internal->magic = FCI_INT_MAGIC;
p_fci_internal->perf = perf;
p_fci_internal->fileplaced = pfnfiledest;
@ -1038,26 +1039,8 @@ HFCI __cdecl FCICreate(
p_fci_internal->gettemp = pfnfcigtf;
p_fci_internal->ccab = *pccab;
p_fci_internal->pccab = pccab;
p_fci_internal->fPrevCab = FALSE;
p_fci_internal->fNextCab = FALSE;
p_fci_internal->fSplitFolder = FALSE;
p_fci_internal->fGetNextCabInVain = FALSE;
p_fci_internal->pv = pv;
p_fci_internal->cdata_in = 0;
p_fci_internal->cCompressedBytesInFolder = 0;
p_fci_internal->cFolders = 0;
p_fci_internal->cFiles = 0;
p_fci_internal->cDataBlocks = 0;
p_fci_internal->data.handle = -1;
p_fci_internal->fNewPrevious = FALSE;
p_fci_internal->estimatedCabinetSize = 0;
p_fci_internal->statusFolderTotal = 0;
p_fci_internal->folders_size = 0;
p_fci_internal->files_size = 0;
p_fci_internal->placed_files_size = 0;
p_fci_internal->pending_data_size = 0;
p_fci_internal->folders_data_size = 0;
p_fci_internal->compression = tcompTYPE_NONE;
p_fci_internal->compress = compress_NONE;
list_init( &p_fci_internal->folders_list );

2
reactos/media/doc/README.WINE
View file

@ -51,7 +51,7 @@ reactos/dll/win32/atl100 # Synced to WineStaging-1.9.11
reactos/dll/win32/avifil32 # Synced to WineStaging-1.9.23
reactos/dll/win32/bcrypt # Synced to WineStaging-1.9.23
reactos/dll/win32/browseui # Out of sync
reactos/dll/win32/cabinet # Synced to WineStaging-1.9.23
reactos/dll/win32/cabinet # Synced to WineStaging-2.2
reactos/dll/win32/clusapi # Synced to WineStaging-1.9.11
reactos/dll/win32/comcat # Synced to WineStaging-1.9.11
reactos/dll/win32/comctl32 # Synced to WineStaging-1.9.23