Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 66951: [USETUP] Upgrade a few DPRINT to DPRINT1 for failure cases.
by tkreuzer＠svn.reactos.org 29 Mar '15

29 Mar '15

Author: tkreuzer Date: Sun Mar 29 11:29:02 2015 New Revision: 66951 URL: http://svn.reactos.org/svn/reactos?rev=66951&view=rev Log: [USETUP] Upgrade a few DPRINT to DPRINT1 for failure cases. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/registry.c trunk/reactos/base/setup/usetup/settings.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Mar 29 11:29:02 2015 @@ -3633,7 +3633,7 @@ if (!SetInstallPathValue(&DestinationPath)) { - DPRINT("SetInstallPathValue() failed\n"); + DPRINT1("SetInstallPathValue() failed\n"); MUIDisplayError(ERROR_INITIALIZE_REGISTRY, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -3643,7 +3643,7 @@ Status = NtInitializeRegistry(CM_BOOT_FLAG_SETUP); if (!NT_SUCCESS(Status)) { - DPRINT("NtInitializeRegistry() failed (Status %lx)\n", Status); + DPRINT1("NtInitializeRegistry() failed (Status %lx)\n", Status); MUIDisplayError(ERROR_CREATE_HIVE, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -3689,7 +3689,7 @@ if (!ImportRegistryFile(File, Section, LanguageId, Delete)) { - DPRINT("Importing %S failed\n", File); + DPRINT1("Importing %S failed\n", File); MUIDisplayError(ERROR_IMPORT_HIVE, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; Modified: trunk/reactos/base/setup/usetup/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/registry… ============================================================================== --- trunk/reactos/base/setup/usetup/registry.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/registry.c [iso-8859-1] Sun Mar 29 11:29:02 2015 @@ -560,7 +560,7 @@ &ObjectAttributes); if (!NT_SUCCESS(Status)) { - DPRINT("NtOpenKey(%wZ) failed (Status %lx)\n", &Name, Status); + DPRINT1("NtOpenKey(%wZ) failed (Status %lx)\n", &Name, Status); continue; /* ignore if it doesn't exist */ } } @@ -571,7 +571,7 @@ &ObjectAttributes); if (!NT_SUCCESS(Status)) { - DPRINT("CreateNestedKey(%wZ) failed (Status %lx)\n", &Name, Status); + DPRINT1("CreateNestedKey(%wZ) failed (Status %lx)\n", &Name, Status); continue; } } Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] Sun Mar 29 11:29:02 2015 @@ -691,20 +691,20 @@ Entry = GetCurrentListEntry(List); if (Entry == NULL) { - DPRINT("GetCurrentListEntry() failed\n"); + DPRINT1("GetCurrentListEntry() failed\n"); return FALSE; } if (!SetupFindFirstLineW(InfFile, L"Display", (WCHAR*)GetListEntryUserData(Entry), &Context)) { - DPRINT("SetupFindFirstLineW() failed\n"); + DPRINT1("SetupFindFirstLineW() failed\n"); return FALSE; } /* Enable the right driver */ if (!INF_GetDataField(&Context, 3, &ServiceName)) { - DPRINT("INF_GetDataField() failed\n"); + DPRINT1("INF_GetDataField() failed\n"); return FALSE; } @@ -720,7 +720,7 @@ sizeof(ULONG)); if (!NT_SUCCESS(Status)) { - DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + DPRINT1("RtlWriteRegistryValue() failed (Status %lx)\n", Status); return FALSE; } @@ -729,7 +729,7 @@ if (!INF_GetDataField(&Context, 4, &Buffer)) { - DPRINT("INF_GetDataField() failed\n"); + DPRINT1("INF_GetDataField() failed\n"); return FALSE; } @@ -742,13 +742,13 @@ sizeof(ULONG)); if (!NT_SUCCESS(Status)) { - DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + DPRINT1("RtlWriteRegistryValue() failed (Status %lx)\n", Status); return FALSE; } if (!INF_GetDataField(&Context, 5, &Buffer)) { - DPRINT("INF_GetDataField() failed\n"); + DPRINT1("INF_GetDataField() failed\n"); return FALSE; } @@ -761,13 +761,13 @@ sizeof(ULONG)); if (!NT_SUCCESS(Status)) { - DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + DPRINT1("RtlWriteRegistryValue() failed (Status %lx)\n", Status); return FALSE; } if (!INF_GetDataField(&Context, 6, &Buffer)) { - DPRINT("INF_GetDataField() failed\n"); + DPRINT1("INF_GetDataField() failed\n"); return FALSE; } @@ -780,7 +780,7 @@ sizeof(ULONG)); if (!NT_SUCCESS(Status)) { - DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + DPRINT1("RtlWriteRegistryValue() failed (Status %lx)\n", Status); return FALSE; } @@ -928,7 +928,7 @@ PGENERIC_LIST CreateLanguageList( HINF InfFile, - WCHAR *DefaultLanguage) + WCHAR *DefaultLanguage) { CHAR Buffer[128]; PGENERIC_LIST List; @@ -956,7 +956,7 @@ if (!SetupFindFirstLineW (InfFile, L"Language", NULL, &Context)) { DestroyGenericList(List, FALSE); - return NULL; + return NULL; } do

1 0

[tfaber] 66950: [NTOS:MM] - Do not track failed pool allocations as successful CORE-9440 #resolve
by tfaber＠svn.reactos.org 29 Mar '15

29 Mar '15

Author: tfaber Date: Sun Mar 29 10:02:47 2015 New Revision: 66950 URL: http://svn.reactos.org/svn/reactos?rev=66950&view=rev Log: [NTOS:MM] - Do not track failed pool allocations as successful CORE-9440 #resolve Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Sun Mar 29 10:02:47 2015 @@ -1632,6 +1632,8 @@ { ExRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); } + + return NULL; } //

1 0

[tfaber] 66949: [WSCRIPT] - Mark as GUI app CORE-9439
by tfaber＠svn.reactos.org 29 Mar '15

29 Mar '15

Author: tfaber Date: Sun Mar 29 07:48:38 2015 New Revision: 66949 URL: http://svn.reactos.org/svn/reactos?rev=66949&view=rev Log: [WSCRIPT] - Mark as GUI app CORE-9439 Modified: trunk/reactos/base/applications/cmdutils/wscript/CMakeLists.txt Modified: trunk/reactos/base/applications/cmdutils/wscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wscript/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wscript/CMakeLists.txt [iso-8859-1] Sun Mar 29 07:48:38 2015 @@ -10,7 +10,7 @@ add_typelib(ihost.idl) set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ihost.tlb) target_link_libraries(wscript uuid wine) -set_module_type(wscript win32cui UNICODE) +set_module_type(wscript win32gui UNICODE) add_importlibs(wscript shell32 oleaut32 ole32 advapi32 msvcrt kernel32 ntdll) add_dependencies(wscript stdole2 wscript_idlheader) add_pch(wscript wscript.h SOURCE)

1 0

[tfaber] 66948: [NTOSKRNL] - More pool tagging!
by tfaber＠svn.reactos.org 29 Mar '15

29 Mar '15

Author: tfaber Date: Sun Mar 29 06:04:19 2015 New Revision: 66948 URL: http://svn.reactos.org/svn/reactos?rev=66948&view=rev Log: [NTOSKRNL] - More pool tagging! Modified: trunk/reactos/ntoskrnl/include/internal/tag.h trunk/reactos/ntoskrnl/lpc/connect.c trunk/reactos/ntoskrnl/po/events.c trunk/reactos/ntoskrnl/po/power.c trunk/reactos/ntoskrnl/rtl/libsupp.c trunk/reactos/ntoskrnl/se/access.c trunk/reactos/ntoskrnl/se/audit.c trunk/reactos/ntoskrnl/se/priv.c trunk/reactos/ntoskrnl/se/sd.c Modified: trunk/reactos/ntoskrnl/include/internal/tag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/tag.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/tag.h [iso-8859-1] Sun Mar 29 06:04:19 2015 @@ -164,16 +164,14 @@ /* formerly located in rtl/handle.c */ #define TAG_HDTB 'BTDH' -/* formerly located in se/acl.c */ -#define TAG_ACL 'cAeS' - -/* formerly located in se/sid.c */ -#define TAG_SID 'iSeS' - -/* formerly located in se/sd.c */ -#define TAG_SD 'dSeS' - -/* formerly located in se/token.c */ +/* Security Manager Tags */ +#define TAG_SE ' eS' +#define TAG_ACL 'cAeS' +#define TAG_SID 'iSeS' +#define TAG_SD 'dSeS' +#define TAG_QOS 'sQeS' +#define TAG_LUID 'uLeS' +#define TAG_PRIVILEGE_SET 'rPeS' #define TAG_TOKEN_USERS 'uKOT' #define TAG_TOKEN_PRIVILAGES 'pKOT' #define TAG_TOKEN_ACL 'kDOT' Modified: trunk/reactos/ntoskrnl/lpc/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/connect.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/connect.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/connect.c [iso-8859-1] Sun Mar 29 06:04:19 2015 @@ -164,7 +164,7 @@ //Status = SeQueryInformationToken(Token, TokenUser, (PVOID*)&TokenUserInfo); // FIXME: Need SeQueryInformationToken Status = STATUS_SUCCESS; - TokenUserInfo = ExAllocatePool(PagedPool, sizeof(TOKEN_USER)); + TokenUserInfo = ExAllocatePoolWithTag(PagedPool, sizeof(TOKEN_USER), TAG_SE); TokenUserInfo->User.Sid = ServerSid; PsDereferencePrimaryToken(Token); @@ -179,7 +179,7 @@ } /* Free token information */ - ExFreePool(TokenUserInfo); + ExFreePoolWithTag(TokenUserInfo, TAG_SE); } } else Modified: trunk/reactos/ntoskrnl/po/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/events.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/po/events.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/events.c [iso-8859-1] Sun Mar 29 06:04:19 2015 @@ -91,7 +91,7 @@ if (!SysButtonContext->WorkItem) { DPRINT("IoAllocateWorkItem() failed\n"); - ExFreePool(SysButtonContext); + ExFreePoolWithTag(SysButtonContext, 'IWOP'); return STATUS_SUCCESS; } IoQueueWorkItem( @@ -139,7 +139,7 @@ else { DPRINT1("IoBuildDeviceIoControlRequest() failed\n"); - ExFreePool(SysButtonContext); + ExFreePoolWithTag(SysButtonContext, 'IWOP'); } IoFreeWorkItem(CurrentWorkItem); @@ -258,10 +258,12 @@ DPRINT(" )\n"); } - SysButtonContext = ExAllocatePool(NonPagedPool, sizeof(SYS_BUTTON_CONTEXT)); + SysButtonContext = ExAllocatePoolWithTag(NonPagedPool, + sizeof(SYS_BUTTON_CONTEXT), + 'IWOP'); if (!SysButtonContext) { - DPRINT1("ExAllocatePool() failed\n"); + DPRINT1("ExAllocatePoolWithTag() failed\n"); ZwClose(FileHandle); return STATUS_INSUFFICIENT_RESOURCES; } @@ -273,7 +275,7 @@ { DPRINT1("IoAllocateWorkItem() failed\n"); ZwClose(FileHandle); - ExFreePool(SysButtonContext); + ExFreePoolWithTag(SysButtonContext, 'IWOP'); return STATUS_INSUFFICIENT_RESOURCES; } IoQueueWorkItem( Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=66… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Sun Mar 29 06:04:19 2015 @@ -59,7 +59,7 @@ IoFreeIrp(Irp); ObDereferenceObject(RequestPowerItem->TopDeviceObject); - ExFreePool(Context); + ExFreePoolWithTag(Context, 'IRoP'); return STATUS_MORE_PROCESSING_REQUIRED; } @@ -528,7 +528,9 @@ && MinorFunction != IRP_MN_WAIT_WAKE) return STATUS_INVALID_PARAMETER_2; - RequestPowerItem = ExAllocatePool(NonPagedPool, sizeof(REQUEST_POWER_ITEM)); + RequestPowerItem = ExAllocatePoolWithTag(NonPagedPool, + sizeof(REQUEST_POWER_ITEM), + 'IRoP'); if (!RequestPowerItem) return STATUS_INSUFFICIENT_RESOURCES; @@ -544,7 +546,7 @@ if (!Irp) { ObDereferenceObject(TopDeviceObject); - ExFreePool(RequestPowerItem); + ExFreePoolWithTag(RequestPowerItem, 'IRoP'); return STATUS_INSUFFICIENT_RESOURCES; } Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Sun Mar 29 06:04:19 2015 @@ -14,6 +14,7 @@ #include <debug.h> #define TAG_ATMT 'TotA' /* Atom table */ +#define TAG_RTHL 'LHtR' /* Heap Lock */ extern ULONG NtGlobalFlag; @@ -159,7 +160,7 @@ RtlDeleteHeapLock(IN OUT PHEAP_LOCK Lock) { ExDeleteResourceLite(&Lock->Resource); - ExFreePool(Lock); + ExFreePoolWithTag(Lock, TAG_RTHL); return STATUS_SUCCESS; } @@ -200,7 +201,9 @@ NTAPI RtlInitializeHeapLock(IN OUT PHEAP_LOCK *Lock) { - PHEAP_LOCK HeapLock = ExAllocatePool(NonPagedPool, sizeof(HEAP_LOCK)); + PHEAP_LOCK HeapLock = ExAllocatePoolWithTag(NonPagedPool, + sizeof(HEAP_LOCK), + TAG_RTHL); if (HeapLock == NULL) return STATUS_NO_MEMORY; @@ -580,8 +583,9 @@ PRTL_ATOM_TABLE RtlpAllocAtomTable(ULONG Size) { - PRTL_ATOM_TABLE Table = ExAllocatePool(NonPagedPool, - Size); + PRTL_ATOM_TABLE Table = ExAllocatePoolWithTag(NonPagedPool, + Size, + TAG_ATMT); if (Table != NULL) { RtlZeroMemory(Table, @@ -594,7 +598,7 @@ VOID RtlpFreeAtomTable(PRTL_ATOM_TABLE AtomTable) { - ExFreePool(AtomTable); + ExFreePoolWithTag(AtomTable, TAG_ATMT); } PRTL_ATOM_TABLE_ENTRY Modified: trunk/reactos/ntoskrnl/se/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/access.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/se/access.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/access.c [iso-8859-1] Sun Mar 29 06:04:19 2015 @@ -460,7 +460,8 @@ AuxData = AccessState->AuxData; /* Deallocate Privileges */ - if (AccessState->PrivilegesAllocated) ExFreePool(AuxData->PrivilegeSet); + if (AccessState->PrivilegesAllocated) + ExFreePoolWithTag(AuxData->PrivilegeSet, TAG_PRIVILEGE_SET); /* Deallocate Name and Type Name */ if (AccessState->ObjectName.Buffer) Modified: trunk/reactos/ntoskrnl/se/audit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/audit.c?rev=66… ============================================================================== --- trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] Sun Mar 29 06:04:19 2015 @@ -1113,7 +1113,7 @@ /* Allocate a temp buffer */ CapturedPrivilegeSet = ExAllocatePoolWithTag(PagedPool, PrivilegeSetSize, - 'rPeS'); + TAG_PRIVILEGE_SET); if (CapturedPrivilegeSet == NULL) { DPRINT1("Failed to allocate %u bytes\n", PrivilegeSetSize); @@ -1215,7 +1215,7 @@ SeReleaseSecurityDescriptor(CapturedSecurityDescriptor, UserMode, FALSE); if (CapturedPrivilegeSet != NULL) - ExFreePoolWithTag(CapturedPrivilegeSet, 'rPeS'); + ExFreePoolWithTag(CapturedPrivilegeSet, TAG_PRIVILEGE_SET); /* Release the security subject context */ SeReleaseSubjectContext(&SubjectContext); @@ -1336,7 +1336,7 @@ /* Allocate a temp buffer */ CapturedPrivileges = ExAllocatePoolWithTag(PagedPool, PrivilegesSize, - 'rPeS'); + TAG_PRIVILEGE_SET); if (CapturedPrivileges == NULL) { DPRINT1("Failed to allocate %u bytes\n", PrivilegesSize); @@ -1375,7 +1375,7 @@ ReleaseCapturedUnicodeString(&CapturedServiceName, PreviousMode); if (CapturedPrivileges != NULL) - ExFreePoolWithTag(CapturedPrivileges, 'rPeS'); + ExFreePoolWithTag(CapturedPrivileges, TAG_PRIVILEGE_SET); /* Release the security subject context */ SeReleaseSubjectContext(&SubjectContext); Modified: trunk/reactos/ntoskrnl/se/priv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/priv.c?rev=669… ============================================================================== --- trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] Sun Mar 29 06:04:19 2015 @@ -219,7 +219,7 @@ { /* Calculate size and allocate the structure */ PrivilegeSize = FIELD_OFFSET(PRIVILEGE_SET, Privilege[PrivilegeCount]); - PrivilegeSet = ExAllocatePoolWithTag(PagedPool, PrivilegeSize, 'rPeS'); + PrivilegeSet = ExAllocatePoolWithTag(PagedPool, PrivilegeSize, TAG_PRIVILEGE_SET); *OutPrivilegeSet = PrivilegeSet; if (PrivilegeSet == NULL) { @@ -352,8 +352,9 @@ } else { - *Dest = ExAllocatePool(PoolType, - BufferSize); + *Dest = ExAllocatePoolWithTag(PoolType, + BufferSize, + TAG_LUID); if (*Dest == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -375,7 +376,7 @@ if (!NT_SUCCESS(Status) && AllocatedMem == NULL) { - ExFreePool(*Dest); + ExFreePoolWithTag(*Dest, TAG_LUID); } return Status; @@ -392,7 +393,7 @@ if (Privilege != NULL && (PreviousMode != KernelMode || CaptureIfKernel)) { - ExFreePool(Privilege); + ExFreePoolWithTag(Privilege, TAG_LUID); } } @@ -428,7 +429,9 @@ Privileges->PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES); /* Allocate a new privilege set */ - PrivilegeSet = ExAllocatePool(PagedPool, NewPrivilegeSetSize); + PrivilegeSet = ExAllocatePoolWithTag(PagedPool, + NewPrivilegeSetSize, + TAG_PRIVILEGE_SET); if (PrivilegeSet == NULL) return STATUS_INSUFFICIENT_RESOURCES; @@ -447,7 +450,7 @@ /* Free the old privilege set if it was allocated */ if (AccessState->PrivilegesAllocated != FALSE) - ExFreePool(AuxData->PrivilegeSet); + ExFreePoolWithTag(AuxData->PrivilegeSet, TAG_PRIVILEGE_SET); /* Now we are using an allocated privilege set */ AccessState->PrivilegesAllocated = TRUE; @@ -477,7 +480,7 @@ SeFreePrivileges(IN PPRIVILEGE_SET Privileges) { PAGED_CODE(); - ExFreePool(Privileges); + ExFreePoolWithTag(Privileges, TAG_PRIVILEGE_SET); } /* Modified: trunk/reactos/ntoskrnl/se/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=66948… ============================================================================== --- trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] Sun Mar 29 06:04:19 2015 @@ -281,8 +281,9 @@ { if (*Present) { - CapturedQos = ExAllocatePool(PoolType, - sizeof(SECURITY_QUALITY_OF_SERVICE)); + CapturedQos = ExAllocatePoolWithTag(PoolType, + sizeof(SECURITY_QUALITY_OF_SERVICE), + TAG_QOS); if (CapturedQos != NULL) { RtlCopyMemory(CapturedQos, @@ -312,8 +313,9 @@ if (((PSECURITY_QUALITY_OF_SERVICE)ObjectAttributes->SecurityQualityOfService)->Length == sizeof(SECURITY_QUALITY_OF_SERVICE)) { - CapturedQos = ExAllocatePool(PoolType, - sizeof(SECURITY_QUALITY_OF_SERVICE)); + CapturedQos = ExAllocatePoolWithTag(PoolType, + sizeof(SECURITY_QUALITY_OF_SERVICE), + TAG_QOS); if (CapturedQos != NULL) { RtlCopyMemory(CapturedQos, @@ -371,7 +373,7 @@ if (CapturedSecurityQualityOfService != NULL && (AccessMode != KernelMode || CaptureIfKernel)) { - ExFreePool(CapturedSecurityQualityOfService); + ExFreePoolWithTag(CapturedSecurityQualityOfService, TAG_QOS); } } @@ -904,9 +906,11 @@ } SaclLength = Sacl ? ROUND_UP((ULONG)Sacl->AclSize, 4) : 0; - NewSd = ExAllocatePool(NonPagedPool, - sizeof(SECURITY_DESCRIPTOR_RELATIVE) + OwnerLength + GroupLength + - DaclLength + SaclLength); + NewSd = ExAllocatePoolWithTag(NonPagedPool, + sizeof(SECURITY_DESCRIPTOR_RELATIVE) + + OwnerLength + GroupLength + + DaclLength + SaclLength, + TAG_SD); if (NewSd == NULL) { return STATUS_INSUFFICIENT_RESOURCES;

1 0

[hbelusca] 66947: [BIN2C][CAT]: Use stderr for printing errors (to not mix them up with normal output that should go to stdout. This is especially needed for cat).
by hbelusca＠svn.reactos.org 29 Mar '15

29 Mar '15

Author: hbelusca Date: Sun Mar 29 02:00:15 2015 New Revision: 66947 URL: http://svn.reactos.org/svn/reactos?rev=66947&view=rev Log: [BIN2C][CAT]: Use stderr for printing errors (to not mix them up with normal output that should go to stdout. This is especially needed for cat). Modified: trunk/reactos/tools/bin2c.c trunk/reactos/tools/cat.c Modified: trunk/reactos/tools/bin2c.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2c.c?rev=66947&r1… ============================================================================== --- trunk/reactos/tools/bin2c.c [iso-8859-1] (original) +++ trunk/reactos/tools/bin2c.c [iso-8859-1] Sun Mar 29 02:00:15 2015 @@ -19,7 +19,7 @@ /* Validate the arguments */ if (argc < 5) { - printf("Usage: bin2c infile.bin outfile.c outfile.h array_name [array_attribute [header_for_attribute]]\n"); + fprintf(stdout, "Usage: bin2c infile.bin outfile.c outfile.h array_name [array_attribute [header_for_attribute]]\n"); return -1; } @@ -27,14 +27,14 @@ inFile = fopen(argv[1], "rb"); if (!inFile) { - printf("ERROR: Couldn't open data file '%s'.\n", argv[1]); + fprintf(stderr, "ERROR: Couldn't open data file '%s'.\n", argv[1]); return -1; } outCFile = fopen(argv[2], "w"); if (!outCFile) { fclose(inFile); - printf("ERROR: Couldn't create output source file '%s'.\n", argv[2]); + fprintf(stderr, "ERROR: Couldn't create output source file '%s'.\n", argv[2]); return -1; } outHFile = fopen(argv[3], "w"); @@ -42,7 +42,7 @@ { fclose(outCFile); fclose(inFile); - printf("ERROR: Couldn't create output header file '%s'.\n", argv[3]); + fprintf(stderr, "ERROR: Couldn't create output header file '%s'.\n", argv[3]); return -1; } Modified: trunk/reactos/tools/cat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cat.c?rev=66947&r1=6… ============================================================================== --- trunk/reactos/tools/cat.c [iso-8859-1] (original) +++ trunk/reactos/tools/cat.c [iso-8859-1] Sun Mar 29 02:00:15 2015 @@ -23,11 +23,12 @@ void help(void) { - printf("\n" - "ReactOS File Concatenation Tool\n" - "\n" - "Usage: cat [options] [file [...]]\n" - "options - Currently ignored\n"); + fprintf(stdout, + "\n" + "ReactOS File Concatenation Tool\n" + "\n" + "Usage: cat [options] [file [...]]\n" + "options - Currently ignored\n"); } int main(int argc, char* argv[]) @@ -84,7 +85,7 @@ in = fopen(argv[i], "rb"); if (in == NULL) { - printf("Failed to open file '%s'\n", argv[i]); + fprintf(stderr, "Failed to open file '%s'\n", argv[i]); return -1; } @@ -104,7 +105,7 @@ */ if (!feof(in)) { - printf("Error while reading file '%s'\n", argv[i]); + fprintf(stderr, "Error while reading file '%s'\n", argv[i]); fclose(in); return -1; }

1 0

[hbelusca] 66946: [CMAKE] Improve the concatenate_files macro introduced by Timo in r52179 + r52182 and hackfixed in r53914 . Notice that now it can take an arbitrary number of files to be concaten...
by hbelusca＠svn.reactos.org 29 Mar '15

29 Mar '15

Author: hbelusca Date: Sun Mar 29 01:53:10 2015 New Revision: 66946 URL: http://svn.reactos.org/svn/reactos?rev=66946&view=rev Log: [CMAKE] Improve the concatenate_files macro introduced by Timo in r52179 + r52182 and hackfixed in r53914 . Notice that now it can take an arbitrary number of files to be concatenated. Hence you need to specify first the output file, and all the rest is the different files. [FREELDR] Use the improved concatenate_files macro. Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sun Mar 29 01:53:10 2015 @@ -226,10 +226,13 @@ add_dependencies(freeldr_pe asm) add_dependencies(freeldr_pe_dbg asm) +# Retrieve the full path to the generated file of the 'freeldr_pe' target +get_target_property(_freeldr_pe_output_file freeldr_pe LOCATION) + concatenate_files( + ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin - freeldr_pe - ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys) + ${_freeldr_pe_output_file}) add_custom_target(freeldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys) @@ -238,9 +241,9 @@ add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FOR livecd hybridcd NAME_ON_CD setupldr.sys) concatenate_files( + ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin - freeldr_pe - ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) + ${_freeldr_pe_output_file}) add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) add_cd_file(TARGET setupldr FILE ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys DESTINATION loader NO_CAB FOR bootcd regtest) Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sun Mar 29 01:53:10 2015 @@ -504,33 +504,12 @@ endfunction() endif() -if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") - macro(to_win_path _cmake_path _native_path) - string(REPLACE "/" "\\" ${_native_path} "${_cmake_path}") - endmacro() - - # yeah the parameter mess sucks, but thats what works... - function(concatenate_files _file1 _target2 _output) - get_target_property(_file2 ${_target2} LOCATION) - to_win_path("${_file1}" _real_file1) - to_win_path("${_file2}" _real_file2) - to_win_path("${_output}" _real_output) - add_custom_command( - OUTPUT ${_output} - COMMAND cmd.exe /C "copy /Y /B ${_real_file1} + ${_real_file2} ${_real_output} > nul" - DEPENDS ${_file1} - DEPENDS ${_target2}) - endfunction() -else() - macro(concatenate_files _file1 _target2 _output) - get_target_property(_file2 ${_target2} LOCATION) - add_custom_command( - OUTPUT ${_output} - COMMAND cat ${_file1} ${_file2} > ${_output} - DEPENDS ${_file1} - DEPENDS ${_target2}) - endmacro() -endif() +macro(concatenate_files _output) + add_custom_command( + OUTPUT ${_output} + COMMAND native-cat ${ARGN} > ${_output} + DEPENDS ${ARGN} native-cat) +endmacro() function(add_importlibs _module) add_dependency_node(${_module})

1 0

[hbelusca] 66945: [CAT] - stricmp doesn't exist in *nix, use strcasecmp instead. - setmode (for setting IO streams mode -- text, binary --) is useless in *nix world, so just define it as a dummy fu...
by hbelusca＠svn.reactos.org 29 Mar '15

29 Mar '15

Author: hbelusca Date: Sun Mar 29 00:52:49 2015 New Revision: 66945 URL: http://svn.reactos.org/svn/reactos?rev=66945&view=rev Log: [CAT] - stricmp doesn't exist in *nix, use strcasecmp instead. - setmode (for setting IO streams mode -- text, binary --) is useless in *nix world, so just define it as a dummy function. Should fix build. Modified: trunk/reactos/tools/cat.c Modified: trunk/reactos/tools/cat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cat.c?rev=66945&r1=6… ============================================================================== --- trunk/reactos/tools/cat.c [iso-8859-1] (original) +++ trunk/reactos/tools/cat.c [iso-8859-1] Sun Mar 29 00:52:49 2015 @@ -8,8 +8,16 @@ * Hermès Bélusca - Maïto */ +#include <stdio.h> + +#ifdef _WIN32 #include <fcntl.h> -#include <stdio.h> +#else +#define O_TEXT 0x4000 +#define O_BINARY 0x8000 +#define setmode(fd, mode) // This function is useless in *nix world. +#define stricmp strcasecmp +#endif #define ARRAYSIZE(a) (sizeof(a) / sizeof((a)[0]))

1 0

[gadamopoulos] 66944: [SHELL32] - Load the shell extensions of the * class only for files. CORE-6806
by gadamopoulos＠svn.reactos.org 29 Mar '15

29 Mar '15

Author: gadamopoulos Date: Sun Mar 29 00:37:39 2015 New Revision: 66944 URL: http://svn.reactos.org/svn/reactos?rev=66944&view=rev Log: [SHELL32] - Load the shell extensions of the * class only for files. CORE-6806 Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Sun Mar 29 00:37:39 2015 @@ -760,13 +760,6 @@ } } } - - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"*", 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - /* load default extensions */ - EnumerateDynamicContextHandlerForKey(hKey); - RegCloseKey(hKey); - } } } else @@ -844,6 +837,15 @@ /* sendto service is registered here */ EnumerateDynamicContextHandlerForKey(hKey); RegCloseKey(hKey); + } + + if (!(rfg & SFGAO_FOLDER)) + { + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"*", 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + EnumerateDynamicContextHandlerForKey(hKey); + RegCloseKey(hKey); + } } }

1 0

[hbelusca] 66943: [CAT]: io.h appears to be useless, and seems to not be part of all C setups.
by hbelusca＠svn.reactos.org 29 Mar '15

29 Mar '15

Author: hbelusca Date: Sun Mar 29 00:16:53 2015 New Revision: 66943 URL: http://svn.reactos.org/svn/reactos?rev=66943&view=rev Log: [CAT]: io.h appears to be useless, and seems to not be part of all C setups. Modified: trunk/reactos/tools/cat.c Modified: trunk/reactos/tools/cat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cat.c?rev=66943&r1=6… ============================================================================== --- trunk/reactos/tools/cat.c [iso-8859-1] (original) +++ trunk/reactos/tools/cat.c [iso-8859-1] Sun Mar 29 00:16:53 2015 @@ -8,7 +8,6 @@ * Hermès Bélusca - Maïto */ -#include <io.h> #include <fcntl.h> #include <stdio.h>

1 0

[hbelusca] 66942: [ROSAPPS][HOST-TOOLS]: - Take the best of the two CAT rosapps and turn them into a host-tool. Will be used later on in the build process. - Few comment cleaning in bin2c tool.
by hbelusca＠svn.reactos.org 29 Mar '15

29 Mar '15

Author: hbelusca Date: Sun Mar 29 00:13:25 2015 New Revision: 66942 URL: http://svn.reactos.org/svn/reactos?rev=66942&view=rev Log: [ROSAPPS][HOST-TOOLS]: - Take the best of the two CAT rosapps and turn them into a host-tool. Will be used later on in the build process. - Few comment cleaning in bin2c tool. Added: trunk/reactos/tools/cat.c - copied, changed from r66923, trunk/rosapps/applications/sysutils/utils/cat/cat.c Removed: trunk/rosapps/applications/sysutils/tcat/ trunk/rosapps/applications/sysutils/utils/cat/ Modified: trunk/reactos/CMakeLists.txt trunk/reactos/tools/CMakeLists.txt trunk/reactos/tools/bin2c.c trunk/rosapps/applications/sysutils/CMakeLists.txt trunk/rosapps/applications/sysutils/utils/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=66942&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sun Mar 29 00:13:25 2015 @@ -85,9 +85,9 @@ add_subdirectory(lib) if(NOT MSVC) - export(TARGETS bin2c widl gendib cabman cdmake mkhive obj2bin spec2def geninc rsym mkshelllink utf16le FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) - else() - export(TARGETS bin2c widl gendib cabman cdmake mkhive obj2bin spec2def geninc mkshelllink utf16le FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + export(TARGETS bin2c cat widl gendib cabman cdmake mkhive obj2bin spec2def geninc rsym mkshelllink utf16le FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + else() + export(TARGETS bin2c cat widl gendib cabman cdmake mkhive obj2bin spec2def geninc mkshelllink utf16le FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) endif() else() Modified: trunk/reactos/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/CMakeLists.txt?rev=6… ============================================================================== --- trunk/reactos/tools/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/CMakeLists.txt [iso-8859-1] Sun Mar 29 00:13:25 2015 @@ -6,6 +6,7 @@ endif() add_executable(bin2c bin2c.c) +add_executable(cat cat.c) add_executable(gendib gendib/gendib.c) add_executable(geninc geninc/geninc.c) add_executable(mkshelllink mkshelllink/mkshelllink.c) Modified: trunk/reactos/tools/bin2c.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2c.c?rev=66942&r1… ============================================================================== --- trunk/reactos/tools/bin2c.c [iso-8859-1] (original) +++ trunk/reactos/tools/bin2c.c [iso-8859-1] Sun Mar 29 00:13:25 2015 @@ -16,18 +16,14 @@ unsigned char ch; unsigned char cnt; - /* - * Validate the arguments. - */ + /* Validate the arguments */ if (argc < 5) { printf("Usage: bin2c infile.bin outfile.c outfile.h array_name [array_attribute [header_for_attribute]]\n"); return -1; } - /* - * Open the input and the output files. - */ + /* Open the input and output files */ inFile = fopen(argv[1], "rb"); if (!inFile) { @@ -50,9 +46,7 @@ return -1; } - /* - * Generate the header file and close it. - */ + /* Generate the header file and close it */ fprintf(outHFile, "/* This file is autogenerated, do not edit. */\n\n"); fprintf(outHFile, "#ifndef CHAR\n" "#define CHAR char\n" @@ -60,21 +54,19 @@ fprintf(outHFile, "extern CHAR %s[];\n", argv[4]); fclose(outHFile); - /* - * Generate the source file and close it. - */ + /* Generate the source file and close it */ fprintf(outCFile, "/* This file is autogenerated, do not edit. */\n\n"); if (argc >= 7) { - /* There is a header to be included for defining the array attribute. */ + /* Include needed header for defining the array attribute */ fprintf(outCFile, "#include \"%s\"\n", argv[6]); } fprintf(outCFile, "#include \"%s\"\n\n", argv[3]); - /* Generate the array. */ + /* Generate the data array */ if (argc >= 6) { - /* There is an array attribute. */ + /* Add the array attribute */ fprintf(outCFile, "%s ", argv[5]); } fprintf(outCFile, "CHAR %s[] =\n{", argv[4]); @@ -92,12 +84,12 @@ ++cnt; ch = fgetc(inFile); } - /* Put a final NULL terminator. */ + /* Put a final NULL terminator */ fprintf(outCFile, "\n 0x00"); fprintf(outCFile, "\n};\n"); fclose(outCFile); - /* Close the input file. */ + /* Close the input file */ fclose(inFile); return 0; Copied: trunk/reactos/tools/cat.c (from r66923, trunk/rosapps/applications/sysutils/utils/cat/cat.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cat.c?p2=trunk/react… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/cat/cat.c [iso-8859-1] (original) +++ trunk/reactos/tools/cat.c [iso-8859-1] Sun Mar 29 00:13:25 2015 @@ -1,26 +1,120 @@ -#include <stdlib.h> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS conCATenation tool + * FILE: tools/cat.c + * PURPOSE: Concatenates STDIN or an arbitrary number of files to STDOUT + * PROGRAMMERS: David Welch + * Semyon Novikov (tappak) + * Hermès Bélusca - Maïto + */ + +#include <io.h> +#include <fcntl.h> #include <stdio.h> + +#define ARRAYSIZE(a) (sizeof(a) / sizeof((a)[0])) + +void help(void) +{ + printf("\n" + "ReactOS File Concatenation Tool\n" + "\n" + "Usage: cat [options] [file [...]]\n" + "options - Currently ignored\n"); +} int main(int argc, char* argv[]) { - int i; - FILE* in; - char ch; + int i; + FILE* in; + unsigned char buff[512]; + size_t cnt, readcnt; - for (i=1; i<argc; i++) - { - in = fopen(argv[i],"r"); - if (in == NULL) - { - printf("Failed to open file %s\n", argv[i]); - return(0); - } + if (argc >= 2) + { + if (stricmp(argv[1], "-h" ) == 0 || + stricmp(argv[1], "--help") == 0 || + stricmp(argv[1], "/?" ) == 0 || + stricmp(argv[1], "/help" ) == 0) + { + help(); + return 0; + } + } - while ((ch = fgetc(in)) != EOF) - { - putchar(ch); - } - fclose(in); - } - return 0; + /* Set STDOUT to binary */ + setmode(fileno(stdout), O_BINARY); + + /* Special case where we run 'cat' without any argument: we use STDIN */ + if (argc <= 1) + { + unsigned int ch; + + /* Set STDIN to binary */ + setmode(fileno(stdin), O_BINARY); + +#if 0 // Version using feof() + ch = fgetc(stdin); + while (!feof(stdin)) + { + putchar(ch); + ch = fgetc(stdin); + } +#else + while ((ch = fgetc(stdin)) != EOF) + { + putchar(ch); + } +#endif + + return 0; + } + + /* We have files: read them and output them to STDOUT */ + for (i = 1; i < argc; i++) + { + /* Open the file in binary read mode */ + in = fopen(argv[i], "rb"); + if (in == NULL) + { + printf("Failed to open file '%s'\n", argv[i]); + return -1; + } + + /* Dump the file to STDOUT */ + cnt = 0; readcnt = 0; + while (readcnt == cnt) + { + /* Read data from the input file */ + cnt = ARRAYSIZE(buff); + readcnt = fread(&buff, sizeof(buff[0]), cnt, in); + if (readcnt != cnt) + { + /* + * The real number of read bytes differs from the number of bytes + * we wanted to read, so either a reading error occurred, or EOF + * was reached while reading. Bail out if it is a reading error. + */ + if (!feof(in)) + { + printf("Error while reading file '%s'\n", argv[i]); + fclose(in); + return -1; + } + } + + /* Nothing to be read anymore, so we can gracefully break */ + if (readcnt == 0) break; + + /* Write data to STDOUT */ + fwrite(&buff, sizeof(buff[0]), readcnt, stdout); + } + + /* Finally close the file */ + fclose(in); + } + + return 0; } + +/* EOF */ Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/CMak… ============================================================================== --- trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] Sun Mar 29 00:13:25 2015 @@ -12,6 +12,5 @@ #add_subdirectory(rosddt) #add_subdirectory(screenshot) #add_subdirectory(systeminfo) -#add_subdirectory(tcat) add_subdirectory(tlist) add_subdirectory(utils) Modified: trunk/rosapps/applications/sysutils/utils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/utils/CMakeLists.txt [iso-8859-1] Sun Mar 29 00:13:25 2015 @@ -1,5 +1,4 @@ #add_subdirectory(binpatch) -add_subdirectory(cat) #add_subdirectory(driver) #add_subdirectory(infinst) #add_subdirectory(nts2w32err)

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