Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[hpoussin] 18238: Add SetupPromptReboot stub
by hpoussin＠svn.reactos.com 03 Oct '05

03 Oct '05

Add SetupPromptReboot stub In SetupInstallServicesFromInfSectionExW, LoadOrderGroup value is optional. Don't break if it is missing Modified: trunk/reactos/lib/setupapi/install.c Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/lib/setupapi/stubs.c _____ Modified: trunk/reactos/lib/setupapi/install.c --- trunk/reactos/lib/setupapi/install.c 2005-10-03 07:22:19 UTC (rev 18237) +++ trunk/reactos/lib/setupapi/install.c 2005-10-03 07:26:39 UTC (rev 18238) @@ -1087,11 +1087,8 @@ return FALSE; } if (!GetLineText(hinf, sectionname, L"LoadOrderGroup", &LoadOrderGroup)) - { - CloseServiceHandle(hSCManager); - HeapFree(GetProcessHeap(), 0, ServiceBinary); - return FALSE; - } + /* LoadOrderGroup value is optional. Ignore the error */ + LoadOrderGroup = NULL; /* Don't check return value, as these fields are optional and * GetLineText initialize output parameter even on failure */ _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-10-03 07:22:19 UTC (rev 18237) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-10-03 07:26:39 UTC (rev 18238) @@ -455,7 +455,7 @@ @ stdcall SetupOpenMasterInf() @ stub SetupPromptForDiskA @ stub SetupPromptForDiskW -@ stub SetupPromptReboot +@ stdcall SetupPromptReboot(ptr ptr long) @ stub SetupQueryDrivesInDiskSpaceListA @ stub SetupQueryDrivesInDiskSpaceListW @ stub SetupQueryFileLogA _____ Modified: trunk/reactos/lib/setupapi/stubs.c --- trunk/reactos/lib/setupapi/stubs.c 2005-10-03 07:22:19 UTC (rev 18237) +++ trunk/reactos/lib/setupapi/stubs.c 2005-10-03 07:26:39 UTC (rev 18238) @@ -125,6 +125,57 @@ } /*********************************************************************** + * SetupPromptReboot(SETUPAPI.@) + */ +INT WINAPI SetupPromptReboot(HSPFILEQ FileQueue, HWND Owner, BOOL ScanOnly) +{ +#if 0 + int ret; + TCHAR RebootText[RC_STRING_MAX_SIZE]; + TCHAR RebootCaption[RC_STRING_MAX_SIZE]; + INT rc = 0; + + TRACE("%p %p %d\n", FileQueue, Owner, ScanOnly); + + if (ScanOnly && !FileQueue) + { + SetLastError(ERROR_INVALID_PARAMETER); + return -1; + } + + if (FileQueue) + { + FIXME("Case 'FileQueue != NULL' not implemented\n"); + /* In some cases, do 'rc |= SPFILEQ_FILE_IN_USE' */ + } + + if (ScanOnly) + return rc; + + /* We need to ask the question to the user. */ + rc |= SPFILEQ_REBOOT_RECOMMENDED; + if (0 == LoadString(hInstance, IDS_QUERY_REBOOT_TEXT, RebootText, RC_STRING_MAX_SIZE)) + return -1; + if (0 == LoadString(hInstance, IDS_QUERY_REBOOT_CAPTION, RebootCaption, RC_STRING_MAX_SIZE)) + return -1; + ret = MessageBox(Owner, RebootText, RebootCaption, MB_YESNO | MB_DEFBUTTON1); + if (IDNO == ret) + return rc; + else + { + if (ExitWindowsEx(EWX_REBOOT, 0)) + return rc | SPFILEQ_REBOOT_IN_PROGRESS; + else + return -1; + } +#endif + FIXME("Stub %p %p %d\n", FileQueue, Owner, ScanOnly); + SetLastError(ERROR_GEN_FAILURE); + return -1; +} + + +/********************************************************************** * * SetupTerminateFileLog(SETUPAPI.@) */ BOOL WINAPI SetupTerminateFileLog(HANDLE FileLogHandle)

1 0

[hpoussin] 18237: Implement CM_Get_DevNode_Registry_Property_ExA
by hpoussin＠svn.reactos.com 03 Oct '05

03 Oct '05

Implement CM_Get_DevNode_Registry_Property_ExA Modified: trunk/reactos/lib/setupapi/cfgmgr.c _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-10-03 07:15:12 UTC (rev 18236) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-10-03 07:22:19 UTC (rev 18237) @@ -779,11 +779,67 @@ DEVINST dnDevInst, ULONG ulProperty, PULONG pulRegDataType, PVOID Buffer, PULONG pulLength, ULONG ulFlags, HMACHINE hMachine) { - FIXME("%lx %lu %p %p %p %lx %lx\n", + PVOID BufferW; + ULONG LengthW; + ULONG RegDataType; + CONFIGRET ret; + + TRACE("%lx %lu %p %p %p %lx %lx\n", dnDevInst, ulProperty, pulRegDataType, Buffer, pulLength, ulFlags, hMachine); - return CR_CALL_NOT_IMPLEMENTED; + if (!pulLength) + return CR_INVALID_POINTER; + + LengthW = *pulLength * sizeof(WCHAR); + BufferW = HeapAlloc(GetProcessHeap(), 0, LengthW); + + if (!BufferW) + return CR_OUT_OF_MEMORY; + + ret = CM_Get_DevNode_Registry_Property_ExW(dnDevInst, + ulProperty, + &RegDataType, + BufferW, + &LengthW, + ulFlags, + hMachine); + + if (ret == CR_SUCCESS) + { + if (RegDataType == REG_SZ || RegDataType == REG_EXPAND_SZ) + { + /* Do W->A conversion */ + *pulLength = WideCharToMultiByte(CP_ACP, + 0, + BufferW, + lstrlenW(BufferW) + 1, + Buffer, + *pulLength, + NULL, + NULL); + if (*pulLength == 0) + ret = CR_FAILURE; + } + else + { + /* Directly copy the value */ + if (LengthW <= *pulLength) + memcpy(Buffer, BufferW, LengthW); + else + { + *pulLength = LengthW; + ret = CR_BUFFER_SMALL; + } + } + } + + if (pulRegDataType) + *pulRegDataType = RegDataType; + + HeapFree(GetProcessHeap(), 0, BufferW); + + return ret; } @@ -801,7 +857,7 @@ ULONG ulDataType = 0; ULONG ulTransferLength = 0; - FIXME("%lx %lu %p %p %p %lx %lx\n", + TRACE("%lx %lu %p %p %p %lx %lx\n", dnDevInst, ulProperty, pulRegDataType, Buffer, pulLength, ulFlags, hMachine);

1 0

[hpoussin] 18236: Replace STDCALL by NTAPI
by hpoussin＠svn.reactos.com 03 Oct '05

03 Oct '05

Replace STDCALL by NTAPI Little changes in vfat.h to be able to compile with MSVC Modified: trunk/reactos/drivers/fs/vfat/blockdev.c Modified: trunk/reactos/drivers/fs/vfat/fastio.c Modified: trunk/reactos/drivers/fs/vfat/iface.c Modified: trunk/reactos/drivers/fs/vfat/misc.c Modified: trunk/reactos/drivers/fs/vfat/shutdown.c Modified: trunk/reactos/drivers/fs/vfat/vfat.h _____ Modified: trunk/reactos/drivers/fs/vfat/blockdev.c --- trunk/reactos/drivers/fs/vfat/blockdev.c 2005-10-03 07:06:42 UTC (rev 18235) +++ trunk/reactos/drivers/fs/vfat/blockdev.c 2005-10-03 07:15:12 UTC (rev 18236) @@ -15,7 +15,7 @@ /* FUNCTIONS ***************************************************************/ -static NTSTATUS STDCALL +static NTSTATUS NTAPI VfatReadWritePartialCompletion (IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context) _____ Modified: trunk/reactos/drivers/fs/vfat/fastio.c --- trunk/reactos/drivers/fs/vfat/fastio.c 2005-10-03 07:06:42 UTC (rev 18235) +++ trunk/reactos/drivers/fs/vfat/fastio.c 2005-10-03 07:15:12 UTC (rev 18236) @@ -3,14 +3,14 @@ * PURPOSE: Fast IO routines. * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * PROGRAMMER: Herve Poussineau (reactos(a)poussine.freesurf.fr) + * PROGRAMMER: Herve Poussineau (hpoussin(a)reactos.org) * Hartmut Birr */ #define NDEBUG #include "vfat.h" -BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoCheckIfPossible(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Lenght, @@ -25,7 +25,7 @@ return FALSE; } -BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoRead(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -39,13 +39,13 @@ return FALSE; } -BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoWrite(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, - IN ULONG Length, + IN ULONG Length, IN BOOLEAN Wait, IN ULONG LockKey, - OUT PVOID Buffer, + OUT PVOID Buffer, OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject) { @@ -53,18 +53,18 @@ return FALSE; } -BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoQueryBasicInfo(IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, OUT PFILE_BASIC_INFORMATION Buffer, - OUT PIO_STATUS_BLOCK IoStatus, + OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject) { DPRINT("VfatFastIoQueryBasicInfo()\n"); return FALSE; } -BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoQueryStandardInfo(IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, OUT PFILE_STANDARD_INFORMATION Buffer, @@ -75,7 +75,7 @@ return FALSE; } -BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoLock(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN PLARGE_INTEGER Length, @@ -90,7 +90,7 @@ return FALSE; } -BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoUnlockSingle(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN PLARGE_INTEGER Length, @@ -103,7 +103,7 @@ return FALSE; } -BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoUnlockAll(IN PFILE_OBJECT FileObject, PEPROCESS ProcessId, OUT PIO_STATUS_BLOCK IoStatus, @@ -113,7 +113,7 @@ return FALSE; } -BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoUnlockAllByKey(IN PFILE_OBJECT FileObject, PEPROCESS ProcessId, ULONG Key, @@ -124,7 +124,7 @@ return FALSE; } -BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoDeviceControl(IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, IN PVOID InputBuffer OPTIONAL, @@ -139,26 +139,26 @@ return FALSE; } -VOID STDCALL +VOID NTAPI VfatAcquireFileForNtCreateSection(IN PFILE_OBJECT FileObject) { DPRINT("VfatAcquireFileForNtCreateSection\n"); } -VOID STDCALL +VOID NTAPI VfatReleaseFileForNtCreateSection(IN PFILE_OBJECT FileObject) { DPRINT("VfatReleaseFileForNtCreateSection\n"); } -VOID STDCALL +VOID NTAPI VfatFastIoDetachDevice(IN PDEVICE_OBJECT SourceDevice, IN PDEVICE_OBJECT TargetDevice) { DPRINT("VfatFastIoDetachDevice\n"); } -BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoQueryNetworkOpenInfo(IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, OUT PFILE_NETWORK_OPEN_INFORMATION Buffer, @@ -169,7 +169,7 @@ return FALSE; } -NTSTATUS STDCALL +NTSTATUS NTAPI VfatAcquireForModWrite(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER EndingOffset, OUT PERESOURCE* ResourceToRelease, @@ -179,7 +179,7 @@ return STATUS_UNSUCCESSFUL; } -BOOLEAN STDCALL +BOOLEAN NTAPI VfatMdlRead(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -192,7 +192,7 @@ return FALSE; } -BOOLEAN STDCALL +BOOLEAN NTAPI VfatMdlReadComplete(IN PFILE_OBJECT FileObject, IN PMDL MdlChain, IN PDEVICE_OBJECT DeviceObject) @@ -201,7 +201,7 @@ return FALSE; } -BOOLEAN STDCALL +BOOLEAN NTAPI VfatPrepareMdlWrite(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -214,7 +214,7 @@ return FALSE; } -BOOLEAN STDCALL +BOOLEAN NTAPI VfatMdlWriteComplete(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN PMDL MdlChain, @@ -224,7 +224,7 @@ return FALSE; } -BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoReadCompressed(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -240,10 +240,10 @@ return FALSE; } -BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoWriteCompressed(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, - IN ULONG Length, + IN ULONG Length, IN ULONG LockKey, IN PVOID Buffer, OUT PMDL* MdlChain, @@ -256,7 +256,7 @@ return FALSE; } -BOOLEAN STDCALL +BOOLEAN NTAPI VfatMdlReadCompleteCompressed(IN PFILE_OBJECT FileObject, IN PMDL MdlChain, IN PDEVICE_OBJECT DeviceObject) @@ -265,7 +265,7 @@ return FALSE; } -BOOLEAN STDCALL +BOOLEAN NTAPI VfatMdlWriteCompleteCompressed(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN PMDL MdlChain, @@ -275,16 +275,16 @@ return FALSE; } -BOOLEAN STDCALL +BOOLEAN NTAPI VfatFastIoQueryOpen(IN PIRP Irp, OUT PFILE_NETWORK_OPEN_INFORMATION NetworkInformation, - IN PDEVICE_OBJECT DeviceObject) + IN PDEVICE_OBJECT DeviceObject) { DPRINT("VfatFastIoQueryOpen\n"); return FALSE; } -NTSTATUS STDCALL +NTSTATUS NTAPI VfatReleaseForModWrite(IN PFILE_OBJECT FileObject, IN PERESOURCE ResourceToRelease, IN PDEVICE_OBJECT DeviceObject) @@ -293,7 +293,7 @@ return STATUS_UNSUCCESSFUL; } -NTSTATUS STDCALL +NTSTATUS NTAPI VfatAcquireForCcFlush(IN PFILE_OBJECT FileObject, IN PDEVICE_OBJECT DeviceObject) { @@ -301,7 +301,7 @@ return STATUS_UNSUCCESSFUL; } -NTSTATUS STDCALL +NTSTATUS NTAPI VfatReleaseForCcFlush(IN PFILE_OBJECT FileObject, IN PDEVICE_OBJECT DeviceObject) { @@ -309,11 +309,11 @@ return STATUS_UNSUCCESSFUL; } -BOOLEAN STDCALL +BOOLEAN NTAPI VfatAcquireForLazyWrite(IN PVOID Context, IN BOOLEAN Wait) { - PVFATFCB Fcb = (PVFATFCB)Context; + PVFATFCB Fcb = (PVFATFCB)Context; ASSERT(Fcb); DPRINT("VfatAcquireForLazyWrite(): Fcb %p\n", Fcb); @@ -325,21 +325,21 @@ return TRUE; } -VOID STDCALL +VOID NTAPI VfatReleaseFromLazyWrite(IN PVOID Context) { - PVFATFCB Fcb = (PVFATFCB)Context; + PVFATFCB Fcb = (PVFATFCB)Context; ASSERT(Fcb); DPRINT("VfatReleaseFromLazyWrite(): Fcb %p\n", Fcb); ExReleaseResourceLite(&(Fcb->MainResource)); } -BOOLEAN STDCALL +BOOLEAN NTAPI VfatAcquireForReadAhead(IN PVOID Context, IN BOOLEAN Wait) { - PVFATFCB Fcb = (PVFATFCB)Context; + PVFATFCB Fcb = (PVFATFCB)Context; ASSERT(Fcb); DPRINT("VfatAcquireForReadAhead(): Fcb %p\n", Fcb); @@ -349,12 +349,12 @@ return FALSE; } return TRUE; -} +} -VOID STDCALL +VOID NTAPI VfatReleaseFromReadAhead(IN PVOID Context) { - PVFATFCB Fcb = (PVFATFCB)Context; + PVFATFCB Fcb = (PVFATFCB)Context; ASSERT(Fcb); DPRINT("VfatReleaseFromReadAhead(): Fcb %p\n", Fcb); @@ -394,4 +394,3 @@ FastIoDispatch->ReleaseForCcFlush = VfatReleaseForCcFlush; } - _____ Modified: trunk/reactos/drivers/fs/vfat/iface.c --- trunk/reactos/drivers/fs/vfat/iface.c 2005-10-03 07:06:42 UTC (rev 18235) +++ trunk/reactos/drivers/fs/vfat/iface.c 2005-10-03 07:15:12 UTC (rev 18236) @@ -35,7 +35,7 @@ /* FUNCTIONS ****************************************************************/ -NTSTATUS STDCALL +NTSTATUS NTAPI DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) /* _____ Modified: trunk/reactos/drivers/fs/vfat/misc.c --- trunk/reactos/drivers/fs/vfat/misc.c 2005-10-03 07:06:42 UTC (rev 18235) +++ trunk/reactos/drivers/fs/vfat/misc.c 2005-10-03 07:15:12 UTC (rev 18236) @@ -136,7 +136,7 @@ } } -NTSTATUS STDCALL VfatBuildRequest ( +NTSTATUS NTAPI VfatBuildRequest ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -222,7 +222,7 @@ return IrpContext; } -VOID STDCALL VfatDoRequest (PVOID IrpContext) +VOID NTAPI VfatDoRequest (PVOID IrpContext) { InterlockedDecrement(&QueueCount); DPRINT ("VfatDoRequest (IrpContext %x), MajorFunction %x, %d\n", IrpContext, ((PVFAT_IRP_CONTEXT)IrpContext)->MajorFunction, QueueCount); _____ Modified: trunk/reactos/drivers/fs/vfat/shutdown.c --- trunk/reactos/drivers/fs/vfat/shutdown.c 2005-10-03 07:06:42 UTC (rev 18235) +++ trunk/reactos/drivers/fs/vfat/shutdown.c 2005-10-03 07:15:12 UTC (rev 18236) @@ -41,7 +41,7 @@ return Status; } -NTSTATUS STDCALL +NTSTATUS NTAPI VfatShutdown(PDEVICE_OBJECT DeviceObject, PIRP Irp) { NTSTATUS Status; _____ Modified: trunk/reactos/drivers/fs/vfat/vfat.h --- trunk/reactos/drivers/fs/vfat/vfat.h 2005-10-03 07:06:42 UTC (rev 18235) +++ trunk/reactos/drivers/fs/vfat/vfat.h 2005-10-03 07:15:12 UTC (rev 18236) @@ -1,14 +1,18 @@ -/* $Id$ */ +#include <debug.h> +#include <ntifs.h> +#include <ntdddisk.h> -#include <ddk/ntifs.h> -#include <ddk/ntdddisk.h> +#ifdef __GNUC__ #include <ndk/ntndk.h> -#include <reactos/helper.h> #include <ccros.h> -#include <limits.h> -#include <debug.h> #define USE_ROS_CC_AND_FS +#else +#define KEBUGCHECK KeBugCheck +#define KEBUGCHECKEX KeBugCheckEx +#define ROUND_DOWN(N, S) ((N) - ((N) % (S))) +#define ROUND_UP(N, S) ROUND_DOWN((N) + (S) - 1, (S)) +#endif #include <pshpack1.h> struct _BootSector @@ -419,7 +423,7 @@ /* ------------------------------------------------------ shutdown.c */ -NTSTATUS STDCALL VfatShutdown (PDEVICE_OBJECT DeviceObject, +NTSTATUS NTAPI VfatShutdown (PDEVICE_OBJECT DeviceObject, PIRP Irp); /* -------------------------------------------------------- volume.c */ @@ -538,7 +542,7 @@ /* --------------------------------------------------------- iface.c */ -NTSTATUS STDCALL DriverEntry (PDRIVER_OBJECT DriverObject, +NTSTATUS NTAPI DriverEntry (PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath); /* --------------------------------------------------------- dirwr.c */ @@ -722,7 +726,7 @@ VOID VfatFreeIrpContext(PVFAT_IRP_CONTEXT IrpContext); -NTSTATUS STDCALL VfatBuildRequest (PDEVICE_OBJECT DeviceObject, +NTSTATUS NTAPI VfatBuildRequest (PDEVICE_OBJECT DeviceObject, PIRP Irp); PVOID VfatGetUserBuffer(IN PIRP);

1 0

[hpoussin] 18235: Map status codes to CONFIGRET error codes
by hpoussin＠svn.reactos.com 03 Oct '05

03 Oct '05

Map status codes to CONFIGRET error codes Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-10-03 00:51:24 UTC (rev 18234) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-10-03 07:06:42 UTC (rev 18235) @@ -112,6 +112,21 @@ } +static CONFIGRET WINAPI +NtStatusToCrError(NTSTATUS Status) +{ + switch (Status) + { + case STATUS_NO_SUCH_DEVICE: + return CR_NO_SUCH_DEVINST; + default: + /* FIXME: add more mappings */ + DPRINT1("Unable to map status 0x%08lx\n", Status); + return CR_FAILURE; + } +} + + CONFIGRET PNP_GetVersion(handle_t BindingHandle, unsigned short *Version) @@ -235,8 +250,7 @@ sizeof(PLUGPLAY_CONTROL_RELATED_DEVICE_DATA)); if (!NT_SUCCESS(Status)) { - /* FIXME: Map Status to ret */ - ret = CR_FAILURE; + ret = NtStatusToCrError(Status); } DPRINT("PNP_GetRelatedDeviceInstance() done (returns %lx)\n", ret); @@ -341,7 +355,7 @@ } else { - ret = CR_FAILURE; /* FIXME */ + ret = NtStatusToCrError(Status); } DPRINT("PNP_GetDepth() done (returns %lx)\n", ret); @@ -639,7 +653,7 @@ } else { - ret = CR_FAILURE; /* FIXME */ + ret = NtStatusToCrError(Status); } } @@ -767,7 +781,7 @@ } else { - ret = CR_FAILURE; /* FIXME */ + ret = NtStatusToCrError(Status); } DPRINT("PNP_GetDeviceStatus() done (returns %lx)\n", ret);

1 0

[turner] 18234: fix detection of missing target. thanks to thomas.
by turner＠svn.reactos.com 03 Oct '05

03 Oct '05

fix detection of missing target. thanks to thomas. Modified: trunk/reactos/subsys/system/cmd/internal.c _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-10-03 00:26:39 UTC (rev 18233) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-10-03 00:51:24 UTC (rev 18234) @@ -566,6 +566,7 @@ return 1; } + dir[0] = 0; /* check for options anywhere in command line */ for (i = 0; i < args; i++) { @@ -592,7 +593,7 @@ } } - if (!dir) + if (dir[0] == _T('\0')) { /* No folder to remove */ ConErrResPuts(STRING_ERROR_REQ_PARAM_MISSING);

1 0

[turner] 18233: allocate memory for the string. thanks to thomas for finding it.
by turner＠svn.reactos.com 03 Oct '05

03 Oct '05

allocate memory for the string. thanks to thomas for finding it. Modified: trunk/reactos/subsys/system/cmd/internal.c _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-10-02 20:17:59 UTC (rev 18232) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-10-03 00:26:39 UTC (rev 18233) @@ -535,7 +535,7 @@ } INT cmd_rmdir (LPTSTR cmd, LPTSTR param) { - LPTSTR dir; /* pointer to the directory to change to */ + TCHAR dir[MAX_PATH]; /* pointer to the directory to change to */ char ch; INT args; LPTSTR *arg = NULL;

1 0

[turner] 18232: Implemented /S and /Q in remove directory.
by turner＠svn.reactos.com 02 Oct '05

02 Oct '05

Implemented /S and /Q in remove directory. Added a check for files in the folder. This fixes bug 742. Updated res file, translators please update sometime soon. Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/internal.c Modified: trunk/reactos/subsys/system/cmd/resource.h _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-10-02 20:03:20 UTC (rev 18231) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-10-02 20:17:59 UTC (rev 18232) @@ -364,7 +364,10 @@ STRING_REM_HELP, "Starts a comment line in a batch file.\n\nREM [Comment]" STRING_RMDIR_HELP, "Removes a directory.\n\n\ -RMDIR [drive:]path\nRD [drive:]path" +RMDIR [drive:]path\nRD [drive:]path\n\ +/S Deletes all files and folders within target\n\ +/Q Doesnt prompt for user\n" +STRING_RMDIR_HELP2, "Directory is not empty!\n" STRING_REN_HELP1, "Renames a file/directory or files/directories.\n\n\ RENAME [/E /N /P /Q /S /T] old_name ... new_name\n\ _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-10-02 20:03:20 UTC (rev 18231) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-10-02 20:17:59 UTC (rev 18232) @@ -499,68 +499,163 @@ * RD / RMDIR * */ +BOOL DeleteFolder(LPTSTR FileName) +{ + TCHAR Base[MAX_PATH]; + TCHAR TempFileName[MAX_PATH]; + HANDLE hFile; + WIN32_FIND_DATA f; + _tcscpy(Base,FileName); + _tcscat(Base,_T("\\*")); + hFile = FindFirstFile(Base, &f); + Base[_tcslen(Base) - 1] = _T('\0'); + if (hFile != INVALID_HANDLE_VALUE) + { + do + { + if (!_tcscmp(f.cFileName, _T(".")) || + !_tcscmp(f.cFileName, _T(".."))) + continue; + _tcscpy(TempFileName,Base); + _tcscat(TempFileName,f.cFileName); + + if(f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + DeleteFolder(TempFileName); + else + { + SetFileAttributes(TempFileName,FILE_ATTRIBUTE_NORMAL); + if(!DeleteFile(TempFileName)) + return 0; + } + + }while (FindNextFile (hFile, &f)); + FindClose (hFile); + } + return RemoveDirectory(FileName); +} INT cmd_rmdir (LPTSTR cmd, LPTSTR param) { LPTSTR dir; /* pointer to the directory to change to */ - LPTSTR place; /* used to search for the \ when no space is used */ - - LPTSTR *p = NULL; - INT argc; - + char ch; + INT args; + LPTSTR *arg = NULL; + INT i; + BOOL RD_SUB = FALSE; + BOOL RD_QUIET = FALSE; + HANDLE hFile; + WIN32_FIND_DATA f; + INT res; + TCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szFullPath[MAX_PATH]; + if (!_tcsncmp (param, _T("/?"), 2)) { ConOutResPaging(TRUE,STRING_RMDIR_HELP); return 0; } - /* check if there is no space between the command and the path */ - if (param[0] == _T('\0')) + nErrorLevel = 0; + + arg = split (param, &args, FALSE); + + if (args == 0) { - /* search for the \ or . so that both short & long names will work */ - for (place = cmd; *place; place++) - if (*place == _T('.') || *place == _T('\\')) - break; + /* only command given */ + error_req_param_missing (); + freep (arg); + return 1; + } - if (*place) - dir = place; - else - /* signal that there are no parameters */ - dir = NULL; - } - else + /* check for options anywhere in command line */ + for (i = 0; i < args; i++) { - p = split (param, &argc, FALSE); - if (argc > 1) + if (*arg[i] == _T('/')) { - /*JPP 20-Jul-1998 use standard error message */ - error_too_many_parameters (param); - freep (p); - return 1; + /*found a command, but check to make sure it has something after it*/ + if (_tcslen (arg[i]) == 2) + { + ch = _totupper (arg[i][1]); + if (ch == _T('S')) + { + RD_SUB = TRUE; + } + else if (ch == _T('Q')) + { + RD_QUIET = TRUE; + } + } } else - dir = p[0]; + { + /* get the folder name */ + _tcscpy(dir,arg[i]); + } } - + if (!dir) { + /* No folder to remove */ ConErrResPuts(STRING_ERROR_REQ_PARAM_MISSING); + freep(arg); return 1; } + GetFullPathName(dir,MAX_PATH,szFullPath,NULL); /* remove trailing \ if any, but ONLY if dir is not the root dir */ - if (_tcslen (dir) >= 2 && dir[_tcslen (dir) - 1] == _T('\\')) - dir[_tcslen(dir) - 1] = _T('\0'); + if (_tcslen (szFullPath) >= 2 && szFullPath[_tcslen (szFullPath) - 1] == _T('\\')) + szFullPath[_tcslen(szFullPath) - 1] = _T('\0'); - if (!RemoveDirectory (dir)) + if(RD_SUB) { + /* ask if they want to delete evrything in the folder */ + if (!RD_QUIET) + { + LoadString( CMD_ModuleHandle, STRING_DEL_HELP2, szMsg, RC_STRING_MAX_SIZE); + res = FilePromptYNA (szMsg); + if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) + { + freep(arg); + nErrorLevel = 1; + return 1; + } + } + + } + else + { + /* check for files in the folder */ + _tcscat(szFullPath,_T("\\*")); + + hFile = FindFirstFile(szFullPath, &f); + if (hFile != INVALID_HANDLE_VALUE) + { + do + { + if (!_tcscmp(f.cFileName,_T(".")) || + !_tcscmp(f.cFileName,_T(".."))) + continue; + ConOutResPuts(STRING_RMDIR_HELP2); + freep(arg); + FindClose (hFile); + nErrorLevel = 1; + return 1; + }while (FindNextFile (hFile, &f)); + FindClose (hFile); + } + /* reovme the \\* */ + szFullPath[_tcslen(szFullPath) - 2] = _T('\0'); + } + + if (!DeleteFolder(szFullPath)) + { + /* Couldnt delete the folder, clean up and print out the error */ ErrorMessage (GetLastError(), _T("RD")); - freep (p); - + freep (arg); + nErrorLevel = 1; return 1; } - freep (p); - + freep (arg); return 0; } #endif _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-10-02 20:03:20 UTC (rev 18231) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-10-02 20:17:59 UTC (rev 18232) @@ -219,7 +219,9 @@ #define STRING_EXPECTED_CLOSE_PAREN 721 #define STRING_EXPECTED_NUMBER_OR_VARIABLE 722 #define STRING_SYNTAX_COMMAND_INCORRECT 723 +#define STRING_RMDIR_HELP2 724 + /* These strings are language independent (cmd.rc) */ #define STRING_FREEDOS_DEV 800 #define STRING_REACTOS_DEV 801

1 0

[ea] 18231: add comp.exe (optional).
by ea＠svn.reactos.com 02 Oct '05

02 Oct '05

add comp.exe (optional). Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-10-02 19:39:30 UTC (rev 18230) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-10-02 20:03:20 UTC (rev 18231) @@ -298,6 +298,7 @@ modules\rosky\lib\libskygi\libskygi.dll 1 optional modules\vms\server\vmssrv.dll 1 optional modules\vms\lib\vmsdll\vmsdll.dll 1 optional +modules\rosapps\cmdutils\comp\comp.exe 1 optional modules\rosapps\cmdutils\find\find.exe 1 optional modules\rosapps\cmdutils\mode\mode.exe 1 optional modules\rosapps\cmdutils\more\more.exe 1 optional

1 0

[ea] 18230: More fixes to compile.
by ea＠svn.reactos.com 02 Oct '05

02 Oct '05

More fixes to compile. Modified: trunk/reactos/subsys/csr/csrsrv/api.c Modified: trunk/reactos/subsys/csr/csrsrv/process.c _____ Modified: trunk/reactos/subsys/csr/csrsrv/api.c --- trunk/reactos/subsys/csr/csrsrv/api.c 2005-10-02 19:31:30 UTC (rev 18229) +++ trunk/reactos/subsys/csr/csrsrv/api.c 2005-10-02 19:39:30 UTC (rev 18230) @@ -1124,13 +1124,13 @@ CsrCaptureArguments(IN PCSR_THREAD CsrThread, IN PCSR_API_MESSAGE ApiMessage) { - PCSR_CAPTURE_BUFFER LocalCaptureBuffer; - ULONG LocalLength; - PCSR_CAPTURE_BUFFER RemoteCaptureBuffer; - SIZE_T BufferDistance; - ULONG PointerCount; - ULONG_PTR **PointerOffsets; - ULONG_PTR *CurrentPointer; + PCSR_CAPTURE_BUFFER LocalCaptureBuffer = NULL; + ULONG LocalLength = 0; + PCSR_CAPTURE_BUFFER RemoteCaptureBuffer = NULL; + SIZE_T BufferDistance = 0; + ULONG PointerCount = 0; + ULONG_PTR **PointerOffsets = NULL; + ULONG_PTR *CurrentPointer = NULL; /* Use SEH to make sure this is valid */ _SEH_TRY _____ Modified: trunk/reactos/subsys/csr/csrsrv/process.c --- trunk/reactos/subsys/csr/csrsrv/process.c 2005-10-02 19:31:30 UTC (rev 18229) +++ trunk/reactos/subsys/csr/csrsrv/process.c 2005-10-02 19:39:30 UTC (rev 18230) @@ -1097,12 +1097,12 @@ ULONG Flags) { PLIST_ENTRY ListHead, NextEntry; - PCSR_PROCESS CsrProcess; + PCSR_PROCESS CsrProcess = NULL; NTSTATUS Status = STATUS_UNSUCCESSFUL; BOOLEAN FirstTry = TRUE; - ULONG i; - PCSR_SERVER_DLL ServerDll; - ULONG Result; + ULONG i = 0; + PCSR_SERVER_DLL ServerDll = NULL; + ULONG Result = 0; /* Acquire process lock */ CsrAcquireProcessLock();

1 0

[ea] 18229: Modify to conform to the new CSR.
by ea＠svn.reactos.com 02 Oct '05

02 Oct '05

Modify to conform to the new CSR. Modified: trunk/vms/server/server.c Modified: trunk/vms/server/vmssrv.def _____ Modified: trunk/vms/server/server.c --- trunk/vms/server/server.c 2005-10-02 18:31:50 UTC (rev 18228) +++ trunk/vms/server/server.c 2005-10-02 19:31:30 UTC (rev 18229) @@ -32,35 +32,37 @@ /********************************************************************** * NAME PRIVATE - * VmsStaticServerThread/1 + * VmsApiNull/2 */ -VOID STDCALL VmsStaticServerThread (PVOID x) +NTSTATUS NTAPI VmsApiNull (IN OUT PCSR_API_MESSAGE ApiMessage, + IN OUT PULONG Reply) { - NTSTATUS Status = STATUS_SUCCESS; - PPORT_MESSAGE Request = (PPORT_MESSAGE) x; - PPORT_MESSAGE Reply = NULL; - ULONG MessageType = 0; - DPRINT("VMSSRV: %s called\n", __FUNCTION__); - MessageType = Request->u2.s2.Type; - DPRINT("VMSSRV: %s received a message (Type=%d)\n", - __FUNCTION__, MessageType); - switch (MessageType) - { - default: - Reply = Request; - Status = NtReplyPort (VmsApiPort, Reply); - break; - } + *Reply = 0; + return STATUS_SUCCESS; } +PCSR_API_ROUTINE VmsServerApiDispatchTable [1] = +{ + VmsApiNull +}; + +BOOLEAN VmsServerApiValidTable [1] = +{ + TRUE +}; + +PCHAR VmsServerApiNameTable [1] = +{ + "Null", +}; + /*===================================================================== * PUBLIC API *===================================================================*/ -NTSTATUS STDCALL ServerDllInitialization (ULONG ArgumentCount, - LPWSTR *Argument) +NTSTATUS NTAPI ServerDllInitialization (PCSR_SERVER_DLL LoadedServerDll) { NTSTATUS Status = STATUS_SUCCESS; @@ -70,14 +72,18 @@ VmsApiPort = CsrQueryApiPort (); if (NULL == VmsApiPort) { - return STATUS_UNSUCCESSFUL; + Status = STATUS_UNSUCCESSFUL; + } else { + // Set CSR information + LoadedServerDll->ApiBase = 0; + LoadedServerDll->HighestApiSupported = 0; + LoadedServerDll->DispatchTable = VmsServerApiDispatchTable; + LoadedServerDll->ValidTable = VmsServerApiValidTable; + LoadedServerDll->NameTable = VmsServerApiNameTable; + LoadedServerDll->SizeOfProcessData = 0; + LoadedServerDll->ConnectCallback = NULL; + LoadedServerDll->DisconnectCallback = NULL; } - // Register our message dispatcher - Status = CsrAddStaticServerThread (VmsStaticServerThread); - if (NT_SUCCESS(Status)) - { - //TODO: perform the real VMS server internal initialization here - } return Status; } _____ Modified: trunk/vms/server/vmssrv.def --- trunk/vms/server/vmssrv.def 2005-10-02 18:31:50 UTC (rev 18228) +++ trunk/vms/server/vmssrv.def 2005-10-02 19:31:30 UTC (rev 18229) @@ -1,3 +1,3 @@ LIBRARY vmssrv.dll EXPORTS -ServerDllInitialization@8 +ServerDllInitialization@4

1 0

← Newer
1
...
66
67
68
69
70
71
72
73
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2005