Ros-diffs September 2017

ros-diffs@reactos.org

17 participants
284 discussions

[ashaposhnikov] 75820: [RAPPS] Moved cabinet.dll related definitions to separate header

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Sun Sep 10 17:33:14 2017 New Revision: 75820 URL: http://svn.reactos.org/svn/reactos?rev=75820&view=rev Log: [RAPPS] Moved cabinet.dll related definitions to separate header Added: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/cabinet.h (with props) Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/CMakeLists.txt branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] Sun Sep 10 17:33:14 2017 @@ -22,6 +22,7 @@ include/gui.h include/dialogs.h include/installed.h + include/cabinet.h include/crichedit.h include/defines.h include/misc.h Added: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/cabinet.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/cabinet.h (added) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/cabinet.h [iso-8859-1] Sun Sep 10 17:33:14 2017 @@ -0,0 +1,32 @@ +// Structs related to .cab extraction +// FIXME: they should belong to exports of cabinet.dll +#pragma once + +struct ERF +{ + INT erfOper; + INT erfType; + BOOL fError; +}; + +struct FILELIST +{ + LPSTR FileName; + FILELIST *next; + BOOL DoExtract; +}; + +struct SESSION +{ + INT FileSize; + ERF Error; + FILELIST *FileList; + INT FileCount; + INT Operation; + CHAR Destination[MAX_PATH]; + CHAR CurrentFile[MAX_PATH]; + CHAR Reserved[MAX_PATH]; + FILELIST *FilterList; +}; + +typedef HRESULT(WINAPI *fnExtract)(SESSION *dest, LPCSTR szCabName); Propchange: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/cabinet.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp [iso-8859-1] Sun Sep 10 17:33:14 2017 @@ -11,42 +11,13 @@ #include "gui.h" #include "misc.h" +#include "cabinet.h" /* SESSION Operation */ #define EXTRACT_FILLFILELIST 0x00000001 #define EXTRACT_EXTRACTFILES 0x00000002 static HANDLE hLog = NULL; - -struct ERF -{ - INT erfOper; - INT erfType; - BOOL fError; -}; - -struct FILELIST -{ - LPSTR FileName; - FILELIST *next; - BOOL DoExtract; -}; - -struct SESSION -{ - INT FileSize; - ERF Error; - FILELIST *FileList; - INT FileCount; - INT Operation; - CHAR Destination[MAX_PATH]; - CHAR CurrentFile[MAX_PATH]; - CHAR Reserved[MAX_PATH]; - FILELIST *FilterList; -}; - -typedef HRESULT(WINAPI *fnExtract)(SESSION *dest, LPCSTR szCabName); -fnExtract pfnExtract; INT GetWindowWidth(HWND hwnd) { @@ -243,7 +214,8 @@ CHAR szCabName[MAX_PATH]; SESSION Dest; HRESULT Result; - + fnExtract pfnExtract; + hCabinetDll = LoadLibraryW(L"cabinet.dll"); if (hCabinetDll) {

7 years, 2 months

[spetreolle] 75819: Commit forgotten part of the Esperanto support from r75378. CORE-11021

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Sep 10 16:38:24 2017 New Revision: 75819 URL: http://svn.reactos.org/svn/reactos?rev=75819&view=rev Log: Commit forgotten part of the Esperanto support from r75378. CORE-11021 Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sun Sep 10 16:38:24 2017 @@ -763,6 +763,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000455","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5140" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000048f","Layout File",0x00000000,"kbdeo.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000048f","Layout Text",0x00000000,"Esperanto" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000048f","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5142" + ; Keyboard layouts HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layout",,0x00000012 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layout\DosKeybCodes","00000402",2,"bg" @@ -797,6 +801,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layout\DosKeybCodes","00000425",2,"et" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layout\DosKeybCodes","00000426",2,"us" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layout\DosKeybCodes","00000427",2,"us" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layout\DosKeybCodes","0000048f",2,"eo" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layout\DosKeybCodes","00000804",2,"ch" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layout\DosKeybCodes","00000807",2,"sg" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layout\DosKeybCodes","00000809",2,"uk" Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Sun Sep 10 16:38:24 2017 @@ -383,6 +383,7 @@ 00000809 = "English (United Kingdom)" 00000409 = "English (USA)" 00010409 = "English (USA-Dvorak)" +0000048F = "Esperanto" 00000425 = "Estonian" 0000040B = "Finnish" 0000080C = "French (Belgium)" @@ -521,6 +522,7 @@ 0000044C = kbdinmal.dll 0000044D = kbdinasa.dll 00000455 = kbdbur.dll +0000048F = kbdeo.dll [HiveInfs.Install] AddReg=registry.inf,AddReg

7 years, 2 months

[khornicek] 75818: [WIN32K] - really check whether the requested pixel is outside of the surface in NtGdiGetPixel CORE-12820

by khornicek＠svn.reactos.org

Author: khornicek Date: Sun Sep 10 09:09:57 2017 New Revision: 75818 URL: http://svn.reactos.org/svn/reactos?rev=75818&view=rev Log: [WIN32K] - really check whether the requested pixel is outside of the surface in NtGdiGetPixel CORE-12820 Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Sun Sep 10 09:09:57 2017 @@ -1496,7 +1496,9 @@ /* Check if the pixel is outside the surface */ psurfSrc = pdc->dclevel.pSurface; if ((ptlSrc.x >= psurfSrc->SurfObj.sizlBitmap.cx) || - (ptlSrc.y >= psurfSrc->SurfObj.sizlBitmap.cy)) + (ptlSrc.y >= psurfSrc->SurfObj.sizlBitmap.cy) || + (ptlSrc.x < 0) || + (ptlSrc.y < 0)) { /* Fail! */ goto leave;

7 years, 2 months

[tthompson] 75817: [NTFS] - Respect NTFS' file ordering when enumerating a directory. Split off part of BrowseIndexEntries() into a separate function to simplify the code. AddNewMftEntry() - Zero t...

by tthompson＠svn.reactos.org

Author: tthompson Date: Sat Sep 9 23:10:52 2017 New Revision: 75817 URL: http://svn.reactos.org/svn/reactos?rev=75817&view=rev Log: [NTFS] - Respect NTFS' file ordering when enumerating a directory. Split off part of BrowseIndexEntries() into a separate function to simplify the code. AddNewMftEntry() - Zero the (larger) buffer for the bitmap prior to reading the bitmap. BrowseIndexEntries() - Check sub-nodes before checking an index entry. Read and use the index bitmap when checking sub-nodes. +BrowseSubNodeIndexEntries() - Called for sub-nodes of an index when browsing index entries. +NtfsDumpData() - Diagnostic function which allows for visualizing a series of bytes. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Sat Sep 9 23:10:52 2017 @@ -1988,6 +1988,7 @@ ReleaseAttributeContext(BitmapContext); return STATUS_INSUFFICIENT_RESOURCES; } + RtlZeroMemory(BitmapBuffer, BitmapDataSize + sizeof(ULONG)); // Get a ULONG-aligned pointer for the bitmap itself BitmapData = (PUCHAR)ALIGN_UP_BY((ULONG_PTR)BitmapBuffer, sizeof(ULONG)); @@ -2766,9 +2767,157 @@ #endif NTSTATUS +BrowseSubNodeIndexEntries(PNTFS_VCB Vcb, + PFILE_RECORD_HEADER MftRecord, + ULONG IndexBlockSize, + PUNICODE_STRING FileName, + PNTFS_ATTR_CONTEXT IndexAllocationContext, + PRTL_BITMAP Bitmap, + ULONGLONG VCN, + PULONG StartEntry, + PULONG CurrentEntry, + BOOLEAN DirSearch, + BOOLEAN CaseSensitive, + ULONGLONG *OutMFTIndex) +{ + PINDEX_BUFFER IndexRecord; + ULONGLONG Offset; + ULONG BytesRead; + PINDEX_ENTRY_ATTRIBUTE FirstEntry; + PINDEX_ENTRY_ATTRIBUTE LastEntry; + PINDEX_ENTRY_ATTRIBUTE IndexEntry; + ULONG NodeNumber; + NTSTATUS Status; + + DPRINT("BrowseSubNodeIndexEntries(%p, %p, %lu, %wZ, %p, %p, %I64d, %lu, %lu, %s, %s, %p)\n", + Vcb, + MftRecord, + IndexBlockSize, + FileName, + IndexAllocationContext, + Bitmap, + VCN, + *StartEntry, + *CurrentEntry, + "FALSE", + DirSearch ? "TRUE" : "FALSE", + CaseSensitive ? "TRUE" : "FALSE", + OutMFTIndex); + + // Calculate node number as VCN / Clusters per index record + NodeNumber = VCN / (Vcb->NtfsInfo.BytesPerIndexRecord / Vcb->NtfsInfo.BytesPerCluster); + + // Is the bit for this node clear in the bitmap? + if (!RtlCheckBit(Bitmap, NodeNumber)) + { + DPRINT1("File system corruption detected, node with VCN %I64u is being reused or is marked as deleted.\n", VCN); + return STATUS_DATA_ERROR; + } + + // Clear the bit for this node so it can't be recursively referenced + RtlClearBits(Bitmap, NodeNumber, 1); + + // Allocate memory for the index record + IndexRecord = ExAllocatePoolWithTag(NonPagedPool, IndexBlockSize, TAG_NTFS); + if (!IndexRecord) + { + DPRINT1("Unable to allocate memory for index record!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // Calculate offset of index record + Offset = VCN * Vcb->NtfsInfo.BytesPerCluster; + + // Read the index record + BytesRead = ReadAttribute(Vcb, IndexAllocationContext, Offset, (PCHAR)IndexRecord, IndexBlockSize); + if (BytesRead != IndexBlockSize) + { + DPRINT1("Unable to read index record!\n"); + ExFreePoolWithTag(IndexRecord, TAG_NTFS); + return STATUS_UNSUCCESSFUL; + } + + // Assert that we're dealing with an index record here + ASSERT(IndexRecord->Ntfs.Type == NRH_INDX_TYPE); + + // Apply the fixup array to the index record + Status = FixupUpdateSequenceArray(Vcb, &((PFILE_RECORD_HEADER)IndexRecord)->Ntfs); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(IndexRecord, TAG_NTFS); + DPRINT1("Failed to apply fixup array!\n"); + return Status; + } + + ASSERT(IndexRecord->Header.AllocatedSize + FIELD_OFFSET(INDEX_BUFFER, Header) == IndexBlockSize); + FirstEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)&IndexRecord->Header + IndexRecord->Header.FirstEntryOffset); + LastEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)&IndexRecord->Header + IndexRecord->Header.TotalSizeOfEntries); + ASSERT(LastEntry <= (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexRecord + IndexBlockSize)); + + // Loop through all Index Entries of index, starting with FirstEntry + IndexEntry = FirstEntry; + while (IndexEntry <= LastEntry) + { + // Does IndexEntry have a sub-node? + if (IndexEntry->Flags & NTFS_INDEX_ENTRY_NODE) + { + if (!(IndexRecord->Header.Flags & INDEX_NODE_LARGE) || !IndexAllocationContext) + { + DPRINT1("Filesystem corruption detected!\n"); + } + else + { + Status = BrowseSubNodeIndexEntries(Vcb, + MftRecord, + IndexBlockSize, + FileName, + IndexAllocationContext, + Bitmap, + GetIndexEntryVCN(IndexEntry), + StartEntry, + CurrentEntry, + DirSearch, + CaseSensitive, + OutMFTIndex); + if (NT_SUCCESS(Status)) + { + ExFreePoolWithTag(IndexRecord, TAG_NTFS); + return Status; + } + } + } + + // Are we done? + if (IndexEntry->Flags & NTFS_INDEX_ENTRY_END) + break; + + // If we've found a file whose index is greater than or equal to StartEntry that matches the search criteria + if ((IndexEntry->Data.Directory.IndexedFile & NTFS_MFT_MASK) >= NTFS_FILE_FIRST_USER_FILE && + *CurrentEntry >= *StartEntry && + IndexEntry->FileName.NameType != NTFS_FILE_NAME_DOS && + CompareFileName(FileName, IndexEntry, DirSearch, CaseSensitive)) + { + *StartEntry = *CurrentEntry; + *OutMFTIndex = (IndexEntry->Data.Directory.IndexedFile & NTFS_MFT_MASK); + ExFreePoolWithTag(IndexRecord, TAG_NTFS); + return STATUS_SUCCESS; + } + + // Advance to the next index entry + (*CurrentEntry) += 1; + ASSERT(IndexEntry->Length >= sizeof(INDEX_ENTRY_ATTRIBUTE)); + IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((PCHAR)IndexEntry + IndexEntry->Length); + } + + ExFreePoolWithTag(IndexRecord, TAG_NTFS); + + return STATUS_OBJECT_PATH_NOT_FOUND; +} + +NTSTATUS BrowseIndexEntries(PDEVICE_EXTENSION Vcb, PFILE_RECORD_HEADER MftRecord, - PCHAR IndexRecord, + PINDEX_ROOT_ATTRIBUTE IndexRecord, ULONG IndexBlockSize, PINDEX_ENTRY_ATTRIBUTE FirstEntry, PINDEX_ENTRY_ATTRIBUTE LastEntry, @@ -2780,11 +2929,12 @@ ULONGLONG *OutMFTIndex) { NTSTATUS Status; - ULONG RecordOffset; PINDEX_ENTRY_ATTRIBUTE IndexEntry; - PNTFS_ATTR_CONTEXT IndexAllocationCtx; - ULONGLONG IndexAllocationSize; - PINDEX_BUFFER IndexBuffer; + PNTFS_ATTR_CONTEXT IndexAllocationContext; + PNTFS_ATTR_CONTEXT BitmapContext; + PCHAR *BitmapMem; + ULONG *BitmapPtr; + RTL_BITMAP Bitmap; DPRINT("BrowseIndexEntries(%p, %p, %p, %lu, %p, %p, %wZ, %lu, %lu, %s, %s, %p)\n", Vcb, @@ -2800,10 +2950,100 @@ CaseSensitive ? "TRUE" : "FALSE", OutMFTIndex); + // Find the $I30 index allocation, if there is one + Status = FindAttribute(Vcb, MftRecord, AttributeIndexAllocation, L"$I30", 4, &IndexAllocationContext, NULL); + if (NT_SUCCESS(Status)) + { + ULONGLONG BitmapLength; + // Find the bitmap attribute for the index + Status = FindAttribute(Vcb, MftRecord, AttributeBitmap, L"$I30", 4, &BitmapContext, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Potential file system corruption detected!\n"); + ReleaseAttributeContext(IndexAllocationContext); + return Status; + } + + // Get the length of the bitmap attribute + BitmapLength = AttributeDataLength(BitmapContext->pRecord); + + // Allocate memory for the bitmap, including some padding; RtlInitializeBitmap() wants a pointer + // that's ULONG-aligned, and it wants the size of the memory allocated for it to be a ULONG-multiple. + BitmapMem = ExAllocatePoolWithTag(NonPagedPool, BitmapLength + sizeof(ULONG), TAG_NTFS); + if (!BitmapMem) + { + DPRINT1("Error: failed to allocate bitmap!"); + ReleaseAttributeContext(BitmapContext); + ReleaseAttributeContext(IndexAllocationContext); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlZeroMemory(BitmapMem, BitmapLength + sizeof(ULONG)); + + // RtlInitializeBitmap() wants a pointer that's ULONG-aligned. + BitmapPtr = (PULONG)ALIGN_UP_BY((ULONG_PTR)BitmapMem, sizeof(ULONG)); + + // Read the existing bitmap data + Status = ReadAttribute(Vcb, BitmapContext, 0, (PCHAR)BitmapPtr, BitmapLength); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Failed to read bitmap attribute!\n"); + ExFreePoolWithTag(BitmapMem, TAG_NTFS); + ReleaseAttributeContext(BitmapContext); + ReleaseAttributeContext(IndexAllocationContext); + return Status; + } + + // Initialize bitmap + RtlInitializeBitMap(&Bitmap, BitmapPtr, BitmapLength * 8); + } + else + { + // Couldn't find an index allocation + IndexAllocationContext = NULL; + } + + + // Loop through all Index Entries of index, starting with FirstEntry IndexEntry = FirstEntry; - while (IndexEntry < LastEntry && - !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) - { + while (IndexEntry <= LastEntry) + { + // Does IndexEntry have a sub-node? + if (IndexEntry->Flags & NTFS_INDEX_ENTRY_NODE) + { + if (!(IndexRecord->Header.Flags & INDEX_ROOT_LARGE) || !IndexAllocationContext) + { + DPRINT1("Filesystem corruption detected!\n"); + } + else + { + Status = BrowseSubNodeIndexEntries(Vcb, + MftRecord, + IndexBlockSize, + FileName, + IndexAllocationContext, + &Bitmap, + GetIndexEntryVCN(IndexEntry), + StartEntry, + CurrentEntry, + DirSearch, + CaseSensitive, + OutMFTIndex); + if (NT_SUCCESS(Status)) + { + ExFreePoolWithTag(BitmapMem, TAG_NTFS); + ReleaseAttributeContext(BitmapContext); + ReleaseAttributeContext(IndexAllocationContext); + return Status; + } + } + } + + // Are we done? + if (IndexEntry->Flags & NTFS_INDEX_ENTRY_END) + break; + + // If we've found a file whose index is greater than or equal to StartEntry that matches the search criteria if ((IndexEntry->Data.Directory.IndexedFile & NTFS_MFT_MASK) >= NTFS_FILE_FIRST_USER_FILE && *CurrentEntry >= *StartEntry && IndexEntry->FileName.NameType != NTFS_FILE_NAME_DOS && @@ -2811,71 +3051,29 @@ { *StartEntry = *CurrentEntry; *OutMFTIndex = (IndexEntry->Data.Directory.IndexedFile & NTFS_MFT_MASK); + if (IndexAllocationContext) + { + ExFreePoolWithTag(BitmapMem, TAG_NTFS); + ReleaseAttributeContext(BitmapContext); + ReleaseAttributeContext(IndexAllocationContext); + } return STATUS_SUCCESS; } + // Advance to the next index entry (*CurrentEntry) += 1; ASSERT(IndexEntry->Length >= sizeof(INDEX_ENTRY_ATTRIBUTE)); IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((PCHAR)IndexEntry + IndexEntry->Length); } - /* If we're already browsing a subnode */ - if (IndexRecord == NULL) - { - return STATUS_OBJECT_PATH_NOT_FOUND; - } - - /* If there's no subnode */ - if (!(IndexEntry->Flags & NTFS_INDEX_ENTRY_NODE)) - { - return STATUS_OBJECT_PATH_NOT_FOUND; - } - - Status = FindAttribute(Vcb, MftRecord, AttributeIndexAllocation, L"$I30", 4, &IndexAllocationCtx, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Corrupted filesystem!\n"); - return Status; - } - - IndexAllocationSize = AttributeDataLength(IndexAllocationCtx->pRecord); - Status = STATUS_OBJECT_PATH_NOT_FOUND; - for (RecordOffset = 0; RecordOffset < IndexAllocationSize; RecordOffset += IndexBlockSize) - { - ReadAttribute(Vcb, IndexAllocationCtx, RecordOffset, IndexRecord, IndexBlockSize); - Status = FixupUpdateSequenceArray(Vcb, &((PFILE_RECORD_HEADER)IndexRecord)->Ntfs); - if (!NT_SUCCESS(Status)) - { - break; - } - - IndexBuffer = (PINDEX_BUFFER)IndexRecord; - ASSERT(IndexBuffer->Ntfs.Type == NRH_INDX_TYPE); - ASSERT(IndexBuffer->Header.AllocatedSize + FIELD_OFFSET(INDEX_BUFFER, Header) == IndexBlockSize); - FirstEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)&IndexBuffer->Header + IndexBuffer->Header.FirstEntryOffset); - LastEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)&IndexBuffer->Header + IndexBuffer->Header.TotalSizeOfEntries); - ASSERT(LastEntry <= (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexBuffer + IndexBlockSize)); - - Status = BrowseIndexEntries(NULL, - NULL, - NULL, - 0, - FirstEntry, - LastEntry, - FileName, - StartEntry, - CurrentEntry, - DirSearch, - CaseSensitive, - OutMFTIndex); - if (NT_SUCCESS(Status)) - { - break; - } - } - - ReleaseAttributeContext(IndexAllocationCtx); - return Status; + if (IndexAllocationContext) + { + ExFreePoolWithTag(BitmapMem, TAG_NTFS); + ReleaseAttributeContext(BitmapContext); + ReleaseAttributeContext(IndexAllocationContext); + } + + return STATUS_OBJECT_PATH_NOT_FOUND; } NTSTATUS @@ -2946,7 +3144,7 @@ Status = BrowseIndexEntries(Vcb, MftRecord, - IndexRecord, + (PINDEX_ROOT_ATTRIBUTE)IndexRecord, IndexRoot->SizeOfEntry, IndexEntry, IndexEntryEnd, @@ -3031,6 +3229,24 @@ return NtfsLookupFileAt(Vcb, PathName, CaseSensitive, FileRecord, MFTIndex, NTFS_FILE_ROOT); } +void +NtfsDumpData(ULONG_PTR Buffer, ULONG Length) +{ + ULONG i, j; + + // dump binary data, 8 bytes at a time + for (i = 0; i < Length; i += 8) + { + // display current offset, in hex + DbgPrint("\t%03x\t", i); + + // display hex value of each of the next 8 bytes + for (j = 0; j < 8; j++) + DbgPrint("%02x ", *(PUCHAR)(Buffer + i + j)); + DbgPrint("\n"); + } +} + /** * @name NtfsDumpFileRecord * @implemented Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sat Sep 9 23:10:52 2017 @@ -769,6 +769,9 @@ ULONG IndexBufferSize, ULONGLONG Vcn); +ULONGLONG +GetIndexEntryVCN(PINDEX_ENTRY_ATTRIBUTE IndexEntry); + ULONG GetSizeOfIndexEntries(PB_TREE_FILENAME_NODE Node); @@ -1001,6 +1004,9 @@ PDEVICE_EXTENSION DeviceExt, PULONGLONG DestinationIndex, BOOLEAN CanWait); + +VOID +NtfsDumpData(ULONG_PTR Buffer, ULONG Length); PNTFS_ATTR_CONTEXT PrepareAttributeContext(PNTFS_ATTR_RECORD AttrRecord);

7 years, 2 months

[ashaposhnikov] 75816: [RAPPS] Replaced my @gmail.com email with @reactos, org one & Removed my copyright from rosui.h

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Sat Sep 9 20:44:43 2017 New Revision: 75816 URL: http://svn.reactos.org/svn/reactos?rev=75816&view=rev Log: [RAPPS] Replaced my @gmail.com email with @reactos,org one & Removed my copyright from rosui.h Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/aboutdlg.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/rosui.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/settingsdlg.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/aboutdlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/aboutdlg.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/aboutdlg.cpp [iso-8859-1] Sat Sep 9 20:44:43 2017 @@ -3,8 +3,8 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * FILE: base/applications/rapps/aboutdlg.cpp * PURPOSE: About Dialog - * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) - * Copyright 2017 Alexander Shaposhikov (chaez.san(a)gmail.com) + * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) + * Copyright 2017 Alexander Shaposhikov (sanchaez(a)reactos.org) */ #include "defines.h" Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] Sat Sep 9 20:44:43 2017 @@ -5,7 +5,7 @@ * PURPOSE: Classes for working with available applications * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) - * Copyright 2017 Alexander Shaposhnikov (chaez.san(a)gmail.com) + * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) */ #include "defines.h" Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] Sat Sep 9 20:44:43 2017 @@ -4,7 +4,7 @@ * FILE: base/applications/rapps/gui.cpp * PURPOSE: GUI classes for RAPPS * COPYRIGHT: Copyright 2015 David Quintana (gigaherz(a)gmail.com) - * Copyright 2017 Alexander Shaposhnikov (chaez.san(a)gmail.com) + * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) */ #include "defines.h" Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/rosui.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/rosui.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/rosui.h [iso-8859-1] Sat Sep 9 20:44:43 2017 @@ -4,7 +4,6 @@ * FILE: base/applications/rapps/include/rosui.h * PURPOSE: ATL Layout engine for RAPPS * COPYRIGHT: Copyright 2015 David Quintana (gigaherz(a)gmail.com) - * Copyright 2017 Alexander Shaposhnikov (chaez.san(a)gmail.com) */ #pragma once Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp [iso-8859-1] Sat Sep 9 20:44:43 2017 @@ -4,7 +4,7 @@ * FILE: base/applications/rapps/installed.cpp * PURPOSE: Functions for working with installed applications * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) - * Copyright 2017 Alexander Shaposhnikov (chaez.san(a)gmail.com) + * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) */ #include "defines.h" Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] Sat Sep 9 20:44:43 2017 @@ -8,7 +8,7 @@ * Copyright 2005 Ge van Geldorp (gvg(a)reactos.org) * Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) - * Copyright 2017 Alexander Shaposhnikov (chaez.san(a)gmail.com) + * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) */ /* Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp [iso-8859-1] Sat Sep 9 20:44:43 2017 @@ -5,7 +5,7 @@ * PURPOSE: Misc functions * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) - * Copyright 2017 Alexander Shaposhnikov (chaez.san(a)gmail.com) + * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) */ #include "defines.h" Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/settingsdlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/settingsdlg.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/settingsdlg.cpp [iso-8859-1] Sat Sep 9 20:44:43 2017 @@ -4,7 +4,7 @@ * FILE: base/applications/rapps/settingsdlg.cpp * PURPOSE: Settings Dialog * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) - * Copyright 2017 Alexander Shaposhnikov (chaez.san(a)gmail.com) + * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) */ #include "defines.h" Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp [iso-8859-1] Sat Sep 9 20:44:43 2017 @@ -3,7 +3,7 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * FILE: base/applications/rapps/unattended.cpp * PURPOSE: Functions to parse command-line flags and process them -* COPYRIGHT: Copyright 2017 Alexander Shaposhnikov (chaez.san(a)gmail.com) +* COPYRIGHT: Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) */ #include "unattended.h" #include "defines.h" Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] Sat Sep 9 20:44:43 2017 @@ -5,7 +5,7 @@ * PURPOSE: Main program * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) - * Copyright 2017 Alexander Shaposhnikov (chaez.san(a)gmail.com) + * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) */ #include "defines.h" #include "rapps.h"

7 years, 2 months

[ashaposhnikov] 75815: [RAPPS] License header unification and minor style changes - Unified & reformatted license headers according to https://www.reactos.org/wiki/Coding_Style - Minor style changes

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Sat Sep 9 20:38:06 2017 New Revision: 75815 URL: http://svn.reactos.org/svn/reactos?rev=75815&view=rev Log: [RAPPS] License header unification and minor style changes - Unified & reformatted license headers according to https://www.reactos.org/wiki/Coding_Style - Minor style changes Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/aboutdlg.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/installed.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/rosui.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/winmain.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/integrity.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/settingsdlg.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/aboutdlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/aboutdlg.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/aboutdlg.cpp [iso-8859-1] Sat Sep 9 20:38:06 2017 @@ -1,10 +1,10 @@ /* - * PROJECT: ReactOS Applications Manager - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps/aboutdlg.cpp - * PURPOSE: About Dialog - * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) - * Alexander Shaposhikov (chaez.san(a)gmail.com) + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * FILE: base/applications/rapps/aboutdlg.cpp + * PURPOSE: About Dialog + * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) + * Copyright 2017 Alexander Shaposhikov (chaez.san(a)gmail.com) */ #include "defines.h" Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] Sat Sep 9 20:38:06 2017 @@ -1,11 +1,11 @@ /* - * PROJECT: ReactOS Applications Manager - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps/available.cpp - * PURPOSE: Classes for working with available applications - * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) - * Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) - * Alexander Shaposhnikov (chaez.san(a)gmail.com) + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * FILE: base/applications/rapps/available.cpp + * PURPOSE: Classes for working with available applications + * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) + * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) + * Copyright 2017 Alexander Shaposhnikov (chaez.san(a)gmail.com) */ #include "defines.h" Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] Sat Sep 9 20:38:06 2017 @@ -1,7 +1,10 @@ -ï»¿/* PROJECT: ReactOS CE Applications Manager - * LICENSE: GPL - See COPYING in the top level directory - * AUTHORS: David Quintana <gigaherz(a)gmail.com> - * Alexander Shaposhnikov <chaez.san(a)gmail.com> +ï»¿/* + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * FILE: base/applications/rapps/gui.cpp + * PURPOSE: GUI classes for RAPPS + * COPYRIGHT: Copyright 2015 David Quintana (gigaherz(a)gmail.com) + * Copyright 2017 Alexander Shaposhnikov (chaez.san(a)gmail.com) */ #include "defines.h" @@ -633,18 +636,18 @@ class CMainWindow : public CWindowImpl<CMainWindow, CWindow, CFrameWinTraits> { - CUiPanel * m_ClientPanel; - CUiSplitPanel * m_VSplitter; - CUiSplitPanel * m_HSplitter; - - CMainToolbar * m_Toolbar; - CAppsListView * m_ListView; - - CSideTreeView * m_TreeView; - CUiWindow<CStatusBar> * m_StatusBar; - CUiWindow<CRichEdit> * m_RichEdit; - - CUiWindow<CSearchBar> * m_SearchBar; + CUiPanel* m_ClientPanel; + CUiSplitPanel* m_VSplitter; + CUiSplitPanel* m_HSplitter; + + CMainToolbar* m_Toolbar; + CAppsListView* m_ListView; + + CSideTreeView* m_TreeView; + CUiWindow<CStatusBar>* m_StatusBar; + CUiWindow<CRichEdit>* m_RichEdit; + + CUiWindow<CSearchBar>* m_SearchBar; CAvailableApps m_AvailableApps; LPWSTR pLink; @@ -1636,8 +1639,7 @@ } }; -// File interface - +// global interface CMainWindow * g_MainWindow; HWND CreateMainWindow() @@ -1675,7 +1677,12 @@ g_MainWindow->GetRichEdit()->InsertText(szText, flags); } -/* ATL version of functions */ +CAvailableApps* GetAvailableApps() +{ + return g_MainWindow->GetAvailableApps(); +} + +// ATL version of functions above VOID SetStatusBarText(const ATL::CStringW& szText) { SetStatusBarText(szText.GetString()); @@ -1695,8 +1702,3 @@ { InsertRichEditText(szText.GetString(), flags); } - -CAvailableApps* GetAvailableApps() -{ - return g_MainWindow->GetAvailableApps(); -} Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h [iso-8859-1] Sat Sep 9 20:38:06 2017 @@ -80,13 +80,14 @@ class CAvailableApps { - ATL::CAtlList<CAvailableApplicationInfo*> m_InfoList; static ATL::CStringW m_szPath; static ATL::CStringW m_szCabPath; static ATL::CStringW m_szAppsPath; static ATL::CStringW m_szSearchPath; static BOOL InitializeStaticStrings(); + + ATL::CAtlList<CAvailableApplicationInfo*> m_InfoList; public: CAvailableApps(); Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h [iso-8859-1] Sat Sep 9 20:38:06 2017 @@ -16,6 +16,7 @@ static INT iCurrentApp; static VOID Download(const DownloadInfo& DLInfo, BOOL bIsModal = FALSE); + public: static INT_PTR CALLBACK DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM wParam, LPARAM lParam); static LRESULT CALLBACK DownloadProgressProc(HWND hWnd, Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/installed.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/installed.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/installed.h [iso-8859-1] Sat Sep 9 20:38:06 2017 @@ -9,6 +9,7 @@ HKEY hSubKey; ATL::CStringW szKeyName; }; + typedef INSTALLED_INFO *PINSTALLED_INFO; typedef BOOL(CALLBACK *APPENUMPROC)(INT ItemIndex, ATL::CStringW &Name, PINSTALLED_INFO Info); Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/rosui.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/rosui.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/rosui.h [iso-8859-1] Sat Sep 9 20:38:06 2017 @@ -1,6 +1,10 @@ -/* PROJECT: ReactOS UI Layout Engine - * LICENSE: GPL - See COPYING in the top level directory - * AUTHORS: David Quintana <gigaherz(a)gmail.com> +/* + * PROJECT: ReactOS UI Layout Engine + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * FILE: base/applications/rapps/include/rosui.h + * PURPOSE: ATL Layout engine for RAPPS + * COPYRIGHT: Copyright 2015 David Quintana (gigaherz(a)gmail.com) + * Copyright 2017 Alexander Shaposhnikov (chaez.san(a)gmail.com) */ #pragma once Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/winmain.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/winmain.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/winmain.h [iso-8859-1] Sat Sep 9 20:38:06 2017 @@ -1,7 +1,7 @@ #pragma once #include <windef.h> + //TODO: Separate main and settings related definitions - struct SETTINGS_INFO { BOOL bSaveWndPos; Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp [iso-8859-1] Sat Sep 9 20:38:06 2017 @@ -1,12 +1,11 @@ /* - * PROJECT: ReactOS Applications Manager - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps/installed.cpp - * PURPOSE: Functions for working with installed applications - * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) - * Alexander Shaposhnikov (chaez.san(a)gmail.com) + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * FILE: base/applications/rapps/installed.cpp + * PURPOSE: Functions for working with installed applications + * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) + * Copyright 2017 Alexander Shaposhnikov (chaez.san(a)gmail.com) */ - #include "defines.h" #include "installed.h" @@ -14,16 +13,14 @@ #include "gui.h" #include "misc.h" -BOOL -GetApplicationString(HKEY hKey, LPCWSTR lpKeyName, ATL::CStringW& String) +BOOL GetApplicationString(HKEY hKey, LPCWSTR lpKeyName, ATL::CStringW& String) { BOOL result = GetApplicationString(hKey, lpKeyName, String.GetBuffer(MAX_PATH)); String.ReleaseBuffer(); return result; } -BOOL -GetApplicationString(HKEY hKey, LPCWSTR lpKeyName, LPWSTR szString) +BOOL GetApplicationString(HKEY hKey, LPCWSTR lpKeyName, LPWSTR szString) { DWORD dwSize = MAX_PATH * sizeof(WCHAR); @@ -41,8 +38,7 @@ return FALSE; } -BOOL -UninstallApplication(INT Index, BOOL bModify) +BOOL UninstallApplication(INT Index, BOOL bModify) { LPCWSTR szModify = L"ModifyPath"; LPCWSTR szUninstall = L"UninstallString"; @@ -96,8 +92,7 @@ return StartProcess(szPath, TRUE); } -BOOL -ShowInstalledAppInfo(INT Index) +BOOL ShowInstalledAppInfo(INT Index) { ATL::CStringW szText; ATL::CStringW szInfo; @@ -138,8 +133,7 @@ return TRUE; } -VOID -RemoveAppFromRegistry(INT Index) +VOID RemoveAppFromRegistry(INT Index) { PINSTALLED_INFO Info; WCHAR szFullName[MAX_PATH] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"; @@ -176,8 +170,7 @@ } } -BOOL -EnumInstalledApplications(INT EnumType, BOOL IsUserKey, APPENUMPROC lpEnumProc) +BOOL EnumInstalledApplications(INT EnumType, BOOL IsUserKey, APPENUMPROC lpEnumProc) { DWORD dwSize = MAX_PATH, dwType, dwValue; BOOL bIsSystemComponent, bIsUpdate; Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/integrity.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/integrity.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/integrity.cpp [iso-8859-1] Sat Sep 9 20:38:06 2017 @@ -1,10 +1,10 @@ /* - * PROJECT: ReactOS Applications Manager - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps/integrity.cpp - * PURPOSE: Various integrity check mechanisms - * PROGRAMMERS: Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) - * Mark Jansen + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * FILE: base/applications/rapps/integrity.cpp + * PURPOSE: Various integrity check mechanisms + * COPYRIGHT: Copyright Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) + * Copyright Mark Jansen */ #include "defines.h" Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] Sat Sep 9 20:38:06 2017 @@ -1,5 +1,6 @@ -/* PROJECT: ReactOS Applications Manager - * LICENSE: GPL - See COPYING in the top level directory +/* + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * FILE: base/applications/rapps/loaddlg.cpp * PURPOSE: Displaying a download dialog * COPYRIGHT: Copyright 2001 John R. Sheets (for CodeWeavers) Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp [iso-8859-1] Sat Sep 9 20:38:06 2017 @@ -1,11 +1,11 @@ /* - * PROJECT: ReactOS Applications Manager - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps/misc.cpp - * PURPOSE: Misc functions - * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) - * Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) - * Alexander Shaposhnikov (chaez.san(a)gmail.com) + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * FILE: base/applications/rapps/misc.cpp + * PURPOSE: Misc functions + * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) + * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) + * Copyright 2017 Alexander Shaposhnikov (chaez.san(a)gmail.com) */ #include "defines.h" Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/settingsdlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/settingsdlg.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/settingsdlg.cpp [iso-8859-1] Sat Sep 9 20:38:06 2017 @@ -1,10 +1,10 @@ /* - * PROJECT: ReactOS Applications Manager - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps/settingsdlg.cpp - * PURPOSE: Settings Dialog - * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) - * Alexander Shaposhnikov (chaez.san(a)gmail.com) + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * FILE: base/applications/rapps/settingsdlg.cpp + * PURPOSE: Settings Dialog + * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) + * Copyright 2017 Alexander Shaposhnikov (chaez.san(a)gmail.com) */ #include "defines.h" Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp [iso-8859-1] Sat Sep 9 20:38:06 2017 @@ -1,11 +1,10 @@ /* -* PROJECT: ReactOS Applications Manager -* LICENSE: GPL - See COPYING in the top level directory -* FILE: base/applications/rapps/unattended.cpp -* PURPOSE: Functions to parse command-line flags and process them -* PROGRAMMERS: Alexander Shaposhnikov (chaez.san(a)gmail.com) +* PROJECT: ReactOS Applications Manager +* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) +* FILE: base/applications/rapps/unattended.cpp +* PURPOSE: Functions to parse command-line flags and process them +* COPYRIGHT: Copyright 2017 Alexander Shaposhnikov (chaez.san(a)gmail.com) */ - #include "unattended.h" #include "defines.h" #include "available.h" @@ -25,9 +24,7 @@ return FALSE; } - // Setup key - single app expected // TODO: use DB filenames as names because they're shorter - ATL::CSimpleArray<ATL::CStringW> arrNames; if (!StrCmpW(argv[0], CMD_KEY_INSTALL)) { Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] Sat Sep 9 20:38:06 2017 @@ -1,11 +1,11 @@ /* - * PROJECT: ReactOS Applications Manager - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps/winmain.cpp - * PURPOSE: Main program - * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) - * Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) - * Alexander Shaposhnikov (chaez.san(a)gmail.com) + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * FILE: base/applications/rapps/winmain.cpp + * PURPOSE: Main program + * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) + * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) + * Copyright 2017 Alexander Shaposhnikov (chaez.san(a)gmail.com) */ #include "defines.h" #include "rapps.h"

7 years, 2 months

[ashaposhnikov] 75814: [RAPPS] CConfigParser cleanup - removed `static` from strings declaration as pointed out by gadamopoulos

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Sat Sep 9 19:43:39 2017 New Revision: 75814 URL: http://svn.reactos.org/svn/reactos?rev=75814&view=rev Log: [RAPPS] CConfigParser cleanup - removed `static` from strings declaration as pointed out by gadamopoulos Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/misc.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/misc.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/misc.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/misc.h [iso-8859-1] Sat Sep 9 19:43:39 2017 @@ -25,19 +25,16 @@ // Locale names cache const static INT m_cchLocaleSize = 5; - static ATL::CStringW m_szLocaleID; - static ATL::CStringW m_szCachedINISectionLocale; - static ATL::CStringW m_szCachedINISectionLocaleNeutral; + ATL::CStringW m_szLocaleID; + ATL::CStringW m_szCachedINISectionLocale; + ATL::CStringW m_szCachedINISectionLocaleNeutral; const ATL::CStringW szConfigPath; - static ATL::CStringW GetINIFullPath(const ATL::CStringW& FileName); - static VOID CacheINILocaleLazy(); + ATL::CStringW GetINIFullPath(const ATL::CStringW& FileName); + VOID CacheINILocale(); public: - static const ATL::CStringW& GetLocale(); - static INT CConfigParser::GetLocaleSize(); - CConfigParser(const ATL::CStringW& FileName = ""); UINT GetString(const ATL::CStringW& KeyName, ATL::CStringW& ResultString); Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp [iso-8859-1] Sat Sep 9 19:43:39 2017 @@ -405,14 +405,10 @@ } // CConfigParser -ATL::CStringW CConfigParser::m_szLocaleID; -ATL::CStringW CConfigParser::m_szCachedINISectionLocale; -ATL::CStringW CConfigParser::m_szCachedINISectionLocaleNeutral; CConfigParser::CConfigParser(const ATL::CStringW& FileName) : szConfigPath(GetINIFullPath(FileName)) { - // we don't have cached section strings for the current system language, create them, lazy - CacheINILocaleLazy(); + CacheINILocale(); } ATL::CStringW CConfigParser::GetINIFullPath(const ATL::CStringW& FileName) @@ -426,32 +422,18 @@ return szBuffer; } -VOID CConfigParser::CacheINILocaleLazy() -{ - if (m_szLocaleID.IsEmpty()) - { - // TODO: Set default locale if call fails - // find out what is the current system lang code (e.g. "0a") and append it to SectionLocale - GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_ILANGUAGE, - m_szLocaleID.GetBuffer(m_cchLocaleSize), m_cchLocaleSize); - - m_szLocaleID.ReleaseBuffer(); - m_szCachedINISectionLocale = L"Section." + m_szLocaleID; - - // turn "Section.0c0a" into "Section.0a", keeping just the neutral lang part - m_szCachedINISectionLocaleNeutral = m_szCachedINISectionLocale + m_szLocaleID.Right(2); - } -} - -const ATL::CStringW& CConfigParser::GetLocale() -{ - CacheINILocaleLazy(); - return m_szLocaleID; -} - -INT CConfigParser::GetLocaleSize() -{ - return m_cchLocaleSize; +VOID CConfigParser::CacheINILocale() +{ + // TODO: Set default locale if call fails + // find out what is the current system lang code (e.g. "0a") and append it to SectionLocale + GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_ILANGUAGE, + m_szLocaleID.GetBuffer(m_cchLocaleSize), m_cchLocaleSize); + + m_szLocaleID.ReleaseBuffer(); + m_szCachedINISectionLocale = L"Section." + m_szLocaleID; + + // turn "Section.0c0a" into "Section.0a", keeping just the neutral lang part + m_szCachedINISectionLocaleNeutral = m_szCachedINISectionLocale + m_szLocaleID.Right(2); } UINT CConfigParser::GetString(const ATL::CStringW& KeyName, ATL::CStringW& ResultString)

7 years, 2 months

[ashaposhnikov] 75813: [RAPPS] Renamed CmdParser to UseCmdParameters

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Sat Sep 9 19:41:08 2017 New Revision: 75813 URL: http://svn.reactos.org/svn/reactos?rev=75813&view=rev Log: [RAPPS] Renamed CmdParser to UseCmdParameters Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/unattended.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/unattended.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/unattended.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/unattended.h [iso-8859-1] Sat Sep 9 19:41:08 2017 @@ -5,4 +5,4 @@ #define CMD_KEY_SETUP L"/SETUP" // return TRUE if the SETUP key was valid -BOOL CmdParser(LPWSTR lpCmdLine); +BOOL UseCmdParameters(LPWSTR lpCmdLine); Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp [iso-8859-1] Sat Sep 9 19:41:08 2017 @@ -15,7 +15,7 @@ #define MIN_ARGS 2 -BOOL CmdParser(LPWSTR lpCmdLine) +BOOL UseCmdParameters(LPWSTR lpCmdLine) { INT argc; LPWSTR* argv = CommandLineToArgvW(lpCmdLine, &argc); Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] Sat Sep 9 19:41:08 2017 @@ -160,7 +160,7 @@ InitCommonControls(); // skip window creation if there were some keys - if (!CmdParser(lpCmdLine)) + if (!UseCmdParameters(lpCmdLine)) { if (SettingsInfo.bUpdateAtStart || bIsFirstLaunch) CAvailableApps::ForceUpdateAppsDB();

7 years, 2 months

[ashaposhnikov] 75812: [RAPPS] resource.h: Added missing space

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Sat Sep 9 19:13:35 2017 New Revision: 75812 URL: http://svn.reactos.org/svn/reactos?rev=75812&view=rev Log: [RAPPS] resource.h: Added missing space Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/resource.h Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/resource.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/resource.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/resource.h [iso-8859-1] Sat Sep 9 19:13:35 2017 @@ -77,7 +77,7 @@ #define ID_REFRESH 559 #define ID_REGREMOVE 560 #define ID_RESETDB 561 -#define ID_CHECK_ALL 562 +#define ID_CHECK_ALL 562 /* Strings */ #define IDS_APPTITLE 100

7 years, 2 months

[ashaposhnikov] 75811: [RAPPS] Deleted installdlg.cpp as unused

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Sat Sep 9 19:12:41 2017 New Revision: 75811 URL: http://svn.reactos.org/svn/reactos?rev=75811&view=rev Log: [RAPPS] Deleted installdlg.cpp as unused Removed: branches/GSoC_2017/rapps/reactos/base/applications/rapps/installdlg.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/CMakeLists.txt branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] Sat Sep 9 19:12:41 2017 @@ -10,7 +10,6 @@ aboutdlg.cpp available.cpp gui.cpp - installdlg.cpp installed.cpp integrity.cpp loaddlg.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h [iso-8859-1] Sat Sep 9 19:12:41 2017 @@ -37,6 +37,3 @@ // About dialog (aboutdlg.cpp) VOID ShowAboutDialog(); - -// Installation dialog (installdlg.cpp) -//BOOL InstallApplication(INT Index); Removed: branches/GSoC_2017/rapps/reactos/base/applications/rapps/installdlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/installdlg.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/installdlg.cpp (removed) @@ -1,57 +0,0 @@ -/* - * PROJECT: ReactOS Applications Manager - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps/installdlg.cpp - * PURPOSE: "Download and Install" Dialog - * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) - */ -#include "defines.h" - -#include "dialogs.h" -#include "available.h" - -static CAvailableApplicationInfo* AppInfo; - -static -INT_PTR CALLBACK -InstallDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) -{ - switch (Msg) - { - case WM_INITDIALOG: - { - } - break; - - case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDOK: - case IDCANCEL: - EndDialog(hDlg, LOWORD(wParam)); - break; - } - } - break; - } - - return FALSE; -} - -BOOL -InstallApplication(INT Index) -{ - if (!IsAvailableEnum(SelectedEnumType)) - return FALSE; - - AppInfo = (CAvailableApplicationInfo*) ListViewGetlParam(Index); - if (!AppInfo) return FALSE; - - DialogBoxW(hInst, - MAKEINTRESOURCEW(IDD_INSTALL_DIALOG), - hMainWnd, - InstallDlgProc); - - return TRUE; -}

7 years, 2 months

← Newer
1
...
17
18
19
20
21
22
23
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2017