Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 16248: (Brandon Turner) <turnerb7@msu.edu>) Fixed bug to allow MS style wildcards + code clean up added /y and /-y
by greatlrd＠svn.reactos.com 23 Jun '05

23 Jun '05

(Brandon Turner) <turnerb7(a)msu.edu>) Fixed bug to allow MS style wildcards + code clean up added /y and /-y Modified: trunk/reactos/subsys/system/cmd/move.c _____ Modified: trunk/reactos/subsys/system/cmd/move.c --- trunk/reactos/subsys/system/cmd/move.c 2005-06-23 17:54:22 UTC (rev 16247) +++ trunk/reactos/subsys/system/cmd/move.c 2005-06-23 18:12:17 UTC (rev 16248) @@ -1,29 +1,33 @@ /* - * MOVE.C - move internal command. - * - * - * History: - * - * 14-Dec-1998 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) - * Started. - * - * 18-Jan-1999 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) - * Unicode safe! - * Preliminary version!!! - * - * 20-Jan-1999 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) - * Redirection safe! - * - * 27-Jan-1999 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) - * Added help text ("/?"). - * Added more error checks. - * - * 03-Feb-1999 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) - * Added "/N" option. - * - * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) - * Remove all hardcode string to En.rc - */ +* MOVE.C - move internal command. +* +* +* History: +* +* 14-Dec-1998 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) +* Started. +* +* 18-Jan-1999 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) +* Unicode safe! +* Preliminary version!!! +* +* 20-Jan-1999 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) +* Redirection safe! +* +* 27-Jan-1999 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) +* Added help text ("/?"). +* Added more error checks. +* +* 03-Feb-1999 (Eric Kohl <ekohl(a)abo.rhein-zeitung.de>) +* Added "/N" option. +* +* 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) +* Remove all hardcode string to En.rc +* +* 24-Jun-2005 (Brandon Turner) <turnerb7(a)msu.edu>) +* Fixed bug to allow MS style wildcards + code clean up +* added /y and /-y +*/ #include "precomp.h" #include "resource.h" @@ -31,32 +35,22 @@ #ifdef INCLUDE_CMD_MOVE -#define OVERWRITE_NO 0 -#define OVERWRITE_YES 1 -#define OVERWRITE_ALL 2 -#define OVERWRITE_CANCEL 3 +enum +{ + MOVE_NOTHING = 0x001, /* /N */ + MOVE_OVER_YES = 0x002, /* /Y */ + MOVE_OVER_NO = 0x004, /* /-Y */ +}; - static INT Overwrite (LPTSTR fn) { + /*ask the user if they want to override*/ TCHAR szMsg[RC_STRING_MAX_SIZE]; - TCHAR inp[10]; - LPTSTR p; - + INT res; LoadString(CMD_ModuleHandle, STRING_MOVE_HELP1, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg, fn); - ConInString(inp, 10); - - _tcsupr (inp); - for (p = inp; _istspace(*p); p++) - ; - - if (*p != szMsg[0] && *p != szMsg[2]) - return OVERWRITE_NO; - if (*p == szMsg[2]) - return OVERWRITE_ALL; - - return OVERWRITE_YES; + ConOutPrintf(szMsg,fn); + res = FilePromptYNA (""); + return res; } @@ -68,29 +62,29 @@ INT argc, i, nFiles; TCHAR szDestPath[MAX_PATH]; TCHAR szSrcPath[MAX_PATH]; - BOOL bPrompt = TRUE; - LPTSTR p; + DWORD dwFlags = 0; + INT nOverwrite = 0; WIN32_FIND_DATA findBuffer; HANDLE hFile; LPTSTR pszFile; - BOOL bNothing = FALSE; + if (!_tcsncmp (param, _T("/?"), 2)) { #if 0 ConOutPuts (_T("Moves files and renames files and directories.\n\n" - "To move one or more files:\n" - "MOVE [/N][/Y|/-Y][drive:][path]filename1[,...] destination\n" - "\n" - "To rename a directory:\n" - "MOVE [/N][/Y|/-Y][drive:][path]dirname1 dirname2\n" - "\n" - " [drive:][path]filename1 Specifies the location and name of the file\n" - " or files you want to move.\n" - " /N Nothing. Don everthing but move files or direcories.\n" - " /Y\n" - " /-Y\n" - "...")); + "To move one or more files:\n" + "MOVE [/N][/Y|/-Y][drive:][path]filename1[,...] destination\n" + "\n" + "To rename a directory:\n" + "MOVE [/N][/Y|/-Y][drive:][path]dirname1 dirname2\n" + "\n" + " [drive:][path]filename1 Specifies the location and name of the file\n" + " or files you want to move.\n" + " /N Nothing. Don everthing but move files or direcories.\n" + " /Y\n" + " /-Y\n" + "...")); #else ConOutResPuts(STRING_MOVE_HELP2); #endif @@ -103,24 +97,25 @@ /* read options */ for (i = 0; i < argc; i++) { - p = arg[i]; - - if (*p == _T('/')) + if (*arg[i] == _T('/')) { - p++; - if (*p == _T('-')) + if (_tcslen(arg[i]) >= 2) { - p++; - if (_totupper (*p) == _T('Y')) - bPrompt = TRUE; + switch (_totupper(arg[i][1])) + { + case _T('N'): + dwFlags |= MOVE_NOTHING; + break; + + case _T('Y'): + dwFlags |= MOVE_OVER_YES; + break; + + case _T('-'): + dwFlags |= MOVE_OVER_NO; + break; + } } - else - { - if (_totupper (*p) == _T('Y')) - bPrompt = FALSE; - else if (_totupper (*p) == _T('N')) - bNothing = TRUE; - } nFiles--; } } @@ -132,13 +127,20 @@ return 1; } + if (_tcschr (arg[argc - 1], _T('*')) != NULL) + { + /*'*' in dest, this doesnt happen. give folder name instead*/ + error_parameter_format('2'); + return 1; + } + /* get destination */ GetFullPathName (arg[argc - 1], MAX_PATH, szDestPath, NULL); #ifdef _DEBUG DebugPrintf (_T("Destination: %s\n"), szDestPath); #endif - /* move it*/ + /* move it */ for (i = 0; i < argc - 1; i++) { if (*arg[i] == _T('/')) @@ -154,6 +156,8 @@ do { + + nOverwrite = 1; GetFullPathName (findBuffer.cFileName, MAX_PATH, szSrcPath, &pszFile); if (GetFileAttributes (szSrcPath) & FILE_ATTRIBUTE_DIRECTORY) @@ -162,93 +166,100 @@ #ifdef _DEBUG DebugPrintf (_T("Move directory \'%s\' to \'%s\'\n"), - szSrcPath, szDestPath); + szSrcPath, szDestPath); #endif - if (!bNothing) - { - MoveFile (szSrcPath, szDestPath); - } + if (!(dwFlags & MOVE_NOTHING)) + continue; + MoveFile (szSrcPath, szDestPath); } else { - /* source is file */ - - if (IsExistingFile (szDestPath)) + /* source is file */ + if (GetFileAttributes (szDestPath) & FILE_ATTRIBUTE_DIRECTORY) { - /* destination exists */ - if (GetFileAttributes (szDestPath) & FILE_ATTRIBUTE_DIRECTORY) - { - /* destination is existing directory */ + /* destination is existing directory */ - TCHAR szFullDestPath[MAX_PATH]; + /*build the dest string(accounts for *)*/ + TCHAR szFullDestPath[MAX_PATH]; + _tcscpy (szFullDestPath, szDestPath); + /*this line causes a one to many slashes, GetFullPathName must + be adding on a \ when it sees that is a dir*/ + //_tcscat (szFullDestPath, _T("\\")); + _tcscat (szFullDestPath, findBuffer.cFileName); - _tcscpy (szFullDestPath, szDestPath); - _tcscat (szFullDestPath, _T("\\")); - _tcscat (szFullDestPath, pszFile); + /*checks to make sure user wanted/wants the override*/ + if((dwFlags & MOVE_OVER_NO) && IsExistingFile (szFullDestPath)) + continue; + if(!(dwFlags & MOVE_OVER_YES) && IsExistingFile (szFullDestPath)) + nOverwrite = Overwrite (szFullDestPath); + if (nOverwrite == PROMPT_NO || nOverwrite == PROMPT_BREAK) + continue; + if (nOverwrite == PROMPT_ALL) + dwFlags |= MOVE_OVER_YES; - ConOutPrintf (_T("%s => %s"), szSrcPath, szFullDestPath); + /*delete the file that might be there first*/ + DeleteFile(szFullDestPath); + ConOutPrintf (_T("%s => %s"), szSrcPath, szFullDestPath); - if (!bNothing) - { - if (MoveFile (szSrcPath, szFullDestPath)) - LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE); - else - LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR2, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg); - } - } + if ((dwFlags & MOVE_NOTHING)) + continue; + + /*delete the file that might be there first*/ + DeleteFile(szFullDestPath); + /*move the file*/ + if (MoveFile (szSrcPath, szFullDestPath)) + LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE); else - { - /* destination is existing file */ - INT nOverwrite; + LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR2, szMsg, RC_STRING_MAX_SIZE); - /* must get the overwrite code */ - if ((nOverwrite = Overwrite (szDestPath))) - { -#if 0 - if (nOverwrite == OVERWRITE_ALL) - *lpFlags |= FLAG_OVERWRITE_ALL; -#endif - ConOutPrintf (_T("%s => %s"), szSrcPath, szDestPath); - - if (!bNothing) - { - if (MoveFile (szSrcPath, szDestPath)) - LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE); - else - LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR2, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg); - } - } - } + ConOutPrintf(szMsg); } else { - /* destination does not exist */ - TCHAR szFullDestPath[MAX_PATH]; + /* destination is a file */ - GetFullPathName (szDestPath, MAX_PATH, szFullDestPath, NULL); + if (_tcschr (arg[argc - 2], _T('*')) != NULL) + { + /*'*' in src but there should't be one in the dest*/ + error_parameter_format('1'); + return 1; + } - ConOutPrintf (_T("%s => %s"), szSrcPath, szFullDestPath); + /*bunch of checks to see if we the user wanted/wants + to really override the files*/ + if((dwFlags & MOVE_OVER_NO) && IsExistingFile (szDestPath)) + continue; + if(!(dwFlags & MOVE_OVER_YES) && IsExistingFile (szDestPath)) + nOverwrite = Overwrite (szDestPath); + if (nOverwrite == PROMPT_NO || nOverwrite == PROMPT_BREAK) + continue; + if (nOverwrite == PROMPT_ALL) + dwFlags |= MOVE_OVER_YES; - if (!bNothing) - { - if (MoveFile (szSrcPath, szFullDestPath)) - LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE); - else - LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR2, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(szMsg); - } + ConOutPrintf (_T("%s => %s"), szSrcPath, szDestPath); + + if ((dwFlags & MOVE_NOTHING)) + continue; + + /*delete the file first just to get ride of it + if it was already there*/ + DeleteFile(szDestPath); + /*do the moving*/ + if (MoveFile (szSrcPath, szDestPath)) + LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE); + else + LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR2, szMsg, RC_STRING_MAX_SIZE); + + ConOutPrintf(szMsg); + } } } while (FindNextFile (hFile, &findBuffer)); - FindClose (hFile); } freep (arg); - return 0; }

1 0

[gvg] 16247: Don't draw 0-width HLine
by gvg＠svn.reactos.com 23 Jun '05

23 Jun '05

Don't draw 0-width HLine Modified: trunk/reactos/subsys/win32k/eng/lineto.c _____ Modified: trunk/reactos/subsys/win32k/eng/lineto.c --- trunk/reactos/subsys/win32k/eng/lineto.c 2005-06-23 15:58:03 UTC (rev 16246) +++ trunk/reactos/subsys/win32k/eng/lineto.c 2005-06-23 17:54:22 UTC (rev 16247) @@ -418,16 +418,18 @@ EnumMore = CLIPOBJ_bEnum(Clip, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); for (i = 0; i < RectEnum.c && RectEnum.arcl[i].top + Translate.y <= y1; i++) { - if (y1 < RectEnum.arcl[i].bottom + Translate.y && - RectEnum.arcl[i].left + Translate.x <= hx + deltax && - hx < RectEnum.arcl[i].right + Translate.x) - { - DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_HLine( + if (y1 < RectEnum.arcl[i].bottom + Translate.y && + RectEnum.arcl[i].left + Translate.x <= hx + deltax && + hx < RectEnum.arcl[i].right + Translate.x && + max(hx, RectEnum.arcl[i].left + Translate.x) < + min(hx + deltax, RectEnum.arcl[i].right + Translate.x)) + { + DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_HLine( OutputObj, - max(hx, RectEnum.arcl[i].left + Translate.x), - min(hx + deltax, RectEnum.arcl[i].right + Translate.x), - y1, Pixel); - } + max(hx, RectEnum.arcl[i].left + Translate.x), + min(hx + deltax, RectEnum.arcl[i].right + Translate.x), + y1, Pixel); + } } } while (EnumMore);

1 0

[ion] 16246: Build stub hal with NDK
by ion＠svn.reactos.com 23 Jun '05

23 Jun '05

Build stub hal with NDK Modified: trunk/reactos/hal/hal/hal.c _____ Modified: trunk/reactos/hal/hal/hal.c --- trunk/reactos/hal/hal/hal.c 2005-06-23 15:29:20 UTC (rev 16245) +++ trunk/reactos/hal/hal/hal.c 2005-06-23 15:58:03 UTC (rev 16246) @@ -12,15 +12,11 @@ /* INCLUDES ******************************************************************/ #include <ddk/ntddk.h> -#include <roscfg.h> +#include <ndk/ntndk.h> -#include <internal/debug.h> #define NDEBUG #include <debug.h> -typedef struct _LOADER_PARAMETER_BLOCK *PLOADER_PARAMETER_BLOCK; -typedef struct _KD_PORT_INFORMATION *PKD_PORT_INFORMATION; - /* DATA **********************************************************************/ ULONG KdComPortInUse = 0; @@ -439,7 +435,7 @@ VOID STDCALL HalReturnToFirmware( - ULONG Action) + FIRMWARE_REENTRY Action) { UNIMPLEMENTED; }

1 0

[ion] 16245: Fix bug in interrupt code
by ion＠svn.reactos.com 23 Jun '05

23 Jun '05

Fix bug in interrupt code Modified: trunk/reactos/ntoskrnl/io/irq.c _____ Modified: trunk/reactos/ntoskrnl/io/irq.c --- trunk/reactos/ntoskrnl/io/irq.c 2005-06-23 13:31:33 UTC (rev 16244) +++ trunk/reactos/ntoskrnl/io/irq.c 2005-06-23 15:29:20 UTC (rev 16245) @@ -95,7 +95,7 @@ (count - 1)* sizeof(KINTERRUPT) + sizeof(IO_INTERRUPT), TAG_KINTERRUPT); - if (!Interrupt) return(STATUS_INSUFFICIENT_RESOURCES); + if (!IoInterrupt) return(STATUS_INSUFFICIENT_RESOURCES); /* Select which Spinlock to use */ if (SpinLock)

1 0

[sedwards] 16244: properly break it. correct typo
by sedwards＠svn.reactos.com 23 Jun '05

23 Jun '05

properly break it. correct typo Modified: trunk/reactos/ntoskrnl/io/disk.c _____ Modified: trunk/reactos/ntoskrnl/io/disk.c --- trunk/reactos/ntoskrnl/io/disk.c 2005-06-23 13:26:18 UTC (rev 16243) +++ trunk/reactos/ntoskrnl/io/disk.c 2005-06-23 13:31:33 UTC (rev 16244) @@ -1610,7 +1610,7 @@ IoReadPartitionTable(PDEVICE_OBJECT DeviceObject, ULONG SectorSize, BOOLEAN ReturnRecognizedPartitions, - PVOID PartitionBuffer) + PDRIVE_LAYOUT_INFORMATION *PartitionBuffer) { return(HalIoReadPartitionTable(DeviceObject, SectorSize, @@ -1623,7 +1623,7 @@ IoSetPartitionInformation(PDEVICE_OBJECT DeviceObject, ULONG SectorSize, ULONG PartitionNumber, - PDRIVE_LAYOUT_INFORMATION *PartitionType) + ULONG PartitionType) { return(HalIoSetPartitionInformation(DeviceObject, SectorSize,

1 0

[sedwards] 16243: break the tree for gcc 3.4.1 and gcc 4 at the request of Alex
by sedwards＠svn.reactos.com 23 Jun '05

23 Jun '05

break the tree for gcc 3.4.1 and gcc 4 at the request of Alex Modified: trunk/reactos/ntoskrnl/io/disk.c _____ Modified: trunk/reactos/ntoskrnl/io/disk.c --- trunk/reactos/ntoskrnl/io/disk.c 2005-06-23 12:38:13 UTC (rev 16242) +++ trunk/reactos/ntoskrnl/io/disk.c 2005-06-23 13:26:18 UTC (rev 16243) @@ -1623,7 +1623,7 @@ IoSetPartitionInformation(PDEVICE_OBJECT DeviceObject, ULONG SectorSize, ULONG PartitionNumber, - ULONG PartitionType) + PDRIVE_LAYOUT_INFORMATION *PartitionType) { return(HalIoSetPartitionInformation(DeviceObject, SectorSize, @@ -1637,7 +1637,7 @@ ULONG SectorSize, ULONG SectorsPerTrack, ULONG NumberOfHeads, - PVOID PartitionBuffer) + PDRIVE_LAYOUT_INFORMATION PartitionBuffer) { return(HalIoWritePartitionTable(DeviceObject, SectorSize,

1 0

[sedwards] 16242: one has to wonder if I am fixing a kernel build.....
by sedwards＠svn.reactos.com 23 Jun '05

23 Jun '05

one has to wonder if I am fixing a kernel build..... Modified: trunk/reactos/ntoskrnl/io/disk.c _____ Modified: trunk/reactos/ntoskrnl/io/disk.c --- trunk/reactos/ntoskrnl/io/disk.c 2005-06-23 12:22:32 UTC (rev 16241) +++ trunk/reactos/ntoskrnl/io/disk.c 2005-06-23 12:38:13 UTC (rev 16242) @@ -1610,7 +1610,7 @@ IoReadPartitionTable(PDEVICE_OBJECT DeviceObject, ULONG SectorSize, BOOLEAN ReturnRecognizedPartitions, - PDRIVE_LAYOUT_INFORMATION *PartitionBuffer) + PVOID PartitionBuffer) { return(HalIoReadPartitionTable(DeviceObject, SectorSize, @@ -1637,7 +1637,7 @@ ULONG SectorSize, ULONG SectorsPerTrack, ULONG NumberOfHeads, - PDRIVE_LAYOUT_INFORMATION PartitionBuffer) + PVOID PartitionBuffer) { return(HalIoWritePartitionTable(DeviceObject, SectorSize,

1 0

[ion] 16241: Revert accidental change
by ion＠svn.reactos.com 23 Jun '05

23 Jun '05

Revert accidental change Modified: trunk/reactos/w32api/include/ddk/win2k.h _____ Modified: trunk/reactos/w32api/include/ddk/win2k.h --- trunk/reactos/w32api/include/ddk/win2k.h 2005-06-23 10:34:16 UTC (rev 16240) +++ trunk/reactos/w32api/include/ddk/win2k.h 2005-06-23 12:22:32 UTC (rev 16241) @@ -64,7 +64,7 @@ IN PDEVICE_OBJECT DeviceObject, IN ULONG SectorSize, IN BOOLEAN ReturnRecognizedPartitions, - OUT PVOID PartitionBuffer); + OUT struct _DRIVE_LAYOUT_INFORMATION **PartitionBuffer); NTOSAPI NTSTATUS @@ -83,7 +83,7 @@ IN ULONG SectorSize, IN ULONG SectorsPerTrack, IN ULONG NumberOfHeads, - IN PVOID PartitionBuffer); + IN struct _DRIVE_LAYOUT_INFORMATION *PartitionBuffer); /* * PVOID MmGetSystemAddressForMdl(

1 0

[weiden] 16240: flag IsTokenRestricted() as @implemented
by weiden＠svn.reactos.com 23 Jun '05

23 Jun '05

flag IsTokenRestricted() as @implemented Modified: trunk/reactos/lib/advapi32/token/token.c _____ Modified: trunk/reactos/lib/advapi32/token/token.c --- trunk/reactos/lib/advapi32/token/token.c 2005-06-23 05:07:25 UTC (rev 16239) +++ trunk/reactos/lib/advapi32/token/token.c 2005-06-23 10:34:16 UTC (rev 16240) @@ -401,6 +401,10 @@ return Result; } + +/* + * @implemented + */ BOOL STDCALL IsTokenRestricted(HANDLE TokenHandle) {

1 0

[ion] 16239: Fix two more build issues caused by greatlod's d3d header change and ndk bug
by ion＠svn.reactos.com 23 Jun '05

23 Jun '05

Fix two more build issues caused by greatlod's d3d header change and ndk bug Modified: trunk/reactos/include/ddk/d3dhal.h Modified: trunk/reactos/include/ndk/obtypes.h Modified: trunk/reactos/include/ndk/umtypes.h _____ Modified: trunk/reactos/include/ddk/d3dhal.h --- trunk/reactos/include/ddk/d3dhal.h 2005-06-23 04:53:57 UTC (rev 16238) +++ trunk/reactos/include/ddk/d3dhal.h 2005-06-23 05:07:25 UTC (rev 16239) @@ -26,7 +26,7 @@ extern "C" { #endif -#include <ddrawi.h> +#include <ddk/ddrawi.h> #include <d3d.h> /*********************************************************************** ****** _____ Modified: trunk/reactos/include/ndk/obtypes.h --- trunk/reactos/include/ndk/obtypes.h 2005-06-23 04:53:57 UTC (rev 16238) +++ trunk/reactos/include/ndk/obtypes.h 2005-06-23 05:07:25 UTC (rev 16239) @@ -11,10 +11,6 @@ /* DEPENDENCIES **************************************************************/ -/* EXPORTED DATA *************************************************************/ -extern NTOSAPI POBJECT_TYPE ObDirectoryType; -extern NTOSAPI PDEVICE_MAP ObSystemDeviceMap; - /* CONSTANTS *****************************************************************/ /* Values for DosDeviceDriveType */ @@ -46,5 +42,39 @@ } OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION; /* FIXME: Add Object Structures Here */ +/* + * FIXME: These will eventually become centerfold in the compliant Ob Manager + * For now, they are only here so Device Map is properly defined before the header + * changes + */ +typedef struct _OBJECT_DIRECTORY_ENTRY +{ + struct _OBJECT_DIRECTORY_ENTRY *ChainLink; + PVOID Object; + ULONG HashValue; +} OBJECT_DIRECTORY_ENTRY, *POBJECT_DIRECTORY_ENTRY; +#define NUMBER_HASH_BUCKETS 37 +typedef struct _OBJECT_DIRECTORY +{ + struct _OBJECT_DIRECTORY_ENTRY *HashBuckets[NUMBER_HASH_BUCKETS]; + struct _EX_PUSH_LOCK *Lock; + struct _DEVICE_MAP *DeviceMap; + ULONG SessionId; +} OBJECT_DIRECTORY, *POBJECT_DIRECTORY; + +typedef struct _DEVICE_MAP +{ + POBJECT_DIRECTORY DosDevicesDirectory; + POBJECT_DIRECTORY GlobalDosDevicesDirectory; + ULONG ReferenceCount; + ULONG DriveMap; + UCHAR DriveType[32]; +} DEVICE_MAP, *PDEVICE_MAP; + +/* EXPORTED DATA *************************************************************/ + +extern NTOSAPI POBJECT_TYPE ObDirectoryType; +extern NTOSAPI PDEVICE_MAP ObSystemDeviceMap; + #endif _____ Modified: trunk/reactos/include/ndk/umtypes.h --- trunk/reactos/include/ndk/umtypes.h 2005-06-23 04:53:57 UTC (rev 16238) +++ trunk/reactos/include/ndk/umtypes.h 2005-06-23 05:07:25 UTC (rev 16239) @@ -104,6 +104,12 @@ #define FSCTL_PIPE_INTERNAL_READ_OVFLOW \ CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2048, METHOD_BUFFERED, FILE_READ_DATA) +/* Macros for current Process/Thread built-in 'special' ID */ +#define NtCurrentProcess() ( (HANDLE)(LONG_PTR) -1 ) +#define ZwCurrentProcess() NtCurrentProcess() +#define NtCurrentThread() ( (HANDLE)(LONG_PTR) -2 ) +#define ZwCurrentThread() NtCurrentThread() + /* Kernel Shared Data Constants */ #define PROCESSOR_FEATURE_MAX 64 #define SharedUserData ((KUSER_SHARED_DATA * CONST) USER_SHARED_DATA)

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