Ros-diffs January 2016

ros-diffs@reactos.org

13 participants
192 discussions

[hbelusca] 70579: [CMLIB] - Fix some structure definitions to match Win2k3 symbols (define also _SECURITY_DESCRIPTOR_RELATIVE for the host-tools so that the CM_KEY_SECURITY structure is always corr...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Jan 12 21:37:36 2016 New Revision: 70579 URL: http://svn.reactos.org/svn/reactos?rev=70579&view=rev Log: [CMLIB] - Fix some structure definitions to match Win2k3 symbols (define also _SECURITY_DESCRIPTOR_RELATIVE for the host-tools so that the CM_KEY_SECURITY structure is always correctly defined). - Complete other structure definitions with respect to the NT version defined at compile time; http://msdn.mirt.net/ was used as the source of information. - Add the definition of CM_BIG_DATA for supporting big valued keys (see also http://www.msuiche.net/2009/06/07/windows-vista-and-later-registry-secrets/ for what they are). [NTOS] - Move CM functions defined in the CMLIB out of the internal ntoskrnl headers. Modified: trunk/reactos/lib/cmlib/cmdata.h trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/cmlib/hivedata.h trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/lib/cmlib/cmdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmdata.h?rev=705… ============================================================================== --- trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] Tue Jan 12 21:37:36 2016 @@ -18,16 +18,18 @@ // Key Types // #define CM_KEY_INDEX_ROOT 0x6972 // "ri" -#define CM_KEY_INDEX_LEAF 0x696c // "li" -#define CM_KEY_FAST_LEAF 0x666c // "lf" -#define CM_KEY_HASH_LEAF 0x686c // "lh" +#define CM_KEY_INDEX_LEAF 0x696C // "li" +#define CM_KEY_FAST_LEAF 0x666C // "lf" +#define CM_KEY_HASH_LEAF 0x686C // "lh" // // Key Signatures // #define CM_KEY_NODE_SIGNATURE 0x6B6E // "nk" #define CM_LINK_NODE_SIGNATURE 0x6B6C // "lk" +#define CM_KEY_SECURITY_SIGNATURE 0x6B73 // "sk" #define CM_KEY_VALUE_SIGNATURE 0x6B76 // "vk" +#define CM_BIG_DATA_SIGNATURE 0x6264 // "db" // // CM_KEY_NODE Flags @@ -140,7 +142,7 @@ HCELL_INDEX Data; ULONG Type; USHORT Flags; - USHORT Unused1; + USHORT Spare; WCHAR Name[ANYSIZE_ARRAY]; } CM_KEY_VALUE, *PCM_KEY_VALUE; @@ -155,9 +157,18 @@ HCELL_INDEX Blink; ULONG ReferenceCount; ULONG DescriptorLength; - //SECURITY_DESCRIPTOR_RELATIVE Descriptor; - UCHAR Data[ANYSIZE_ARRAY]; + SECURITY_DESCRIPTOR_RELATIVE Descriptor; } CM_KEY_SECURITY, *PCM_KEY_SECURITY; + +// +// Big Value Key +// +typedef struct _CM_BIG_DATA +{ + USHORT Signature; + USHORT Count; + HCELL_INDEX List; +} CM_BIG_DATA, *PCM_BIG_DATA; #include <poppack.h> @@ -205,6 +216,7 @@ CM_KEY_VALUE KeyValue; CM_KEY_SECURITY KeySecurity; CM_KEY_INDEX KeyIndex; + CM_BIG_DATA ValueData; HCELL_INDEX KeyList[ANYSIZE_ARRAY]; WCHAR KeyString[ANYSIZE_ARRAY]; } u; Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=7057… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Tue Jan 12 21:37:36 2016 @@ -17,6 +17,9 @@ #include <typedefs.h> #include <stdio.h> #include <string.h> + + /* C_ASSERT Definition */ + #define C_ASSERT(expr) extern char (*c_assert(void)) [(expr) ? 1 : -1] #ifdef _WIN32 #define strncasecmp _strnicmp @@ -97,6 +100,19 @@ #define PKEVENT PVOID #define PWORK_QUEUE_ITEM PVOID #define EX_PUSH_LOCK PULONG_PTR + + typedef USHORT SECURITY_DESCRIPTOR_CONTROL, *PSECURITY_DESCRIPTOR_CONTROL; + + typedef struct _SECURITY_DESCRIPTOR_RELATIVE + { + UCHAR Revision; + UCHAR Sbz1; + SECURITY_DESCRIPTOR_CONTROL Control; + ULONG Owner; + ULONG Group; + ULONG Sacl; + ULONG Dacl; + } SECURITY_DESCRIPTOR_RELATIVE, *PISECURITY_DESCRIPTOR_RELATIVE; #define CMLTRACE(x, ...) #undef PAGED_CODE @@ -118,7 +134,7 @@ #endif #include <ntdef.h> - #include <ntddk.h> + #include <ntifs.h> #include <bugcodes.h> #undef PAGED_CODE #define PAGED_CODE() @@ -482,46 +498,104 @@ _Out_ PWCHAR ValueNameBuffer, _Inout_ ULONG BufferLength); + + /* NT-style Public Cm functions */ + +// +// Cell Index Routines +// +HCELL_INDEX +NTAPI +CmpFindSubKeyByName( + IN PHHIVE Hive, + IN PCM_KEY_NODE Parent, + IN PCUNICODE_STRING SearchName +); + +HCELL_INDEX +NTAPI +CmpFindSubKeyByNumber( + IN PHHIVE Hive, + IN PCM_KEY_NODE Node, + IN ULONG Number +); + +ULONG +NTAPI +CmpComputeHashKey( + IN ULONG Hash, + IN PCUNICODE_STRING Name, + IN BOOLEAN AllowSeparators +); + +BOOLEAN +NTAPI +CmpAddSubKey( + IN PHHIVE Hive, + IN HCELL_INDEX Parent, + IN HCELL_INDEX Child +); + +BOOLEAN +NTAPI +CmpRemoveSubKey( + IN PHHIVE Hive, + IN HCELL_INDEX ParentKey, + IN HCELL_INDEX TargetKey +); + +BOOLEAN +NTAPI +CmpMarkIndexDirty( + IN PHHIVE Hive, + HCELL_INDEX ParentKey, + HCELL_INDEX TargetKey +); + + +// +// Name Functions +// LONG NTAPI CmpCompareCompressedName( IN PCUNICODE_STRING SearchName, IN PWCHAR CompressedName, IN ULONG NameLength - ); +); + +USHORT +NTAPI +CmpNameSize( + IN PHHIVE Hive, + IN PUNICODE_STRING Name +); USHORT NTAPI CmpCompressedNameSize( IN PWCHAR Name, IN ULONG Length - ); - -HCELL_INDEX -NTAPI -CmpFindSubKeyByName( - IN PHHIVE Hive, - IN PCM_KEY_NODE Parent, - IN PCUNICODE_STRING SearchName - ); - -HCELL_INDEX -NTAPI -CmpFindSubKeyByNumber( - IN PHHIVE Hive, - IN PCM_KEY_NODE Node, - IN ULONG Number - ); - -PCELL_DATA -NTAPI -CmpValueToData( - IN PHHIVE Hive, - IN PCM_KEY_VALUE Value, - OUT PULONG Length - ); +); + +USHORT +NTAPI +CmpCopyName( + IN PHHIVE Hive, + IN PWCHAR Destination, + IN PUNICODE_STRING Source +); + +VOID +NTAPI +CmpCopyCompressedName( + IN PWCHAR Destination, + IN ULONG DestinationLength, + IN PWCHAR Source, + IN ULONG SourceLength +); BOOLEAN NTAPI @@ -531,7 +605,102 @@ IN PUNICODE_STRING Name, IN PULONG ChildIndex, IN PHCELL_INDEX CellIndex - ); +); + + +// +// Cell Value Routines +// +HCELL_INDEX +NTAPI +CmpFindValueByName( + IN PHHIVE Hive, + IN PCM_KEY_NODE KeyNode, + IN PUNICODE_STRING Name +); + +PCELL_DATA +NTAPI +CmpValueToData( + IN PHHIVE Hive, + IN PCM_KEY_VALUE Value, + OUT PULONG Length +); + +NTSTATUS +NTAPI +CmpSetValueDataNew( + IN PHHIVE Hive, + IN PVOID Data, + IN ULONG DataSize, + IN ULONG StorageType, + IN HCELL_INDEX ValueCell, + OUT PHCELL_INDEX DataCell +); + +NTSTATUS +NTAPI +CmpAddValueToList( + IN PHHIVE Hive, + IN HCELL_INDEX ValueCell, + IN ULONG Index, + IN ULONG Type, + IN OUT PCHILD_LIST ChildList +); + +BOOLEAN +NTAPI +CmpFreeValue( + IN PHHIVE Hive, + IN HCELL_INDEX Cell +); + +BOOLEAN +NTAPI +CmpMarkValueDataDirty( + IN PHHIVE Hive, + IN PCM_KEY_VALUE Value +); + +BOOLEAN +NTAPI +CmpFreeValueData( + IN PHHIVE Hive, + IN HCELL_INDEX DataCell, + IN ULONG DataLength +); + +NTSTATUS +NTAPI +CmpRemoveValueFromList( + IN PHHIVE Hive, + IN ULONG Index, + IN OUT PCHILD_LIST ChildList +); + +BOOLEAN +NTAPI +CmpGetValueData( + IN PHHIVE Hive, + IN PCM_KEY_VALUE Value, + IN PULONG Length, + OUT PVOID *Buffer, + OUT PBOOLEAN BufferAllocated, + OUT PHCELL_INDEX CellToRelease +); + +NTSTATUS +NTAPI +CmpCopyKeyValueList( + IN PHHIVE SourceHive, + IN PCHILD_LIST SrcValueList, + IN PHHIVE DestinationHive, + IN OUT PCHILD_LIST DestValueList, + IN HSTORAGE_TYPE StorageType +); + + +/******************************************************************************/ /* To be implemented by the user of this library */ PVOID @@ -549,13 +718,4 @@ IN ULONG Quota ); -VOID -NTAPI -CmpCopyCompressedName( - IN PWCHAR Destination, - IN ULONG DestinationLength, - IN PWCHAR Source, - IN ULONG SourceLength - ); - #endif /* _CMLIB_H_ */ Modified: trunk/reactos/lib/cmlib/hivedata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] Tue Jan 12 21:37:36 2016 @@ -137,7 +137,7 @@ If the hive is volatile, this is the actual pointer to the CM_KEY_NODE */ HCELL_INDEX RootCell; - /* Size in bytes of the full hive, minus the header */ + /* Size in bytes of the full hive, minus the header, multiple of the block size (4KB) */ ULONG Length; /* (1?) */ @@ -157,6 +157,8 @@ ULONG BootRecover; } HBASE_BLOCK, *PHBASE_BLOCK; +C_ASSERT(sizeof(HBASE_BLOCK) == HBLOCK_SIZE); + typedef struct _HBIN { /* Bin identifier "hbin" (0x6E696268) */ @@ -165,7 +167,7 @@ /* Block offset of this bin */ HCELL_INDEX FileOffset; - /* Size in bytes, multiple of the block size (4KB) */ + /* Size in bytes of this bin, multiple of the block size (4KB) */ ULONG Size; ULONG Reserved1[2]; @@ -282,10 +284,13 @@ PRELEASE_CELL_ROUTINE ReleaseCellRoutine; PALLOCATE_ROUTINE Allocate; PFREE_ROUTINE Free; + PFILE_SET_SIZE_ROUTINE FileSetSize; + PFILE_WRITE_ROUTINE FileWrite; PFILE_READ_ROUTINE FileRead; - PFILE_WRITE_ROUTINE FileWrite; - PFILE_SET_SIZE_ROUTINE FileSetSize; PFILE_FLUSH_ROUTINE FileFlush; +#if (NTDDI_VERSION >= NTDDI_WIN7) + PVOID HiveLoadFailure; // PHIVE_LOAD_FAILURE +#endif PHBASE_BLOCK BaseBlock; RTL_BITMAP DirtyVector; ULONG DirtyCount; @@ -294,14 +299,23 @@ ULONG Cluster; BOOLEAN Flat; BOOLEAN ReadOnly; +#if (NTDDI_VERSION < NTDDI_VISTA) // NTDDI_LONGHORN BOOLEAN Log; +#endif BOOLEAN DirtyFlag; +#if (NTDDI_VERSION >= NTDDI_VISTA) // NTDDI_LONGHORN ULONG HvBinHeadersUse; ULONG HvFreeCellsUse; - ULONG HvUsedcellsUse; + ULONG HvUsedCellsUse; ULONG CmUsedCellsUse; +#endif ULONG HiveFlags; +#if (NTDDI_VERSION < NTDDI_VISTA) // NTDDI_LONGHORN ULONG LogSize; +#else + ULONG CurrentLog; + ULONG LogSize[2]; +#endif ULONG RefreshCount; ULONG StorageTypeCount; ULONG Version; Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Tue Jan 12 21:37:36 2016 @@ -1089,58 +1089,6 @@ ); // -// Name Functions -// -LONG -NTAPI -CmpCompareCompressedName( - IN PCUNICODE_STRING SearchName, - IN PWCHAR CompressedName, - IN ULONG NameLength -); - -USHORT -NTAPI -CmpNameSize( - IN PHHIVE Hive, - IN PUNICODE_STRING Name -); - -USHORT -NTAPI -CmpCompressedNameSize( - IN PWCHAR Name, - IN ULONG Length -); - -VOID -NTAPI -CmpCopyCompressedName( - IN PWCHAR Destination, - IN ULONG DestinationLength, - IN PWCHAR Source, - IN ULONG SourceLength -); - -USHORT -NTAPI -CmpCopyName( - IN PHHIVE Hive, - IN PWCHAR Destination, - IN PUNICODE_STRING Source -); - -BOOLEAN -NTAPI -CmpFindNameInList( - IN PHHIVE Hive, - IN PCHILD_LIST ChildList, - IN PUNICODE_STRING Name, - IN PULONG ChildIndex, - IN PHCELL_INDEX CellIndex -); - -// // Parse Routines // BOOLEAN @@ -1219,149 +1167,6 @@ ); // -// Cell Index Routines -// - -HCELL_INDEX -NTAPI -CmpFindSubKeyByName( - IN PHHIVE Hive, - IN PCM_KEY_NODE Parent, - IN PCUNICODE_STRING SearchName -); - -HCELL_INDEX -NTAPI -CmpFindSubKeyByNumber( - IN PHHIVE Hive, - IN PCM_KEY_NODE Node, - IN ULONG Number -); - -ULONG -NTAPI -CmpComputeHashKey( - IN ULONG Hash, - IN PCUNICODE_STRING Name, - IN BOOLEAN AllowSeparators -); - -BOOLEAN -NTAPI -CmpAddSubKey( - IN PHHIVE Hive, - IN HCELL_INDEX Parent, - IN HCELL_INDEX Child -); - -BOOLEAN -NTAPI -CmpRemoveSubKey( - IN PHHIVE Hive, - IN HCELL_INDEX ParentKey, - IN HCELL_INDEX TargetKey -); - -BOOLEAN -NTAPI -CmpMarkIndexDirty( - IN PHHIVE Hive, - HCELL_INDEX ParentKey, - HCELL_INDEX TargetKey -); - -// -// Cell Value Routines -// -HCELL_INDEX -NTAPI -CmpFindValueByName( - IN PHHIVE Hive, - IN PCM_KEY_NODE KeyNode, - IN PUNICODE_STRING Name -); - -PCELL_DATA -NTAPI -CmpValueToData( - IN PHHIVE Hive, - IN PCM_KEY_VALUE Value, - OUT PULONG Length -); - -NTSTATUS -NTAPI -CmpSetValueDataNew( - IN PHHIVE Hive, - IN PVOID Data, - IN ULONG DataSize, - IN ULONG StorageType, - IN HCELL_INDEX ValueCell, - OUT PHCELL_INDEX DataCell -); - -NTSTATUS -NTAPI -CmpAddValueToList( - IN PHHIVE Hive, - IN HCELL_INDEX ValueCell, - IN ULONG Index, - IN ULONG Type, - IN OUT PCHILD_LIST ChildList -); - -BOOLEAN -NTAPI -CmpFreeValue( - IN PHHIVE Hive, - IN HCELL_INDEX Cell -); - -BOOLEAN -NTAPI -CmpMarkValueDataDirty( - IN PHHIVE Hive, - IN PCM_KEY_VALUE Value -); - -BOOLEAN -NTAPI -CmpFreeValueData( - IN PHHIVE Hive, - IN HCELL_INDEX DataCell, - IN ULONG DataLength -); - -NTSTATUS -NTAPI -CmpRemoveValueFromList( - IN PHHIVE Hive, - IN ULONG Index, - IN OUT PCHILD_LIST ChildList -); - -BOOLEAN -NTAPI -CmpGetValueData( - IN PHHIVE Hive, - IN PCM_KEY_VALUE Value, - IN PULONG Length, - OUT PVOID *Buffer, - OUT PBOOLEAN BufferAllocated, - OUT PHCELL_INDEX CellToRelease -); - -NTSTATUS -NTAPI -CmpCopyKeyValueList( - IN PHHIVE SourceHive, - IN PCHILD_LIST SrcValueList, - IN PHHIVE DestinationHive, - IN OUT PCHILD_LIST DestValueList, - IN HSTORAGE_TYPE StorageType -); - -// // Boot Routines // HCELL_INDEX @@ -1379,7 +1184,6 @@ IN PVOID SystemHiveData, IN PCM_SYSTEM_CONTROL_VECTOR ControlVector ); - // // Hardware Configuration Routines

8 years, 11 months

[pschweitzer] 70578: [ROSVBOXMGMT] Let's add hacks to glue hacks together: In case rosvboxmgmt is started with its current directory not being the directory where it is along with hackssign_client....

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Jan 11 22:41:32 2016 New Revision: 70578 URL: http://svn.reactos.org/svn/reactos?rev=70578&view=rev Log: [ROSVBOXMGMT] Let's add hacks to glue hacks together: In case rosvboxmgmt is started with its current directory not being the directory where it is along with hackssign_client.exe, then autoassign fails finding the hackssign client executable and thus, fails assigning drive letter. This is what happens when you starts rosvboxmgmt on boot with shell. So, when using autoassign, first look for the location of rosvboxmgmt and set our current directory there. This fixes rosvboxmgmt autoassign not working on boot. CORE-10032 ROSAPPS-303 Modified: trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c Modified: trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/rosv… ============================================================================== --- trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c [iso-8859-1] Mon Jan 11 22:41:32 2016 @@ -297,6 +297,14 @@ if (assign) { + wchar_t path[MAX_PATH]; + if (GetModuleFileName(NULL, path, ARRAYSIZE(path)) != 0) + { + *(wcsrchr(path, '\\')) = 0; + wprintf(L"Switching to %s\n", path); + SetCurrentDirectory(path); + } + if (OpenFile("hackssign_client.exe", &ofs, OF_EXIST) != 1) { wprintf(L"hackssign_client.exe not found, falling back to links\n");

8 years, 11 months

[hbelusca] 70577: [DESK.CPL] Resolution selection improvement patch by Mark Jansen: - Fix a bug that allowed only a subset of resolutions to be visible. - Update the preview on the fly when draggin...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jan 11 20:52:44 2016 New Revision: 70577 URL: http://svn.reactos.org/svn/reactos?rev=70577&view=rev Log: [DESK.CPL] Resolution selection improvement patch by Mark Jansen: - Fix a bug that allowed only a subset of resolutions to be visible. - Update the preview on the fly when dragging the resolution slider. - Fix a bug that prevented the monitor preview from properly invalidating the preview, leaving the old preview partially visible. Needs to be included in 0.4 branch. CORE-10786 Modified: trunk/reactos/dll/cpl/desk/monslctl.c trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/monslctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/monslctl.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/monslctl.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/monslctl.c [iso-8859-1] Mon Jan 11 20:52:44 2016 @@ -39,6 +39,7 @@ PMONSL_MON Monitors; RECT rcExtent; RECT rcMonitors; + RECT rcOldMonitors; POINT ScrollPos; SIZE Margin; SIZE SelectionFrame; @@ -261,6 +262,14 @@ InvalidateRect(infoPtr->hSelf, &rc, TRUE); + + if (!EqualRect(&infoPtr->rcMonitors, &infoPtr->rcOldMonitors) && + infoPtr->rcOldMonitors.right != infoPtr->rcOldMonitors.left) + { + MonSelRectToScreen(infoPtr, &infoPtr->rcOldMonitors, &rc); + InvalidateRect(infoPtr->hSelf, &rc, TRUE); + infoPtr->rcOldMonitors = infoPtr->rcMonitors; + } } static VOID @@ -355,6 +364,7 @@ ScaleRectSizeFit(&rcExtSurface, &rcExtDisplay); + infoPtr->rcOldMonitors = infoPtr->rcMonitors; infoPtr->rcMonitors = rcExtDisplay; /* Now that we know in which area all monitors are located, Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] Mon Jan 11 20:52:44 2016 @@ -26,6 +26,8 @@ TCHAR Buffer[64]; TCHAR Pixel[64]; DWORD index; + HWND hwndMonSel; + MONSL_MONINFO info; LoadString(hApplet, IDS_PIXEL, Pixel, sizeof(Pixel) / sizeof(TCHAR)); _stprintf(Buffer, Pixel, pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth, pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight, Pixel); @@ -43,6 +45,15 @@ } if (LoadString(hApplet, (2900 + pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel), Buffer, sizeof(Buffer) / sizeof(TCHAR))) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_SELECTSTRING, (WPARAM)-1, (LPARAM)Buffer); + + hwndMonSel = GetDlgItem(hwndDlg, IDC_SETTINGS_MONSEL); + index = (INT)SendMessage(hwndMonSel, MSLM_GETCURSEL, 0, 0); + if (index != (DWORD)-1 && SendMessage(hwndMonSel, MSLM_GETMONITORINFO, index, (LPARAM)&info)) + { + info.Size.cx = pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth; + info.Size.cy = pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight; + SendMessage(hwndMonSel, MSLM_SETMONITORINFO, index, (LPARAM)&info); + } } static PSETTINGS_ENTRY @@ -165,8 +176,8 @@ for (Current = newEntry->Settings; Current != NULL; Current = Current->Flink) { if (Current->Flink != NULL && - ((Current->dmPelsWidth != Current->Flink->dmPelsWidth) && - (Current->dmPelsHeight != Current->Flink->dmPelsHeight))) + ((Current->dmPelsWidth != Current->Flink->dmPelsWidth) || + (Current->dmPelsHeight != Current->Flink->dmPelsHeight))) { ResolutionsCount++; } @@ -182,8 +193,8 @@ { if (Current->Flink == NULL || (Current->Flink != NULL && - ((Current->dmPelsWidth != Current->Flink->dmPelsWidth) && - (Current->dmPelsHeight != Current->Flink->dmPelsHeight)))) + ((Current->dmPelsWidth != Current->Flink->dmPelsWidth) || + (Current->dmPelsHeight != Current->Flink->dmPelsHeight)))) { newEntry->Resolutions[i].dmPelsWidth = Current->dmPelsWidth; newEntry->Resolutions[i].dmPelsHeight = Current->dmPelsHeight;

8 years, 11 months

[ekohl] 70576: [vfatlib] - Use a single wipe function (FatWipeSectors) for FAT12, FAT16 and FAT32. - Code has been reviewed by Hermès and me. Ready for merge into 0.4.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Jan 11 20:44:06 2016 New Revision: 70576 URL: http://svn.reactos.org/svn/reactos?rev=70576&view=rev Log: [vfatlib] - Use a single wipe function (FatWipeSectors) for FAT12, FAT16 and FAT32. - Code has been reviewed by Hermès and me. Ready for merge into 0.4. Modified: trunk/reactos/lib/fslib/vfatlib/common.c trunk/reactos/lib/fslib/vfatlib/common.h trunk/reactos/lib/fslib/vfatlib/fat12.c trunk/reactos/lib/fslib/vfatlib/fat16.c trunk/reactos/lib/fslib/vfatlib/fat32.c Modified: trunk/reactos/lib/fslib/vfatlib/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/common.c… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/common.c [iso-8859-1] Mon Jan 11 20:44:06 2016 @@ -50,36 +50,36 @@ return Serial; } -/***** Wipe function for FAT12 and FAT16 formats, adapted from FAT32 code *****/ +/***** Wipe function for FAT12, FAT16 and FAT32 formats, adapted from FAT32 code *****/ NTSTATUS -Fat1216WipeSectors( +FatWipeSectors( IN HANDLE FileHandle, - IN PFAT16_BOOT_SECTOR BootSector, + IN ULONG TotalSectors, + IN ULONG SectorsPerCluster, + IN ULONG BytesPerSector, IN OUT PFORMAT_CONTEXT Context) { IO_STATUS_BLOCK IoStatusBlock; PUCHAR Buffer; LARGE_INTEGER FileOffset; ULONGLONG Sector; - ULONG SectorsHuge; ULONG Length; NTSTATUS Status; + + Length = SectorsPerCluster * BytesPerSector; /* Allocate buffer for the cluster */ Buffer = (PUCHAR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, - BootSector->SectorsPerCluster * BootSector->BytesPerSector); + Length); if (Buffer == NULL) return STATUS_INSUFFICIENT_RESOURCES; + /* Wipe all clusters */ Sector = 0; - Length = BootSector->SectorsPerCluster * BootSector->BytesPerSector; - - SectorsHuge = (BootSector->SectorsHuge != 0 ? BootSector->SectorsHuge : BootSector->Sectors); - - while (Sector + BootSector->SectorsPerCluster < SectorsHuge) + while (Sector + SectorsPerCluster < TotalSectors) { - FileOffset.QuadPart = Sector * BootSector->BytesPerSector; + FileOffset.QuadPart = Sector * BytesPerSector; Status = NtWriteFile(FileHandle, NULL, @@ -96,17 +96,18 @@ goto done; } - UpdateProgress(Context, (ULONG)BootSector->SectorsPerCluster); + UpdateProgress(Context, SectorsPerCluster); - Sector += BootSector->SectorsPerCluster; + Sector += SectorsPerCluster; } - if (Sector + BootSector->SectorsPerCluster > SectorsHuge) + /* Wipe the trailing space behind the last cluster */ + if (Sector < TotalSectors) { - DPRINT("Remaining sectors %lu\n", SectorsHuge - Sector); + DPRINT("Remaining sectors %lu\n", TotalSectors - Sector); - FileOffset.QuadPart = Sector * BootSector->BytesPerSector; - Length = (SectorsHuge - Sector) * BootSector->BytesPerSector; + FileOffset.QuadPart = Sector * BytesPerSector; + Length = (TotalSectors - Sector) * BytesPerSector; Status = NtWriteFile(FileHandle, NULL, @@ -123,7 +124,7 @@ goto done; } - UpdateProgress(Context, SectorsHuge - Sector); + UpdateProgress(Context, TotalSectors - Sector); } done: Modified: trunk/reactos/lib/fslib/vfatlib/common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/common.h… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/common.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/common.h [iso-8859-1] Mon Jan 11 20:44:06 2016 @@ -14,9 +14,11 @@ ULONG CalcVolumeSerialNumber(VOID); NTSTATUS -Fat1216WipeSectors( +FatWipeSectors( IN HANDLE FileHandle, - IN PFAT16_BOOT_SECTOR BootSector, + IN ULONG TotalSectors, + IN ULONG SectorsPerCluster, + IN ULONG BytesPerSector, IN OUT PFORMAT_CONTEXT Context); #endif /* _VFATCOMMON_H_ */ Modified: trunk/reactos/lib/fslib/vfatlib/fat12.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat12.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] Mon Jan 11 20:44:06 2016 @@ -326,9 +326,11 @@ { Context->TotalSectorCount += SectorCount; - Status = Fat1216WipeSectors(FileHandle, - &BootSector, - Context); + Status = FatWipeSectors(FileHandle, + SectorCount, + (ULONG)BootSector.SectorsPerCluster, + (ULONG)BootSector.BytesPerSector, + Context); if (!NT_SUCCESS(Status)) { DPRINT("Fat12WipeSectors() failed with status 0x%.08x\n", Status); Modified: trunk/reactos/lib/fslib/vfatlib/fat16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat16.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat16.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat16.c [iso-8859-1] Mon Jan 11 20:44:06 2016 @@ -334,9 +334,11 @@ { Context->TotalSectorCount += SectorCount; - Status = Fat1216WipeSectors(FileHandle, - &BootSector, - Context); + Status = FatWipeSectors(FileHandle, + SectorCount, + (ULONG)BootSector.SectorsPerCluster, + (ULONG)BootSector.BytesPerSector, + Context); if (!NT_SUCCESS(Status)) { DPRINT("Fat16WipeSectors() failed with status 0x%.08x\n", Status); Modified: trunk/reactos/lib/fslib/vfatlib/fat32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat32.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] Mon Jan 11 20:44:06 2016 @@ -375,86 +375,6 @@ } UpdateProgress(Context, (ULONG)BootSector->SectorsPerCluster); - -done: - /* Free the buffer */ - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; -} - - -static -NTSTATUS -Fat32WipeSectors( - IN HANDLE FileHandle, - IN PFAT32_BOOT_SECTOR BootSector, - IN OUT PFORMAT_CONTEXT Context) -{ - IO_STATUS_BLOCK IoStatusBlock; - PUCHAR Buffer; - LARGE_INTEGER FileOffset; - ULONGLONG Sector; - ULONG Length; - NTSTATUS Status; - - /* Allocate buffer for the cluster */ - Buffer = (PUCHAR)RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - BootSector->SectorsPerCluster * BootSector->BytesPerSector); - if (Buffer == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - Sector = 0; - Length = BootSector->SectorsPerCluster * BootSector->BytesPerSector; - - while (Sector + BootSector->SectorsPerCluster < BootSector->SectorsHuge) - { - FileOffset.QuadPart = Sector * BootSector->BytesPerSector; - - Status = NtWriteFile(FileHandle, - NULL, - NULL, - NULL, - &IoStatusBlock, - Buffer, - Length, - &FileOffset, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - goto done; - } - - UpdateProgress(Context, (ULONG)BootSector->SectorsPerCluster); - - Sector += BootSector->SectorsPerCluster; - } - - if (Sector + BootSector->SectorsPerCluster > BootSector->SectorsHuge) - { - DPRINT("Remaining sectors %lu\n", BootSector->SectorsHuge - Sector); - - FileOffset.QuadPart = Sector * BootSector->BytesPerSector; - Length = (BootSector->SectorsHuge - Sector) * BootSector->BytesPerSector; - - Status = NtWriteFile(FileHandle, - NULL, - NULL, - NULL, - &IoStatusBlock, - Buffer, - Length, - &FileOffset, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - goto done; - } - - UpdateProgress(Context, BootSector->SectorsHuge - Sector); - } done: /* Free the buffer */ @@ -557,9 +477,11 @@ { Context->TotalSectorCount += BootSector.SectorsHuge; - Status = Fat32WipeSectors(FileHandle, - &BootSector, - Context); + Status = FatWipeSectors(FileHandle, + BootSector.SectorsHuge, + (ULONG)BootSector.SectorsPerCluster, + (ULONG)BootSector.BytesPerSector, + Context); if (!NT_SUCCESS(Status)) { DPRINT("Fat32WipeSectors() failed with status 0x%.08x\n", Status);

8 years, 11 months

[hbelusca] 70575: [NTOS:CONFIG] Remove a very old hack (that dated back from the Configuration Manager rewrite): now the hives are already correctly loaded in memory, therefore there is no need to ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jan 11 00:37:44 2016 New Revision: 70575 URL: http://svn.reactos.org/svn/reactos?rev=70575&view=rev Log: [NTOS:CONFIG] Remove a very old hack (that dated back from the Configuration Manager rewrite): now the hives are already correctly loaded in memory, therefore there is no need to call CmCreateRootNode after creating a hive, because the root node is subsequently initialized with calls to CmpCreateLinkNode. The comment saying that calls to CmCreateRootNode can be removed when CmpCreateLinkNode is used, is now in order. This means we correctly parse & mount the hives. The CmCreateRootNode function is now only used in the 'mkhive' tool in order to create file hives, since this tool needs to create new hives from nowhere (that's why also our bootloaders do not need this function: they only load & parse existing hive files). The fact that this hack remained caused us hidden troubles: some hives (SAM, SOFTWARE) had "two" root keys: a first one that was unused (which was created by this hackish call), and the second one which was the one used (and was created by CmpCreateLinkNode as expected). Modified: trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] Mon Jan 11 00:37:44 2016 @@ -715,7 +715,6 @@ return Status; } -/* Remove calls to CmCreateRootNode once this is used! */ NTSTATUS NTAPI CmpCreateLinkNode(IN PHHIVE Hive, Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Mon Jan 11 00:37:44 2016 @@ -370,9 +370,6 @@ /* Success, return hive */ *Hive = NewHive; - - /* HACK: ROS: Init root key cell and prepare the hive */ - if (Operation == HINIT_CREATE) CmCreateRootNode(&NewHive->Hive, L""); /* Duplicate the hive name */ NewHive->FileFullPath.Buffer = ExAllocatePoolWithTag(PagedPool,

8 years, 11 months

[ekohl] 70574: [SCSIPORT] Fix indentation! No code changes!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jan 10 22:39:25 2016 New Revision: 70574 URL: http://svn.reactos.org/svn/reactos?rev=70574&view=rev Log: [SCSIPORT] Fix indentation! No code changes! Modified: trunk/reactos/drivers/storage/scsiport/scsiport_int.h Modified: trunk/reactos/drivers/storage/scsiport/scsiport_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport_int.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport_int.h [iso-8859-1] Sun Jan 10 22:39:25 2016 @@ -51,10 +51,10 @@ typedef enum _SCSI_PORT_TIMER_STATES { - IDETimerIdle, - IDETimerCmdWait, - IDETimerResetWaitForBusyNegate, - IDETimerResetWaitForDrdyAssert + IDETimerIdle, + IDETimerCmdWait, + IDETimerResetWaitForBusyNegate, + IDETimerResetWaitForDrdyAssert } SCSI_PORT_TIMER_STATES; typedef struct _CONFIGURATION_INFO @@ -80,12 +80,12 @@ typedef struct _SCSI_PORT_DEVICE_BASE { - LIST_ENTRY List; - - PVOID MappedAddress; - ULONG NumberOfBytes; - SCSI_PHYSICAL_ADDRESS IoAddress; - ULONG SystemIoBusNumber; + LIST_ENTRY List; + + PVOID MappedAddress; + ULONG NumberOfBytes; + SCSI_PHYSICAL_ADDRESS IoAddress; + ULONG SystemIoBusNumber; } SCSI_PORT_DEVICE_BASE, *PSCSI_PORT_DEVICE_BASE; typedef struct _SCSI_SG_ADDRESS @@ -116,38 +116,38 @@ typedef struct _SCSI_PORT_LUN_EXTENSION { - UCHAR PathId; - UCHAR TargetId; - UCHAR Lun; - - ULONG Flags; - - struct _SCSI_PORT_LUN_EXTENSION *Next; - - BOOLEAN DeviceClaimed; - PDEVICE_OBJECT DeviceObject; - - INQUIRYDATA InquiryData; - - KDEVICE_QUEUE DeviceQueue; - ULONG SortKey; - ULONG QueueCount; - ULONG MaxQueueCount; - - ULONG AttemptCount; - LONG RequestTimeout; - - PIRP BusyRequest; - PIRP PendingRequest; - - struct _SCSI_PORT_LUN_EXTENSION *ReadyLun; - struct _SCSI_PORT_LUN_EXTENSION *CompletedAbortRequests; - - SCSI_REQUEST_BLOCK_INFO SrbInfo; - - /* More data? */ - - UCHAR MiniportLunExtension[1]; /* must be the last entry */ + UCHAR PathId; + UCHAR TargetId; + UCHAR Lun; + + ULONG Flags; + + struct _SCSI_PORT_LUN_EXTENSION *Next; + + BOOLEAN DeviceClaimed; + PDEVICE_OBJECT DeviceObject; + + INQUIRYDATA InquiryData; + + KDEVICE_QUEUE DeviceQueue; + ULONG SortKey; + ULONG QueueCount; + ULONG MaxQueueCount; + + ULONG AttemptCount; + LONG RequestTimeout; + + PIRP BusyRequest; + PIRP PendingRequest; + + struct _SCSI_PORT_LUN_EXTENSION *ReadyLun; + struct _SCSI_PORT_LUN_EXTENSION *CompletedAbortRequests; + + SCSI_REQUEST_BLOCK_INFO SrbInfo; + + /* More data? */ + + UCHAR MiniportLunExtension[1]; /* must be the last entry */ } SCSI_PORT_LUN_EXTENSION, *PSCSI_PORT_LUN_EXTENSION; /* Structures for inquiries support */ @@ -206,94 +206,94 @@ typedef struct _SCSI_PORT_DEVICE_EXTENSION { - ULONG Length; - ULONG MiniPortExtensionSize; - PPORT_CONFIGURATION_INFORMATION PortConfig; - PBUSES_CONFIGURATION_INFORMATION BusesConfig; - PVOID NonCachedExtension; - ULONG PortNumber; - - LONG ActiveRequestCounter; - ULONG SrbFlags; - ULONG Flags; - - ULONG BusNum; - ULONG MaxTargedIds; - ULONG MaxLunCount; - - KSPIN_LOCK IrqLock; /* Used when there are 2 irqs */ - ULONG SequenceNumber; /* Global sequence number for packets */ - KSPIN_LOCK SpinLock; - PKINTERRUPT Interrupt[2]; - PIRP CurrentIrp; - ULONG IrpFlags; - - SCSI_PORT_TIMER_STATES TimerState; - LONG TimerCount; - - KTIMER MiniportTimer; - KDPC MiniportTimerDpc; - - PMAPPED_ADDRESS MappedAddressList; - - ULONG LunExtensionSize; - PSCSI_PORT_LUN_EXTENSION LunExtensionList[LUS_NUMBER]; - - SCSI_PORT_INTERRUPT_DATA InterruptData; - - /* SRB extension stuff*/ - ULONG SrbExtensionSize; - PVOID SrbExtensionBuffer; - PVOID FreeSrbExtensions; - - /* SRB information */ - PSCSI_REQUEST_BLOCK_INFO SrbInfo; - PSCSI_REQUEST_BLOCK_INFO FreeSrbInfo; - ULONG SrbDataCount; - - IO_SCSI_CAPABILITIES PortCapabilities; - - PDEVICE_OBJECT DeviceObject; - PCONTROLLER_OBJECT ControllerObject; - - PHW_INITIALIZE HwInitialize; - PHW_STARTIO HwStartIo; - PHW_INTERRUPT HwInterrupt; - PHW_RESET_BUS HwResetBus; - PHW_DMA_STARTED HwDmaStarted; - PHW_TIMER HwScsiTimer; - - PSCSI_REQUEST_BLOCK OriginalSrb; - SCSI_REQUEST_BLOCK InternalSrb; - SENSE_DATA InternalSenseData; - - /* DMA related stuff */ - PADAPTER_OBJECT AdapterObject; - ULONG MapRegisterCount; - BOOLEAN MapBuffers; - BOOLEAN MapRegisters; - PVOID MapRegisterBase; - - /* Features */ - BOOLEAN CachesData; - BOOLEAN SupportsTaggedQueuing; - BOOLEAN SupportsAutoSense; - BOOLEAN MultipleReqsPerLun; - BOOLEAN ReceiveEvent; - - PHYSICAL_ADDRESS PhysicalAddress; - ULONG CommonBufferLength; - ULONG InterruptLevel[2]; - ULONG IoAddress; - - BOOLEAN NeedSrbExtensionAlloc; - BOOLEAN NeedSrbDataAlloc; - - ULONG RequestsNumber; - - ULONG InterruptCount; - - UCHAR MiniPortDeviceExtension[1]; /* must be the last entry */ + ULONG Length; + ULONG MiniPortExtensionSize; + PPORT_CONFIGURATION_INFORMATION PortConfig; + PBUSES_CONFIGURATION_INFORMATION BusesConfig; + PVOID NonCachedExtension; + ULONG PortNumber; + + LONG ActiveRequestCounter; + ULONG SrbFlags; + ULONG Flags; + + ULONG BusNum; + ULONG MaxTargedIds; + ULONG MaxLunCount; + + KSPIN_LOCK IrqLock; /* Used when there are 2 irqs */ + ULONG SequenceNumber; /* Global sequence number for packets */ + KSPIN_LOCK SpinLock; + PKINTERRUPT Interrupt[2]; + PIRP CurrentIrp; + ULONG IrpFlags; + + SCSI_PORT_TIMER_STATES TimerState; + LONG TimerCount; + + KTIMER MiniportTimer; + KDPC MiniportTimerDpc; + + PMAPPED_ADDRESS MappedAddressList; + + ULONG LunExtensionSize; + PSCSI_PORT_LUN_EXTENSION LunExtensionList[LUS_NUMBER]; + + SCSI_PORT_INTERRUPT_DATA InterruptData; + + /* SRB extension stuff*/ + ULONG SrbExtensionSize; + PVOID SrbExtensionBuffer; + PVOID FreeSrbExtensions; + + /* SRB information */ + PSCSI_REQUEST_BLOCK_INFO SrbInfo; + PSCSI_REQUEST_BLOCK_INFO FreeSrbInfo; + ULONG SrbDataCount; + + IO_SCSI_CAPABILITIES PortCapabilities; + + PDEVICE_OBJECT DeviceObject; + PCONTROLLER_OBJECT ControllerObject; + + PHW_INITIALIZE HwInitialize; + PHW_STARTIO HwStartIo; + PHW_INTERRUPT HwInterrupt; + PHW_RESET_BUS HwResetBus; + PHW_DMA_STARTED HwDmaStarted; + PHW_TIMER HwScsiTimer; + + PSCSI_REQUEST_BLOCK OriginalSrb; + SCSI_REQUEST_BLOCK InternalSrb; + SENSE_DATA InternalSenseData; + + /* DMA related stuff */ + PADAPTER_OBJECT AdapterObject; + ULONG MapRegisterCount; + BOOLEAN MapBuffers; + BOOLEAN MapRegisters; + PVOID MapRegisterBase; + + /* Features */ + BOOLEAN CachesData; + BOOLEAN SupportsTaggedQueuing; + BOOLEAN SupportsAutoSense; + BOOLEAN MultipleReqsPerLun; + BOOLEAN ReceiveEvent; + + PHYSICAL_ADDRESS PhysicalAddress; + ULONG CommonBufferLength; + ULONG InterruptLevel[2]; + ULONG IoAddress; + + BOOLEAN NeedSrbExtensionAlloc; + BOOLEAN NeedSrbDataAlloc; + + ULONG RequestsNumber; + + ULONG InterruptCount; + + UCHAR MiniPortDeviceExtension[1]; /* must be the last entry */ } SCSI_PORT_DEVICE_EXTENSION, *PSCSI_PORT_DEVICE_EXTENSION; typedef struct _RESETBUS_PARAMS

8 years, 11 months

[hbelusca] 70573: [NTOS:CONFIG] - Remove useless casts. - Fix a REG_OPTION_* hack.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 10 22:35:09 2016 New Revision: 70573 URL: http://svn.reactos.org/svn/reactos?rev=70573&view=rev Log: [NTOS:CONFIG] - Remove useless casts. - Fix a REG_OPTION_* hack. Modified: trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] Sun Jan 10 22:35:09 2016 @@ -225,7 +225,7 @@ /* Get the storage type */ StorageType = Stable; - if (Flags & REG_OPTION_VOLATILE) StorageType = Volatile; + if (ParseContext->CreateOptions & REG_OPTION_VOLATILE) StorageType = Volatile; /* Allocate the child */ *KeyCell = HvAllocateCell(Hive, @@ -311,7 +311,7 @@ /* Fill out the key node */ KeyNode->Signature = CM_KEY_NODE_SIGNATURE; - KeyNode->Flags = Flags &~ REG_OPTION_CREATE_LINK; + KeyNode->Flags = Flags; KeQuerySystemTime(&SystemTime); KeyNode->LastWriteTime = SystemTime; KeyNode->Spare = 0; @@ -474,7 +474,7 @@ AccessMode, ParseContext, ParentKcb, - ParseContext->CreateOptions, // WRONG! + 0, &KeyCell, Object); if (NT_SUCCESS(Status)) Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Sun Jan 10 22:35:09 2016 @@ -350,7 +350,7 @@ } /* Initialize the hive */ - Status = CmpInitializeHive((PCMHIVE*)&NewHive, + Status = CmpInitializeHive(&NewHive, Operation, HiveFlags, FileType, @@ -904,7 +904,7 @@ if (HiveBase) { /* Import it */ - Status = CmpInitializeHive((PCMHIVE*)&SystemHive, + Status = CmpInitializeHive(&SystemHive, HINIT_MEMORY, HIVE_NOLAZYFLUSH, HFILE_TYPE_LOG, @@ -975,7 +975,7 @@ RtlInitUnicodeString(&KeyName, L"\\Registry\\Machine\\SYSTEM"); Status = CmpLinkHiveToMaster(&KeyName, NULL, - (PCMHIVE)SystemHive, + SystemHive, Allocate, SecurityDescriptor); @@ -984,7 +984,7 @@ if (!NT_SUCCESS(Status)) return FALSE; /* Add the hive to the hive list */ - CmpMachineHiveList[3].CmHive = (PCMHIVE)SystemHive; + CmpMachineHiveList[3].CmHive = SystemHive; /* Success! */ return TRUE; @@ -1711,7 +1711,7 @@ } /* Create the hardware hive */ - Status = CmpInitializeHive((PCMHIVE*)&HardwareHive, + Status = CmpInitializeHive(&HardwareHive, HINIT_CREATE, HIVE_VOLATILE, HFILE_TYPE_PRIMARY, @@ -1728,13 +1728,13 @@ } /* Add the hive to the hive list */ - CmpMachineHiveList[0].CmHive = (PCMHIVE)HardwareHive; + CmpMachineHiveList[0].CmHive = HardwareHive; /* Attach it to the machine key */ RtlInitUnicodeString(&KeyName, L"\\Registry\\Machine\\HARDWARE"); Status = CmpLinkHiveToMaster(&KeyName, NULL, - (PCMHIVE)HardwareHive, + HardwareHive, TRUE, SecurityDescriptor); if (!NT_SUCCESS(Status))

8 years, 11 months

[ekohl] 70572: [NDK] Add PLUGPLAY_CONTROL_RETRIEVE_DOCK_DATA.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jan 10 21:26:46 2016 New Revision: 70572 URL: http://svn.reactos.org/svn/reactos?rev=70572&view=rev Log: [NDK] Add PLUGPLAY_CONTROL_RETRIEVE_DOCK_DATA. Modified: trunk/reactos/include/ndk/cmtypes.h Modified: trunk/reactos/include/ndk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/cmtypes.h [iso-8859-1] Sun Jan 10 21:26:46 2016 @@ -471,6 +471,13 @@ PWCHAR Buffer; } PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA, *PPLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA; +// Class 0x13 +typedef struct _PLUGPLAY_CONTROL_RETRIEVE_DOCK_DATA +{ + ULONG DeviceInstanceLength; + PWSTR DeviceInstance; +} PLUGPLAY_CONTROL_RETRIEVE_DOCK_DATA, *PPLUGPLAY_CONTROL_RETRIEVE_DOCK_DATA; + // Class 0x14 typedef struct _PLUGPLAY_CONTROL_RESET_DEVICE_DATA {

8 years, 11 months

[ekohl] 70571: [INTL] - Remove the Advanced page for non-admin users. - Disable the 'complex script' and 'east asian language' checkboxes for non-admin users.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jan 10 21:12:23 2016 New Revision: 70571 URL: http://svn.reactos.org/svn/reactos?rev=70571&view=rev Log: [INTL] - Remove the Advanced page for non-admin users. - Disable the 'complex script' and 'east asian language' checkboxes for non-admin users. Modified: trunk/reactos/dll/cpl/intl/intl.c trunk/reactos/dll/cpl/intl/intl.h trunk/reactos/dll/cpl/intl/languages.c Modified: trunk/reactos/dll/cpl/intl/intl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.c?rev=70… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/intl.c [iso-8859-1] Sun Jan 10 21:12:23 2016 @@ -168,6 +168,7 @@ return FALSE; pGlobalData->SystemLCID = GetSystemDefaultLCID(); + pGlobalData->bIsUserAdmin = IsUserAdmin(); LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); @@ -178,13 +179,20 @@ psh.hInstance = hApplet; psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON)); psh.pszCaption = Caption; - psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); + psh.nPages = 0; //sizeof(psp) / sizeof(PROPSHEETPAGE); psh.nStartPage = 0; psh.ppsp = psp; InitPropSheetPage(&psp[0], IDD_GENERALPAGE, GeneralPageProc, (LPARAM)pGlobalData); + psh.nPages++; InitPropSheetPage(&psp[1], IDD_LANGUAGESPAGE, LanguagesPageProc, (LPARAM)pGlobalData); - InitPropSheetPage(&psp[2], IDD_ADVANCEDPAGE, AdvancedPageProc, (LPARAM)pGlobalData); + psh.nPages++; + + if (pGlobalData->bIsUserAdmin) + { + InitPropSheetPage(&psp[2], IDD_ADVANCEDPAGE, AdvancedPageProc, (LPARAM)pGlobalData); + psh.nPages++; + } ret = (LONG)(PropertySheet(&psh) != -1); Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=70… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] Sun Jan 10 21:12:23 2016 @@ -116,6 +116,8 @@ GEOID geoid; BOOL fGeoIdChanged; + /* Misc */ + BOOL bIsUserAdmin; } GLOBALDATA, *PGLOBALDATA; typedef struct Modified: trunk/reactos/dll/cpl/intl/languages.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/languages.c?r… ============================================================================== --- trunk/reactos/dll/cpl/intl/languages.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/languages.c [iso-8859-1] Sun Jan 10 21:12:23 2016 @@ -10,10 +10,21 @@ LPARAM lParam) { SHELLEXECUTEINFOW shInputDll; + PGLOBALDATA pGlobalData; + + pGlobalData = (PGLOBALDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { case WM_INITDIALOG: + pGlobalData = (PGLOBALDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + + if (!pGlobalData->bIsUserAdmin) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_INST_FILES_FOR_RTOL_LANG), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_INST_FILES_FOR_ASIAN), FALSE); + } break; case WM_COMMAND:

8 years, 11 months

[tkreuzer] 70570: [PSDK] Add missing dbghelp.h definitions

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jan 10 19:46:16 2016 New Revision: 70570 URL: http://svn.reactos.org/svn/reactos?rev=70570&view=rev Log: [PSDK] Add missing dbghelp.h definitions Modified: trunk/reactos/include/psdk/dbghelp.h Modified: trunk/reactos/include/psdk/dbghelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbghelp.h?rev… ============================================================================== --- trunk/reactos/include/psdk/dbghelp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dbghelp.h [iso-8859-1] Sun Jan 10 19:46:16 2016 @@ -487,10 +487,8 @@ #define SYMOPT_EXACT_SYMBOLS 0x00000400 #define SYMOPT_WILD_UNDERSCORE 0x00000800 #define SYMOPT_USE_DEFAULTS 0x00001000 -/* latest SDK defines: #define SYMOPT_ALLOW_ABSOLUTE_SYMBOLS 0x00000800 #define SYMOPT_IGNORE_NT_SYMPATH 0x00001000 -*/ #define SYMOPT_INCLUDE_32BIT_MODULES 0x00002000 #define SYMOPT_PUBLICS_ONLY 0x00004000 #define SYMOPT_NO_PUBLICS 0x00008000 @@ -500,7 +498,12 @@ #define SYMOPT_NO_PROMPTS 0x00080000 #define SYMOPT_OVERWRITE 0x00100000 #define SYMOPT_IGNORE_IMAGEDIR 0x00200000 - +#define SYMOPT_FLAT_DIRECTORY 0x00400000 +#define SYMOPT_FAVOR_COMPRESSED 0x00800000 +#define SYMOPT_ALLOW_ZERO_ADDRESS 0x01000000 +#define SYMOPT_DISABLE_SYMSRV_AUTODETECT 0x02000000 +#define SYMOPT_READONLY_CACHE 0x04000000 +#define SYMOPT_SYMPATH_LAST 0x08000000 #define SYMOPT_DEBUG 0x80000000 typedef struct _IMAGEHLP_STACK_FRAME @@ -2541,6 +2544,12 @@ BOOL WINAPI SymUnloadModule(_In_ HANDLE, _In_ DWORD); +BOOL +IMAGEAPI +SymSrvIsStore( + _In_opt_ HANDLE hProcess, + _In_ PCSTR path); + #endif #ifdef __cplusplus

8 years, 11 months

← Newer
1
...
7
8
9
10
11
12
13
...
20
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 January 2016