Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[ea] 17368: Implement csrsrv!CsrSrvInitializeServerDll based on current code from CsrpInitWin32Csr (partial).

by ea＠svn.reactos.com

Implement csrsrv!CsrSrvInitializeServerDll based on current code from CsrpInitWin32Csr (partial). Note: it currently works only for servers with 1 ServerDll, because the entrypoint's name is a literal. Modified: trunk/reactos/subsys/csr/csrsrv/server.c _____ Modified: trunk/reactos/subsys/csr/csrsrv/server.c --- trunk/reactos/subsys/csr/csrsrv/server.c 2005-08-13 13:16:16 UTC (rev 17367) +++ trunk/reactos/subsys/csr/csrsrv/server.c 2005-08-13 13:21:28 UTC (rev 17368) @@ -28,6 +28,8 @@ //#define NDEBUG #include <debug.h> +typedef NTSTATUS (STDCALL * CSR_SERVER_DLL_INIT_PROC)(ULONG,LPWSTR*); + typedef struct _CSRSRV_SERVER_DLL { USHORT ServerIndex; @@ -96,6 +98,51 @@ return STATUS_SUCCESS; } /********************************************************************** + * CsrSrvInitializeServerDll/1 PRIVATE + * + * NOTE + * Code dapted from CsrpInitWin32Csr. + */ +static NTSTATUS CsrSrvInitializeServerDll (USHORT ServerIndex) +{ + NTSTATUS Status = STATUS_SUCCESS; + HINSTANCE hInst; + ANSI_STRING ProcName; + CSR_SERVER_DLL_INIT_PROC InitProc; + + DPRINT("CSRSRV: %s called\n", __FUNCTION__); + + Status = LdrLoadDll (NULL, 0, & ServerThread[ServerIndex].DllName, (PVOID *) &hInst); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSRSRV:%s: loading ServerDll '%S' failed (Status=%08lx)\n", + __FUNCTION__, ServerThread[ServerIndex].DllName.Buffer, Status); + return Status; + } + RtlInitAnsiString (& ProcName, "ServerDllInitialization"); + Status = LdrGetProcedureAddress(hInst, &ProcName, 0, (PVOID *) &InitProc); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSRSRV:%s: ServerDll '%S!%s' not found (Status=%08lx)\n", + __FUNCTION__, + ServerThread[ServerIndex].DllName.Buffer, + "ServerDllInitialization", + Status); + return Status; + } + Status = InitProc (0, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSRSRV:%s: %S.%s failed with Status=%08lx\n", + __FUNCTION__, + ServerThread[ServerIndex].DllName.Buffer, + "ServerDllInitialization", + Status); + } + return Status; +} + +/********************************************************************** * CsrpCreateObjectDirectory/1 PRIVATE */ NTSTATUS STDCALL CsrpCreateObjectDirectory (PUNICODE_STRING pObjectDirectory) @@ -175,7 +222,15 @@ { if (NULL == ServerThread [ServerIndex].ServerThread) { - //TODO: load DLL and call ServerDllInitialize + Status = CsrSrvInitializeServerDll (ServerIndex); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSRSRV:%s: server thread #%d init failed!\n", + __FUNCTION__, ServerIndex); + } + } else { + DPRINT1("CSRSRV:%s: server thread #%d initialized more than once!\n", + __FUNCTION__, ServerIndex); } } }

19 years, 1 month

[royce] 17367: BCB tracing implementation

by royce＠svn.reactos.com

BCB tracing implementation Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.def _____ Modified: trunk/reactos/ntoskrnl/cc/view.c --- trunk/reactos/ntoskrnl/cc/view.c 2005-08-13 13:13:05 UTC (rev 17366) +++ trunk/reactos/ntoskrnl/cc/view.c 2005-08-13 13:16:16 UTC (rev 17367) @@ -81,12 +81,81 @@ #error Unknown compiler for alloca intrinsic stack allocation "function" #endif +#if defined(DBG) || defined(KDBG) +static void CcRosCacheSegmentIncRefCount ( PCACHE_SEGMENT cs ) +{ + ++cs->ReferenceCount; + if ( cs->Bcb->Trace ) + { + DPRINT1("CacheSegment %p ++RefCount=%d, Dirty %d, PageOut %d\n", + cs, cs->ReferenceCount, cs->Dirty, cs->PageOut ); + } +} +static void CcRosCacheSegmentDecRefCount ( PCACHE_SEGMENT cs ) +{ + --cs->ReferenceCount; + if ( cs->Bcb->Trace ) + { + DPRINT1("CacheSegment %p --RefCount=%d, Dirty %d, PageOut %d\n", + cs, cs->ReferenceCount, cs->Dirty, cs->PageOut ); + } +} +#else +#define CcRosCacheSegmentIncRefCount(cs) (++((cs)->ReferenceCount)) +#define CcRosCacheSegmentDecRefCount(cs) (--((cs)->ReferenceCount)) +#endif NTSTATUS CcRosInternalFreeCacheSegment(PCACHE_SEGMENT CacheSeg); /* FUNCTIONS *****************************************************************/ +VOID +STDCALL +CcRosTraceCacheMap ( + PBCB Bcb, + BOOLEAN Trace ) +{ +#if defined(DBG) || defined(KDBG) + KIRQL oldirql; + PLIST_ENTRY current_entry; + PCACHE_SEGMENT current; + + if ( !Bcb ) + return; + + Bcb->Trace = Trace; + + if ( Trace ) + { + DPRINT1("Enabling Tracing for CacheMap 0x%p:\n", Bcb ); + + ExAcquireFastMutex(&ViewLock); + KeAcquireSpinLock(&Bcb->BcbLock, &oldirql); + + current_entry = Bcb->BcbSegmentListHead.Flink; + while (current_entry != &Bcb->BcbSegmentListHead) + { + current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); + current_entry = current_entry->Flink; + + DPRINT1(" CacheSegment 0x%p enabled, RefCount %d, Dirty %d, PageOut %d\n", + current, current->ReferenceCount, current->Dirty, current->PageOut ); + } + KeReleaseSpinLock(&Bcb->BcbLock, oldirql); + ExReleaseFastMutex(&ViewLock); + } + else + { + DPRINT1("Disabling Tracing for CacheMap 0x%p:\n", Bcb ); + } + +#else + Bcb = Bcb; + Trace = Trace; +#endif +} + NTSTATUS CcRosFlushCacheSegment(PCACHE_SEGMENT CacheSegment) { @@ -100,7 +169,7 @@ CacheSegment->Dirty = FALSE; RemoveEntryList(&CacheSegment->DirtySegmentListEntry); DirtyPageCount -= CacheSegment->Bcb->CacheSegmentSize / PAGE_SIZE; - CacheSegment->ReferenceCount--; + CcRosCacheSegmentDecRefCount ( CacheSegment ); KeReleaseSpinLock(&CacheSegment->Bcb->BcbLock, oldIrql); ExReleaseFastMutex(&ViewLock); } @@ -243,7 +312,7 @@ ULONG i; NTSTATUS Status; - current->ReferenceCount++; + CcRosCacheSegmentIncRefCount(current); last = current; current->PageOut = TRUE; KeReleaseSpinLock(&current->Bcb->BcbLock, oldIrql); @@ -260,8 +329,8 @@ } ExAcquireFastMutex(&ViewLock); KeAcquireSpinLock(&current->Bcb->BcbLock, &oldIrql); - current->ReferenceCount--; - current->PageOut = FALSE; + CcRosCacheSegmentDecRefCount(current); + current->PageOut = FALSE; KeReleaseSpinLock(&current->Bcb->BcbLock, oldIrql); current_entry = &current->CacheSegmentLRUListEntry; continue; @@ -315,14 +384,14 @@ CacheSeg->MappedCount++; } KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); - CacheSeg->ReferenceCount--; + CcRosCacheSegmentDecRefCount(CacheSeg); if (Mapped && CacheSeg->MappedCount == 1) { - CacheSeg->ReferenceCount++; + CcRosCacheSegmentIncRefCount(CacheSeg); } if (!WasDirty && CacheSeg->Dirty) { - CacheSeg->ReferenceCount++; + CcRosCacheSegmentIncRefCount(CacheSeg); } KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); ExReleaseFastMutex(&ViewLock); @@ -351,7 +420,7 @@ if (current->FileOffset <= FileOffset && (current->FileOffset + Bcb->CacheSegmentSize) > FileOffset) { - current->ReferenceCount++; + CcRosCacheSegmentIncRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); ExAcquireFastMutex(&current->Lock); return(current); @@ -387,7 +456,7 @@ else { KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); - CacheSeg->ReferenceCount--; + CcRosCacheSegmentDecRefCount(CacheSeg); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); } @@ -430,14 +499,14 @@ } KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); - CacheSeg->ReferenceCount--; + CcRosCacheSegmentDecRefCount(CacheSeg); if (!WasDirty && NowDirty) { - CacheSeg->ReferenceCount++; + CcRosCacheSegmentIncRefCount(CacheSeg); } if (CacheSeg->MappedCount == 0) { - CacheSeg->ReferenceCount--; + CcRosCacheSegmentDecRefCount(CacheSeg); } KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); @@ -480,6 +549,12 @@ current->PageOut = FALSE; current->FileOffset = ROUND_DOWN(FileOffset, Bcb->CacheSegmentSize); current->Bcb = Bcb; +#if defined(DBG) || defined(KDBG) + if ( Bcb->Trace ) + { + DPRINT1("CacheMap 0x%p: new Cache Segment: 0x%p\n", Bcb, current ); + } +#endif current->MappedCount = 0; current->DirtySegmentListEntry.Flink = NULL; current->DirtySegmentListEntry.Blink = NULL; @@ -504,8 +579,17 @@ if (current->FileOffset <= FileOffset && (current->FileOffset + Bcb->CacheSegmentSize) > FileOffset) { - current->ReferenceCount++; + CcRosCacheSegmentIncRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); +#if defined(DBG) || defined(KDBG) + if ( Bcb->Trace ) + { + DPRINT1("CacheMap 0x%p: deleting newly created Cache Segment 0x%p ( found existing one 0x%p )\n", + Bcb, + (*CacheSeg), + current ); + } +#endif ExReleaseFastMutex(&(*CacheSeg)->Lock); ExReleaseFastMutex(&ViewLock); ExFreeToNPagedLookasideList(&CacheSegLookasideList, *CacheSeg); @@ -761,6 +845,12 @@ KIRQL oldIrql; #endif DPRINT("Freeing cache segment 0x%p\n", CacheSeg); +#if defined(DBG) || defined(KDBG) + if ( CacheSeg->Bcb->Trace ) + { + DPRINT1("CacheMap 0x%p: deleting Cache Segment: 0x%p\n", CacheSeg->Bcb, CacheSeg ); + } +#endif #ifdef CACHE_BITMAP RegionSize = CacheSeg->Bcb->CacheSegmentSize / PAGE_SIZE; @@ -878,7 +968,7 @@ } KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); ExReleaseFastMutex(&current->Lock); - current->ReferenceCount--; + CcRosCacheSegmentDecRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); } @@ -953,6 +1043,9 @@ } InsertHeadList(&FreeList, &current->BcbSegmentListEntry); } +#if defined(DBG) || defined(KDBG) + Bcb->Trace = FALSE; +#endif KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); ExReleaseFastMutex(&ViewLock); _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.def --- trunk/reactos/ntoskrnl/ntoskrnl.def 2005-08-13 13:13:05 UTC (rev 17366) +++ trunk/reactos/ntoskrnl/ntoskrnl.def 2005-08-13 13:16:16 UTC (rev 17367) @@ -7,6 +7,7 @@ EXPORTS CcRosInitializeFileCache@8 CcRosReleaseFileCache@4 +CcRosTraceCacheMap@8 CcCanIWrite@16 CcCopyRead@24 CcCopyWrite@20

19 years, 1 month

[royce] 17366: function declaration to enable/disable BCB tracing

by royce＠svn.reactos.com

function declaration to enable/disable BCB tracing Modified: trunk/reactos/include/ccros.h _____ Modified: trunk/reactos/include/ccros.h --- trunk/reactos/include/ccros.h 2005-08-13 13:11:59 UTC (rev 17365) +++ trunk/reactos/include/ccros.h 2005-08-13 13:13:05 UTC (rev 17366) @@ -7,6 +7,14 @@ NTSTATUS STDCALL CcRosReleaseFileCache (PFILE_OBJECT FileObject); +struct _BCB; + +VOID +STDCALL +CcRosTraceCacheMap ( + struct _BCB* Bcb, + BOOLEAN Trace ); + #define FSCTL_ROS_QUERY_LCN_MAPPING \ CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS)

19 years, 1 month

[royce] 17365: variable to enable per-BCB debugging

by royce＠svn.reactos.com

variable to enable per-BCB debugging Modified: trunk/reactos/ntoskrnl/include/internal/cc.h _____ Modified: trunk/reactos/ntoskrnl/include/internal/cc.h --- trunk/reactos/ntoskrnl/include/internal/cc.h 2005-08-13 12:46:37 UTC (rev 17364) +++ trunk/reactos/ntoskrnl/include/internal/cc.h 2005-08-13 13:11:59 UTC (rev 17365) @@ -13,6 +13,9 @@ LARGE_INTEGER FileSize; KSPIN_LOCK BcbLock; ULONG RefCount; +#if defined(DBG) || defined(KDBG) + BOOLEAN Trace; /* enable extra trace output for this BCB and it's cache segments */ +#endif } BCB, *PBCB; typedef struct _CACHE_SEGMENT @@ -91,7 +94,7 @@ NTSTATUS CcRosFreeCacheSegment( - PBCB, + PBCB, PCACHE_SEGMENT ); @@ -105,14 +108,14 @@ NTSTATUS CcRosUnmapCacheSegment( - PBCB Bcb, - ULONG FileOffset, + PBCB Bcb, + ULONG FileOffset, BOOLEAN NowDirty ); PCACHE_SEGMENT CcRosLookupCacheSegment( - PBCB Bcb, + PBCB Bcb, ULONG FileOffset ); @@ -129,13 +132,13 @@ NTSTATUS CcRosMarkDirtyCacheSegment( - PBCB Bcb, + PBCB Bcb, ULONG FileOffset ); NTSTATUS CcRosFlushDirtyPages( - ULONG Target, + ULONG Target, PULONG Count ); @@ -157,7 +160,7 @@ BOOLEAN Mapped ); -NTSTATUS +NTSTATUS STDCALL CcRosRequestCacheSegment( BCB* Bcb,

19 years, 1 month

[ea] 17364: Conform to the new CSR_PROCESS and CSR_THREAD.

by ea＠svn.reactos.com

Conform to the new CSR_PROCESS and CSR_THREAD. Modified: trunk/reactos/subsys/csr/csrsrv/process.c Modified: trunk/reactos/subsys/csr/csrsrv/thread.c _____ Modified: trunk/reactos/subsys/csr/csrsrv/process.c --- trunk/reactos/subsys/csr/csrsrv/process.c 2005-08-13 12:45:33 UTC (rev 17363) +++ trunk/reactos/subsys/csr/csrsrv/process.c 2005-08-13 12:46:37 UTC (rev 17364) @@ -68,7 +68,7 @@ { Status = STATUS_NO_MEMORY; } else { - pCsrProcess->CsrSession = pCsrSession; + pCsrProcess->NtSession = pCsrSession; if (NULL != ppCsrProcess) { *ppCsrProcess = pCsrProcess; _____ Modified: trunk/reactos/subsys/csr/csrsrv/thread.c --- trunk/reactos/subsys/csr/csrsrv/thread.c 2005-08-13 12:45:33 UTC (rev 17363) +++ trunk/reactos/subsys/csr/csrsrv/thread.c 2005-08-13 12:46:37 UTC (rev 17364) @@ -53,7 +53,7 @@ { return STATUS_INVALID_PARAMETER; } - pCsrSession = pCsrProcess->CsrSession; + pCsrSession = pCsrProcess->NtSession; pCsrThread = RtlAllocateHeap (pCsrSession->Heap, HEAP_ZERO_MEMORY, sizeof (CSR_THREAD)); @@ -62,8 +62,7 @@ DPRINT1("CSRSRV:%s: out of memory!\n", __FUNCTION__); return STATUS_NO_MEMORY; } - pCsrThread->CsrSession = pCsrSession; - pCsrThread->CsrProcess = pCsrProcess; + pCsrThread->Process = pCsrProcess; return Status; }

19 years, 1 month

[ea] 17363: Alex Ionescu: CSR_PROCESS and CSR_THREAD layout from WinDBG.

by ea＠svn.reactos.com

Alex Ionescu: CSR_PROCESS and CSR_THREAD layout from WinDBG. Modified: trunk/reactos/include/subsys/csr/server.h _____ Modified: trunk/reactos/include/subsys/csr/server.h --- trunk/reactos/include/subsys/csr/server.h 2005-08-13 12:35:00 UTC (rev 17362) +++ trunk/reactos/include/subsys/csr/server.h 2005-08-13 12:45:33 UTC (rev 17363) @@ -14,29 +14,55 @@ typedef struct _CSR_PROCESS { - HANDLE Process; - PCSR_SESSION CsrSession; + CLIENT_ID ClientId; + LIST_ENTRY ListLink; + LIST_ENTRY ThreadList; + PCSR_SESSION NtSession; + ULONG ExpectedVersion; + HANDLE ClientPort; + ULONG_PTR ClientViewBase; + ULONG_PTR ClientViewBounds; + HANDLE ProcessHandle; + ULONG SequenceNumber; + ULONG Flags; + ULONG DebugFlags; ULONG ReferenceCount; - PVOID ServerData; + ULONG ProcessGroupId; + ULONG ProcessGroupSequence; + ULONG fVDM; + ULONG ThreadCount; + ULONG PriorityClass; + ULONG Reserved; + ULONG ShutdownLevel; + ULONG ShutdownFlags; + PVOID ServerData; } CSR_PROCESS, * PCSR_PROCESS; +struct _CSR_WAIT; + typedef struct _CSR_THREAD { - HANDLE Thread; - PCSR_SESSION CsrSession; - PCSR_PROCESS CsrProcess; - ULONG ReferenceCount; - PVOID ServerData; + LARGE_INTEGER CreateTime; + LIST_ENTRY Link; + LIST_ENTRY HashLinks; + CLIENT_ID ClientId; + PCSR_PROCESS Process; + struct _CSR_WAIT *WaitBlock; + HANDLE ThreadHandle; + ULONG Flags; + ULONG ReferenceCount; + ULONG ImpersonationCount; } CSR_THREAD, * PCSR_THREAD; typedef struct _CSR_WAIT { - PCSR_PROCESS CsrThread; + PCSR_THREAD CsrThread; } CSR_WAIT, * PCSR_WAIT; + typedef VOID (CALLBACK * CSR_SERVER_THREAD)(PVOID); /* symbols exported by native DLL csrsrv.dll */

19 years, 1 month

[ea] 17362: Begin making the 'posix' module conform to rbuild.

by ea＠svn.reactos.com

Begin making the 'posix' module conform to rbuild. Modified: trunk/posix/Makefile Added: trunk/posix/copying Added: trunk/posix/directory.xml _____ Modified: trunk/posix/Makefile --- trunk/posix/Makefile 2005-08-13 12:33:04 UTC (rev 17361) +++ trunk/posix/Makefile 2005-08-13 12:35:00 UTC (rev 17362) @@ -1,154 +1,14 @@ -# $Id: Makefile,v 1.7 2003/01/05 18:29:41 robd Exp $ -# -# ReactOS POSIX+ Personality -# - -PATH_TO_TOP = ../reactos - -include $(PATH_TO_TOP)/rules.mak - - -POSIX_OTHER = server #lib - -POSIX_TOOLS = mksystab - -POSIX_LIBS = psxdll psxx - -POSIX_APPS = baresh posixw32 - -POSIX_MODULES = $(POSIX_OTHER) $(POSIX_TOOLS) $(POSIX_LIBS) $(POSIX_APPS) - -all: implib $(POSIX_MODULES) - -implib: $(POSIX_MODULES:%=%_implib) - -clean: $(POSIX_MODULES:%=%_clean) - -install: $(POSIX_MODULES:%=%_install) - -#dist: $(TOOLS_PATH)/rcopy$(EXE_POSTFIX) dist_clean dist_dirs \ -# $(POSIX_MODULES:%=%_dist) - -.PHONY: all implib clean -#.PHONY: all implib install dist - - -# -# Other POSIX+ Modules -# -$(POSIX_OTHER): %: - make -f Makefile -C $(POSIX_PATH)/$* - -$(POSIX_OTHER:%=%_implib): %_implib: - make -f Makefile -C $(POSIX_PATH)/$* implib - -$(POSIX_OTHER:%=%_clean): %_clean: - make -f Makefile -C $(POSIX_PATH)/$* clean - -$(POSIX_OTHER:%=%_dist): %_dist: - make -f Makefile -C $(POSIX_PATH)/$* dist - -$(POSIX_OTHER:%=%_install): %_install: - make -f Makefile -C $(POSIX_PATH)/$* install - -.PHONY: $(POSIX_OTHER) $(POSIX_OTHER:%=%_implib) $(POSIX_OTHER:%=%_clean) $(POSIX_OTHER:%=%_install) $(POSIX_OTHER:%=%_dist) - - -# -# POSIX+ Tools -# -$(POSIX_TOOLS): %: - make -f Makefile -C $(POSIX_PATH)/tools/$* - -$(POSIX_TOOLS:%=%_implib): %_implib: - make -f Makefile -C $(POSIX_PATH)/tools/$* implib - -$(POSIX_TOOLS:%=%_clean): %_clean: - make -f Makefile -C $(POSIX_PATH)/tools/$* clean - -$(POSIX_TOOLS:%=%_dist): %_dist: - make -f Makefile -C $(POSIX_PATH)/tools/$* dist - -$(POSIX_TOOLS:%=%_install): %_install: - make -f Makefile -C $(POSIX_PATH)/tools/$* install - -.PHONY: $(POSIX_LIBS) $(POSIX_LIBS:%=%_implib) $(POSIX_LIBS:%=%_clean) $(POSIX_LIBS:%=%_install) $(POSIX_LIBS:%=%_dist) - - -# -# POSIX+ DLLs -# -$(POSIX_LIBS): %: - make -f Makefile -C $(POSIX_PATH)/lib/$* - -$(POSIX_LIBS:%=%_implib): %_implib: - make -f Makefile -C $(POSIX_PATH)/lib/$* implib - -$(POSIX_LIBS:%=%_clean): %_clean: - make -f Makefile -C $(POSIX_PATH)/lib/$* clean - -$(POSIX_LIBS:%=%_dist): %_dist: - make -f Makefile -C $(POSIX_PATH)/lib/$* dist - -$(POSIX_LIBS:%=%_install): %_install: - make -f Makefile -C $(POSIX_PATH)/lib/$* install - -.PHONY: $(POSIX_LIBS) $(POSIX_LIBS:%=%_implib) $(POSIX_LIBS:%=%_clean) $(POSIX_LIBS:%=%_install) $(POSIX_LIBS:%=%_dist) - - -# -# POSIX+ Programs -# -$(POSIX_APPS): %: - make -f Makefile -C $(POSIX_PATH)/apps/$* - -$(POSIX_APPS:%=%_implib): %_implib: - make -f Makefile -C $(POSIX_PATH)/apps/$* implib - -$(POSIX_APPS:%=%_clean): %_clean: - make -f Makefile -C $(POSIX_PATH)/apps/$* clean - -$(POSIX_APPS:%=%_dist): %_dist: - make -f Makefile -C $(POSIX_PATH)/apps/$* dist - -$(POSIX_APPS:%=%_install): %_install: - make -f Makefile -C $(POSIX_PATH)/apps/$* install - -.PHONY: $(POSIX_APPS) $(POSIX_APPS:%=%_implib) $(POSIX_APPS:%=%_clean) $(POSIX_APPS:%=%_install) $(POSIX_APPS:%=%_dist) - - -etags: - find . -name "*.[ch]" -print | etags --language=c - - -# EOF - - - -#CFLAGS=-Iinclude - -#all: lib/crt0w32.o -# make -C tools -# make -C lib -# make -C server -# make -C lib/psxdll -# make -C lib/psxx -# make -C apps/baresh -# make -C apps/posixw32 - -#lib/crt0w32.o: lib/crt0w32.c - -#implib: - -#clean: -# make -C lib clean -# make -C tools clean -# make -C server clean -# make -C lib/psxdll clean -# make -C lib/psxx clean -# make -C apps/baresh clean -# make -C apps/posixw32 clean -# - $(RM) lib/crt0w32.o - -#include $(PATH_TO_TOP)/rules.mak - -# EOF +all: + @echo To build "posix" there are two paths: + @echo --- + @echo 1. copy the posix folder into the reactos\modules folder + @echo 2. link reactos/modules/posix to posix + @echo UNIX + @echo cd $${ROS_SRC_ROOT}/reactos/modules + @echo ln -s $${ROS_SRC_ROOT}/posix posix + @echo WINDOWS + @echo cd %%ROS_SRC_ROOT%%\reactos\modules + @echo junction posix %%ROS_SRC_ROOT%%\posix + @echo --- + @echo Eventually you can run "make depends" in the %%ROS_SRC_ROOT%%\reactos + @echo directory to compile it. _____ Added: trunk/posix/copying --- trunk/posix/copying 2005-08-13 12:33:04 UTC (rev 17361) +++ trunk/posix/copying 2005-08-13 12:35:00 UTC (rev 17362) @@ -0,0 +1,340 @@ + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) 19yy <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Property changes on: trunk/posix/copying ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/posix/directory.xml --- trunk/posix/directory.xml 2005-08-13 12:33:04 UTC (rev 17361) +++ trunk/posix/directory.xml 2005-08-13 12:35:00 UTC (rev 17362) @@ -0,0 +1,14 @@ +<group> + <directory name="tools"> + <xi:include href="tools/directory.xml" /> + </directory> + <directory name="apps"> + <xi:include href="apps/directory.xml" /> + </directory> + <directory name="lib"> + <xi:include href="lib/directory.xml" /> + </directory> + <directory name="server"> + <xi:include href="server/psxsrv.xml" /> + </directory> +</group> Property changes on: trunk/posix/directory.xml ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native

19 years, 1 month

[ea] 17361: Minor changes.

by ea＠svn.reactos.com

Minor changes. Modified: trunk/vms/lib/vmsdll/vmsdll.xml Modified: trunk/vms/server/vmssrv.rc _____ Modified: trunk/vms/lib/vmsdll/vmsdll.xml --- trunk/vms/lib/vmsdll/vmsdll.xml 2005-08-13 12:25:16 UTC (rev 17360) +++ trunk/vms/lib/vmsdll/vmsdll.xml 2005-08-13 12:33:04 UTC (rev 17361) @@ -1,9 +1,9 @@ <module name="vmsdll" type="nativedll"> - <bootstrap base="reactos/system32" /> <importlibrary definition="vmsdll.def" /> <include base="vmsdll">../include</include> <linkerflag>-lgcc</linkerflag> <file>dllmain.c</file> + <file>vmsdll.rc</file> <directory name="lib"> <file>stubs.c</file> </directory> _____ Modified: trunk/vms/server/vmssrv.rc --- trunk/vms/server/vmssrv.rc 2005-08-13 12:25:16 UTC (rev 17360) +++ trunk/vms/server/vmssrv.rc 2005-08-13 12:33:04 UTC (rev 17361) @@ -1,4 +1,4 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS/VMS Environment Subsystem Server\0" #define REACTOS_STR_INTERNAL_NAME "vmssrv\0" -#define REACTOS_STR_ORIGINAL_FILENAME "vmsrv.dll\0" +#define REACTOS_STR_ORIGINAL_FILENAME "vmssrv.dll\0" #include <reactos/version.rc>

19 years, 1 month

[ea] 17360: Make 'rosapps' module build.

by ea＠svn.reactos.com

Make 'rosapps' module build. Added: trunk/reactos/lib/ddraw/ddraw.rc Modified: trunk/reactos/lib/ddraw/ddraw.xml Modified: trunk/reactos/lib/directory.xml _____ Added: trunk/reactos/lib/ddraw/ddraw.rc --- trunk/reactos/lib/ddraw/ddraw.rc 2005-08-13 12:09:34 UTC (rev 17359) +++ trunk/reactos/lib/ddraw/ddraw.rc 2005-08-13 12:25:16 UTC (rev 17360) @@ -0,0 +1,7 @@ +/* $Id$ */ + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS/Win32 - DDraw\0" +#define REACTOS_STR_INTERNAL_NAME "ddraw\0" +#define REACTOS_STR_ORIGINAL_FILENAME "ddraw.dll\0" +#include <reactos/version.rc> Property changes on: trunk/reactos/lib/ddraw/ddraw.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/ddraw/ddraw.xml --- trunk/reactos/lib/ddraw/ddraw.xml 2005-08-13 12:09:34 UTC (rev 17359) +++ trunk/reactos/lib/ddraw/ddraw.xml 2005-08-13 12:25:16 UTC (rev 17360) @@ -14,6 +14,7 @@ <library>dxguid</library> <library>ole32</library> + <file>ddraw.rc</file> <file>main.c</file> <file>regsvr.c</file> _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-08-13 12:09:34 UTC (rev 17359) +++ trunk/reactos/lib/directory.xml 2005-08-13 12:25:16 UTC (rev 17360) @@ -44,6 +44,9 @@ <directory name="dbghelp"> <xi:include href="dbghelp/dbghelp.xml" /> </directory> +<directory name="ddraw"> + <xi:include href="ddraw/ddraw.xml" /> +</directory> <directory name="devenum"> <xi:include href="devenum/devenum.xml" /> </directory>

19 years, 1 month

[greatlrd] 17359: small clean up. remove double define of COPY_FILE_FAIL_IF_EXISTS and COPY_FILE_RESTARTABLE

by greatlrd＠svn.reactos.com

small clean up. remove double define of COPY_FILE_FAIL_IF_EXISTS and COPY_FILE_RESTARTABLE Modified: trunk/reactos/w32api/include/winbase.h _____ Modified: trunk/reactos/w32api/include/winbase.h --- trunk/reactos/w32api/include/winbase.h 2005-08-12 23:35:14 UTC (rev 17358) +++ trunk/reactos/w32api/include/winbase.h 2005-08-13 12:09:34 UTC (rev 17359) @@ -130,8 +130,6 @@ #define PROGRESS_QUIET 3 #define CALLBACK_CHUNK_FINISHED 0 #define CALLBACK_STREAM_SWITCH 1 -#define COPY_FILE_FAIL_IF_EXISTS 1 -#define COPY_FILE_RESTARTABLE 2 #define OFS_MAXPATHNAME 128 #define FILE_MAP_ALL_ACCESS 0xf001f #define FILE_MAP_READ 4

19 years, 1 month

← Newer
1
...
21
22
23
24
25
26
27
...
67
Older →

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