Author: akhaldi Date: Sun Feb 26 16:00:58 2017 New Revision: 73929
URL: http://svn.reactos.org/svn/reactos?rev=73929&view=rev Log: [CABINET] Sync with Wine Staging 2.2. CORE-12823
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).
Modified: trunk/reactos/dll/win32/cabinet/cabinet_main.c trunk/reactos/dll/win32/cabinet/fci.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/cabinet/cabinet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet_m... ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/cabinet_main.c [iso-8859-1] Sun Feb 26 16:00:58 2017 @@ -237,11 +237,9 @@ }
hFile = CreateFileA(szFullPath, GENERIC_READ | GENERIC_WRITE, 0, NULL, - CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); - - if (hFile == INVALID_HANDLE_VALUE) - hFile = 0; - else if (node) + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + + if (hFile != INVALID_HANDLE_VALUE && node) node->DoExtract = FALSE; }
Modified: trunk/reactos/dll/win32/cabinet/fci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fci.c?rev... ============================================================================== --- trunk/reactos/dll/win32/cabinet/fci.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/fci.c [iso-8859-1] Sun Feb 26 16:00:58 2017 @@ -1024,6 +1024,7 @@ 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 @@ 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 );
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Feb 26 16:00:58 2017 @@ -51,7 +51,7 @@ 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