Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[weiden] 15199: fixed some more warnings
by weiden＠svn.reactos.com 10 May '05

10 May '05

fixed some more warnings Modified: trunk/reactos/apps/utils/net/ftp/fake.c Modified: trunk/reactos/apps/utils/net/ping/ping.c Modified: trunk/reactos/apps/utils/net/telnet/src/ansiprsr.cpp Modified: trunk/reactos/apps/utils/net/telnet/src/ansiprsr.h Modified: trunk/reactos/apps/utils/net/whois/whois.c _____ Modified: trunk/reactos/apps/utils/net/ftp/fake.c --- trunk/reactos/apps/utils/net/ftp/fake.c 2005-05-10 06:17:54 UTC (rev 15198) +++ trunk/reactos/apps/utils/net/ftp/fake.c 2005-05-10 08:04:08 UTC (rev 15199) @@ -92,7 +92,7 @@ { static int index = 0; static int total = 0; - static unsigned char buffer[4096]; + static char buffer[4096]; if (index == total) { _____ Modified: trunk/reactos/apps/utils/net/ping/ping.c --- trunk/reactos/apps/utils/net/ping/ping.c 2005-05-10 06:17:54 UTC (rev 15198) +++ trunk/reactos/apps/utils/net/ping/ping.c 2005-05-10 08:04:08 UTC (rev 15199) @@ -467,7 +467,7 @@ { INT Status; SOCKADDR From; - UINT Length; + INT Length; PVOID Buffer; UINT Size; PICMP_ECHO_PACKET Packet; _____ Modified: trunk/reactos/apps/utils/net/telnet/src/ansiprsr.cpp --- trunk/reactos/apps/utils/net/telnet/src/ansiprsr.cpp 2005-05-10 06:17:54 UTC (rev 15198) +++ trunk/reactos/apps/utils/net/telnet/src/ansiprsr.cpp 2005-05-10 08:04:08 UTC (rev 15199) @@ -53,6 +53,8 @@ #include <string.h> #include "ansiprsr.h" +const int ANSIColors[] = {BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE}; + // The constructor now takes different arguments and initializes different // variables (Paul Brannan 6/15/98) TANSIParser::TANSIParser(TConsole &RefConsole, KeyTranslator &RefKeyTrans, _____ Modified: trunk/reactos/apps/utils/net/telnet/src/ansiprsr.h --- trunk/reactos/apps/utils/net/telnet/src/ansiprsr.h 2005-05-10 06:17:54 UTC (rev 15198) +++ trunk/reactos/apps/utils/net/telnet/src/ansiprsr.h 2005-05-10 08:04:08 UTC (rev 15199) @@ -10,7 +10,7 @@ // added this color table to make things go faster (Paul Branann 5/8/98) enum Colors {BLACK=0, BLUE, GREEN, CYAN, RED, MAGENTA, YELLOW, WHITE}; -static const int ANSIColors[] = {BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE}; +extern const int ANSIColors[]; // This should be greater than the largest conceivable window size // 200 should suffice _____ Modified: trunk/reactos/apps/utils/net/whois/whois.c --- trunk/reactos/apps/utils/net/whois/whois.c 2005-05-10 06:17:54 UTC (rev 15198) +++ trunk/reactos/apps/utils/net/whois/whois.c 2005-05-10 08:04:08 UTC (rev 15199) @@ -52,6 +52,7 @@ /* #include <netinet/in.h> */ /* #include <netdb.h> */ #include <stdio.h> +#include <stdlib.h> /* #include <various.h> */ #include <getopt.h>

1 0

[weiden] 15198: - disable -Werror for lib/mesa32 to get it to compile with GCC4, however, an upgrade to 6.2.1 would solve these problems
by weiden＠svn.reactos.com 10 May '05

10 May '05

- disable -Werror for lib/mesa32 to get it to compile with GCC4, however, an upgrade to 6.2.1 would solve these problems - fixed a few more warnings, the the tree should now fully compile and work with GCC4 Modified: trunk/reactos/drivers/net/npf/time_calls.c Modified: trunk/reactos/drivers/storage/atapi/atapi.c Modified: trunk/reactos/drivers/storage/disk/disk.c Modified: trunk/reactos/lib/mesa32/Makefile _____ Modified: trunk/reactos/drivers/net/npf/time_calls.c --- trunk/reactos/drivers/net/npf/time_calls.c 2005-05-10 06:13:39 UTC (rev 15197) +++ trunk/reactos/drivers/net/npf/time_calls.c 2005-05-10 06:17:54 UTC (rev 15198) @@ -54,6 +54,8 @@ tmp.tv_usec-=(LONG)((PTime.QuadPart%TimeFreq.QuadPart)*1000000/TimeFreq. QuadPart); #else // TODO FIXME: + tmp.tv_sec = 0; + tmp.tv_usec = 0; #endif if (tmp.tv_usec<0) { tmp.tv_sec--; _____ Modified: trunk/reactos/drivers/storage/atapi/atapi.c --- trunk/reactos/drivers/storage/atapi/atapi.c 2005-05-10 06:13:39 UTC (rev 15197) +++ trunk/reactos/drivers/storage/atapi/atapi.c 2005-05-10 06:17:54 UTC (rev 15198) @@ -2070,6 +2070,9 @@ SectorNumber[0] = StartingSector & 0xff; CylinderLow[0] = (StartingSector >> 8) & 0xff; CylinderHigh[0] = (StartingSector >> 16) & 0xff; + SectorNumber[1] = 0; + CylinderLow[1] = 0; + CylinderHigh[1] = 0; DrvHead = ((StartingSector >> 24) & 0x0f) | (Srb->TargetId ? IDE_DH_DRV1 : 0) | IDE_DH_LBA; @@ -2092,6 +2095,9 @@ StartingSector /= DeviceParams->LogicalHeads; CylinderLow[0] = StartingSector & 0xff; CylinderHigh[0] = StartingSector >> 8; + SectorNumber[1] = 0; + CylinderLow[1] = 0; + CylinderHigh[1] = 0; DPRINT("%s:BUS=%04x:DRV=%d:LBA=0:CH=%02x:CL=%02x:HD=%01x:SN=%02x:SC=%02x :CM=%02x\n", (Srb->SrbFlags & SRB_FLAGS_DATA_IN) ? "READ" : "WRITE", _____ Modified: trunk/reactos/drivers/storage/disk/disk.c --- trunk/reactos/drivers/storage/disk/disk.c 2005-05-10 06:13:39 UTC (rev 15197) +++ trunk/reactos/drivers/storage/disk/disk.c 2005-05-10 06:17:54 UTC (rev 15198) @@ -1898,7 +1898,7 @@ UNICODE_STRING ValueName; HANDLE SystemKey; HANDLE BusKey; - ULONG DiskNumber; + ULONG DiskNumber = 0; ULONG Length; #if 0 ULONG i; _____ Modified: trunk/reactos/lib/mesa32/Makefile --- trunk/reactos/lib/mesa32/Makefile 2005-05-10 06:13:39 UTC (rev 15197) +++ trunk/reactos/lib/mesa32/Makefile 2005-05-10 06:17:54 UTC (rev 15198) @@ -245,7 +245,7 @@ TARGET_BASE = $(TARGET_BASE_LIB_MESA32) -TARGET_CFLAGS = -D__USE_W32API -Wall -Werror $(MESA_CFLAGS) $(MESA_INCLUDE_DIRS) +TARGET_CFLAGS = -D__USE_W32API -Wall $(MESA_CFLAGS) $(MESA_INCLUDE_DIRS) TARGET_ASFLAGS = $(TARGET_CFLAGS)

1 0

[greatlrd] 15197: Swedish charaters was gone. it should also commit to wine
by greatlrd＠svn.reactos.com 10 May '05

10 May '05

Swedish charaters was gone. it should also commit to wine Modified: trunk/reactos/lib/oleaut32/oleaut32_Sv.rc _____ Modified: trunk/reactos/lib/oleaut32/oleaut32_Sv.rc --- trunk/reactos/lib/oleaut32/oleaut32_Sv.rc 2005-05-09 23:39:08 UTC (rev 15196) +++ trunk/reactos/lib/oleaut32/oleaut32_Sv.rc 2005-05-10 06:13:39 UTC (rev 15197) @@ -26,6 +26,6 @@ IDS_FALSE "Falskt" IDS_YES "Ja" IDS_NO "Nej" - IDS_ON "Pi" + IDS_ON "PÕ" IDS_OFF "Av" }

1 0

[ion] 15195: Revert most of IoCreateStreamFileObject... it's wrong but needs to be wrong for now.
by ion＠svn.reactos.com 09 May '05

09 May '05

Revert most of IoCreateStreamFileObject... it's wrong but needs to be wrong for now. Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-09 22:12:43 UTC (rev 15194) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-09 22:35:43 UTC (rev 15195) @@ -994,16 +994,16 @@ * * @implemented */ -PFILE_OBJECT +PFILE_OBJECT STDCALL IoCreateStreamFileObject(PFILE_OBJECT FileObject, PDEVICE_OBJECT DeviceObject) { PFILE_OBJECT CreatedFileObject; NTSTATUS Status; - - /* FIXME: This function should call ObInsertObject. The "Lite" version - doesnt. This function is also called from IoCreateFile for some + + /* FIXME: This function should call ObInsertObject. The "Lite" version + doesnt. This function is also called from IoCreateFile for some reason. These hacks need to be removed. */ @@ -1030,12 +1030,17 @@ /* Choose Device Object */ if (FileObject) DeviceObject = FileObject->DeviceObject; DPRINT("DeviceObject %x\n", DeviceObject); - + + /* HACK */ + DeviceObject = IoGetAttachedDevice(DeviceObject); + /* Set File Object Data */ - CreatedFileObject->DeviceObject = DeviceObject; + CreatedFileObject->DeviceObject = DeviceObject; CreatedFileObject->Vpb = DeviceObject->Vpb; CreatedFileObject->Type = IO_TYPE_FILE; - CreatedFileObject->Flags = FO_STREAM_FILE; + /* HACK */ + CreatedFileObject->Flags |= FO_DIRECT_DEVICE_OPEN; + //CreatedFileObject->Flags = FO_STREAM_FILE; /* Initialize Lock and Event */ KeInitializeEvent(&CreatedFileObject->Event, NotificationEvent, FALSE); @@ -1057,6 +1062,7 @@ UNIMPLEMENTED; return 0; } + /* * @unimplemented */

1 0

[Phreak] 15194: Fixed backwards access check that was causing NtWriteFile to fail when given a read only buffer
by Phreak＠svn.reactos.com 09 May '05

09 May '05

Fixed backwards access check that was causing NtWriteFile to fail when given a read only buffer Modified: trunk/reactos/ntoskrnl/io/irp.c _____ Modified: trunk/reactos/ntoskrnl/io/irp.c --- trunk/reactos/ntoskrnl/io/irp.c 2005-05-09 22:05:47 UTC (rev 15193) +++ trunk/reactos/ntoskrnl/io/irp.c 2005-05-09 22:12:43 UTC (rev 15194) @@ -472,14 +472,14 @@ /* Use an MDL for Direct I/O */ Irp->MdlAddress = MmCreateMdl(NULL, Buffer, Length); - /* Use the right Access Type */ + if (MajorFunction == IRP_MJ_READ) { - AccessType = IoReadAccess; + AccessType = IoWriteAccess; } else { - AccessType = IoWriteAccess; + AccessType = IoReadAccess; } /* Probe and Lock */

1 0

[weiden] 15193: fixed some more warnings
by weiden＠svn.reactos.com 09 May '05

09 May '05

fixed some more warnings Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/proc.h Modified: trunk/reactos/drivers/lib/oskittcp/makefile _____ Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/proc.h --- trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/proc.h 2005-05-09 21:28:01 UTC (rev 15192) +++ trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/proc.h 2005-05-09 22:05:47 UTC (rev 15193) @@ -296,14 +296,14 @@ extern struct proc *initproc, *pageproc; /* Process slots for init, pager. */ #define NQS 32 /* 32 run queues. */ +struct prochd { + struct proc *ph_link; /* Linked list of running processes. */ + struct proc *ph_rlink; +}; extern struct prochd qs[]; extern struct prochd rtqs[]; extern struct prochd idqs[]; extern int whichqs; /* Bit mask summary of non-empty Q's. */ -struct prochd { - struct proc *ph_link; /* Linked list of running processes. */ - struct proc *ph_rlink; -}; int chgproccnt __P((uid_t, int)); struct proc *pfind __P((pid_t)); /* Find process by id. */ _____ Modified: trunk/reactos/drivers/lib/oskittcp/makefile --- trunk/reactos/drivers/lib/oskittcp/makefile 2005-05-09 21:28:01 UTC (rev 15192) +++ trunk/reactos/drivers/lib/oskittcp/makefile 2005-05-09 22:05:47 UTC (rev 15193) @@ -62,14 +62,14 @@ TARGET_OBJECTS = $(FREEBSD_OBJECTS) $(REACTOS_OBJECTS) DEP_OBJECTS = $(TARGET_OBJECTS) +TARGET_CFLAGS += -D__REACTOS__=1 -D__NTDRIVER__ -DKERNEL -I./include/freebsd -I./include/freebsd/sys/include -I./include/freebsd/src/sys -I./include/freebsd/dev/include -I./include/freebsd/net/include -I./include + include $(PATH_TO_TOP)/rules.mak include $(TOOLS_PATH)/helper.mk include $(TOOLS_PATH)/depend.mk -TARGET_CFLAGS += -D__REACTOS__=1 -D__NTDRIVER__ -DKERNEL -Iinclude/freebsd -Iinclude/freebsd/sys/include -Iinclude/freebsd/src/sys -Iinclude/freebsd/dev/include -Iinclude/freebsd/net/include -Iinclude - %/TAGS: etags -o $(@D)/TAGS $((a)D)/\*.c

1 0

[hbirr] 15192: Removed the deallocation of the irp on error after IoBuildSynchronousFsdRequest in NtRead/WriteFile.
by hbirr＠svn.reactos.com 09 May '05

09 May '05

Removed the deallocation of the irp on error after IoBuildSynchronousFsdRequest in NtRead/WriteFile. There is no irp at this point. If the exception handler is hit, the irp isn't set. Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-09 20:14:10 UTC (rev 15191) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-09 21:28:01 UTC (rev 15192) @@ -2540,6 +2540,10 @@ ByteOffset, EventObject, IoStatusBlock); + if (Irp == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + } } _SEH_HANDLE { @@ -2548,15 +2552,11 @@ _SEH_END; /* Cleanup if IRP Allocation Failed */ - if (!NT_SUCCESS(Status) || !Irp) + if (!NT_SUCCESS(Status)) { if (Event) ObDereferenceObject(EventObject); ObDereferenceObject(FileObject); - if (Irp) - { - IoFreeIrp(Irp); - } - return NT_SUCCESS(Status) ? STATUS_INSUFFICIENT_RESOURCES : Status; + return Status; } /* Set up IRP Data */ @@ -3117,6 +3117,10 @@ ByteOffset, EventObject, IoStatusBlock); + if (Irp == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + } } _SEH_HANDLE { @@ -3125,15 +3129,14 @@ _SEH_END; /* Cleanup on failure */ - if (!NT_SUCCESS(Status) || !Irp) + if (!NT_SUCCESS(Status)) { if (Event) { ObDereferenceObject(&EventObject); } ObDereferenceObject(FileObject); - if (Irp) IoFreeIrp(Irp); - return NT_SUCCESS(Status) ? STATUS_INSUFFICIENT_RESOURCES : Status; + return Status; } /* Set up IRP Data */

1 0

[ion] 15191: Fix rc file
by ion＠svn.reactos.com 09 May '05

09 May '05

Fix rc file Deleted: trunk/reactos/subsys/system/reporterror/Sv.rc Modified: trunk/reactos/subsys/system/reporterror/reporterror.rc Added: trunk/reactos/subsys/system/reporterror/sv.rc _____ Deleted: trunk/reactos/subsys/system/reporterror/Sv.rc --- trunk/reactos/subsys/system/reporterror/Sv.rc 2005-05-09 19:57:41 UTC (rev 15190) +++ trunk/reactos/subsys/system/reporterror/Sv.rc 2005-05-09 20:14:10 UTC (rev 15191) @@ -1,56 +0,0 @@ -/* Swedish resources by David Nordenberg */ - -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT - -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Felrapporteringsassistenten" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Systemet har Õterstõllts efter ett fel.", -1, 115, 15, 160, 24 - LTEXT "Vill du rapportera felet till ReactOS-projektet?", -1, 115, 35, 160, 17 -END - -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Felrapporteringsassistenten" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Beskriv vad du gjorde nõr felet uppstod. Klicka pÕ 'Nõsta' f÷r att \n\nskicka rapporten till ReactOS-projektet eller 'Avbryt' f÷r at inte skicka nÕgon information.",-1,10,0,225,40 - LTEXT "Din epost-adress (frivilligt):",-1,10,40,120,20 - EDITTEXT IDE_SUBMIT_REPORT_YOUR_EMAIL, 110,40,150,12 - LTEXT "Beskrivning av problemet (frivilligt):",-1,10,55,120,20 - EDITTEXT IDE_SUBMIT_REPORT_PROBLEM_DESCRIPTION,10,65,250,55,ES_WANTRETURN|ES_MULT ILINE|ES_LEFT|WS_BORDER|WS_TABSTOP|WS_VSCROLL -END - -IDD_SUBMITTING_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Felrapporteringsassistenten" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "{STATUS}",IDC_SUBMISSION_STATUS,25,58,225,8 - CONTROL "", IDC_SUBMITTING_IN_PROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 -END - -IDD_SUBMITTED_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Felrapporteringsassistenten" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Din felrapport har skickats.",-1,25,5,225,20 -END - -STRINGTABLE -BEGIN - IDS_WIZARD_NAME "Rapportera fel till ReactOS-projektet" - IDS_FAILED_TO_CONTACT_SERVER "Systemet kunde inte kontakta felrapportsservern.\nKontrollera att din anslutning till internet fungerar." - IDS_FAILED_TO_DELIVER_ERROR_REPORT "Systemet har inte kunnat leverera felrapporten." -END - -STRINGTABLE -BEGIN - IDS_CONTACTING_SERVER "Ansluter till felrapportsservern..." - IDS_FAILED_TO_INITIALIZE_WINSOCK "Kunde inte initiera winsock (windows felkod %d)" - IDS_FAILED_TO_LOCATE_SERVER "Misslyckades att ansluta till servern" -END - _____ Modified: trunk/reactos/subsys/system/reporterror/reporterror.rc --- trunk/reactos/subsys/system/reporterror/reporterror.rc 2005-05-09 19:57:41 UTC (rev 15190) +++ trunk/reactos/subsys/system/reporterror/reporterror.rc 2005-05-09 20:14:10 UTC (rev 15191) @@ -14,8 +14,8 @@ IDB_WATERMARK BITMAP "resources/watermark.bmp" IDB_HEADER BITMAP "resources/header.bmp" -#include "En.rc" -#include "De.rc" -#include "Dk.rc" -#include "Sv.rc" +#include "en.rc" +#include "de.rc" +#include "dk.rc" +#include "sv.rc" _____ Copied: trunk/reactos/subsys/system/reporterror/sv.rc (from rev 15188, trunk/reactos/subsys/system/reporterror/Sv.rc)

1 0

[ion] 15190: Implement Access State support (SeCreate/DeleteAccessState and SeSetAccessStateGenericMapping. Based on a patch by Javier M. Mellid
by ion＠svn.reactos.com 09 May '05

09 May '05

Implement Access State support (SeCreate/DeleteAccessState and SeSetAccessStateGenericMapping. Based on a patch by Javier M. Mellid Modified: trunk/reactos/include/ddk/sefuncs.h Modified: trunk/reactos/include/ddk/setypes.h Modified: trunk/reactos/ntoskrnl/se/access.c _____ Modified: trunk/reactos/include/ddk/sefuncs.h --- trunk/reactos/include/ddk/sefuncs.h 2005-05-09 19:08:49 UTC (rev 15189) +++ trunk/reactos/include/ddk/sefuncs.h 2005-05-09 19:57:41 UTC (rev 15190) @@ -122,7 +122,7 @@ STDCALL SeCreateAccessState( PACCESS_STATE AccessState, - PVOID AuxData, + PAUX_DATA AuxData, ACCESS_MASK Access, PGENERIC_MAPPING GenericMapping ); _____ Modified: trunk/reactos/include/ddk/setypes.h --- trunk/reactos/include/ddk/setypes.h 2005-05-09 19:08:49 UTC (rev 15189) +++ trunk/reactos/include/ddk/setypes.h 2005-05-09 19:57:41 UTC (rev 15190) @@ -97,6 +97,7 @@ }; } SEP_AUDIT_POLICY, *PSEP_AUDIT_POLICY; +#define TOKEN_HAS_TRAVERSE_PRIVILEGE 0x01 typedef struct _TOKEN { TOKEN_SOURCE TokenSource; /* 0x00 */ LUID TokenId; /* 0x10 */ @@ -222,6 +223,13 @@ AssignSecurityDescriptor } SECURITY_OPERATION_CODE, *PSECURITY_OPERATION_CODE; +typedef struct _AUX_DATA +{ + PPRIVILEGE_SET PrivilegeSet; + GENERIC_MAPPING GenericMapping; + ULONG Reserved; +} AUX_DATA, *PAUX_DATA; + typedef struct _ACCESS_STATE { LUID OperationID; _____ Modified: trunk/reactos/ntoskrnl/se/access.c --- trunk/reactos/ntoskrnl/se/access.c 2005-05-09 19:08:49 UTC (rev 15189) +++ trunk/reactos/ntoskrnl/se/access.c 2005-05-09 19:57:41 UTC (rev 15190) @@ -4,7 +4,8 @@ * FILE: ntoskrnl/se/access.c * PURPOSE: Access state functions * - * PROGRAMMERS: Eric Kohl + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - + * Based on patch by Javier M. Mellid */ /* INCLUDES *****************************************************************/ @@ -13,47 +14,108 @@ #define NDEBUG #include <internal/debug.h> +#define GENERIC_ACCESS (GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | \ + GENERIC_ALL) + /* FUNCTIONS ***************************************************************/ /* - * @unimplemented + * @implemented */ NTSTATUS STDCALL -SeCreateAccessState( - PACCESS_STATE AccessState, - PVOID AuxData, - ACCESS_MASK Access, - PGENERIC_MAPPING GenericMapping - ) +SeCreateAccessState(PACCESS_STATE AccessState, + PAUX_DATA AuxData, + ACCESS_MASK Access, + PGENERIC_MAPPING GenericMapping) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + ACCESS_MASK AccessMask = Access; + PTOKEN Token; + + PAGED_CODE(); + + /* Map the Generic Acess to Specific Access if we have a Mapping */ + if ((Access & GENERIC_ACCESS) && (GenericMapping)) + { + RtlMapGenericMask(&AccessMask, GenericMapping); + } + + /* Initialize the Access State */ + RtlZeroMemory(AccessState, sizeof(ACCESS_STATE)); + + /* Capture the Subject Context */ + SeCaptureSubjectContext(&AccessState->SubjectSecurityContext); + + /* Set Access State Data */ + AccessState->AuxData = AuxData; + AccessState->RemainingDesiredAccess = AccessMask; + AccessState->OriginallyDesiredAccess = AccessMask; + ExpAllocateLocallyUniqueId(&AccessState->OperationID); + + /* Get the Token to use */ + Token = AccessState->SubjectSecurityContext.ClientToken ? + (PTOKEN)&AccessState->SubjectSecurityContext.ClientToken : + (PTOKEN)&AccessState->SubjectSecurityContext.PrimaryToken; + + /* Check for Travers Privilege */ + if (Token->TokenFlags & TOKEN_HAS_TRAVERSE_PRIVILEGE) + { + /* Preserve the Traverse Privilege */ + AccessState->Flags = TOKEN_HAS_TRAVERSE_PRIVILEGE; + } + + /* Set the Auxiliary Data */ + AuxData->PrivilegeSet = (PPRIVILEGE_SET)((ULONG_PTR)AccessState + + FIELD_OFFSET(ACCESS_STATE, + Privileges)); + if (GenericMapping) AuxData->GenericMapping = *GenericMapping; + + /* Return Sucess */ + return STATUS_SUCCESS; } /* - * @unimplemented + * @implemented */ VOID STDCALL -SeDeleteAccessState( - IN PACCESS_STATE AccessState - ) +SeDeleteAccessState(IN PACCESS_STATE AccessState) { - UNIMPLEMENTED; + PAUX_DATA AuxData; + PAGED_CODE(); + + /* Get the Auxiliary Data */ + AuxData = AccessState->AuxData; + + /* Deallocate Privileges */ + if (AccessState->PrivilegesAllocated) ExFreePool(AuxData->PrivilegeSet); + + /* Deallocate Name and Type Name */ + if (AccessState->ObjectName.Buffer) + { + ExFreePool(AccessState->ObjectName.Buffer); + } + if (AccessState->ObjectTypeName.Buffer) + { + ExFreePool(AccessState->ObjectTypeName.Buffer); + } + + /* Release the Subject Context */ + SeReleaseSubjectContext(&AccessState->SubjectSecurityContext); } /* - * @unimplemented + * @implemented */ VOID STDCALL -SeSetAccessStateGenericMapping( - PACCESS_STATE AccessState, - PGENERIC_MAPPING GenericMapping - ) +SeSetAccessStateGenericMapping(PACCESS_STATE AccessState, + PGENERIC_MAPPING GenericMapping) { - UNIMPLEMENTED; + PAGED_CODE(); + + /* Set the Generic Mapping */ + ((PAUX_DATA)AccessState->AuxData)->GenericMapping = *GenericMapping; } /* EOF */

1 0

[ion] 15189: unmix cases
by ion＠svn.reactos.com 09 May '05

09 May '05

unmix cases Deleted: trunk/reactos/subsys/system/reporterror/De.rc Deleted: trunk/reactos/subsys/system/reporterror/En.rc Added: trunk/reactos/subsys/system/reporterror/de.rc Added: trunk/reactos/subsys/system/reporterror/en.rc _____ Deleted: trunk/reactos/subsys/system/reporterror/De.rc --- trunk/reactos/subsys/system/reporterror/De.rc 2005-05-09 19:05:41 UTC (rev 15188) +++ trunk/reactos/subsys/system/reporterror/De.rc 2005-05-09 19:08:49 UTC (rev 15189) @@ -1,53 +0,0 @@ -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT - -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Fehlerbericht Assistent" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Das System hat einen Fehler entdeckt.", -1, 115, 15, 160, 24 - LTEXT "Wollen Sie den Fehlerbericht an das ReactOS Projekt schicken?", -1, 115, 35, 160, 17 -END - -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Fehlerbericht Assistent" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Bitte beschreiben Sie was sie gerade gemacht haben als der Fehler auftrat.\n\nKlicken Sie auf 'Weiter' um den Fehlerbricht and das ReactOS Projekt zu senden oder 'Abbrechen' um keine Informationen zu senden.",-1,10,0,255,40 - LTEXT "Ihre E-Mail Addresse (freiwillig):",-1,10,40,120,20 - EDITTEXT IDE_SUBMIT_REPORT_YOUR_EMAIL, 120,40,140,12 - LTEXT "Beschreibung des Problems/Fehlers (freiwillig):",-1,10,55,160,20 - EDITTEXT IDE_SUBMIT_REPORT_PROBLEM_DESCRIPTION,10,65,250,55,ES_WANTRETURN|ES_MULT ILINE|ES_LEFT|WS_BORDER|WS_TABSTOP|WS_VSCROLL -END - -IDD_SUBMITTING_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Fehlerbericht Assistent" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "{STATUS}",IDC_SUBMISSION_STATUS,25,58,225,8 - CONTROL "", IDC_SUBMITTING_IN_PROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 -END - -IDD_SUBMITTED_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Fehlerbericht Assistent" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Ihr Fehlerbericht wurde erfolgreich an das ReactOS Projekt gesendet.",-1,25,5,225,20 -END - -STRINGTABLE -BEGIN - IDS_WIZARD_NAME "Fehlerbericht an das ReactOS Projekt senden" - IDS_FAILED_TO_CONTACT_SERVER "Das System war nicht in der Lage den ReactOS Fehlerbericht Server zu kontaktieren.\nBitte vergewissern Sie sich das ihr System mit dem Internet verbunden ist." - IDS_FAILED_TO_DELIVER_ERROR_REPORT "Das System konnte den Fehlerbericht nicht versenden." -END - -STRINGTABLE -BEGIN - IDS_CONTACTING_SERVER "Verbindung mit dem ReactOS Fehlerbericht Server wird hergestellt ..." - IDS_FAILED_TO_INITIALIZE_WINSOCK "Fehler beim initialisieren von winsock (windows/ReactOS Fehlercode %d)" - IDS_FAILED_TO_LOCATE_SERVER "Verbindung mit dem ReactOS Fehlerbericht Server konnte nicht hergestellt werden." -END _____ Deleted: trunk/reactos/subsys/system/reporterror/En.rc --- trunk/reactos/subsys/system/reporterror/En.rc 2005-05-09 19:05:41 UTC (rev 15188) +++ trunk/reactos/subsys/system/reporterror/En.rc 2005-05-09 19:08:49 UTC (rev 15189) @@ -1,62 +0,0 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Error reporting assistant" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "The system recovered from an error.", -1, 115, 15, 160, 24 - LTEXT "Would you like to report the error to the ReactOS project?", -1, 115, 35, 160, 17 -END - -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Error reporting assistant" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Please describe what you were trying to do when the error occurred.\n\nClick 'Next' to send the report to the ReactOS project or 'Cancel' to not send any information.",-1,10,0,225,40 - LTEXT "Your e-mail address (optional):",-1,10,40,120,20 - EDITTEXT IDE_SUBMIT_REPORT_YOUR_EMAIL, 110,40,150,12 - LTEXT "Description of problem (optional):",-1,10,55,120,20 - EDITTEXT IDE_SUBMIT_REPORT_PROBLEM_DESCRIPTION,10,65,250,55,ES_WANTRETURN|ES_MULT ILINE|ES_LEFT|WS_BORDER|WS_TABSTOP|WS_VSCROLL -END - -IDD_SUBMITTING_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Error reporting assistant" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "{STATUS}",IDC_SUBMISSION_STATUS,25,58,225,8 - CONTROL "", IDC_SUBMITTING_IN_PROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 -END - -IDD_SUBMITTED_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Error reporting assistant" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Your error report was successfully sent to the ReactOS project.",-1,25,5,225,20 -END - -STRINGTABLE -BEGIN - IDS_WIZARD_NAME "Report error to the ReactOS project" - IDS_FAILED_TO_CONTACT_SERVER "The system was unable to contact the error reporting server.\nPlease make sure that your system is connected to the internet." - IDS_FAILED_TO_DELIVER_ERROR_REPORT "The system was unable to deliver the error report." -END - -STRINGTABLE -BEGIN - IDS_CONTACTING_SERVER "Contacting error reporting server..." - IDS_FAILED_TO_INITIALIZE_WINSOCK "Failed to initialize winsock (windows error code %d)" - IDS_FAILED_TO_LOCATE_SERVER "Failed to contact error reporting server" -END - -STRINGTABLE -BEGIN -IDS_DNS_ERROR "Could not resolve DNS for %S (windows error code %d)" -IDS_SOCKET_ERROR "Could not create socket (windows error code %d)" -IDS_GET_SRV_ERROR "Could not get service (windows error code %d)" -IDS_CON_SRV_ERROR "Could not connect to server (windows error code %d)" -END - _____ Copied: trunk/reactos/subsys/system/reporterror/de.rc (from rev 15070, trunk/reactos/subsys/system/reporterror/De.rc) _____ Copied: trunk/reactos/subsys/system/reporterror/en.rc (from rev 15070, trunk/reactos/subsys/system/reporterror/En.rc)

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
82
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 May 2005