Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 65165: [NTFS_TEST] Add a simple application (à la NTFSInfo & nfi) to dump the data about a NTFS volume using the FSCTL control codes. This is for both demonstrating how it works and t...
by pschweitzer＠svn.reactos.org 01 Nov '14

01 Nov '14

Author: pschweitzer Date: Sat Nov 1 09:56:33 2014 New Revision: 65165 URL: http://svn.reactos.org/svn/reactos?rev=65165&view=rev Log: [NTFS_TEST] Add a simple application (à la NTFSInfo & nfi) to dump the data about a NTFS volume using the FSCTL control codes. This is for both demonstrating how it works and to assess our driver behavior against Windows behavior of these FSCTL. CORE-8725 Added: trunk/rostests/tests/ntfs/ trunk/rostests/tests/ntfs/CMakeLists.txt (with props) trunk/rostests/tests/ntfs/ntfs.c (with props) Added: trunk/rostests/tests/ntfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/ntfs/CMakeLists.txt… ============================================================================== --- trunk/rostests/tests/ntfs/CMakeLists.txt (added) +++ trunk/rostests/tests/ntfs/CMakeLists.txt [iso-8859-1] Sat Nov 1 09:56:33 2014 @@ -0,0 +1,3 @@ +add_executable(ntfs_test ntfs.c) +set_module_type(ntfs_test win32cui) +add_importlibs(ntfs_test msvcrt kernel32) Propchange: trunk/rostests/tests/ntfs/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/tests/ntfs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/ntfs/ntfs.c?rev=651… ============================================================================== --- trunk/rostests/tests/ntfs/ntfs.c (added) +++ trunk/rostests/tests/ntfs/ntfs.c [iso-8859-1] Sat Nov 1 09:56:33 2014 @@ -0,0 +1,242 @@ +/* + * PROJECT: ReactOS NTFS tests/dump + * LICENSE: LGPLv2+ - See COPYING.LIB in the top level directory + * PURPOSE: Query information from NTFS volume using FSCTL and dumps $MFT + * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <windows.h> +#include <stdio.h> + +typedef struct +{ + ULONG Type; + USHORT UsaOffset; + USHORT UsaCount; + ULONGLONG Lsn; +} NTFS_RECORD_HEADER, *PNTFS_RECORD_HEADER; + +#define NRH_FILE_TYPE 0x454C4946 + +typedef struct _FILE_RECORD_HEADER +{ + NTFS_RECORD_HEADER Ntfs; + USHORT SequenceNumber; + USHORT LinkCount; + USHORT AttributeOffset; + USHORT Flags; + ULONG BytesInUse; + ULONG BytesAllocated; + ULONGLONG BaseFileRecord; + USHORT NextAttributeNumber; +} FILE_RECORD_HEADER, *PFILE_RECORD_HEADER; + +typedef enum +{ + AttributeStandardInformation = 0x10, + AttributeAttributeList = 0x20, + AttributeFileName = 0x30, + AttributeObjectId = 0x40, + AttributeSecurityDescriptor = 0x50, + AttributeVolumeName = 0x60, + AttributeVolumeInformation = 0x70, + AttributeData = 0x80, + AttributeIndexRoot = 0x90, + AttributeIndexAllocation = 0xA0, + AttributeBitmap = 0xB0, + AttributeReparsePoint = 0xC0, + AttributeEAInformation = 0xD0, + AttributeEA = 0xE0, + AttributePropertySet = 0xF0, + AttributeLoggedUtilityStream = 0x100, + AttributeEnd = 0xFFFFFFFF +} ATTRIBUTE_TYPE, *PATTRIBUTE_TYPE; + +typedef struct +{ + ULONG Type; + ULONG Length; + UCHAR IsNonResident; + UCHAR NameLength; + USHORT NameOffset; + USHORT Flags; + USHORT Instance; + union + { + struct + { + ULONG ValueLength; + USHORT ValueOffset; + UCHAR Flags; + UCHAR Reserved; + } Resident; + struct + { + ULONGLONG LowestVCN; + ULONGLONG HighestVCN; + USHORT MappingPairsOffset; + USHORT CompressionUnit; + UCHAR Reserved[4]; + LONGLONG AllocatedSize; + LONGLONG DataSize; + LONGLONG InitializedSize; + LONGLONG CompressedSize; + } NonResident; + }; +} NTFS_ATTR_RECORD, *PNTFS_ATTR_RECORD; + +typedef struct +{ + ULONGLONG CreationTime; + ULONGLONG ChangeTime; + ULONGLONG LastWriteTime; + ULONGLONG LastAccessTime; + ULONG FileAttribute; + ULONG AlignmentOrReserved[3]; +} STANDARD_INFORMATION, *PSTANDARD_INFORMATION; + +typedef struct +{ + ULONGLONG DirectoryFileReferenceNumber; + ULONGLONG CreationTime; + ULONGLONG ChangeTime; + ULONGLONG LastWriteTime; + ULONGLONG LastAccessTime; + ULONGLONG AllocatedSize; + ULONGLONG DataSize; + ULONG FileAttributes; + ULONG AlignmentOrReserved; + UCHAR NameLength; + UCHAR NameType; + WCHAR Name[1]; +} FILENAME_ATTRIBUTE, *PFILENAME_ATTRIBUTE; + +int main(int argc, char **argv) +{ + static WCHAR VolumeName[] = L"\\\\.\\E:"; + HANDLE VolumeHandle; + struct { + NTFS_VOLUME_DATA_BUFFER Data; + NTFS_EXTENDED_VOLUME_DATA Extended; + } VolumeInfo; + DWORD LengthReturned; + NTFS_FILE_RECORD_INPUT_BUFFER InputBuffer; + PNTFS_FILE_RECORD_OUTPUT_BUFFER OutputBuffer; + DWORD OutputLength; + PFILE_RECORD_HEADER FileRecord; + PNTFS_ATTR_RECORD Attribute; + DWORD k; + + VolumeHandle = CreateFileW(VolumeName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + if (VolumeHandle == INVALID_HANDLE_VALUE) + { + fprintf(stderr, "Failed opening volume!\n"); + return -1; + } + + if (!DeviceIoControl(VolumeHandle, FSCTL_GET_NTFS_VOLUME_DATA, NULL, 0, &VolumeInfo, sizeof(VolumeInfo), &LengthReturned, NULL)) + { + fprintf(stderr, "Failed requesting volume data!\n"); + CloseHandle(VolumeHandle); + return -1; + } + + printf("Using NTFS: %u.%u\n", VolumeInfo.Extended.MajorVersion, VolumeInfo.Extended.MinorVersion); + + InputBuffer.FileReferenceNumber.QuadPart = 0LL; + OutputLength = sizeof(NTFS_FILE_RECORD_OUTPUT_BUFFER) + VolumeInfo.Data.BytesPerFileRecordSegment; + OutputBuffer = malloc(OutputLength); + if (OutputBuffer == NULL) + { + fprintf(stderr, "Allocation failure!\n"); + CloseHandle(VolumeHandle); + } + + if (!DeviceIoControl(VolumeHandle, FSCTL_GET_NTFS_FILE_RECORD, &InputBuffer, sizeof(InputBuffer), OutputBuffer, OutputLength, &LengthReturned, NULL)) + { + fprintf(stderr, "Failed opening $MFT!\n"); + free(OutputBuffer); + CloseHandle(VolumeHandle); + return -1; + } + + if (OutputBuffer->FileReferenceNumber.QuadPart != 0LL) + { + fprintf(stderr, "Wrong entry read! %I64x\n", OutputBuffer->FileReferenceNumber.QuadPart); + free(OutputBuffer); + CloseHandle(VolumeHandle); + return -1; + } + + FileRecord = (PFILE_RECORD_HEADER)OutputBuffer->FileRecordBuffer; + if (FileRecord->Ntfs.Type != NRH_FILE_TYPE) + { + fprintf(stderr, "Wrong type read! %lx\n", FileRecord->Ntfs.Type); + free(OutputBuffer); + CloseHandle(VolumeHandle); + return -1; + } + + printf("File record size: %lu. Read file record size: %lu\n", VolumeInfo.Data.BytesPerFileRecordSegment, OutputBuffer->FileRecordLength); + printf("SequenceNumber: %u\n", FileRecord->SequenceNumber); + printf("LinkCount: %u\n", FileRecord->LinkCount); + printf("AttributeOffset: %u\n", FileRecord->AttributeOffset); + printf("Flags: %u\n", FileRecord->Flags); + printf("BytesInUse: %lu\n", FileRecord->BytesInUse); + printf("BytesAllocated: %lu\n", FileRecord->BytesAllocated); + printf("BaseFileRecord: %I64x\n", FileRecord->BaseFileRecord); + printf("NextAttributeNumber: %u\n", FileRecord->NextAttributeNumber); + + Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->AttributeOffset); + while (Attribute < (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->BytesInUse) && + Attribute->Type != AttributeEnd) + { + PSTANDARD_INFORMATION StdInfo; + PFILENAME_ATTRIBUTE FileName; + + if (!Attribute->IsNonResident) + { + switch (Attribute->Type) + { + case AttributeStandardInformation: + StdInfo = (PSTANDARD_INFORMATION)((ULONG_PTR)Attribute + Attribute->Resident.ValueOffset); + printf("\t$STANDARD_INFORMATION:\n"); + printf("\tCreationTime: %I64u\n", StdInfo->CreationTime); + printf("\tChangeTime: %I64u\n", StdInfo->ChangeTime); + printf("\tLastWriteTime: %I64u\n", StdInfo->LastWriteTime); + printf("\tLastAccessTime: %I64u\n", StdInfo->LastAccessTime); + printf("\tFileAttribute: %lu\n", StdInfo->FileAttribute); + break; + + case AttributeFileName: + FileName = (PFILENAME_ATTRIBUTE)((ULONG_PTR)Attribute + Attribute->Resident.ValueOffset); + printf("\t$FILE_NAME:\n"); + printf("\tDirectoryFileReferenceNumber: %I64u\n", FileName->DirectoryFileReferenceNumber); + printf("\tCreationTime: %I64u\n", FileName->CreationTime); + printf("\tChangeTime: %I64u\n", FileName->ChangeTime); + printf("\tLastWriteTime: %I64u\n", FileName->LastWriteTime); + printf("\tLastAccessTime: %I64u\n", FileName->LastAccessTime); + printf("\tAllocatedSize: %I64u\n", FileName->AllocatedSize); + printf("\tDataSize: %I64u\n", FileName->DataSize); + printf("\tFileAttributes: %lu\n", FileName->FileAttributes); + printf("\tAlignmentOrReserved: %lu\n", FileName->AlignmentOrReserved); + printf("\tNameLength: %u\n", FileName->NameLength); + printf("\tNameType: %u\n", FileName->NameType); + printf("\tName: "); + for (k = 0; k < FileName->NameLength; ++k) + { + wprintf(L"%C", FileName->Name[k]); + } + printf("\n"); + break; + } + } + + Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Attribute + Attribute->Length); + } + + free(OutputBuffer); + CloseHandle(VolumeHandle); + + return 0; +} Propchange: trunk/rostests/tests/ntfs/ntfs.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[pschweitzer] 65164: [PSDK] Add yet another missing NTFS define
by pschweitzer＠svn.reactos.org 01 Nov '14

01 Nov '14

Author: pschweitzer Date: Sat Nov 1 08:58:41 2014 New Revision: 65164 URL: http://svn.reactos.org/svn/reactos?rev=65164&view=rev Log: [PSDK] Add yet another missing NTFS define Modified: trunk/reactos/include/psdk/winioctl.h Modified: trunk/reactos/include/psdk/winioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winioctl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winioctl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winioctl.h [iso-8859-1] Sat Nov 1 08:58:41 2014 @@ -90,6 +90,7 @@ #define FSCTL_READ_COMPRESSION CTL_CODE(FILE_DEVICE_FILE_SYSTEM,17,METHOD_NEITHER,FILE_READ_DATA) #define FSCTL_WRITE_COMPRESSION CTL_CODE(FILE_DEVICE_FILE_SYSTEM,18,METHOD_NEITHER,FILE_WRITE_DATA) #define FSCTL_GET_NTFS_VOLUME_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM,25,METHOD_BUFFERED,FILE_ANY_ACCESS) +#define FSCTL_GET_NTFS_FILE_RECORD CTL_CODE(FILE_DEVICE_FILE_SYSTEM,26,METHOD_BUFFERED,FILE_ANY_ACCESS) #define FSCTL_GET_VOLUME_BITMAP CTL_CODE(FILE_DEVICE_FILE_SYSTEM,27,METHOD_NEITHER,FILE_ANY_ACCESS) #define FSCTL_GET_RETRIEVAL_POINTERS CTL_CODE(FILE_DEVICE_FILE_SYSTEM,28,METHOD_NEITHER,FILE_ANY_ACCESS) #define FSCTL_MOVE_FILE CTL_CODE(FILE_DEVICE_FILE_SYSTEM,29,METHOD_BUFFERED,FILE_ANY_ACCESS)

1 0

[pschweitzer] 65163: [PSDK] Add missing NTFS defines
by pschweitzer＠svn.reactos.org 01 Nov '14

01 Nov '14

Author: pschweitzer Date: Sat Nov 1 08:03:57 2014 New Revision: 65163 URL: http://svn.reactos.org/svn/reactos?rev=65163&view=rev Log: [PSDK] Add missing NTFS defines Modified: trunk/reactos/include/psdk/winioctl.h Modified: trunk/reactos/include/psdk/winioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winioctl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winioctl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winioctl.h [iso-8859-1] Sat Nov 1 08:03:57 2014 @@ -556,6 +556,19 @@ LARGE_INTEGER MftZoneStart; LARGE_INTEGER MftZoneEnd; } NTFS_VOLUME_DATA_BUFFER, *PNTFS_VOLUME_DATA_BUFFER; +typedef struct { + ULONG ByteCount; + USHORT MajorVersion; + USHORT MinorVersion; +} NTFS_EXTENDED_VOLUME_DATA, *PNTFS_EXTENDED_VOLUME_DATA; +typedef struct { + LARGE_INTEGER FileReferenceNumber; +} NTFS_FILE_RECORD_INPUT_BUFFER, *PNTFS_FILE_RECORD_INPUT_BUFFER; +typedef struct { + LARGE_INTEGER FileReferenceNumber; + ULONG FileRecordLength; + UCHAR FileRecordBuffer[1]; +} NTFS_FILE_RECORD_OUTPUT_BUFFER, *PNTFS_FILE_RECORD_OUTPUT_BUFFER; #define IsRecognizedPartition(t)\ (((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT_12))||\

1 0

[khornicek] 65162: [EVENTLOG] - fix a possible null dereference
by khornicek＠svn.reactos.org 31 Oct '14

31 Oct '14

Author: khornicek Date: Fri Oct 31 22:39:19 2014 New Revision: 65162 URL: http://svn.reactos.org/svn/reactos?rev=65162&view=rev Log: [EVENTLOG] - fix a possible null dereference Modified: trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Fri Oct 31 22:39:19 2014 @@ -118,6 +118,14 @@ if (lpLogHandle->LogFile == NULL) { lpLogHandle->LogFile = LogfListItemByName(L"Application"); + + if (lpLogHandle->LogFile == NULL) + { + DPRINT1("Application log is missing!\n"); + Status = STATUS_UNSUCCESSFUL; + goto Done; + } + lpLogHandle->CurrentRecord = LogfGetOldestRecord(lpLogHandle->LogFile); } }

1 0

[gadamopoulos] 65161: [RSHELL] - A HACK notice was more obvious than needed (I got what I asked after all). - Reenable opening the printers folder since it works now
by gadamopoulos＠svn.reactos.org 31 Oct '14

31 Oct '14

Author: gadamopoulos Date: Fri Oct 31 22:32:01 2014 New Revision: 65161 URL: http://svn.reactos.org/svn/reactos?rev=65161&view=rev Log: [RSHELL] - A HACK notice was more obvious than needed (I got what I asked after all). - Reenable opening the printers folder since it works now Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Fri Oct 31 22:32:01 2014 @@ -230,12 +230,6 @@ HRESULT OnExec(LPSMDATA psmd) { - // H H A CCC K K ! ! ! - // H H A A C C K K ! ! ! - // HHHHH AAAAA C KKK ! ! ! - // H H A A C C K K ! ! ! - // H H A A CCC K K . . . - // // HACK: Instead of running explorer.exe with the path, we should be using ShellExecute to "open" the path directly! // Remove once ShellExecute can handle CLSID path components. @@ -244,7 +238,7 @@ else if (psmd->uId == IDM_NETWORKCONNECTIONS) ShellExecuteW(NULL, NULL, L"explorer.exe", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}", NULL, SW_SHOWNORMAL); else if (psmd->uId == IDM_PRINTERSANDFAXES) - {}/* FIXME: crashes: ShellExecuteW(NULL, NULL, L"explorer.exe", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\\::{2227A280-3AEA-1069-A2DE-08002B30309D}", NULL, SW_SHOWNORMAL);*/ + ShellExecuteW(NULL, NULL, L"explorer.exe", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\\::{2227A280-3AEA-1069-A2DE-08002B30309D}", NULL, SW_SHOWNORMAL); else PostMessageW(m_hwndTray, WM_COMMAND, psmd->uId, 0);

1 0

[gadamopoulos] 65160: [SHELL32] - Do not release the pointer to the ShellView that was just created - Fixes a crash when showing the Printers shell folder
by gadamopoulos＠svn.reactos.org 31 Oct '14

31 Oct '14

Author: gadamopoulos Date: Fri Oct 31 22:30:21 2014 New Revision: 65160 URL: http://svn.reactos.org/svn/reactos?rev=65160&view=rev Log: [SHELL32] - Do not release the pointer to the ShellView that was just created - Fixes a crash when showing the Printers shell folder Modified: branches/shell-experiments/dll/win32/shell32/folders/printers.cpp Modified: branches/shell-experiments/dll/win32/shell32/folders/printers.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/printers.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/printers.cpp [iso-8859-1] Fri Oct 31 22:30:21 2014 @@ -430,7 +430,6 @@ if (pShellView) { hr = pShellView->QueryInterface(riid, ppvOut); - pShellView->Release(); } } TRACE ("-- (%p)->(interface=%p)\n", this, ppvOut);

1 0

[akhaldi] 65159: [SHELL32] * Apply Wine commit a2c90524 by Aric Stewart: Improve the FO_MOVE operation. * More shell32:shlfileop tests run, less fail. CORE-8540
by akhaldi＠svn.reactos.org 31 Oct '14

31 Oct '14

Author: akhaldi Date: Fri Oct 31 18:46:27 2014 New Revision: 65159 URL: http://svn.reactos.org/svn/reactos?rev=65159&view=rev Log: [SHELL32] * Apply Wine commit a2c90524 by Aric Stewart: Improve the FO_MOVE operation. * More shell32:shlfileop tests run, less fail. CORE-8540 Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp trunk/reactos/dll/win32/shell32/undocshell.h Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] Fri Oct 31 18:46:27 2014 @@ -1559,14 +1559,18 @@ } /* the FO_MOVE operation */ -static HRESULT move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo) +static DWORD move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo) { DWORD i; + INT mismatched = 0; const FILE_ENTRY *entryToMove; const FILE_ENTRY *fileDest; - if (!flFrom->dwNumFiles || !flTo->dwNumFiles) - return ERROR_CANCELLED; + if (!flFrom->dwNumFiles) + return ERROR_SUCCESS; + + if (!flTo->dwNumFiles) + return ERROR_FILE_NOT_FOUND; if (!(lpFileOp->fFlags & FOF_MULTIDESTFILES) && flTo->dwNumFiles > 1 && flFrom->dwNumFiles > 1) @@ -1584,27 +1588,42 @@ if (!PathFileExistsW(flTo->feFiles[0].szDirectory)) return ERROR_CANCELLED; - if ((lpFileOp->fFlags & FOF_MULTIDESTFILES) && - flFrom->dwNumFiles != flTo->dwNumFiles) - { - return ERROR_CANCELLED; - } + if (lpFileOp->fFlags & FOF_MULTIDESTFILES) + mismatched = flFrom->dwNumFiles - flTo->dwNumFiles; fileDest = &flTo->feFiles[0]; for (i = 0; i < flFrom->dwNumFiles; i++) { entryToMove = &flFrom->feFiles[i]; - if (lpFileOp->fFlags & FOF_MULTIDESTFILES) - fileDest = &flTo->feFiles[i]; - if (!PathFileExistsW(fileDest->szDirectory)) return ERROR_CANCELLED; + + if (lpFileOp->fFlags & FOF_MULTIDESTFILES) + { + if (i >= flTo->dwNumFiles) + break; + fileDest = &flTo->feFiles[i]; + if (mismatched && !fileDest->bExists) + { + create_dest_dirs(flTo->feFiles[i].szFullPath); + flTo->feFiles[i].bExists = TRUE; + flTo->feFiles[i].attributes = FILE_ATTRIBUTE_DIRECTORY; + } + } if (fileDest->bExists && IsAttribDir(fileDest->attributes)) move_to_dir(lpFileOp, entryToMove, fileDest); else SHNotifyMoveFileW(entryToMove->szFullPath, fileDest->szFullPath, IsAttribDir(entryToMove->attributes)); + } + + if (mismatched > 0) + { + if (flFrom->bAnyDirectories) + return DE_DESTSAMETREE; + else + return DE_SAMEFILE; } return ERROR_SUCCESS; Modified: trunk/reactos/dll/win32/shell32/undocshell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/undocshe… ============================================================================== --- trunk/reactos/dll/win32/shell32/undocshell.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/undocshell.h [iso-8859-1] Fri Oct 31 18:46:27 2014 @@ -83,7 +83,8 @@ #define RFF_NOLABEL 0x08 #define RFF_NOSEPARATEMEM 0x20 /* NT only */ -#define DE_SAMEFILE 0x71 +#define DE_SAMEFILE 0x71 +#define DE_DESTSAMETREE 0x7D /* RunFileFlg notification structure */ typedef struct

1 0

[dquintana] 65158: [BROWSEUI] * Implement hiding the statusbar from the view menu. Based on patch by Christoph von Wittich.
by dquintana＠svn.reactos.org 31 Oct '14

31 Oct '14

Author: dquintana Date: Fri Oct 31 18:37:40 2014 New Revision: 65158 URL: http://svn.reactos.org/svn/reactos?rev=65158&view=rev Log: [BROWSEUI] * Implement hiding the statusbar from the view menu. Based on patch by Christoph von Wittich. Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Fri Oct 31 18:37:40 2014 @@ -3309,7 +3309,11 @@ LRESULT CShellBrowser::OnToggleStatusBarVisible(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { fStatusBarVisible = !fStatusBarVisible; - // TODO: trigger a relayout of contained items + if (fStatusBar) + { + ::ShowWindow(fStatusBar, fStatusBarVisible ? SW_SHOW : SW_HIDE); + RepositionBars(); + } return 0; }

1 0

[khornicek] 65157: [KERNEL32] - rewrite the GEO_FRIENDLYNAME case of GetGeoInfoW which was completely wrong, intl.cpl now shows a valid list of locations - note: The geo location resource strings h...
by khornicek＠svn.reactos.org 31 Oct '14

31 Oct '14

Author: khornicek Date: Fri Oct 31 18:13:36 2014 New Revision: 65157 URL: http://svn.reactos.org/svn/reactos?rev=65157&view=rev Log: [KERNEL32] - rewrite the GEO_FRIENDLYNAME case of GetGeoInfoW which was completely wrong, intl.cpl now shows a valid list of locations - note: The geo location resource strings have an arbitrary offset so that they don't collide with the nls resources (which shouldn't be there). Once these are moved out of kernel32 into locale.nls this offset alongside with the hack already present in GetLocalisedText can be removed. Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc trunk/reactos/dll/win32/kernel32/winnls/lang/cs-CZ.rc trunk/reactos/dll/win32/kernel32/winnls/lang/de-DE.rc trunk/reactos/dll/win32/kernel32/winnls/lang/en-US.rc trunk/reactos/dll/win32/kernel32/winnls/lang/es-ES.rc trunk/reactos/dll/win32/kernel32/winnls/lang/fr-FR.rc trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc trunk/reactos/dll/win32/kernel32/winnls/lang/sq-AL.rc trunk/reactos/dll/win32/kernel32/winnls/lang/tr-TR.rc trunk/reactos/dll/win32/kernel32/winnls/lang/uk-UA.rc trunk/reactos/dll/win32/kernel32/winnls/string/lang.c trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/…

1 0

[tfaber] 65156: [SHELL32] - Fix a use after free in COpenWithMenu::Initialize. Powered by DPH.
by tfaber＠svn.reactos.org 31 Oct '14

31 Oct '14

Author: tfaber Date: Fri Oct 31 18:02:52 2014 New Revision: 65156 URL: http://svn.reactos.org/svn/reactos?rev=65156&view=rev Log: [SHELL32] - Fix a use after free in COpenWithMenu::Initialize. Powered by DPH. Modified: trunk/reactos/dll/win32/shell32/openwithmenu.cpp Modified: trunk/reactos/dll/win32/shell32/openwithmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/openwith… ============================================================================== --- trunk/reactos/dll/win32/shell32/openwithmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/openwithmenu.cpp [iso-8859-1] Fri Oct 31 18:02:52 2014 @@ -1334,6 +1334,14 @@ pidlFolder2 = (LPCITEMIDLIST) ((LPBYTE)pida + pida->aoffset[0]); pidlChild = (LPCITEMIDLIST) ((LPBYTE)pida + pida->aoffset[1]); + if (!_ILIsValue(pidlChild)) + { + TRACE("pidl is not a file\n"); + GlobalUnlock(medium.hGlobal); + GlobalFree(medium.hGlobal); + return E_FAIL; + } + pidl = ILCombine(pidlFolder2, pidlChild); GlobalUnlock(medium.hGlobal); @@ -1343,12 +1351,6 @@ { ERR("no mem\n"); return E_OUTOFMEMORY; - } - if (!_ILIsValue(pidlChild)) - { - TRACE("pidl is not a file\n"); - SHFree((void*)pidl); - return E_FAIL; } if (!SHGetPathFromIDListW(pidl, m_wszPath))

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs