Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[navaraf] 16948: Pass correct pool type to PsChargePoolQuota.

by navaraf＠svn.reactos.com

Pass correct pool type to PsChargePoolQuota. Modified: trunk/reactos/ntoskrnl/mm/pool.c _____ Modified: trunk/reactos/ntoskrnl/mm/pool.c --- trunk/reactos/ntoskrnl/mm/pool.c 2005-08-01 11:58:47 UTC (rev 16947) +++ trunk/reactos/ntoskrnl/mm/pool.c 2005-08-01 11:59:22 UTC (rev 16948) @@ -192,14 +192,14 @@ return EXCEPTION_CONTINUE_SEARCH; } _SEH_TRY { //* FIXME: Is there a way to get the actual Pool size allocated from the pool header? */ - PsChargePoolQuota(Process, PoolType, NumberOfBytes); + PsChargePoolQuota(Process, PoolType & PAGED_POOL_MASK, NumberOfBytes); } _SEH_EXCEPT(FreeAndGoOn) { /* Quota Exceeded and the caller had no SEH! */ KeBugCheck(STATUS_QUOTA_EXCEEDED); } _SEH_END; #else /* assuming all other Win32 compilers understand SEH */ __try { - PsChargePoolQuota(Process, PoolType, NumberOfBytes); + PsChargePoolQuota(Process, PoolType & PAGED_POOL_MASK, NumberOfBytes); } __except (ExFreePool(Block), EXCEPTION_CONTINUE_SEARCH) { KeBugCheck(STATUS_QUOTA_EXCEEDED);

19 years, 1 month

[weiden] 16947: don't count references for the default quota block and fixed warnings

by weiden＠svn.reactos.com

don't count references for the default quota block and fixed warnings Modified: trunk/reactos/ntoskrnl/ps/quota.c _____ Modified: trunk/reactos/ntoskrnl/ps/quota.c --- trunk/reactos/ntoskrnl/ps/quota.c 2005-08-01 11:46:30 UTC (rev 16946) +++ trunk/reactos/ntoskrnl/ps/quota.c 2005-08-01 11:58:47 UTC (rev 16947) @@ -19,17 +19,18 @@ STDCALL PspInheritQuota(PEPROCESS Process, PEPROCESS ParentProcess) { - PEPROCESS_QUOTA_BLOCK QuotaBlock; + if (ParentProcess != NULL) + { + PEPROCESS_QUOTA_BLOCK QuotaBlock = ParentProcess->QuotaBlock; + + ASSERT(QuotaBlock != NULL); - if (ParentProcess != NULL) - QuotaBlock = ParentProcess->QuotaBlock; + InterlockedIncrementUL(&QuotaBlock->ReferenceCount); + + Process->QuotaBlock = QuotaBlock; + } else - QuotaBlock = &PspDefaultQuotaBlock; - - ASSERT(QuotaBlock != NULL); - - InterlockedIncrement(&QuotaBlock->ReferenceCount); - Process->QuotaBlock = QuotaBlock; + Process->QuotaBlock = &PspDefaultQuotaBlock; } VOID @@ -38,10 +39,10 @@ { PEPROCESS_QUOTA_BLOCK QuotaBlock = Process->QuotaBlock; - if (InterlockedDecrement(&QuotaBlock->ReferenceCount) == 0) + if (QuotaBlock != &PspDefaultQuotaBlock && + InterlockedDecrementUL(&QuotaBlock->ReferenceCount) == 0) { - if (QuotaBlock != &PspDefaultQuotaBlock) - ExFreePool(QuotaBlock); + ExFreePool(QuotaBlock); } }

19 years, 1 month

[navaraf] 16946: Fix a typo. Thanks to Hervé Poussineau for noticing.

by navaraf＠svn.reactos.com

Fix a typo. Thanks to Hervé Poussineau for noticing. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/mm/pool.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2005-08-01 11:33:15 UTC (rev 16945) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2005-08-01 11:46:30 UTC (rev 16946) @@ -308,7 +308,7 @@ extern ULONG MmPagedPoolSize; #define PAGED_POOL_MASK 1 -#define MUST_SUCCEES_POOL_MASK 2 +#define MUST_SUCCEED_POOL_MASK 2 #define CACHE_ALIGNED_POOL_MASK 4 #define QUOTA_POOL_MASK 8 #define SESSION_POOL_MASK 32 _____ Modified: trunk/reactos/ntoskrnl/mm/pool.c --- trunk/reactos/ntoskrnl/mm/pool.c 2005-08-01 11:33:15 UTC (rev 16945) +++ trunk/reactos/ntoskrnl/mm/pool.c 2005-08-01 11:46:30 UTC (rev 16946) @@ -40,7 +40,7 @@ Block = ExAllocateNonPagedPoolWithTag(PoolType,NumberOfBytes,Tag,Caller); } - if ((PoolType & MUST_SUCCEES_POOL_MASK) && Block==NULL) + if ((PoolType & MUST_SUCCEED_POOL_MASK) && Block==NULL) { KEBUGCHECK(MUST_SUCCEED_POOL_EMPTY); }

19 years, 1 month

[navaraf] 16945: Add pool type masks and use them.

by navaraf＠svn.reactos.com

Add pool type masks and use them. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/mm/npool.c Modified: trunk/reactos/ntoskrnl/mm/pool.c Modified: trunk/reactos/ntoskrnl/mm/ppool.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2005-08-01 11:26:53 UTC (rev 16944) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2005-08-01 11:33:15 UTC (rev 16945) @@ -307,6 +307,13 @@ extern PVOID MmPagedPoolBase; extern ULONG MmPagedPoolSize; +#define PAGED_POOL_MASK 1 +#define MUST_SUCCEES_POOL_MASK 2 +#define CACHE_ALIGNED_POOL_MASK 4 +#define QUOTA_POOL_MASK 8 +#define SESSION_POOL_MASK 32 +#define VERIFIER_POOL_MASK 64 + #define MM_PAGED_POOL_SIZE (100*1024*1024) #define MM_NONPAGED_POOL_SIZE (100*1024*1024) _____ Modified: trunk/reactos/ntoskrnl/mm/npool.c --- trunk/reactos/ntoskrnl/mm/npool.c 2005-08-01 11:26:53 UTC (rev 16944) +++ trunk/reactos/ntoskrnl/mm/npool.c 2005-08-01 11:33:15 UTC (rev 16945) @@ -1630,8 +1630,7 @@ { alignment = PAGE_SIZE; } - else if (Type == NonPagedPoolCacheAligned || - Type == NonPagedPoolCacheAlignedMustS) + else if (Type & CACHE_ALIGNED_POOL_MASK) { alignment = MM_CACHE_LINE_SIZE; } _____ Modified: trunk/reactos/ntoskrnl/mm/pool.c --- trunk/reactos/ntoskrnl/mm/pool.c 2005-08-01 11:26:53 UTC (rev 16944) +++ trunk/reactos/ntoskrnl/mm/pool.c 2005-08-01 11:33:15 UTC (rev 16945) @@ -30,31 +30,17 @@ { PVOID Block; - - switch(PoolType) + /* FIXME: Handle SESSION_POOL_MASK, VERIFIER_POOL_MASK, QUOTA_POOL_MASK */ + if (PoolType & PAGED_POOL_MASK) { - case NonPagedPool: - case NonPagedPoolMustSucceed: - case NonPagedPoolCacheAligned: - case NonPagedPoolCacheAlignedMustS: - Block = - ExAllocateNonPagedPoolWithTag(PoolType, - NumberOfBytes, - Tag, - Caller); - break; + Block = ExAllocatePagedPoolWithTag(PoolType,NumberOfBytes,Tag); + } + else + { + Block = ExAllocateNonPagedPoolWithTag(PoolType,NumberOfBytes,Tag,Caller); + } - case PagedPool: - case PagedPoolCacheAligned: - Block = ExAllocatePagedPoolWithTag(PoolType,NumberOfBytes,Tag); - break; - - default: - return(NULL); - }; - - if ((PoolType==NonPagedPoolMustSucceed || - PoolType==NonPagedPoolCacheAlignedMustS) && Block==NULL) + if ((PoolType & MUST_SUCCEES_POOL_MASK) && Block==NULL) { KEBUGCHECK(MUST_SUCCEED_POOL_EMPTY); } _____ Modified: trunk/reactos/ntoskrnl/mm/ppool.c --- trunk/reactos/ntoskrnl/mm/ppool.c 2005-08-01 11:26:53 UTC (rev 16944) +++ trunk/reactos/ntoskrnl/mm/ppool.c 2005-08-01 11:33:15 UTC (rev 16945) @@ -80,7 +80,7 @@ if ( NumberOfBytes >= PAGE_SIZE ) align = 2; - else if ( PoolType == PagedPoolCacheAligned ) + else if ( PoolType & CACHE_ALIGNED_POOL_MASK ) align = 1; else align = 0;

19 years, 1 month

[navaraf] 16944: Fix definition of EPROCESS_QUOTA_ENTRY.

by navaraf＠svn.reactos.com

Fix definition of EPROCESS_QUOTA_ENTRY. Modified: trunk/reactos/include/ndk/pstypes.h _____ Modified: trunk/reactos/include/ndk/pstypes.h --- trunk/reactos/include/ndk/pstypes.h 2005-08-01 11:21:42 UTC (rev 16943) +++ trunk/reactos/include/ndk/pstypes.h 2005-08-01 11:26:53 UTC (rev 16944) @@ -287,10 +287,10 @@ typedef struct _EPROCESS_QUOTA_ENTRY { - ULONG Usage; - ULONG Limit; - ULONG Peak; - ULONG Return; + SIZE_T Usage; + SIZE_T Limit; + SIZE_T Peak; + SIZE_T Return; } EPROCESS_QUOTA_ENTRY, *PEPROCESS_QUOTA_ENTRY; typedef struct _EPROCESS_QUOTA_BLOCK

19 years, 1 month

[navaraf] 16943: Setup quota blocks for processes.

by navaraf＠svn.reactos.com

Setup quota blocks for processes. Modified: trunk/reactos/ntoskrnl/include/internal/ps.h _____ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h --- trunk/reactos/ntoskrnl/include/internal/ps.h 2005-08-01 11:20:44 UTC (rev 16942) +++ trunk/reactos/ntoskrnl/include/internal/ps.h 2005-08-01 11:21:42 UTC (rev 16943) @@ -117,6 +117,7 @@ extern LIST_ENTRY PsActiveProcessHead; extern FAST_MUTEX PspActiveProcessMutex; extern LARGE_INTEGER ShortPsLockDelay, PsLockTimeout; +extern EPROCESS_QUOTA_BLOCK PspDefaultQuotaBlock; VOID STDCALL @@ -190,6 +191,14 @@ VOID INIT_FUNCTION PsInitJobManagment(VOID); +VOID +STDCALL +PspInheritQuota(PEPROCESS Process, PEPROCESS ParentProcess); + +VOID +STDCALL +PspDestroyQuotaBlock(PEPROCESS Process); + /* CLIENT ID */ NTSTATUS PsCreateCidHandle(PVOID Object, POBJECT_TYPE ObjectType, PHANDLE Handle);

19 years, 1 month

[navaraf] 16942: Setup quota blocks for processes.

by navaraf＠svn.reactos.com

Setup quota blocks for processes. Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/ps/quota.c _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-08-01 10:58:28 UTC (rev 16941) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-08-01 11:20:44 UTC (rev 16942) @@ -509,6 +509,8 @@ PspRunCreateProcessNotifyRoutines(Process, FALSE); + PspDestroyQuotaBlock(Process); + /* close all handles associated with our process, this needs to be done when the last thread still runs */ ObKillProcess(Process); _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-08-01 10:58:28 UTC (rev 16941) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-08-01 11:20:44 UTC (rev 16942) @@ -20,6 +20,8 @@ PEPROCESS PsIdleProcess = NULL; POBJECT_TYPE EXPORTED PsProcessType = NULL; +EPROCESS_QUOTA_BLOCK PspDefaultQuotaBlock; + LIST_ENTRY PsActiveProcessHead; FAST_MUTEX PspActiveProcessMutex; LARGE_INTEGER ShortPsLockDelay, PsLockTimeout; @@ -295,8 +297,8 @@ Process->Session = pParentProcess->Session; } - /* FIXME: Set up the Quota Block from the Parent - PspInheritQuota(Parent, Process); */ + /* Set up the Quota Block from the Parent */ + PspInheritQuota(Process, pParentProcess); /* FIXME: Set up Dos Device Map from the Parent ObInheritDeviceMap(Parent, Process) */ @@ -369,7 +371,7 @@ DPRINT1("Failed to create CID handle (unique process ID)! Status: 0x%x\n", Status); ObDereferenceObject(Process); goto exitdereferenceobjects; - } + } /* FIXME: Insert into Job Object */ _____ Modified: trunk/reactos/ntoskrnl/ps/psmgr.c --- trunk/reactos/ntoskrnl/ps/psmgr.c 2005-08-01 10:58:28 UTC (rev 16941) +++ trunk/reactos/ntoskrnl/ps/psmgr.c 2005-08-01 11:20:44 UTC (rev 16942) @@ -126,22 +126,31 @@ DPRINT("Creating Process Object Type\n"); - /* Initialize the Thread type */ - RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); - RtlInitUnicodeString(&Name, L"Process"); - ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); - ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(EPROCESS); - ObjectTypeInitializer.GenericMapping = PiProcessMapping; - ObjectTypeInitializer.PoolType = NonPagedPool; - ObjectTypeInitializer.ValidAccessMask = PROCESS_ALL_ACCESS; - ObjectTypeInitializer.UseDefaultObject = TRUE; - ObjectTypeInitializer.DeleteProcedure = PspDeleteProcess; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &PsProcessType); + /* Initialize the Process type */ + RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); + RtlInitUnicodeString(&Name, L"Process"); + ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(EPROCESS); + ObjectTypeInitializer.GenericMapping = PiProcessMapping; + ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.ValidAccessMask = PROCESS_ALL_ACCESS; + ObjectTypeInitializer.UseDefaultObject = TRUE; + ObjectTypeInitializer.DeleteProcedure = PspDeleteProcess; + ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &PsProcessType); InitializeListHead(&PsActiveProcessHead); ExInitializeFastMutex(&PspActiveProcessMutex); /* + * Initialize the default quota block. + */ + + RtlZeroMemory(&PspDefaultQuotaBlock, sizeof(PspDefaultQuotaBlock)); + PspDefaultQuotaBlock.QuotaEntry[PagedPool].Limit = (SIZE_T)-1; + PspDefaultQuotaBlock.QuotaEntry[NonPagedPool].Limit = (SIZE_T)-1; + PspDefaultQuotaBlock.QuotaEntry[2].Limit = (SIZE_T)-1; /* Page file */ + + /* * Initialize the idle process */ Status = ObCreateObject(KernelMode, @@ -175,6 +184,7 @@ FALSE); PsIdleProcess->Pcb.DirectoryTableBase.QuadPart = (ULONG_PTR)MmGetPageDirectory(); strcpy(PsIdleProcess->ImageFileName, "Idle"); + PspInheritQuota(PsIdleProcess, NULL); /* * Initialize the system process @@ -207,6 +217,7 @@ sizeof(EPROCESS), FALSE); KProcess = &PsInitialSystemProcess->Pcb; + PspInheritQuota(PsInitialSystemProcess, NULL); MmInitializeAddressSpace(PsInitialSystemProcess, &PsInitialSystemProcess->AddressSpace); _____ Modified: trunk/reactos/ntoskrnl/ps/quota.c --- trunk/reactos/ntoskrnl/ps/quota.c 2005-08-01 10:58:28 UTC (rev 16941) +++ trunk/reactos/ntoskrnl/ps/quota.c 2005-08-01 11:20:44 UTC (rev 16942) @@ -15,6 +15,36 @@ /* FUNCTIONS ***************************************************************/ +VOID +STDCALL +PspInheritQuota(PEPROCESS Process, PEPROCESS ParentProcess) +{ + PEPROCESS_QUOTA_BLOCK QuotaBlock; + + if (ParentProcess != NULL) + QuotaBlock = ParentProcess->QuotaBlock; + else + QuotaBlock = &PspDefaultQuotaBlock; + + ASSERT(QuotaBlock != NULL); + + InterlockedIncrement(&QuotaBlock->ReferenceCount); + Process->QuotaBlock = QuotaBlock; +} + +VOID +STDCALL +PspDestroyQuotaBlock(PEPROCESS Process) +{ + PEPROCESS_QUOTA_BLOCK QuotaBlock = Process->QuotaBlock; + + if (InterlockedDecrement(&QuotaBlock->ReferenceCount) == 0) + { + if (QuotaBlock != &PspDefaultQuotaBlock) + ExFreePool(QuotaBlock); + } +} + /* * @implemented */

19 years, 1 month

[weiden] 16941: define common build flags so they can easily be changed for all tools

by weiden＠svn.reactos.com

define common build flags so they can easily be changed for all tools Modified: trunk/reactos/tools/bin2c.mak Modified: trunk/reactos/tools/bin2res/bin2res.mak Modified: trunk/reactos/tools/buildno/buildno.mak Modified: trunk/reactos/tools/cabman/cabman.mak Modified: trunk/reactos/tools/cdmake/cdmake.c Modified: trunk/reactos/tools/cdmake/cdmake.mak Modified: trunk/reactos/tools/gendib/gendib.mak Modified: trunk/reactos/tools/mkhive/mkhive.mak Modified: trunk/reactos/tools/nci/nci.mak Modified: trunk/reactos/tools/rbuild/rbuild.mak Modified: trunk/reactos/tools/rsym.mak Modified: trunk/reactos/tools/tools.mak Modified: trunk/reactos/tools/unicode/unicode.mak Modified: trunk/reactos/tools/widl/widl.mak Modified: trunk/reactos/tools/winebuild/winebuild.mak Modified: trunk/reactos/tools/wmc/wmc.mak Modified: trunk/reactos/tools/wpp/wpp.mak Modified: trunk/reactos/tools/wrc/wrc.mak _____ Modified: trunk/reactos/tools/bin2c.mak --- trunk/reactos/tools/bin2c.mak 2005-08-01 10:21:20 UTC (rev 16940) +++ trunk/reactos/tools/bin2c.mak 2005-08-01 10:58:28 UTC (rev 16941) @@ -15,9 +15,9 @@ BIN2C_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(BIN2C_SOURCES:.c=.o)) -BIN2C_HOST_CFLAGS = -g -Werror -Wall +BIN2C_HOST_CFLAGS = $(TOOLS_CFLAGS) -BIN2C_HOST_LFLAGS = -g +BIN2C_HOST_LFLAGS = $(TOOLS_LFLAGS) .PHONY: bin2c bin2c: $(BIN2C_TARGET) _____ Modified: trunk/reactos/tools/bin2res/bin2res.mak --- trunk/reactos/tools/bin2res/bin2res.mak 2005-08-01 10:21:20 UTC (rev 16940) +++ trunk/reactos/tools/bin2res/bin2res.mak 2005-08-01 10:58:28 UTC (rev 16941) @@ -26,9 +26,9 @@ BIN2RES_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(BIN2RES_SOURCES:.c=.o)) -BIN2RES_HOST_CFLAGS = -Iinclude/wine -D__REACTOS__ -g -Werror -Wall +BIN2RES_HOST_CFLAGS = -Iinclude/wine -D__REACTOS__ $(TOOLS_CFLAGS) -BIN2RES_HOST_LFLAGS = -g +BIN2RES_HOST_LFLAGS = $(TOOLS_LFLAGS) $(BIN2RES_TARGET): $(BIN2RES_OBJECTS) | $(BIN2RES_OUT) $(ECHO_LD) _____ Modified: trunk/reactos/tools/buildno/buildno.mak --- trunk/reactos/tools/buildno/buildno.mak 2005-08-01 10:21:20 UTC (rev 16940) +++ trunk/reactos/tools/buildno/buildno.mak 2005-08-01 10:58:28 UTC (rev 16941) @@ -28,9 +28,9 @@ BUILDNO_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(BUILDNO_SOURCES:.cpp=.o)) -BUILDNO_HOST_CFLAGS = -Iinclude/reactos -g -Werror -Wall +BUILDNO_HOST_CXXFLAGS = -Iinclude/reactos $(TOOLS_CPPFLAGS) -BUILDNO_HOST_LFLAGS = -g +BUILDNO_HOST_LFLAGS = $(TOOLS_LFLAGS) $(BUILDNO_TARGET): $(BUILDNO_OBJECTS) | $(BUILDNO_OUT) $(ECHO_LD) @@ -38,19 +38,19 @@ $(BUILDNO_INT_)buildno.o: $(BUILDNO_BASE_)buildno.cpp | $(BUILDNO_INT) $(ECHO_CC) - ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $< -o $@ + ${host_gpp} $(BUILDNO_HOST_CXXFLAGS) -c $< -o $@ $(BUILDNO_INT_)exception.o: $(BUILDNO_BASE_)exception.cpp | $(BUILDNO_INT) $(ECHO_CC) - ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $< -o $@ + ${host_gpp} $(BUILDNO_HOST_CXXFLAGS) -c $< -o $@ $(BUILDNO_INT_)ssprintf.o: $(BUILDNO_BASE_)ssprintf.cpp | $(BUILDNO_INT) $(ECHO_CC) - ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $< -o $@ + ${host_gpp} $(BUILDNO_HOST_CXXFLAGS) -c $< -o $@ $(BUILDNO_INT_)XML.o: $(BUILDNO_BASE_)XML.cpp | $(BUILDNO_INT) $(ECHO_CC) - ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $< -o $@ + ${host_gpp} $(BUILDNO_HOST_CXXFLAGS) -c $< -o $@ .PHONY: buildno_clean buildno_clean: _____ Modified: trunk/reactos/tools/cabman/cabman.mak --- trunk/reactos/tools/cabman/cabman.mak 2005-08-01 10:21:20 UTC (rev 16940) +++ trunk/reactos/tools/cabman/cabman.mak 2005-08-01 10:58:28 UTC (rev 16941) @@ -29,11 +29,11 @@ CABMAN_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(CABMAN_SOURCES:.cxx=.o)) -CABMAN_HOST_CFLAGS = -Iinclude/reactos -Ilib/zlib -g -Werror -Wall +CABMAN_HOST_CXXFLAGS = -Iinclude/reactos -Ilib/zlib $(TOOLS_CXXFLAGS) CABMAN_HOST_LIBS = $(ZLIB_HOST_TARGET) -CABMAN_HOST_LFLAGS = -g $(CABMAN_HOST_LIBS) +CABMAN_HOST_LFLAGS = $(TOOLS_LFLAGS) $(CABMAN_HOST_LIBS) .PHONY: cabman cabman: $(CABMAN_TARGET) @@ -44,23 +44,23 @@ $(CABMAN_INT_)cabinet.o: $(CABMAN_BASE_)cabinet.cxx | $(CABMAN_INT) $(ECHO_CC) - ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ + ${host_gpp} $(CABMAN_HOST_CXXFLAGS) -c $< -o $@ $(CABMAN_INT_)dfp.o: $(CABMAN_BASE_)dfp.cxx | $(CABMAN_INT) $(ECHO_CC) - ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ + ${host_gpp} $(CABMAN_HOST_CXXFLAGS) -c $< -o $@ $(CABMAN_INT_)main.o: $(CABMAN_BASE_)main.cxx | $(CABMAN_INT) $(ECHO_CC) - ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ + ${host_gpp} $(CABMAN_HOST_CXXFLAGS) -c $< -o $@ $(CABMAN_INT_)mszip.o: $(CABMAN_BASE_)mszip.cxx | $(CABMAN_INT) $(ECHO_CC) - ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ + ${host_gpp} $(CABMAN_HOST_CXXFLAGS) -c $< -o $@ $(CABMAN_INT_)raw.o: $(CABMAN_BASE_)raw.cxx | $(CABMAN_INT) $(ECHO_CC) - ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ + ${host_gpp} $(CABMAN_HOST_CXXFLAGS) -c $< -o $@ .PHONY: cabman_clean cabman_clean: _____ Modified: trunk/reactos/tools/cdmake/cdmake.c --- trunk/reactos/tools/cdmake/cdmake.c 2005-08-01 10:21:20 UTC (rev 16940) +++ trunk/reactos/tools/cdmake/cdmake.c 2005-08-01 10:58:28 UTC (rev 16941) @@ -423,6 +423,9 @@ if (d->extension_on_cd[0] != 0) identifier_size += 1 + strlen(d->extension_on_cd); break; + default: + identifier_size = 1; + break; } } record_size = 33 + identifier_size; _____ Modified: trunk/reactos/tools/cdmake/cdmake.mak --- trunk/reactos/tools/cdmake/cdmake.mak 2005-08-01 10:21:20 UTC (rev 16940) +++ trunk/reactos/tools/cdmake/cdmake.mak 2005-08-01 10:58:28 UTC (rev 16941) @@ -26,9 +26,9 @@ CDMAKE_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(CDMAKE_SOURCES:.c=.o)) -CDMAKE_HOST_CFLAGS = -Iinclude -g -Werror -Wall +CDMAKE_HOST_CFLAGS = -Iinclude $(TOOLS_CFLAGS) -CDMAKE_HOST_LFLAGS = -g +CDMAKE_HOST_LFLAGS = $(TOOLS_LFLAGS) .PHONY: cdmake cdmake: $(CDMAKE_TARGET) _____ Modified: trunk/reactos/tools/gendib/gendib.mak --- trunk/reactos/tools/gendib/gendib.mak 2005-08-01 10:21:20 UTC (rev 16940) +++ trunk/reactos/tools/gendib/gendib.mak 2005-08-01 10:58:28 UTC (rev 16941) @@ -24,9 +24,9 @@ GENDIB_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(GENDIB_SOURCES:.c=.o)) -GENDIB_HOST_CFLAGS = -g -Werror -Wall +GENDIB_HOST_CFLAGS = $(TOOLS_CFLAGS) -GENDIB_HOST_LFLAGS = -g +GENDIB_HOST_LFLAGS = $(TOOLS_LFLAGS) $(GENDIB_TARGET): $(GENDIB_OBJECTS) | $(GENDIB_OUT) $(ECHO_LD) _____ Modified: trunk/reactos/tools/mkhive/mkhive.mak --- trunk/reactos/tools/mkhive/mkhive.mak 2005-08-01 10:21:20 UTC (rev 16940) +++ trunk/reactos/tools/mkhive/mkhive.mak 2005-08-01 10:58:28 UTC (rev 16941) @@ -29,9 +29,9 @@ MKHIVE_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(MKHIVE_SOURCES:.c=.o)) -MKHIVE_HOST_CFLAGS = -g -Werror -Wall +MKHIVE_HOST_CFLAGS = $(TOOLS_CFLAGS) -MKHIVE_HOST_LFLAGS = -g +MKHIVE_HOST_LFLAGS = $(TOOLS_LFLAGS) .PHONY: mkhive mkhive: $(MKHIVE_TARGET) _____ Modified: trunk/reactos/tools/nci/nci.mak --- trunk/reactos/tools/nci/nci.mak 2005-08-01 10:21:20 UTC (rev 16940) +++ trunk/reactos/tools/nci/nci.mak 2005-08-01 10:58:28 UTC (rev 16941) @@ -24,9 +24,9 @@ NCI_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(NCI_SOURCES:.c=.o)) -NCI_HOST_CFLAGS = -Iinclude -g -Werror -Wall +NCI_HOST_CFLAGS = -Iinclude $(TOOLS_CFLAGS) -NCI_HOST_LFLAGS = -g +NCI_HOST_LFLAGS = $(TOOLS_LFLAGS) $(NCI_TARGET): $(NCI_OBJECTS) | $(NCI_OUT) $(ECHO_LD) _____ Modified: trunk/reactos/tools/rbuild/rbuild.mak --- trunk/reactos/tools/rbuild/rbuild.mak 2005-08-01 10:21:20 UTC (rev 16940) +++ trunk/reactos/tools/rbuild/rbuild.mak 2005-08-01 10:58:28 UTC (rev 16941) @@ -215,9 +215,9 @@ $(RBUILD_COMMON_OBJECTS) \ $(RBUILD_TEST_SPECIAL_OBJECTS) -RBUILD_HOST_CXXFLAGS = -g -I$(RBUILD_BASE) -Werror -Wall +RBUILD_HOST_CXXFLAGS = -I$(RBUILD_BASE) $(TOOLS_CPPFLAGS) -RBUILD_HOST_LFLAGS = -g +RBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS) .PHONY: rbuild rbuild: $(RBUILD_TARGET) _____ Modified: trunk/reactos/tools/rsym.mak --- trunk/reactos/tools/rsym.mak 2005-08-01 10:21:20 UTC (rev 16940) +++ trunk/reactos/tools/rsym.mak 2005-08-01 10:58:28 UTC (rev 16941) @@ -16,9 +16,9 @@ RSYM_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(RSYM_SOURCES:.c=.o)) -RSYM_HOST_CFLAGS = -g -Werror -Wall +RSYM_HOST_CFLAGS = $(TOOLS_CFLAGS) -RSYM_HOST_LFLAGS = -g +RSYM_HOST_LFLAGS = $(TOOLS_LFLAGS) .PHONY: rsym rsym: $(RSYM_TARGET) _____ Modified: trunk/reactos/tools/tools.mak --- trunk/reactos/tools/tools.mak 2005-08-01 10:21:20 UTC (rev 16940) +++ trunk/reactos/tools/tools.mak 2005-08-01 10:58:28 UTC (rev 16941) @@ -5,6 +5,10 @@ TOOLS_OUT = $(OUTPUT_)$(TOOLS_BASE) TOOLS_OUT_ = $(TOOLS_OUT)$(SEP) +TOOLS_CFLAGS = -Werror -Wall -Wpointer-arith -Wno-strict-aliasing +TOOLS_CPPFLAGS = -Werror -Wall -Wpointer-arith +TOOLS_LFLAGS = + $(TOOLS_INT): | $(INTERMEDIATE) $(ECHO_MKDIR) ${mkdir} $@ _____ Modified: trunk/reactos/tools/unicode/unicode.mak --- trunk/reactos/tools/unicode/unicode.mak 2005-08-01 10:21:20 UTC (rev 16940) +++ trunk/reactos/tools/unicode/unicode.mak 2005-08-01 10:58:28 UTC (rev 16941) @@ -97,7 +97,8 @@ UNICODE_HOST_CFLAGS = \ -D__USE_W32API -DWINVER=0x501 -DWINE_UNICODE_API= \ -Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \ - -I$(UNICODE_BASE) -Iinclude/wine -Iw32api/include + -I$(UNICODE_BASE) -Iinclude/wine -Iw32api/include \ + $(TOOLS_CFLAGS) .PHONY: unicode unicode: $(UNICODE_TARGET) _____ Modified: trunk/reactos/tools/widl/widl.mak --- trunk/reactos/tools/widl/widl.mak 2005-08-01 10:21:20 UTC (rev 16940) +++ trunk/reactos/tools/widl/widl.mak 2005-08-01 10:58:28 UTC (rev 16941) @@ -53,12 +53,12 @@ WIDL_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(WIDL_SOURCES:.c=.o)) -WIDL_HOST_CFLAGS = -g -Werror -Wall \ +WIDL_HOST_CFLAGS = $(TOOLS_CFLAGS) \ -DINT16=SHORT -D__USE_W32API -DYYDEBUG=1 \ -I$(WIDL_BASE) -I$(WPP_BASE) \ -Iinclude/wine -Iinclude -Iw32api/include -WIDL_HOST_LFLAGS = -g +WIDL_HOST_LFLAGS = $(TOOLS_LFLAGS) WIDL_LIBS = $(WPP_TARGET) _____ Modified: trunk/reactos/tools/winebuild/winebuild.mak --- trunk/reactos/tools/winebuild/winebuild.mak 2005-08-01 10:21:20 UTC (rev 16940) +++ trunk/reactos/tools/winebuild/winebuild.mak 2005-08-01 10:58:28 UTC (rev 16941) @@ -32,9 +32,9 @@ WINEBUILD_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(WINEBUILD_SOURCES:.c=.o)) -WINEBUILD_HOST_CFLAGS = -D__USE_W32API -Iinclude/wine +WINEBUILD_HOST_CFLAGS = $(TOOLS_CFLAGS) -D__USE_W32API -Iinclude -Iinclude/wine -WINEBUILD_HOST_LFLAGS = -g +WINEBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS) .PHONY: winebuild winebuild: $(WINEBUILD_TARGET) _____ Modified: trunk/reactos/tools/wmc/wmc.mak --- trunk/reactos/tools/wmc/wmc.mak 2005-08-01 10:21:20 UTC (rev 16940) +++ trunk/reactos/tools/wmc/wmc.mak 2005-08-01 10:58:28 UTC (rev 16941) @@ -32,9 +32,9 @@ WMC_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(WMC_SOURCES:.c=.o)) -WMC_HOST_CXXFLAGS = -I$(WMC_BASE) -g -Werror -Wall +WMC_HOST_CFLAGS = -I$(WMC_BASE) $(TOOLS_CFLAGS) -WMC_HOST_LFLAGS = -g +WMC_HOST_LFLAGS = $(TOOLS_LFLAGS) .PHONY: wmc wmc: $(WMC_TARGET) @@ -45,35 +45,35 @@ $(WMC_INT_)getopt.o: $(WMC_BASE_)getopt.c | $(WMC_INT) $(ECHO_CC) - ${host_gcc} $(WMC_HOST_CXXFLAGS) -c $< -o $@ + ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ $(WMC_INT_)lang.o: $(WMC_BASE_)lang.c | $(WMC_INT) $(ECHO_CC) - ${host_gcc} $(WMC_HOST_CXXFLAGS) -c $< -o $@ + ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ $(WMC_INT_)mcl.o: $(WMC_BASE_)mcl.c | $(WMC_INT) $(ECHO_CC) - ${host_gcc} $(WMC_HOST_CXXFLAGS) -c $< -o $@ + ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ $(WMC_INT_)utils.o: $(WMC_BASE_)utils.c | $(WMC_INT) $(ECHO_CC) - ${host_gcc} $(WMC_HOST_CXXFLAGS) -c $< -o $@ + ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ $(WMC_INT_)wmc.o: $(WMC_BASE_)wmc.c | $(WMC_INT) $(ECHO_CC) - ${host_gcc} $(WMC_HOST_CXXFLAGS) -c $< -o $@ + ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ $(WMC_INT_)write.o: $(WMC_BASE_)write.c | $(WMC_INT) $(ECHO_CC) - ${host_gcc} $(WMC_HOST_CXXFLAGS) -c $< -o $@ + ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ $(WMC_INT_)y_tab.o: $(WMC_BASE_)y_tab.c | $(WMC_INT) $(ECHO_CC) - ${host_gcc} $(WMC_HOST_CXXFLAGS) -c $< -o $@ + ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ $(WMC_INT_)misc.o: $(WMC_BASE_)misc.c | $(WMC_INT) $(ECHO_CC) - ${host_gcc} $(WMC_HOST_CXXFLAGS) -c $< -o $@ + ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ .PHONY: wmc_clean wmc_clean: _____ Modified: trunk/reactos/tools/wpp/wpp.mak --- trunk/reactos/tools/wpp/wpp.mak 2005-08-01 10:21:20 UTC (rev 16940) +++ trunk/reactos/tools/wpp/wpp.mak 2005-08-01 10:58:28 UTC (rev 16941) @@ -28,7 +28,7 @@ WPP_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(WPP_SOURCES:.c=.o)) -WPP_HOST_CFLAGS = -D__USE_W32API -I$(WPP_BASE) -Iinclude -Iinclude/wine -g +WPP_HOST_CFLAGS = -D__USE_W32API -I$(WPP_BASE) -Iinclude -Iinclude/wine $(TOOLS_CFLAGS) .PHONY: wpp wpp: $(WPP_TARGET) _____ Modified: trunk/reactos/tools/wrc/wrc.mak --- trunk/reactos/tools/wrc/wrc.mak 2005-08-01 10:21:20 UTC (rev 16940) +++ trunk/reactos/tools/wrc/wrc.mak 2005-08-01 10:58:28 UTC (rev 16941) @@ -52,13 +52,13 @@ WRC_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(WRC_SOURCES:.c=.o)) -WRC_HOST_CFLAGS = -I$(WRC_BASE) -g -Werror -Wall \ +WRC_HOST_CFLAGS = -I$(WRC_BASE) $(TOOLS_CFLAGS) \ -D__USE_W32API -DWINE_UNICODE_API= \ -Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \ -I$(UNICODE_BASE) -I$(WPP_BASE) \ -Iinclude/wine -Iinclude -Iw32api/include -WRC_HOST_LFLAGS = -g +WRC_HOST_LFLAGS = $(TOOLS_LFLAGS) WRC_LIBS = $(UNICODE_TARGET) $(WPP_TARGET)

19 years, 1 month

[weiden] 16940: fixed some warnings when compiling with -O3

by weiden＠svn.reactos.com

fixed some warnings when compiling with -O3 Modified: trunk/reactos/tools/nci/ncitool.c Modified: trunk/reactos/tools/rsym.c Modified: trunk/reactos/tools/widl/client.c Modified: trunk/reactos/tools/widl/server.c Modified: trunk/reactos/tools/winebuild/import.c Modified: trunk/reactos/tools/winebuild/main.c Modified: trunk/reactos/tools/winebuild/parser.c Modified: trunk/reactos/tools/winebuild/relay.c Modified: trunk/reactos/tools/winebuild/res16.c Modified: trunk/reactos/tools/winebuild/res32.c Modified: trunk/reactos/tools/winebuild/spec16.c Modified: trunk/reactos/tools/winebuild/spec32.c Modified: trunk/reactos/tools/winebuild/utils.c Modified: trunk/reactos/tools/wpp/wpp.c _____ Modified: trunk/reactos/tools/nci/ncitool.c --- trunk/reactos/tools/nci/ncitool.c 2005-08-01 10:19:22 UTC (rev 16939) +++ trunk/reactos/tools/nci/ncitool.c 2005-08-01 10:21:20 UTC (rev 16940) @@ -288,6 +288,7 @@ /* Skip this entry */ *NtSyscallName = NULL; + *SyscallArguments = NULL; } } @@ -336,7 +337,10 @@ /* Extract the Name and Arguments */ GetNameAndArgumentsFromDb(Line, &NtSyscallName, &SyscallArguments); - StackBytes = ARGS_TO_BYTES(strtoul(SyscallArguments, NULL, 0)); + if (SyscallArguments != NULL) + StackBytes = ARGS_TO_BYTES(strtoul(SyscallArguments, NULL, 0)); + else + StackBytes = 0; /* Make sure we really extracted something */ if (NtSyscallName) { @@ -458,7 +462,10 @@ if (SyscallId > 0) fprintf(SyscallTable,",\n"); /* Write the syscall arguments in the argument table. */ - fprintf(SyscallTable,"\t\t%lu * sizeof(void *)",strtoul(SyscallArguments, NULL, 0)); + if (SyscallArguments != NULL) + fprintf(SyscallTable,"\t\t%lu * sizeof(void *)",strtoul(SyscallArguments, NULL, 0)); + else + fprintf(SyscallTable,"\t\t0"); /* Only increase if we actually added something */ SyscallId++; _____ Modified: trunk/reactos/tools/rsym.c --- trunk/reactos/tools/rsym.c 2005-08-01 10:19:22 UTC (rev 16939) +++ trunk/reactos/tools/rsym.c 2005-08-01 10:21:20 UTC (rev 16940) @@ -759,9 +759,9 @@ ULONG StabsLength; void *StabStringBase; ULONG StabStringsLength; - void *CoffBase; + void *CoffBase = NULL; ULONG CoffsLength; - void *CoffStringBase; + void *CoffStringBase = NULL; ULONG CoffStringsLength; char* path1; char* path2; _____ Modified: trunk/reactos/tools/widl/client.c --- trunk/reactos/tools/widl/client.c 2005-08-01 10:19:22 UTC (rev 16939) +++ trunk/reactos/tools/widl/client.c 2005-08-01 10:21:20 UTC (rev 16940) @@ -627,8 +627,8 @@ static void print_message_buffer_size(func_t *func, unsigned int *type_offset) { unsigned int local_type_offset = *type_offset; - unsigned int alignment; - int size; + unsigned int alignment = 0; + int size = 0; int last_size = -1; int in_attr; int out_attr; @@ -1381,7 +1381,7 @@ default: error("%s:%d Unknown/unsupported type 0x%x\n", - __FUNCTION__,__LINE__, var->type->type); + __FUNCTION__,__LINE__, def->type->type); return; } _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-08-01 10:19:22 UTC (rev 16939) +++ trunk/reactos/tools/widl/server.c 2005-08-01 10:21:20 UTC (rev 16940) @@ -1385,7 +1385,7 @@ default: error("%s:%d Unknown/unsupported type 0x%x\n", - __FUNCTION__,__LINE__, var->type->type); + __FUNCTION__,__LINE__, def->type->type); return; } _____ Modified: trunk/reactos/tools/winebuild/import.c --- trunk/reactos/tools/winebuild/import.c 2005-08-01 10:19:22 UTC (rev 16939) +++ trunk/reactos/tools/winebuild/import.c 2005-08-01 10:21:20 UTC (rev 16940) @@ -20,12 +20,14 @@ */ #include "config.h" +#include "wine/port.h" #include <ctype.h> #include <fcntl.h> #include <stdio.h> #include <string.h> #include <stdarg.h> +#include <stdlib.h> #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif _____ Modified: trunk/reactos/tools/winebuild/main.c --- trunk/reactos/tools/winebuild/main.c 2005-08-01 10:19:22 UTC (rev 16939) +++ trunk/reactos/tools/winebuild/main.c 2005-08-01 10:21:20 UTC (rev 16940) @@ -23,6 +23,7 @@ */ #include "config.h" +#include "wine/port.h" #include <assert.h> #include <stdio.h> _____ Modified: trunk/reactos/tools/winebuild/parser.c --- trunk/reactos/tools/winebuild/parser.c 2005-08-01 10:19:22 UTC (rev 16939) +++ trunk/reactos/tools/winebuild/parser.c 2005-08-01 10:21:20 UTC (rev 16940) @@ -23,6 +23,7 @@ */ #include "config.h" +#include "wine/port.h" #include <assert.h> #include <ctype.h> _____ Modified: trunk/reactos/tools/winebuild/relay.c --- trunk/reactos/tools/winebuild/relay.c 2005-08-01 10:19:22 UTC (rev 16939) +++ trunk/reactos/tools/winebuild/relay.c 2005-08-01 10:21:20 UTC (rev 16940) @@ -23,6 +23,7 @@ */ #include "config.h" +#include "wine/port.h" #include <ctype.h> _____ Modified: trunk/reactos/tools/winebuild/res16.c --- trunk/reactos/tools/winebuild/res16.c 2005-08-01 10:19:22 UTC (rev 16939) +++ trunk/reactos/tools/winebuild/res16.c 2005-08-01 10:21:20 UTC (rev 16940) @@ -19,6 +19,7 @@ */ #include "config.h" +#include "wine/port.h" #include <assert.h> #include <ctype.h> _____ Modified: trunk/reactos/tools/winebuild/res32.c --- trunk/reactos/tools/winebuild/res32.c 2005-08-01 10:19:22 UTC (rev 16939) +++ trunk/reactos/tools/winebuild/res32.c 2005-08-01 10:21:20 UTC (rev 16940) @@ -19,6 +19,7 @@ */ #include "config.h" +#include "wine/port.h" #include <ctype.h> #include <stdlib.h> _____ Modified: trunk/reactos/tools/winebuild/spec16.c --- trunk/reactos/tools/winebuild/spec16.c 2005-08-01 10:19:22 UTC (rev 16939) +++ trunk/reactos/tools/winebuild/spec16.c 2005-08-01 10:21:20 UTC (rev 16940) @@ -23,6 +23,7 @@ */ #include "config.h" +#include "wine/port.h" #include <assert.h> #include <ctype.h> _____ Modified: trunk/reactos/tools/winebuild/spec32.c --- trunk/reactos/tools/winebuild/spec32.c 2005-08-01 10:19:22 UTC (rev 16939) +++ trunk/reactos/tools/winebuild/spec32.c 2005-08-01 10:21:20 UTC (rev 16940) @@ -23,6 +23,7 @@ */ #include "config.h" +#include "wine/port.h" #include <assert.h> #include <ctype.h> _____ Modified: trunk/reactos/tools/winebuild/utils.c --- trunk/reactos/tools/winebuild/utils.c 2005-08-01 10:19:22 UTC (rev 16939) +++ trunk/reactos/tools/winebuild/utils.c 2005-08-01 10:21:20 UTC (rev 16940) @@ -19,6 +19,7 @@ */ #include "config.h" +#include "wine/port.h" #if !defined(WIN32) #undef strdup _____ Modified: trunk/reactos/tools/wpp/wpp.c --- trunk/reactos/tools/wpp/wpp.c 2005-08-01 10:19:22 UTC (rev 16939) +++ trunk/reactos/tools/wpp/wpp.c 2005-08-01 10:21:20 UTC (rev 16940) @@ -20,6 +20,7 @@ */ #include "config.h" +#include "wine/port.h" #include <time.h> #include <stdlib.h>

19 years, 1 month

[navaraf] 16939: Fix prototype of RtlCreateHeap and respect the CommitRoutine if passed. Also fix the heap manager to be usable by kernel mode code.

by navaraf＠svn.reactos.com

Fix prototype of RtlCreateHeap and respect the CommitRoutine if passed. Also fix the heap manager to be usable by kernel mode code. Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/ppb.c Modified: trunk/reactos/lib/rtl/rtl.h Modified: trunk/reactos/w32api/include/ddk/ntifs.h _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-08-01 09:23:13 UTC (rev 16938) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-08-01 10:19:22 UTC (rev 16939) @@ -81,10 +81,10 @@ RtlCreateHeap( IN ULONG Flags, IN PVOID BaseAddress OPTIONAL, - IN ULONG SizeToReserve OPTIONAL, - IN ULONG SizeToCommit OPTIONAL, + IN SIZE_T SizeToReserve OPTIONAL, + IN SIZE_T SizeToCommit OPTIONAL, IN PVOID Lock OPTIONAL, - IN PRTL_HEAP_DEFINITION Definition OPTIONAL + IN PRTL_HEAP_PARAMETERS Parameters OPTIONAL ); DWORD _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-08-01 09:23:13 UTC (rev 16938) +++ trunk/reactos/include/ndk/rtltypes.h 2005-08-01 10:19:22 UTC (rev 16939) @@ -109,6 +109,15 @@ PVOID Parameter ); +#ifndef _NTIFS_ +typedef NTSTATUS +(NTAPI * PRTL_HEAP_COMMIT_ROUTINE) ( + IN PVOID Base, + IN OUT PVOID *CommitAddress, + IN OUT PSIZE_T CommitSize +); +#endif + /* TYPES *********************************************************************/ typedef unsigned short RTL_ATOM; @@ -219,12 +228,6 @@ ULONG ModuleCount; DEBUG_MODULE_INFORMATION ModuleEntry[1]; } MODULE_INFORMATION, *PMODULE_INFORMATION; - -typedef struct _RTL_HEAP_DEFINITION -{ - ULONG Length; - ULONG Unknown[11]; -} RTL_HEAP_DEFINITION, *PRTL_HEAP_DEFINITION; /* END REVIEW AREA */ #ifdef _INC_EXCPT @@ -399,6 +402,22 @@ PRTL_ATOM_TABLE_ENTRY Buckets[1]; } RTL_ATOM_TABLE, *PRTL_ATOM_TABLE; +#ifndef _NTIFS_ +typedef struct _RTL_HEAP_PARAMETERS { + ULONG Length; + SIZE_T SegmentReserve; + SIZE_T SegmentCommit; + SIZE_T DeCommitFreeBlockThreshold; + SIZE_T DeCommitTotalFreeThreshold; + SIZE_T MaximumAllocationSize; + SIZE_T VirtualMemoryThreshold; + SIZE_T InitialCommit; + SIZE_T InitialReserve; + PRTL_HEAP_COMMIT_ROUTINE CommitRoutine; + SIZE_T Reserved[2]; +} RTL_HEAP_PARAMETERS, *PRTL_HEAP_PARAMETERS; +#endif + /* Let Kernel Drivers use this */ #ifndef _WINBASE_ typedef struct _SYSTEMTIME _____ Modified: trunk/reactos/lib/rtl/heap.c --- trunk/reactos/lib/rtl/heap.c 2005-08-01 09:23:13 UTC (rev 16938) +++ trunk/reactos/lib/rtl/heap.c 2005-08-01 10:19:22 UTC (rev 16939) @@ -96,7 +96,7 @@ RTL_CRITICAL_SECTION critSection; /* Critical section for serialization */ ULONG flags; /* Heap flags */ ULONG magic; /* Magic number */ - UCHAR filler[4]; /* Make multiple of 8 bytes */ + PRTL_HEAP_COMMIT_ROUTINE commitRoutine; } HEAP, *PHEAP; @@ -301,12 +301,19 @@ address = (PVOID)((char *)subheap + subheap->commitSize); commitsize = size - subheap->commitSize; - Status = NtAllocateVirtualMemory(NtCurrentProcess(), - &address, - 0, - &commitsize, - MEM_COMMIT, - PAGE_EXECUTE_READWRITE); + if (subheap->heap->commitRoutine != NULL) + { + Status = subheap->heap->commitRoutine(subheap->heap, &address, &commitsize); + } + else + { + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &address, + 0, + &commitsize, + MEM_COMMIT, + PAGE_EXECUTE_READWRITE); + } if (!NT_SUCCESS(Status)) { DPRINT( "Could not commit %08lx bytes at %p for heap %p\n", @@ -321,6 +328,7 @@ } +#if 0 /*********************************************************************** * HEAP_Decommit * @@ -356,8 +364,8 @@ subheap->commitSize -= decommitsize; return TRUE; } +#endif - /*********************************************************************** * HEAP_CreateFreeBlock * @@ -504,27 +512,14 @@ * HEAP_InitSubHeap */ static BOOLEAN HEAP_InitSubHeap( HEAP *heap, PVOID address, ULONG flags, - ULONG commitSize, ULONG totalSize ) + ULONG commitSize, ULONG totalSize, + PRTL_HEAP_PARAMETERS Parameters ) { SUBHEAP *subheap = (SUBHEAP *)address; FREE_LIST_ENTRY *pEntry; int i; NTSTATUS Status; - /* Commit memory */ - Status = ZwAllocateVirtualMemory(NtCurrentProcess(), - &address, - 0, - (PULONG)&commitSize, - MEM_COMMIT, - PAGE_EXECUTE_READWRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT("Could not commit %08lx bytes for sub-heap %p\n", - commitSize, address); - return FALSE; - } - /* Fill the sub-heap structure */ subheap = (PSUBHEAP)address; @@ -550,6 +545,10 @@ heap->next = NULL; heap->flags = flags; heap->magic = HEAP_MAGIC; + if (Parameters) + heap->commitRoutine = Parameters->CommitRoutine; + else + heap->commitRoutine = NULL; /* Build the free lists */ @@ -570,6 +569,27 @@ RtlInitializeCriticalSection( &heap->critSection ); } + /* Commit memory */ + if (heap->commitRoutine) + { + Status = heap->commitRoutine(heap, &address, &commitSize); + } + else + { + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + &address, + 0, + &commitSize, + MEM_COMMIT, + PAGE_EXECUTE_READWRITE); + } + if (!NT_SUCCESS(Status)) + { + DPRINT("Could not commit %08lx bytes for sub-heap %p\n", + commitSize, address); + return FALSE; + } + /* Create the first free block */ HEAP_CreateFreeBlock( subheap, (PUCHAR)subheap + subheap->headerSize, @@ -586,8 +606,9 @@ */ static PSUBHEAP HEAP_CreateSubHeap(PVOID BaseAddress, - HEAP *heap, ULONG flags, - ULONG commitSize, ULONG totalSize ) + HEAP *heap, ULONG flags, + ULONG commitSize, ULONG totalSize, + PRTL_HEAP_PARAMETERS Parameters ) { PVOID address; NTSTATUS Status; @@ -621,8 +642,9 @@ /* Initialize subheap */ - if (!HEAP_InitSubHeap( heap? heap : (HEAP *)address, - address, flags, commitSize, totalSize )) + if (!HEAP_InitSubHeap( heap ? heap : (HEAP *)address, + address, flags, commitSize, totalSize, + Parameters )) { if (!BaseAddress) { @@ -690,7 +712,7 @@ * might get assigned all remaining free space in HEAP_ShrinkBlock() */ size += sizeof(SUBHEAP) + sizeof(ARENA_FREE) + HEAP_MIN_BLOCK_SIZE; if (!(subheap = HEAP_CreateSubHeap( NULL, heap, heap->flags, size, - max( HEAP_DEF_SIZE, size ) ))) + max( HEAP_DEF_SIZE, size ), NULL ))) return NULL; DPRINT("created new sub-heap %p of %08lx bytes for heap %p\n", @@ -1055,10 +1077,10 @@ HANDLE STDCALL RtlCreateHeap(ULONG flags, PVOID BaseAddress, - ULONG maxSize, - ULONG initialSize, - PVOID Unknown, - PRTL_HEAP_DEFINITION Definition) + SIZE_T maxSize, + SIZE_T initialSize, + PVOID Lock, + PRTL_HEAP_PARAMETERS Parameters) { SUBHEAP *subheap; HEAP *heapPtr; @@ -1070,20 +1092,24 @@ maxSize = HEAP_DEF_SIZE; flags |= HEAP_GROWABLE; } - if (!(subheap = HEAP_CreateSubHeap( BaseAddress, NULL, flags, initialSize, maxSize ))) + if (!(subheap = HEAP_CreateSubHeap( BaseAddress, NULL, flags, initialSize, + maxSize, Parameters ))) { return 0; } - /* link it into the per-process heap list */ - RtlEnterCriticalSection (&RtlpProcessHeapsListLock); + if (RtlpGetMode() == UserMode) + { + /* link it into the per-process heap list */ + RtlEnterCriticalSection (&RtlpProcessHeapsListLock); - heapPtr = subheap->heap; - heapPtr->next = (HEAP*)NtCurrentPeb()->ProcessHeaps; - NtCurrentPeb()->ProcessHeaps = (HANDLE)heapPtr; - NtCurrentPeb()->NumberOfHeaps++; + heapPtr = subheap->heap; + heapPtr->next = (HEAP*)NtCurrentPeb()->ProcessHeaps; + NtCurrentPeb()->ProcessHeaps = (HANDLE)heapPtr; + NtCurrentPeb()->NumberOfHeaps++; - RtlLeaveCriticalSection (&RtlpProcessHeapsListLock); + RtlLeaveCriticalSection (&RtlpProcessHeapsListLock); + } return (HANDLE)subheap; } @@ -1112,18 +1138,21 @@ if (!heapPtr) return heap; - if (heap == NtCurrentPeb()->ProcessHeap) - return heap; /* cannot delete the main process heap */ + if (RtlpGetMode() == UserMode) + { + if (heap == NtCurrentPeb()->ProcessHeap) + return heap; /* cannot delete the main process heap */ - /* remove it from the per-process list */ - RtlEnterCriticalSection (&RtlpProcessHeapsListLock); + /* remove it from the per-process list */ + RtlEnterCriticalSection (&RtlpProcessHeapsListLock); - pptr = (HEAP**)&NtCurrentPeb()->ProcessHeaps; - while (*pptr && *pptr != heapPtr) pptr = &(*pptr)->next; - if (*pptr) *pptr = (*pptr)->next; - NtCurrentPeb()->NumberOfHeaps--; + pptr = (HEAP**)&NtCurrentPeb()->ProcessHeaps; + while (*pptr && *pptr != heapPtr) pptr = &(*pptr)->next; + if (*pptr) *pptr = (*pptr)->next; + NtCurrentPeb()->NumberOfHeaps--; - RtlLeaveCriticalSection (&RtlpProcessHeapsListLock); + RtlLeaveCriticalSection (&RtlpProcessHeapsListLock); + } RtlDeleteCriticalSection( &heapPtr->critSection ); subheap = &heapPtr->subheap; _____ Modified: trunk/reactos/lib/rtl/ppb.c --- trunk/reactos/lib/rtl/ppb.c 2005-08-01 09:23:13 UTC (rev 16938) +++ trunk/reactos/lib/rtl/ppb.c 2005-08-01 10:19:22 UTC (rev 16939) @@ -22,11 +22,6 @@ #define DENORMALIZE(x,addr) {if(x) x=(PVOID)((ULONG_PTR)(x)-(ULONG_PTR)(addr));} #define ALIGN(x,align) (((ULONG)(x)+(align)-1UL)&(~((align)-1UL))) - -KPROCESSOR_MODE -RtlpGetMode(); - - /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/lib/rtl/rtl.h --- trunk/reactos/lib/rtl/rtl.h 2005-08-01 09:23:13 UTC (rev 16938) +++ trunk/reactos/lib/rtl/rtl.h 2005-08-01 10:19:22 UTC (rev 16939) @@ -29,6 +29,7 @@ extern PVOID RtlpAllocateMemory(UINT Bytes, ULONG Tag); extern VOID RtlpFreeMemory(PVOID Mem, ULONG Tag); +extern KPROCESSOR_MODE RtlpGetMode(); #define RtlpAllocateStringMemory RtlpAllocateMemory #define RtlpFreeStringMemory RtlpFreeMemory _____ Modified: trunk/reactos/w32api/include/ddk/ntifs.h --- trunk/reactos/w32api/include/ddk/ntifs.h 2005-08-01 09:23:13 UTC (rev 16938) +++ trunk/reactos/w32api/include/ddk/ntifs.h 2005-08-01 10:19:22 UTC (rev 16939) @@ -1486,6 +1486,27 @@ #endif +typedef NTSTATUS +(NTAPI * PRTL_HEAP_COMMIT_ROUTINE) ( + IN PVOID Base, + IN OUT PVOID *CommitAddress, + IN OUT PSIZE_T CommitSize +); + +typedef struct _RTL_HEAP_PARAMETERS { + ULONG Length; + SIZE_T SegmentReserve; + SIZE_T SegmentCommit; + SIZE_T DeCommitFreeBlockThreshold; + SIZE_T DeCommitTotalFreeThreshold; + SIZE_T MaximumAllocationSize; + SIZE_T VirtualMemoryThreshold; + SIZE_T InitialCommit; + SIZE_T InitialReserve; + PRTL_HEAP_COMMIT_ROUTINE CommitRoutine; + SIZE_T Reserved[2]; +} RTL_HEAP_PARAMETERS, *PRTL_HEAP_PARAMETERS; + NTKERNELAPI BOOLEAN NTAPI @@ -2171,6 +2192,18 @@ ); NTKERNELAPI +PVOID +NTAPI +RtlCreateHeap ( + IN ULONG Flags, + IN PVOID HeapBase OPTIONAL, + IN SIZE_T ReserveSize OPTIONAL, + IN SIZE_T CommitSize OPTIONAL, + IN PVOID Lock OPTIONAL, + IN PRTL_HEAP_PARAMETERS Parameters OPTIONAL +); + +NTKERNELAPI BOOLEAN NTAPI FsRtlCurrentBatchOplock ( @@ -2200,6 +2233,13 @@ ); NTKERNELAPI +PVOID +NTAPI +RtlDestroyHeap( + IN PVOID HeapHandle +); + +NTKERNELAPI VOID NTAPI FsRtlDissectDbcs (

19 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2005