Ros-diffs October 2015

ros-diffs@reactos.org

18 participants
347 discussions

[tfaber] 69537: [WIN32K:NTUSER] - THREADINFO::hEventQueueClient is a user handle. Treat it as such. CORE-10207

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Oct 15 09:50:12 2015 New Revision: 69537 URL: http://svn.reactos.org/svn/reactos?rev=69537&view=rev Log: [WIN32K:NTUSER] - THREADINFO::hEventQueueClient is a user handle. Treat it as such. CORE-10207 Modified: trunk/reactos/win32ss/user/ntuser/main.c Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Thu Oct 15 09:50:12 2015 @@ -508,12 +508,12 @@ goto error; } Status = ObReferenceObjectByHandle(ptiCurrent->hEventQueueClient, 0, - *ExEventObjectType, KernelMode, + *ExEventObjectType, UserMode, (PVOID*)&ptiCurrent->pEventQueueServer, NULL); if (!NT_SUCCESS(Status)) { ERR_CH(UserThread, "Failed referencing the event object, Status 0x%08x.\n", Status); - ZwClose(ptiCurrent->hEventQueueClient); + ObCloseHandle(ptiCurrent->hEventQueueClient, UserMode); ptiCurrent->hEventQueueClient = NULL; goto error; } @@ -818,7 +818,7 @@ if (ptiCurrent->hEventQueueClient != NULL) { - ZwClose(ptiCurrent->hEventQueueClient); + ObCloseHandle(ptiCurrent->hEventQueueClient, UserMode); ObDereferenceObject(ptiCurrent->pEventQueueServer); } ptiCurrent->hEventQueueClient = NULL;

8 years, 11 months

[tfaber] 69536: [WIN32K:NTUSER] - Don't perform thread initialization twice in csrss's UserInitialize thread CORE-10339 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Oct 15 09:44:20 2015 New Revision: 69536 URL: http://svn.reactos.org/svn/reactos?rev=69536&view=rev Log: [WIN32K:NTUSER] - Don't perform thread initialization twice in csrss's UserInitialize thread CORE-10339 #resolve Modified: trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/ntuser.c Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Thu Oct 15 09:44:20 2015 @@ -379,11 +379,7 @@ /* Check that we were not called with an already existing Win32 thread info */ ptiCurrent = PsGetThreadWin32Thread(Thread); - if (ptiCurrent) - { - ERR_CH(UserThread, "PsGetThreadWin32Thread returned non-NULL thread info!!\n"); - // return STATUS_SUCCESS; - } + NT_ASSERT(ptiCurrent == NULL); /* Allocate a new Win32 thread info */ ptiCurrent = ExAllocatePoolWithTag(NonPagedPool, Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Thu Oct 15 09:44:20 2015 @@ -113,7 +113,9 @@ HBITMAP hPattern55AABitmap = NULL; NTSTATUS Status; -// Create Event for Diconnect Desktop. + NT_ASSERT(PsGetCurrentThreadWin32Thread() != NULL); + +// Create Event for Disconnect Desktop. Status = UserCreateWinstaDirectory(); if (!NT_SUCCESS(Status)) return Status; @@ -128,14 +130,7 @@ // Update Shared Device Caps. // Initialize User Screen. // } -// Create ThreadInfo for this Thread! -// { - - /* Initialize the current thread */ - Status = InitThreadCallback(PsGetCurrentThread()); - if (!NT_SUCCESS(Status)) return Status; - -// } + // Set Global SERVERINFO Error flags. // Load Resources.

8 years, 11 months

[tfaber] 69535: [NPFS] - Don't leave the critical region before releasing ERESOURCE

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Oct 15 08:03:40 2015 New Revision: 69535 URL: http://svn.reactos.org/svn/reactos?rev=69535&view=rev Log: [NPFS] - Don't leave the critical region before releasing ERESOURCE Modified: trunk/reactos/drivers/filesystems/npfs/statesup.c Modified: trunk/reactos/drivers/filesystems/npfs/statesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/s… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/statesup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/statesup.c [iso-8859-1] Thu Oct 15 08:03:40 2015 @@ -27,8 +27,8 @@ RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + NpReleaseVcb(); FsRtlExitFileSystem(); - NpReleaseVcb(); Irp->IoStatus.Status = STATUS_CANCELLED; IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT);

8 years, 11 months

[tfaber] 69534: [NTOS:APPHELP] - Avoid excessive indentation - Minor changes to conform better to kernel style

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Oct 15 07:44:25 2015 New Revision: 69534 URL: http://svn.reactos.org/svn/reactos?rev=69534&view=rev Log: [NTOS:APPHELP] - Avoid excessive indentation - Minor changes to conform better to kernel style Modified: trunk/reactos/ntoskrnl/ps/apphelp.c Modified: trunk/reactos/ntoskrnl/ps/apphelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/apphelp.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/apphelp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/apphelp.c [iso-8859-1] Thu Oct 15 07:44:25 2015 @@ -182,17 +182,25 @@ FILE_STANDARD_INFORMATION FileStandard; NTSTATUS Status; - Status = ZwQueryInformationFile(ImageHandle, &IoStatusBlock, - &FileBasic, sizeof(FileBasic), FileBasicInformation); + Status = ZwQueryInformationFile(ImageHandle, + &IoStatusBlock, + &FileBasic, + sizeof(FileBasic), + FileBasicInformation); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + Status = ZwQueryInformationFile(ImageHandle, + &IoStatusBlock, + &FileStandard, + sizeof(FileStandard), + FileStandardInformation); if (NT_SUCCESS(Status)) { - Status = ZwQueryInformationFile(ImageHandle, &IoStatusBlock, - &FileStandard, sizeof(FileStandard), FileStandardInformation); - if (NT_SUCCESS(Status)) - { - Entry->Persistent.DateTime = FileBasic.LastWriteTime; - Entry->Persistent.FileSize = FileStandard.EndOfFile; - } + Entry->Persistent.DateTime = FileBasic.LastWriteTime; + Entry->Persistent.FileSize = FileStandard.EndOfFile; } return Status; } @@ -204,14 +212,21 @@ _In_ PVOID FirstStruct, _In_ PVOID SecondStruct) { - LONG lResult = RtlCompareUnicodeString( - &((PSHIM_CACHE_ENTRY)FirstStruct)->Persistent.ImageName, - &((PSHIM_CACHE_ENTRY)SecondStruct)->Persistent.ImageName, TRUE); - - if (lResult < 0) + PSHIM_CACHE_ENTRY FirstEntry = FirstStruct; + PSHIM_CACHE_ENTRY SecondEntry = SecondStruct; + LONG Result; + + Result = RtlCompareUnicodeString(&FirstEntry->Persistent.ImageName, + &SecondEntry->Persistent.ImageName, + TRUE); + if (Result < 0) + { return GenericLessThan; - else if (lResult == 0) + } + else if (Result == 0) + { return GenericEqual; + } return GenericGreaterThan; } @@ -239,47 +254,53 @@ _In_ ULONG DataLength) { PSHIM_PERSISTENT_CACHE_HEADER Header = (PSHIM_PERSISTENT_CACHE_HEADER)Data; + ULONG Cur; + ULONG NumEntries; + UNICODE_STRING String; + SHIM_CACHE_ENTRY Entry = EMPTY_SHIM_ENTRY; + PSHIM_CACHE_ENTRY Result; + PSHIM_PERSISTENT_CACHE_ENTRY Persistent; if (DataLength < CACHE_HEADER_SIZE_NT_52) { DPRINT1("SHIMS: ApphelpCacheParse not enough data for a minimal header (0x%x)\n", DataLength); return STATUS_INVALID_PARAMETER; } - if (Header->Magic == SHIM_CACHE_MAGIC) - { - ULONG Cur; - ULONG NumEntries = Header->NumEntries; - DPRINT1("SHIMS: ApphelpCacheParse walking %d entries\n", NumEntries); - for (Cur = 0; Cur < NumEntries; ++Cur) - { - UNICODE_STRING String; - SHIM_CACHE_ENTRY Entry = EMPTY_SHIM_ENTRY; - PSHIM_CACHE_ENTRY Result; - PSHIM_PERSISTENT_CACHE_ENTRY pPersistent = - (PSHIM_PERSISTENT_CACHE_ENTRY)(Data + SHIM_CACHE_HEADER_SIZE + - (Cur * SHIM_PERSISTENT_CACHE_ENTRY_SIZE)); - /* The entry in the Persitent storage is not really a UNICODE_STRING, - so we have to convert the offset into a real pointer before using it. */ - String.Length = pPersistent->ImageName.Length; - String.MaximumLength = pPersistent->ImageName.MaximumLength; - String.Buffer = (PWCHAR)((ULONG_PTR)pPersistent->ImageName.Buffer + Data); - - /* Now we copy all data to a local buffer, that can be safely duplicated by RtlInsert */ - Entry.Persistent = *pPersistent; - ApphelpDuplicateUnicodeString(&Entry.Persistent.ImageName, &String); - Result = RtlInsertElementGenericTableAvl(&ApphelpShimCache, &Entry, sizeof(Entry), NULL); - if (!Result) - { - DPRINT1("SHIMS: ApphelpCacheParse insert failed\n"); - ApphelpFreeUnicodeString(&Entry.Persistent.ImageName); - return STATUS_INVALID_PARAMETER; - } - InsertTailList(&ApphelpShimCacheAge, &Result->List); - } - return STATUS_SUCCESS; - } - DPRINT1("SHIMS: ApphelpCacheParse found invalid magic (0x%x)\n", Header->Magic); - return STATUS_INVALID_PARAMETER; + + if (Header->Magic != SHIM_CACHE_MAGIC) + { + DPRINT1("SHIMS: ApphelpCacheParse found invalid magic (0x%x)\n", Header->Magic); + return STATUS_INVALID_PARAMETER; + } + + NumEntries = Header->NumEntries; + DPRINT1("SHIMS: ApphelpCacheParse walking %d entries\n", NumEntries); + for (Cur = 0; Cur < NumEntries; ++Cur) + { + Persistent = (PSHIM_PERSISTENT_CACHE_ENTRY)(Data + SHIM_CACHE_HEADER_SIZE + + (Cur * SHIM_PERSISTENT_CACHE_ENTRY_SIZE)); + /* The entry in the Persistent storage is not really a UNICODE_STRING, + so we have to convert the offset into a real pointer before using it. */ + String.Length = Persistent->ImageName.Length; + String.MaximumLength = Persistent->ImageName.MaximumLength; + String.Buffer = (PWCHAR)((ULONG_PTR)Persistent->ImageName.Buffer + Data); + + /* Now we copy all data to a local buffer, that can be safely duplicated by RtlInsert */ + Entry.Persistent = *Persistent; + ApphelpDuplicateUnicodeString(&Entry.Persistent.ImageName, &String); + Result = RtlInsertElementGenericTableAvl(&ApphelpShimCache, + &Entry, + sizeof(Entry), + NULL); + if (!Result) + { + DPRINT1("SHIMS: ApphelpCacheParse insert failed\n"); + ApphelpFreeUnicodeString(&Entry.Persistent.ImageName); + return STATUS_INVALID_PARAMETER; + } + InsertTailList(&ApphelpShimCacheAge, &Result->List); + } + return STATUS_SUCCESS; } BOOLEAN @@ -292,33 +313,37 @@ ULONG KeyInfoSize, ResultSize; Status = ZwOpenKey(&KeyHandle, KEY_QUERY_VALUE, &AppCompatKeyAttributes); - if (!NT_SUCCESS(Status)) { DPRINT1("SHIMS: ApphelpCacheRead could not even open Session Manager\\AppCompatCache (0x%x)\n", Status); return FALSE; } - Status = ZwQueryValueKey(KeyHandle, &AppCompatCacheValue, - KeyValuePartialInformation, KeyValueInformation, - sizeof(KeyValueObject), &ResultSize); - + Status = ZwQueryValueKey(KeyHandle, + &AppCompatCacheValue, + KeyValuePartialInformation, + KeyValueInformation, + sizeof(KeyValueObject), + &ResultSize); if (Status == STATUS_BUFFER_OVERFLOW) { KeyInfoSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + KeyValueInformation->DataLength; KeyValueInformation = ApphelpAlloc(KeyInfoSize); if (KeyValueInformation != NULL) { - Status = ZwQueryValueKey(KeyHandle, &AppCompatCacheValue, - KeyValuePartialInformation, KeyValueInformation, - KeyInfoSize, &ResultSize); + Status = ZwQueryValueKey(KeyHandle, + &AppCompatCacheValue, + KeyValuePartialInformation, + KeyValueInformation, + KeyInfoSize, + &ResultSize); } } if (NT_SUCCESS(Status) && KeyValueInformation->Type == REG_BINARY) { Status = ApphelpCacheParse(KeyValueInformation->Data, - KeyValueInformation->DataLength); + KeyValueInformation->DataLength); } else { @@ -326,7 +351,9 @@ } if (KeyValueInformation != &KeyValueObject && KeyValueInformation != NULL) + { ApphelpFree(KeyValueInformation); + } ZwClose(KeyHandle); return NT_SUCCESS(Status); @@ -389,7 +416,12 @@ Status = ZwOpenKey(&KeyHandle, KEY_SET_VALUE, &AppCompatKeyAttributes); if (NT_SUCCESS(Status)) { - Status = ZwSetValueKey(KeyHandle, &AppCompatCacheValue, 0, REG_BINARY, Buffer, Length); + Status = ZwSetValueKey(KeyHandle, + &AppCompatCacheValue, + 0, + REG_BINARY, + Buffer, + Length); ZwClose(KeyHandle); } else @@ -418,10 +450,10 @@ { ExInitializeResourceLite(&ApphelpCacheLock); RtlInitializeGenericTableAvl(&ApphelpShimCache, - ApphelpShimCacheCompareRoutine, - ApphelpShimCacheAllocateRoutine, - ApphelpShimCacheFreeRoutine, - NULL); + ApphelpShimCacheCompareRoutine, + ApphelpShimCacheAllocateRoutine, + ApphelpShimCacheFreeRoutine, + NULL); InitializeListHead(&ApphelpShimCacheAge); ApphelpCacheEnabled = ApphelpCacheRead(); } @@ -452,12 +484,16 @@ UNICODE_STRING LocalImageName; _SEH2_TRY { - ProbeForRead(ServiceData, sizeof(APPHELP_CACHE_SERVICE_LOOKUP), sizeof(ULONG)); + ProbeForRead(ServiceData, + sizeof(APPHELP_CACHE_SERVICE_LOOKUP), + sizeof(ULONG)); LocalImageName = ServiceData->ImageName; *ImageHandle = ServiceData->ImageHandle; if (LocalImageName.Length && LocalImageName.Buffer) { - ProbeForRead(LocalImageName.Buffer, LocalImageName.Length * sizeof(WCHAR), 1); + ProbeForRead(LocalImageName.Buffer, + LocalImageName.Length * sizeof(WCHAR), + 1); ApphelpDuplicateUnicodeString(ImageName, &LocalImageName); Status = STATUS_SUCCESS; } @@ -484,7 +520,9 @@ PWSTR Buffer = Entry->Persistent.ImageName.Buffer; RemoveEntryList(&Entry->List); if (RtlDeleteElementGenericTableAvl(&ApphelpShimCache, Entry)) + { ApphelpFree(Buffer); + } return STATUS_SUCCESS; } return STATUS_NOT_FOUND; @@ -496,45 +534,52 @@ _In_ HANDLE ImageHandle) { NTSTATUS Status = STATUS_NOT_FOUND; - - if (ApphelpCacheTryAcquireLock()) - { - SHIM_CACHE_ENTRY Lookup = EMPTY_SHIM_ENTRY; - PSHIM_CACHE_ENTRY Entry; - Lookup.Persistent.ImageName = *ImageName; - Entry = RtlLookupElementGenericTableAvl(&ApphelpShimCache, &Lookup); - if (Entry) - { - DPRINT1("SHIMS: ApphelpCacheLookupEntry: found %wZ\n", ImageName); - if (ImageHandle == INVALID_HANDLE_VALUE) - { - DPRINT1("SHIMS: ApphelpCacheLookupEntry: ok\n"); - /* just return if we know it, do not query file info */ - Status = STATUS_SUCCESS; - } - else if (NT_SUCCESS(ApphelpCacheQueryInfo(ImageHandle, &Lookup)) && - Lookup.Persistent.DateTime.QuadPart == Entry->Persistent.DateTime.QuadPart && - Lookup.Persistent.FileSize.QuadPart == Entry->Persistent.FileSize.QuadPart) - { - DPRINT1("SHIMS: ApphelpCacheLookupEntry: found & validated\n"); - Status = STATUS_SUCCESS; - /* move it to the front to keep it alive */ - RemoveEntryList(&Entry->List); - InsertHeadList(&ApphelpShimCacheAge, &Entry->List); - } - else - { - DPRINT1("SHIMS: ApphelpCacheLookupEntry: file info mismatch\n"); - /* Could not read file info, or it did not match, drop it from the cache */ - ApphelpCacheRemoveEntryNolock(Entry); - } + SHIM_CACHE_ENTRY Lookup = EMPTY_SHIM_ENTRY; + PSHIM_CACHE_ENTRY Entry; + + if (!ApphelpCacheTryAcquireLock()) + { + return Status; + } + + Lookup.Persistent.ImageName = *ImageName; + Entry = RtlLookupElementGenericTableAvl(&ApphelpShimCache, &Lookup); + if (Entry == NULL) + { + DPRINT1("SHIMS: ApphelpCacheLookupEntry: could not find %wZ\n", ImageName); + goto Cleanup; + } + + DPRINT1("SHIMS: ApphelpCacheLookupEntry: found %wZ\n", ImageName); + if (ImageHandle == INVALID_HANDLE_VALUE) + { + DPRINT1("SHIMS: ApphelpCacheLookupEntry: ok\n"); + /* just return if we know it, do not query file info */ + Status = STATUS_SUCCESS; + } + else + { + Status = ApphelpCacheQueryInfo(ImageHandle, &Lookup); + if (NT_SUCCESS(Status) && + Lookup.Persistent.DateTime.QuadPart == Entry->Persistent.DateTime.QuadPart && + Lookup.Persistent.FileSize.QuadPart == Entry->Persistent.FileSize.QuadPart) + { + DPRINT1("SHIMS: ApphelpCacheLookupEntry: found & validated\n"); + Status = STATUS_SUCCESS; + /* move it to the front to keep it alive */ + RemoveEntryList(&Entry->List); + InsertHeadList(&ApphelpShimCacheAge, &Entry->List); } else { - DPRINT1("SHIMS: ApphelpCacheLookupEntry: could not find %wZ\n", ImageName); - } - ApphelpCacheReleaseLock(); - } + DPRINT1("SHIMS: ApphelpCacheLookupEntry: file info mismatch\n"); + /* Could not read file info, or it did not match, drop it from the cache */ + ApphelpCacheRemoveEntryNolock(Entry); + } + } + +Cleanup: + ApphelpCacheReleaseLock(); return Status; } @@ -584,49 +629,57 @@ if (ImageHandle != INVALID_HANDLE_VALUE) { Status = ApphelpCacheQueryInfo(ImageHandle, &Entry); - } - - if (NT_SUCCESS(Status)) - { - /* Use ImageName for the lookup, don't actually duplicate it */ - Entry.Persistent.ImageName = *ImageName; - Lookup = RtlLookupElementGenericTableFullAvl(&ApphelpShimCache, &Entry, - &NodeOrParent, &SearchResult); - if (Lookup) - { - DPRINT1("SHIMS: ApphelpCacheUpdateEntry: Entry already exists, reusing it\n"); - /* Unlink the found item, so we can put it back at the front, - and copy the earlier obtained file info*/ - RemoveEntryList(&Lookup->List); - Lookup->Persistent.DateTime = Entry.Persistent.DateTime; - Lookup->Persistent.FileSize = Entry.Persistent.FileSize; - } - else - { - DPRINT1("SHIMS: ApphelpCacheUpdateEntry: Inserting new Entry\n"); - /* Insert a new entry, with its own copy of the ImageName */ - ApphelpDuplicateUnicodeString(&Entry.Persistent.ImageName, ImageName); - Lookup = RtlInsertElementGenericTableFullAvl(&ApphelpShimCache, - &Entry, sizeof(Entry), 0, NodeOrParent, SearchResult); - if (!Lookup) - { - ApphelpFreeUnicodeString(&Entry.Persistent.ImageName); - Status = STATUS_NO_MEMORY; - } - } - if (Lookup) - { - /* Either we re-used an existing item, or we inserted a new one, keep it alive */ - InsertHeadList(&ApphelpShimCacheAge, &Lookup->List); - if (RtlNumberGenericTableElementsAvl(&ApphelpShimCache) > MAX_SHIM_ENTRIES) - { - PSHIM_CACHE_ENTRY Remove; - DPRINT1("SHIMS: ApphelpCacheUpdateEntry: Cache growing too big, dropping oldest item\n"); - Remove = CONTAINING_RECORD(ApphelpShimCacheAge.Blink, SHIM_CACHE_ENTRY, List); - Status = ApphelpCacheRemoveEntryNolock(Remove); - } - } - } + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + } + + /* Use ImageName for the lookup, don't actually duplicate it */ + Entry.Persistent.ImageName = *ImageName; + Lookup = RtlLookupElementGenericTableFullAvl(&ApphelpShimCache, + &Entry, + &NodeOrParent, &SearchResult); + if (Lookup) + { + DPRINT1("SHIMS: ApphelpCacheUpdateEntry: Entry already exists, reusing it\n"); + /* Unlink the found item, so we can put it back at the front, + and copy the earlier obtained file info*/ + RemoveEntryList(&Lookup->List); + Lookup->Persistent.DateTime = Entry.Persistent.DateTime; + Lookup->Persistent.FileSize = Entry.Persistent.FileSize; + } + else + { + DPRINT1("SHIMS: ApphelpCacheUpdateEntry: Inserting new Entry\n"); + /* Insert a new entry, with its own copy of the ImageName */ + ApphelpDuplicateUnicodeString(&Entry.Persistent.ImageName, ImageName); + Lookup = RtlInsertElementGenericTableFullAvl(&ApphelpShimCache, + &Entry, + sizeof(Entry), + 0, + NodeOrParent, + SearchResult); + if (!Lookup) + { + ApphelpFreeUnicodeString(&Entry.Persistent.ImageName); + Status = STATUS_NO_MEMORY; + } + } + if (Lookup) + { + /* Either we re-used an existing item, or we inserted a new one, keep it alive */ + InsertHeadList(&ApphelpShimCacheAge, &Lookup->List); + if (RtlNumberGenericTableElementsAvl(&ApphelpShimCache) > MAX_SHIM_ENTRIES) + { + PSHIM_CACHE_ENTRY Remove; + DPRINT1("SHIMS: ApphelpCacheUpdateEntry: Cache growing too big, dropping oldest item\n"); + Remove = CONTAINING_RECORD(ApphelpShimCacheAge.Blink, SHIM_CACHE_ENTRY, List); + Status = ApphelpCacheRemoveEntryNolock(Remove); + } + } + +Cleanup: ApphelpCacheReleaseLock(); return Status; } @@ -650,18 +703,17 @@ ApphelpCacheDump(VOID) { PLIST_ENTRY ListEntry; + PSHIM_CACHE_ENTRY Entry; DPRINT1("SHIMS: NtApphelpCacheControl( Dumping entries, newset to oldest )\n"); ApphelpCacheAcquireLock(); ListEntry = ApphelpShimCacheAge.Flink; while (ListEntry != &ApphelpShimCacheAge) { - PSHIM_CACHE_ENTRY Entry = CONTAINING_RECORD(ListEntry, SHIM_CACHE_ENTRY, List); - DPRINT1("Entry: %S\n", Entry->Persistent.ImageName.Buffer); - DPRINT1("DateTime High: 0x%x, Low: 0x%x\n", - Entry->Persistent.DateTime.HighPart, Entry->Persistent.DateTime.LowPart); - DPRINT1("FileSize High: 0x%x, Low: 0x%x\n", - Entry->Persistent.FileSize.HighPart, Entry->Persistent.FileSize.LowPart); + Entry = CONTAINING_RECORD(ListEntry, SHIM_CACHE_ENTRY, List); + DPRINT1("Entry: %wZ\n", &Entry->Persistent.ImageName); + DPRINT1("DateTime: 0x%I64x\n", Entry->Persistent.DateTime.QuadPart); + DPRINT1("FileSize: 0x%I64x\n", Entry->Persistent.FileSize.QuadPart); DPRINT1("Flags: 0x%x\n", Entry->CompatFlags); ListEntry = ListEntry->Flink; }

8 years, 11 months

[tfaber] 69533: [PARPORT] - Add missing OBJ_KERNEL_HANDLE CORE-10207

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Oct 15 07:16:39 2015 New Revision: 69533 URL: http://svn.reactos.org/svn/reactos?rev=69533&view=rev Log: [PARPORT] - Add missing OBJ_KERNEL_HANDLE CORE-10207 Modified: trunk/reactos/drivers/parallel/parport/fdo.c Modified: trunk/reactos/drivers/parallel/parport/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/f… ============================================================================== --- trunk/reactos/drivers/parallel/parport/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/parallel/parport/fdo.c [iso-8859-1] Thu Oct 15 07:16:39 2015 @@ -292,7 +292,7 @@ L"\\Registry\\Machine\\HARDWARE\\DeviceMap\\PARALLEL PORTS"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL);

8 years, 11 months

[sginsberg] 69532: [NTOS] Fix mapping of working set list page -- it should be local. Get rid of MI_MAKE_LOCAL_PAGE and use ValidKernelPdeLocal/ValidKernelPteLocal consistently. This is what they e...

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Thu Oct 15 01:49:26 2015 New Revision: 69532 URL: http://svn.reactos.org/svn/reactos?rev=69532&view=rev Log: [NTOS] Fix mapping of working set list page -- it should be local. Get rid of MI_MAKE_LOCAL_PAGE and use ValidKernelPdeLocal/ValidKernelPteLocal consistently. This is what they exist for! We should now hopefully not be creating any global pages when we don't want them. Next step; fix flushing. Bonus: Use the right lock in MiSessionLeader Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h trunk/reactos/ntoskrnl/include/internal/arm/mm.h trunk/reactos/ntoskrnl/include/internal/i386/mm.h trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/session.c Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Thu Oct 15 01:49:26 2015 @@ -85,7 +85,6 @@ #define PFN_FROM_PXE(v) ((v)->u.Hard.PageFrameNumber) /* Macros for portable PTE modification */ -#define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.Global = 0) #define MI_MAKE_DIRTY_PAGE(x) ((x)->u.Hard.Dirty = 1) #define MI_MAKE_CLEAN_PAGE(x) ((x)->u.Hard.Dirty = 0) #define MI_MAKE_ACCESSED_PAGE(x) ((x)->u.Hard.Accessed = 1) Modified: trunk/reactos/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] Thu Oct 15 01:49:26 2015 @@ -74,7 +74,6 @@ #define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber) /* Macros for portable PTE modification */ -#define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.NonGlobal = 1) #define MI_MAKE_DIRTY_PAGE(x) #define MI_MAKE_CLEAN_PAGE(x) #define MI_MAKE_ACCESSED_PAGE(x) Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] Thu Oct 15 01:49:26 2015 @@ -89,7 +89,6 @@ #define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber) /* Macros for portable PTE modification */ -#define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.Global = 0) #define MI_MAKE_DIRTY_PAGE(x) ((x)->u.Hard.Dirty = 1) #define MI_MAKE_CLEAN_PAGE(x) ((x)->u.Hard.Dirty = 0) #define MI_MAKE_ACCESSED_PAGE(x) ((x)->u.Hard.Accessed = 1) Modified: trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/hypermap.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c [iso-8859-1] Thu Oct 15 01:49:26 2015 @@ -44,9 +44,8 @@ // // Build the PTE // - TempPte = ValidKernelPte; + TempPte = ValidKernelPteLocal; TempPte.u.Hard.PageFrameNumber = Page; - MI_MAKE_LOCAL_PAGE(&TempPte); // Hyperspace is local! // // Pick the first hyperspace PTE Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Thu Oct 15 01:49:26 2015 @@ -492,8 +492,8 @@ MI_SET_USAGE(MI_USAGE_PAGE_TABLE); MI_SET_PROCESS2("Kernel"); PageFrameIndex = MiRemoveAnyPage(0); + TempPde = ValidKernelPdeLocal; TempPde.u.Hard.PageFrameNumber = PageFrameIndex; - TempPde.u.Hard.Global = FALSE; // Hyperspace is local! MI_WRITE_VALID_PTE(StartPde, TempPde); /* Flush the TLB */ @@ -542,6 +542,7 @@ MI_SET_USAGE(MI_USAGE_PAGE_TABLE); MI_SET_PROCESS2("Kernel WS List"); PageFrameIndex = MiRemoveAnyPage(0); + TempPte = ValidKernelPteLocal; TempPte.u.Hard.PageFrameNumber = PageFrameIndex; /* Map the working set list */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Thu Oct 15 01:49:26 2015 @@ -1163,10 +1163,8 @@ HyperTable = MiPteToAddress(PointerPte); /* Now write the PTE/PDE entry for the working set list index itself */ - TempPte = ValidKernelPte; + TempPte = ValidKernelPteLocal; TempPte.u.Hard.PageFrameNumber = WsListIndex; - /* Hyperspace is local */ - MI_MAKE_LOCAL_PAGE(&TempPte); PdeOffset = MiAddressToPteOffset(MmWorkingSetList); HyperTable[PdeOffset] = TempPte; Modified: trunk/reactos/ntoskrnl/mm/ARM3/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/session.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] Thu Oct 15 01:49:26 2015 @@ -162,9 +162,9 @@ KIRQL OldIrql; /* Set the flag while under the expansion lock */ - OldIrql = KeAcquireQueuedSpinLock(LockQueueExpansionLock); + OldIrql = MiAcquireExpansionLock(); Process->Vm.Flags.SessionLeader = TRUE; - KeReleaseQueuedSpinLock(LockQueueExpansionLock, OldIrql); + MiReleaseExpansionLock(OldIrql); } ULONG @@ -517,7 +517,7 @@ } /* Write a valid PDE for it */ - TempPde.u.Long = ValidKernelPdeLocal.u.Long; + TempPde = ValidKernelPdeLocal; TempPde.u.Hard.PageFrameNumber = PageFrameIndex; MI_WRITE_VALID_PDE(PointerPde, TempPde); @@ -548,7 +548,7 @@ } /* Write a valid PTE for it */ - TempPte.u.Long = ValidKernelPteLocal.u.Long; + TempPte = ValidKernelPteLocal; MI_MAKE_DIRTY_PAGE(&TempPte); TempPte.u.Hard.PageFrameNumber = PageFrameIndex; @@ -667,7 +667,7 @@ OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); /* Loop the global PTEs */ - TempPte.u.Long = ValidKernelPte.u.Long; + TempPte = ValidKernelPte; for (i = 0; i < MiSessionDataPages; i++) { /* Get a zeroed colored zero page */ @@ -707,7 +707,7 @@ } /* Fill the PTE out */ - TempPde.u.Long = ValidKernelPdeLocal.u.Long; + TempPde = ValidKernelPdeLocal; TempPde.u.Hard.PageFrameNumber = SessionPageDirIndex; /* Setup, allocate, fill out the MmSessionSpace PTE */ @@ -720,7 +720,7 @@ ASSERT(MI_PFN_ELEMENT(SessionPageDirIndex)->u1.WsIndex == 0); /* Loop all the local PTEs for it */ - TempPte.u.Long = ValidKernelPteLocal.u.Long; + TempPte = ValidKernelPteLocal; PointerPte = MiAddressToPte(MmSessionSpace); for (i = 0; i < MiSessionDataPages; i++) {

8 years, 11 months

[sginsberg] 69531: [NTOS] Global pages may not have been enabled when KeFlushCurrentTb is first called, so don't enable them in there.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Oct 14 20:42:18 2015 New Revision: 69531 URL: http://svn.reactos.org/svn/reactos?rev=69531&view=rev Log: [NTOS] Global pages may not have been enabled when KeFlushCurrentTb is first called, so don't enable them in there. Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Wed Oct 14 20:42:18 2015 @@ -891,15 +891,15 @@ { ULONG Cr4; - /* Disable PGE */ - Cr4 = __readcr4() & ~CR4_PGE; - __writecr4(Cr4); + /* Disable PGE (Note: may not have been enabled yet) */ + Cr4 = __readcr4(); + __writecr4(Cr4 & ~CR4_PGE); /* Flush everything */ __writecr3(__readcr3()); /* Re-enable PGE */ - __writecr4(Cr4 | CR4_PGE); + __writecr4(Cr4); } else {

8 years, 11 months

[fireball] 69530: [ARWINSS] - Move the patch file to the right place. Patch size increased to 19Kb.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Oct 14 20:29:45 2015 New Revision: 69530 URL: http://svn.reactos.org/svn/reactos?rev=69530&view=rev Log: [ARWINSS] - Move the patch file to the right place. Patch size increased to 19Kb. Removed: branches/arwinss/arwinss/trunk.patch Modified: branches/arwinss/trunk.diff Removed: branches/arwinss/arwinss/trunk.patch URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/trunk.patch?rev… ============================================================================== --- branches/arwinss/arwinss/trunk.patch [iso-8859-1] (original) +++ branches/arwinss/arwinss/trunk.patch (removed) @@ -1,655 +0,0 @@ -Index: base/system/smss/smsubsys.c -=================================================================== ---- base/system/smss/smsubsys.c (revision 69519) -+++ base/system/smss/smsubsys.c (working copy) -@@ -10,7 +10,7 @@ - - #include "smss.h" - --#define NDEBUG -+//#define NDEBUG - #include <debug.h> - - /* GLOBALS ********************************************************************/ -Index: base/system/winlogon/winlogon.c -=================================================================== ---- base/system/winlogon/winlogon.c (revision 69519) -+++ base/system/winlogon/winlogon.c (working copy) -@@ -397,7 +397,7 @@ - HandleShutdown(WLSession, WLX_SAS_ACTION_SHUTDOWN_REBOOT); - ExitProcess(1); - } -- -+ERR("WL Desktop: %x\n", WLSession->WinlogonDesktop); - DisplayStatusMessage(WLSession, WLSession->WinlogonDesktop, IDS_REACTOSISSTARTINGUP); - - #if 0 -Index: cmake/baseaddress.cmake -=================================================================== ---- cmake/baseaddress.cmake (revision 69519) -+++ cmake/baseaddress.cmake (working copy) -@@ -2,7 +2,7 @@ - set(baseaddress_kernel32 0x7c770000) - set(baseaddress_msvcrt 0x7c6c0000) - set(baseaddress_advapi32 0x7c610000) --set(baseaddress_gdi32 0x7c570000) -+set(baseaddress_gdi32 0x7c580000) - set(baseaddress_user32 0x7c3d0000) - set(baseaddress_dhcpcsvc 0x7c380000) - set(baseaddress_dnsapi 0x7c330000) -Index: cmake/config.cmake -=================================================================== ---- cmake/config.cmake (revision 69519) -+++ cmake/config.cmake (working copy) -@@ -58,6 +58,9 @@ - "Whether to compile support for ELF files. - Do not enable unless you know what you're doing.") - -+set(_ARWINSS_ TRUE CACHE BOOL -+"Whether to build and use Wine-based Win32 subsystem.") -+ - set(NSWPAT FALSE CACHE BOOL - "Whether to build apps/libs with features covered by software patents. - If you live in a country where software patents are valid/apply, don't -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt (revision 69519) -+++ CMakeLists.txt (working copy) -@@ -166,6 +166,10 @@ - add_definitions(-D_WINKD_=1) - endif() - -+ if(_ARWINSS_) -+ add_definitions(-D_ARWINSS_=1) -+ endif() -+ - if(CMAKE_VERSION MATCHES "ReactOS") - set(PCH 1 CACHE BOOL "Whether to use precompiled headers") - else() -@@ -279,6 +283,9 @@ - add_subdirectory(subsystems) - add_subdirectory(tools/wpp) - add_subdirectory(win32ss) -+ if (_ARWINSS_) -+ add_subdirectory(arwinss) -+ endif() - - # Create the registry hives - create_registry_hives() -Index: dll/win32/kernel32/client/dllmain.c -=================================================================== ---- dll/win32/kernel32/client/dllmain.c (revision 69519) -+++ dll/win32/kernel32/client/dllmain.c (working copy) -@@ -131,7 +131,7 @@ - SessionId, - WIN_OBJ_DIR); - } -- -+DPRINT1("About to connect to CSR!\n"); - /* Connect to the Base Server */ - Status = CsrClientConnectToServer(SessionDir, - BASESRV_SERVERDLL_INDEX, -Index: dll/win32/msgina/gui.c -=================================================================== ---- dll/win32/msgina/gui.c (revision 69519) -+++ dll/win32/msgina/gui.c (working copy) -@@ -73,6 +73,7 @@ - - /* When SetThreadDesktop is called the system closes the desktop handle when needed - so we have to create a new handle because this handle may still be in use by winlogon */ -+#ifndef _ARWINSS_ - if (!DuplicateHandle ( GetCurrentProcess(), - msg->hDesktop, - GetCurrentProcess(), -@@ -85,6 +86,9 @@ - HeapFree(GetProcessHeap(), 0, lpParam); - return FALSE; - } -+#else -+ hDesk = msg->hDesktop; -+#endif - - if(!SetThreadDesktop(hDesk)) - { -Index: include/asm/syscalls.inc -=================================================================== ---- include/asm/syscalls.inc (revision 69519) -+++ include/asm/syscalls.inc (working copy) -@@ -1,4 +1,4 @@ -- -+ - #ifdef _M_ARM - - #include <ksarm.h> -@@ -52,103 +52,105 @@ - - SyscallId = 0 - --#ifdef _M_IX86 --#define KUSER_SHARED_SYSCALL HEX(7ffe0300) --#define KGDT_R0_CODE 8 --MACRO(STUBCODE_U, Name, SyscallId, ArgCount) -- StackBytes = 4 * ArgCount -- FPO 0, 0, 0, 0, 0, FRAME_FPO -- mov eax, SyscallId -+#ifdef _M_IX86 -+#define KUSER_SHARED_SYSCALL HEX(7ffe0300) -+#define KGDT_R0_CODE 8 -+MACRO(STUBCODE_U, Name, SyscallId, ArgCount) -+ StackBytes = 4 * ArgCount -+ FPO 0, 0, 0, 0, 0, FRAME_FPO -+ mov eax, SyscallId - mov edx, KUSER_SHARED_SYSCALL - call dword ptr [edx] -- ret StackBytes --ENDM --MACRO(STUBCODE_K, Name, SyscallId, ArgCount) -- StackBytes = 4 * &ArgCount -- FPO 0, 0, 0, 0, 0, FRAME_FPO -- mov eax, SyscallId -- lea edx, [esp + 4] -- pushfd -- push KGDT_R0_CODE -- call _KiSystemService -- ret StackBytes --ENDM --#elif defined(_M_AMD64) --MACRO(STUBCODE_U, Name, SyscallId, ArgCount) -- .ENDPROLOG -- mov eax, SyscallId -- mov r10, rcx -- syscall -- ret --ENDM --MACRO(STUBCODE_K, Name, SyscallId, ArgCount) -- .ENDPROLOG -- EXTERN Nt&Name:PROC -- lea rax, Nt&Name[rip] -- mov r10, ArgCount * 8 -- jmp KiZwSystemService --ENDM --#elif defined(_M_PPC) --MACRO(STUBCODE_U, Name, SyscallId, ArgCount) -- stwu 1,-16(1) -- mflr 0 -- stw 0,0(1) -- li 0, SyscallId -- sc -- lwz 0,0(1) -- mtlr 0 -- addi 1,1,16 -- blr --ENDM --#define STUBCODE_K STUBCODE_U --#elif defined(_M_MIPS) --MACRO(STUBCODE_U, Name, SyscallId, ArgCount) -- li $8, KUSER_SHARED_SYSCALL -- lw $8,0($8) -- j $8 -- nop --ENDM --MACRO(STUBCODE_K, Name, SyscallId, ArgCount) -- j KiSystemService -- nop --ENDM --#else --#error unsupported architecture --#endif -+ ret StackBytes -+ENDM -+MACRO(STUBCODE_K, Name, SyscallId, ArgCount) -+ StackBytes = 4 * &ArgCount -+ FPO 0, 0, 0, 0, 0, FRAME_FPO -+ mov eax, SyscallId -+ lea edx, [esp + 4] -+ pushfd -+ push KGDT_R0_CODE -+ call _KiSystemService -+ ret StackBytes -+ENDM -+#elif defined(_M_AMD64) -+MACRO(STUBCODE_U, Name, SyscallId, ArgCount) -+ .ENDPROLOG -+ mov eax, SyscallId -+ mov r10, rcx -+ syscall -+ ret -+ENDM -+MACRO(STUBCODE_K, Name, SyscallId, ArgCount) -+ .ENDPROLOG -+ EXTERN Nt&Name:PROC -+ lea rax, Nt&Name[rip] -+ mov r10, ArgCount * 8 -+ jmp KiZwSystemService -+ENDM -+#elif defined(_M_PPC) -+MACRO(STUBCODE_U, Name, SyscallId, ArgCount) -+ stwu 1,-16(1) -+ mflr 0 -+ stw 0,0(1) -+ li 0, SyscallId -+ sc -+ lwz 0,0(1) -+ mtlr 0 -+ addi 1,1,16 -+ blr -+ENDM -+#define STUBCODE_K STUBCODE_U -+#elif defined(_M_MIPS) -+MACRO(STUBCODE_U, Name, SyscallId, ArgCount) -+ li $8, KUSER_SHARED_SYSCALL -+ lw $8,0($8) -+ j $8 -+ nop -+ENDM -+MACRO(STUBCODE_K, Name, SyscallId, ArgCount) -+ j KiSystemService -+ nop -+ENDM -+#else -+#error unsupported architecture -+#endif -+ -+#ifdef _M_IX86 -+MACRO(MAKE_LABEL, Name, StackBytes) -+ PUBLIC _&Name&@&StackBytes -+ _&Name&@&StackBytes: -+ENDM -+MACRO(START_PROC, Name, StackBytes) -+ PUBLIC _&Name&@&StackBytes -+ .PROC _&Name&@&StackBytes -+ENDM -+#else -+MACRO(MAKE_LABEL, Name, StackBytes) -+ PUBLIC &Name -+ &Name: -+ENDM -+MACRO(START_PROC, Name, StackBytes) -+ PUBLIC &Name -+ .PROC &Name -+ENDM -+#endif -+ -+MACRO(STUB_U, Name, ArgCount) -+ MAKE_LABEL Zw&Name, %ArgCount * 4 -+ MAKE_LABEL Name, %ArgCount * 4 -+ START_PROC Nt&Name, %ArgCount * 4 -+ STUBCODE_U Name, SyscallId, %ArgCount -+ .ENDP -+ SyscallId = SyscallId + 1 -+ENDM -+ -+MACRO(STUB_K, Name, ArgCount) -+ MAKE_LABEL Name, %ArgCount * 4 -+ START_PROC Zw&Name, %ArgCount * 4 -+ STUBCODE_K Name, SyscallId, %ArgCount -+ .ENDP -+ SyscallId = SyscallId + 1 -+ENDM - --#ifdef _M_IX86 --MACRO(MAKE_LABEL, Name, StackBytes) -- PUBLIC _&Name&@&StackBytes -- _&Name&@&StackBytes: --ENDM --MACRO(START_PROC, Name, StackBytes) -- PUBLIC _&Name&@&StackBytes -- .PROC _&Name&@&StackBytes --ENDM --#else --MACRO(MAKE_LABEL, Name, StackBytes) -- PUBLIC &Name -- &Name: --ENDM --MACRO(START_PROC, Name, StackBytes) -- PUBLIC &Name -- .PROC &Name --ENDM - #endif -- --MACRO(STUB_U, Name, ArgCount) -- MAKE_LABEL Zw&Name, %ArgCount * 4 -- START_PROC Nt&Name, %ArgCount * 4 -- STUBCODE_U Name, SyscallId, %ArgCount -- .ENDP -- SyscallId = SyscallId + 1 --ENDM -- --MACRO(STUB_K, Name, ArgCount) -- START_PROC Zw&Name, %ArgCount * 4 -- STUBCODE_K Name, SyscallId, %ArgCount -- .ENDP -- SyscallId = SyscallId + 1 --ENDM -- --#endif -Index: include/psdk/winddi.h -=================================================================== ---- include/psdk/winddi.h (revision 69519) -+++ include/psdk/winddi.h (working copy) -@@ -2911,7 +2911,7 @@ - _In_ ULONG cjSize, - _Out_bytecap_(cjSize) FONTINFO *pfi); - --#if (NTDDI_VERSION <= NTDDI_WINXP) -+#if 0//(NTDDI_VERSION <= NTDDI_WINXP) - /* Obsolete in Windows 2000 and later */ - GAMMA_TABLES* - APIENTRY -Index: include/reactos/wine/config.h -=================================================================== ---- include/reactos/wine/config.h (revision 69519) -+++ include/reactos/wine/config.h (working copy) -@@ -1,3 +1,5 @@ -+#include "reactos/buildno.h" -+ - #define __WINE_CONFIG_H - - /* Define to a function attribute for Microsoft hotpatch assembly prefix. */ -Index: lib/3rdparty/CMakeLists.txt -=================================================================== ---- lib/3rdparty/CMakeLists.txt (revision 69519) -+++ lib/3rdparty/CMakeLists.txt (working copy) -@@ -2,7 +2,9 @@ - add_subdirectory(adns) - add_subdirectory(bzip2) - add_subdirectory(cardlib) -+if (NOT _ARWINSS_) - add_subdirectory(freetype) -+endif () - add_subdirectory(fullfat) - add_subdirectory(libmpg123) - add_subdirectory(libsamplerate) -Index: subsystems/win32/csrsrv/init.c -=================================================================== ---- subsystems/win32/csrsrv/init.c (revision 69519) -+++ subsystems/win32/csrsrv/init.c (working copy) -@@ -20,7 +20,7 @@ - /* DATA ***********************************************************************/ - - // Debug Flag --ULONG CsrDebug = 0; // 0xFFFFFFFF; -+ULONG CsrDebug = 0xFFFFFFFF; - - HANDLE CsrHeap = NULL; - HANDLE CsrObjectDirectory = NULL; -Index: win32ss/CMakeLists.txt -=================================================================== ---- win32ss/CMakeLists.txt (revision 69519) -+++ win32ss/CMakeLists.txt (working copy) -@@ -10,7 +10,10 @@ - PROJECT(WIN32SS) - - add_subdirectory(drivers) -+add_subdirectory(user/winsrv) - -+if (NOT _ARWINSS_) -+ - if(USE_DIBLIB) - add_subdirectory(gdi/diblib) - endif() -@@ -18,7 +21,6 @@ - add_subdirectory(gdi/gdi32) - add_subdirectory(reactx) - add_subdirectory(user/user32) --add_subdirectory(user/winsrv) - - spec2def(win32k.sys win32k.spec ADD_IMPORTLIB) - -@@ -243,3 +245,4 @@ - add_asm_files(win32ksys_asm sys-stubs.S) - add_library(win32ksys ${win32ksys_asm}) - set_target_properties(win32ksys PROPERTIES LINKER_LANGUAGE "C") -+endif() # _ARWINSS_ -\ No newline at end of file -Index: win32ss/drivers/CMakeLists.txt -=================================================================== ---- win32ss/drivers/CMakeLists.txt (revision 69519) -+++ win32ss/drivers/CMakeLists.txt (working copy) -@@ -1,6 +1,8 @@ - - add_subdirectory(displays) -+if (NOT _ARWINSS_) - add_subdirectory(font) -+endif () - add_subdirectory(miniport) - add_subdirectory(videoprt) - add_subdirectory(watchdog) -Index: win32ss/include/ntgdihdl.h -=================================================================== ---- win32ss/include/ntgdihdl.h (revision 69519) -+++ win32ss/include/ntgdihdl.h (working copy) -@@ -260,6 +260,7 @@ - DWORD dwCFCount; - } GDI_SHARED_HANDLE_TABLE, *PGDI_SHARED_HANDLE_TABLE; - -+#ifndef _ARWINSS_ - typedef struct _RGN_ATTR - { - ULONG AttrFlags; -@@ -347,6 +348,19 @@ - RGN_ATTR VisRectRegion; - } DC_ATTR, *PDC_ATTR; - -+#else -+ -+typedef struct _DC_ATTR -+{ -+ HDC hdc; -+ HDC hKernelDC; -+ RECT dc_rect; /* DC rectangle relative to drawable */ -+ HRGN region; /* Device region (visible region & clip region) */ -+ int cache_index; /* cache of a currently selected font */ -+} DC_ATTR, *PDC_ATTR; -+ -+#endif -+ - typedef struct _BRUSH_ATTR /* Used with pen too. */ - { - FLONG AttrFlags; -Index: win32ss/user/winsrv/consrv/conoutput.c -=================================================================== ---- win32ss/user/winsrv/consrv/conoutput.c (revision 69519) -+++ win32ss/user/winsrv/consrv/conoutput.c (working copy) -@@ -99,9 +99,13 @@ - * Indeed, the palette handle comes from a console app - * calling ourselves, running in CSRSS. - */ -+#ifndef _ARWINSS_ - NtUserConsoleControl(ConsoleMakePalettePublic, - &SetPaletteRequest->PaletteHandle, - sizeof(SetPaletteRequest->PaletteHandle)); -+#else -+ UNIMPLEMENTED; -+#endif - - Status = ConDrvSetConsolePalette(Buffer->Header.Console, - Buffer, -Index: win32ss/user/winsrv/consrv/frontends/gui/conwnd.c -=================================================================== ---- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (revision 69519) -+++ win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (working copy) -@@ -159,7 +159,11 @@ - } - else - { -+#ifndef _ARWINSS_ - NtUserConsoleControl(GuiConsoleWndClassAtom, &WndClassAtom, sizeof(ATOM)); -+#else -+ UNIMPLEMENTED; -+#endif - } - - return (WndClassAtom != 0); -Index: win32ss/user/winsrv/consrv/frontends/gui/guiterm.c -=================================================================== ---- win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (revision 69519) -+++ win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (working copy) -@@ -160,9 +160,14 @@ - /* Assign this console input thread to this desktop */ - DesktopConsoleThreadInfo.DesktopHandle = GuiInitInfo->Desktop; // Duplicated desktop handle - DesktopConsoleThreadInfo.ThreadId = InputThreadId; -+#ifndef _ARWINSS_ - Status = NtUserConsoleControl(ConsoleCtrlDesktopConsoleThread, - &DesktopConsoleThreadInfo, - sizeof(DesktopConsoleThreadInfo)); -+#else -+ UNIMPLEMENTED; -+ Status = STATUS_UNSUCCESSFUL; -+#endif - if (!NT_SUCCESS(Status)) goto Quit; - - /* Connect this CSR thread to the USER subsystem */ -@@ -295,13 +300,17 @@ - - Quit: - DPRINT("CONSRV: Quit the Input Thread 0x%p, Status = 0x%08lx\n", InputThreadId, Status); -- -+ - /* Remove this console input thread from this desktop */ - // DesktopConsoleThreadInfo.DesktopHandle; - DesktopConsoleThreadInfo.ThreadId = 0; -+#ifndef _ARWINSS_ - NtUserConsoleControl(ConsoleCtrlDesktopConsoleThread, - &DesktopConsoleThreadInfo, - sizeof(DesktopConsoleThreadInfo)); -+#else -+ UNIMPLEMENTED -+#endif - - /* Close the duplicated desktop handle */ - CloseDesktop(DesktopConsoleThreadInfo.DesktopHandle); // NtUserCloseDesktop -@@ -358,11 +367,16 @@ - { - RtlInitUnicodeString(&DesktopPath, L"Default"); - } -- -+#ifndef _ARWINSS_ - hDesk = NtUserResolveDesktop(ConsoleLeaderProcessHandle, - &DesktopPath, - 0, - &hWinSta); -+#else -+ UNIMPLEMENTED -+ hDesk = NULL; -+#endif -+ - DPRINT("NtUserResolveDesktop(DesktopPath = '%wZ') returned hDesk = 0x%p; hWinSta = 0x%p\n", - &DesktopPath, hDesk, hWinSta); - -Index: win32ss/user/winsrv/usersrv/init.c -=================================================================== ---- win32ss/user/winsrv/usersrv/init.c (revision 69519) -+++ win32ss/user/winsrv/usersrv/init.c (working copy) -@@ -101,7 +101,20 @@ - NTAPI - CreateSystemThreads(PVOID pParam) - { -+#ifndef _ARWINSS_ - NtUserCallOneParam((DWORD)pParam, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); -+#else -+ DWORD WaitRes; -+ HANDLE hDummyEvent; -+ -+ hDummyEvent = CreateEventW(0, FALSE, FALSE, L""); -+ -+ while (TRUE) -+ { -+ WaitRes = WaitForSingleObject(hDummyEvent, INFINITE); -+ } -+ DPRINT1("WaitRes: 0x%x\n", WaitRes); -+#endif - DPRINT1("This thread should not terminate!\n"); - return 0; - } -@@ -173,6 +186,7 @@ - CsrApiPort = CsrQueryApiPort(); - - /* Inform win32k about the API port */ -+#ifndef _ARWINSS_ - Status = NtUserSetInformationThread(NtCurrentThread(), - UserThreadCsrApiPort, - &CsrApiPort, -@@ -181,6 +195,9 @@ - { - return Status; - } -+#else -+ UNIMPLEMENTED -+#endif - } - - /* Check connection info validity */ -@@ -199,9 +216,14 @@ - - /* Pass the request to win32k */ - ConnectInfo->dwDispatchCount = 0; // gDispatchTableValues; -+#ifndef _ARWINSS_ - Status = NtUserProcessConnect(CsrProcess->ProcessHandle, - ConnectInfo, - *ConnectionInfoLength); -+#else -+ Status = STATUS_SUCCESS; -+ UNIMPLEMENTED -+#endif - - return Status; - } -@@ -254,7 +276,11 @@ - } - - /* Set the process creation notify routine for BASE */ -+#ifndef _ARWINSS_ - BaseSetProcessCreateNotify(NtUserNotifyProcessCreate); -+#else -+ UNIMPLEMENTED -+#endif - - /* Initialize the kernel mode subsystem */ - Status = NtUserInitialize(USER_VERSION, -Index: win32ss/user/winsrv/usersrv/shutdown.c -=================================================================== ---- win32ss/user/winsrv/usersrv/shutdown.c (revision 69519) -+++ win32ss/user/winsrv/usersrv/shutdown.c (working copy) -@@ -381,7 +381,12 @@ - static BOOLEAN - IsConsoleMode(VOID) - { -+#ifndef _ARWINSS_ - return (BOOLEAN)NtUserCallNoParam(NOPARAM_ROUTINE_ISCONSOLEMODE); -+#else -+ UNIMPLEMENTED -+ return FALSE; -+#endif - } - - -@@ -678,9 +683,14 @@ - while (TRUE) - { - /* Notify Win32k and potentially Winlogon of the shutdown */ -+#ifndef _ARWINSS_ - Status = NtUserSetInformationThread(CsrThread->ThreadHandle, - UserThreadInitiateShutdown, - &Flags, sizeof(Flags)); -+#else -+ Status = STATUS_SUCCESS; -+ UNIMPLEMENTED -+#endif - DPRINT1("Win32k says: %lx\n", Status); - switch (Status) - { -@@ -736,9 +746,13 @@ - // FIXME: If Status == STATUS_CANCELLED, call RecordShutdownReason - - /* Tell Win32k and potentially Winlogon that we're done */ -+#ifndef _ARWINSS_ - NtUserSetInformationThread(CsrThread->ThreadHandle, - UserThreadEndShutdown, - &Status, sizeof(Status)); -+#else -+ UNIMPLEMENTED -+#endif - - DPRINT1("SrvExitWindowsEx returned 0x%08x\n", Status); - Modified: branches/arwinss/trunk.diff URL: http://svn.reactos.org/svn/reactos/branches/arwinss/trunk.diff?rev=69530&r1… ============================================================================== --- branches/arwinss/trunk.diff [iso-8859-1] (original) +++ branches/arwinss/trunk.diff [iso-8859-1] Wed Oct 14 20:29:45 2015 @@ -1,297 +1,655 @@ -Index: base/shell/explorer/desktop/desktop.cpp -=================================================================== ---- base/shell/explorer/desktop/desktop.cpp (revision 62758) -+++ base/shell/explorer/desktop/desktop.cpp (working copy) -@@ -326,8 +326,8 @@ - HWND DesktopWindow::Create() - { - static IconWindowClass wcDesktop(TEXT("Progman"), IDI_REACTOS, CS_DBLCLKS); -- /* (disabled because of small ugly temporary artefacts when hiding start menu) -- wcDesktop.hbrBackground = (HBRUSH)(COLOR_BACKGROUND+1); */ -+ /* (disabled because of small ugly temporary artefacts when hiding start menu) */ -+ wcDesktop.hbrBackground = (HBRUSH)(COLOR_BACKGROUND+1); - - int width = GetSystemMetrics(SM_CXSCREEN); - int height = GetSystemMetrics(SM_CYSCREEN); +Index: base/system/smss/smsubsys.c +=================================================================== +--- base/system/smss/smsubsys.c (revision 69519) ++++ base/system/smss/smsubsys.c (working copy) +@@ -10,7 +10,7 @@ + + #include "smss.h" + +-#define NDEBUG ++//#define NDEBUG + #include <debug.h> + + /* GLOBALS ********************************************************************/ +Index: base/system/winlogon/winlogon.c +=================================================================== +--- base/system/winlogon/winlogon.c (revision 69519) ++++ base/system/winlogon/winlogon.c (working copy) +@@ -397,7 +397,7 @@ + HandleShutdown(WLSession, WLX_SAS_ACTION_SHUTDOWN_REBOOT); + ExitProcess(1); + } +- ++ERR("WL Desktop: %x\n", WLSession->WinlogonDesktop); + DisplayStatusMessage(WLSession, WLSession->WinlogonDesktop, IDS_REACTOSISSTARTINGUP); + + #if 0 Index: cmake/baseaddress.cmake =================================================================== ---- cmake/baseaddress.cmake (revision 62758) +--- cmake/baseaddress.cmake (revision 69519) +++ cmake/baseaddress.cmake (working copy) -@@ -1,7 +1,7 @@ - set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 - set(baseaddress_kernel32 0x77d80000) - set(baseaddress_msvcrt 0x77cd0000) --set(baseaddress_advapi32 0x77c20000) -+set(baseaddress_advapi32 0x77c70000) - set(baseaddress_gdi32 0x77bb0000) - set(baseaddress_user32 0x77a20000) - set(baseaddress_dhcpcsvc 0x779d0000) -@@ -272,6 +272,7 @@ - set(baseaddress_wbemprox 0x70c70000) - set(baseaddress_windowscodecs 0x70b60000) - set(baseaddress_windowscodecsext 0x70b30000) -+set(baseaddress_freetypd 0x709b0000) - set(baseaddress_wined3d 0x70960000) - set(baseaddress_winfax 0x70930000) - set(baseaddress_wing32 0x70900000) +@@ -2,7 +2,7 @@ + set(baseaddress_kernel32 0x7c770000) + set(baseaddress_msvcrt 0x7c6c0000) + set(baseaddress_advapi32 0x7c610000) +-set(baseaddress_gdi32 0x7c570000) ++set(baseaddress_gdi32 0x7c580000) + set(baseaddress_user32 0x7c3d0000) + set(baseaddress_dhcpcsvc 0x7c380000) + set(baseaddress_dnsapi 0x7c330000) Index: cmake/config.cmake =================================================================== ---- cmake/config.cmake (revision 62758) +--- cmake/config.cmake (revision 69519) +++ cmake/config.cmake (working copy) @@ -58,6 +58,9 @@ - "Whether to compile support for ELF files. - Do not enable unless you know what you're doing.") - -+set(_ARWINSS_ TRUE CACHE BOOL -+"Whether to build and use Wine-based Win32 subsystem.") -+ - set(NSWPAT FALSE CACHE BOOL - "Whether to build apps/libs with features covered by software patents. - If you live in a country where software patents are valid/apply, don't + "Whether to compile support for ELF files. + Do not enable unless you know what you're doing.") + ++set(_ARWINSS_ TRUE CACHE BOOL ++"Whether to build and use Wine-based Win32 subsystem.") ++ + set(NSWPAT FALSE CACHE BOOL + "Whether to build apps/libs with features covered by software patents. + If you live in a country where software patents are valid/apply, don't Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt (revision 62758) +--- CMakeLists.txt (revision 69519) +++ CMakeLists.txt (working copy) -@@ -134,6 +134,10 @@ - add_definitions(-D_WINKD_=1) - endif() - -+ if(_ARWINSS_) -+ add_definitions(-D_ARWINSS_=1) -+ endif() -+ - if((NOT DEFINED PCH) AND (CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS") AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) - set(PCH 1) - else() -@@ -236,6 +240,9 @@ - add_subdirectory(subsystems) - add_subdirectory(tools/wpp) - add_subdirectory(win32ss) -+ if (_ARWINSS_) -+ add_subdirectory(arwinss) -+ endif() - - # Create {bootcd, livecd, bootcdregtest}.lst - create_iso_lists() +@@ -166,6 +166,10 @@ + add_definitions(-D_WINKD_=1) + endif() + ++ if(_ARWINSS_) ++ add_definitions(-D_ARWINSS_=1) ++ endif() ++ + if(CMAKE_VERSION MATCHES "ReactOS") + set(PCH 1 CACHE BOOL "Whether to use precompiled headers") + else() +@@ -279,6 +283,9 @@ + add_subdirectory(subsystems) + add_subdirectory(tools/wpp) + add_subdirectory(win32ss) ++ if (_ARWINSS_) ++ add_subdirectory(arwinss) ++ endif() + + # Create the registry hives + create_registry_hives() +Index: dll/win32/kernel32/client/dllmain.c +=================================================================== +--- dll/win32/kernel32/client/dllmain.c (revision 69519) ++++ dll/win32/kernel32/client/dllmain.c (working copy) +@@ -131,7 +131,7 @@ + SessionId, + WIN_OBJ_DIR); + } +- ++DPRINT1("About to connect to CSR!\n"); + /* Connect to the Base Server */ + Status = CsrClientConnectToServer(SessionDir, + BASESRV_SERVERDLL_INDEX, +Index: dll/win32/msgina/gui.c +=================================================================== +--- dll/win32/msgina/gui.c (revision 69519) ++++ dll/win32/msgina/gui.c (working copy) +@@ -73,6 +73,7 @@ + + /* When SetThreadDesktop is called the system closes the desktop handle when needed + so we have to create a new handle because this handle may still be in use by winlogon */ ++#ifndef _ARWINSS_ + if (!DuplicateHandle ( GetCurrentProcess(), + msg->hDesktop, + GetCurrentProcess(), +@@ -85,6 +86,9 @@ + HeapFree(GetProcessHeap(), 0, lpParam); + return FALSE; + } ++#else ++ hDesk = msg->hDesktop; ++#endif + + if(!SetThreadDesktop(hDesk)) + { Index: include/asm/syscalls.inc =================================================================== ---- include/asm/syscalls.inc (revision 62758) +--- include/asm/syscalls.inc (revision 69519) +++ include/asm/syscalls.inc (working copy) -@@ -95,6 +95,7 @@ - - MACRO(STUB_U, Name, ArgCount) - MAKE_LABEL Zw&Name, %ArgCount * 4 +@@ -1,4 +1,4 @@ +- ++ + #ifdef _M_ARM + + #include <ksarm.h> +@@ -52,103 +52,105 @@ + + SyscallId = 0 + +-#ifdef _M_IX86 +-#define KUSER_SHARED_SYSCALL HEX(7ffe0300) +-#define KGDT_R0_CODE 8 +-MACRO(STUBCODE_U, Name, SyscallId, ArgCount) +- StackBytes = 4 * ArgCount +- FPO 0, 0, 0, 0, 0, FRAME_FPO +- mov eax, SyscallId ++#ifdef _M_IX86 ++#define KUSER_SHARED_SYSCALL HEX(7ffe0300) ++#define KGDT_R0_CODE 8 ++MACRO(STUBCODE_U, Name, SyscallId, ArgCount) ++ StackBytes = 4 * ArgCount ++ FPO 0, 0, 0, 0, 0, FRAME_FPO ++ mov eax, SyscallId + mov edx, KUSER_SHARED_SYSCALL + call dword ptr [edx] +- ret StackBytes +-ENDM +-MACRO(STUBCODE_K, Name, SyscallId, ArgCount) +- StackBytes = 4 * &ArgCount +- FPO 0, 0, 0, 0, 0, FRAME_FPO +- mov eax, SyscallId +- lea edx, [esp + 4] +- pushfd +- push KGDT_R0_CODE +- call _KiSystemService +- ret StackBytes +-ENDM +-#elif defined(_M_AMD64) +-MACRO(STUBCODE_U, Name, SyscallId, ArgCount) +- .ENDPROLOG +- mov eax, SyscallId +- mov r10, rcx +- syscall +- ret +-ENDM +-MACRO(STUBCODE_K, Name, SyscallId, ArgCount) +- .ENDPROLOG +- EXTERN Nt&Name:PROC +- lea rax, Nt&Name[rip] +- mov r10, ArgCount * 8 +- jmp KiZwSystemService +-ENDM +-#elif defined(_M_PPC) +-MACRO(STUBCODE_U, Name, SyscallId, ArgCount) +- stwu 1,-16(1) +- mflr 0 +- stw 0,0(1) +- li 0, SyscallId +- sc +- lwz 0,0(1) +- mtlr 0 +- addi 1,1,16 +- blr +-ENDM +-#define STUBCODE_K STUBCODE_U +-#elif defined(_M_MIPS) +-MACRO(STUBCODE_U, Name, SyscallId, ArgCount) +- li $8, KUSER_SHARED_SYSCALL +- lw $8,0($8) +- j $8 +- nop +-ENDM +-MACRO(STUBCODE_K, Name, SyscallId, ArgCount) +- j KiSystemService +- nop +-ENDM +-#else +-#error unsupported architecture +-#endif ++ ret StackBytes ++ENDM ++MACRO(STUBCODE_K, Name, SyscallId, ArgCount) ++ StackBytes = 4 * &ArgCount ++ FPO 0, 0, 0, 0, 0, FRAME_FPO ++ mov eax, SyscallId ++ lea edx, [esp + 4] ++ pushfd ++ push KGDT_R0_CODE ++ call _KiSystemService ++ ret StackBytes ++ENDM ++#elif defined(_M_AMD64) ++MACRO(STUBCODE_U, Name, SyscallId, ArgCount) ++ .ENDPROLOG ++ mov eax, SyscallId ++ mov r10, rcx ++ syscall ++ ret ++ENDM ++MACRO(STUBCODE_K, Name, SyscallId, ArgCount) ++ .ENDPROLOG ++ EXTERN Nt&Name:PROC ++ lea rax, Nt&Name[rip] ++ mov r10, ArgCount * 8 ++ jmp KiZwSystemService ++ENDM ++#elif defined(_M_PPC) ++MACRO(STUBCODE_U, Name, SyscallId, ArgCount) ++ stwu 1,-16(1) ++ mflr 0 ++ stw 0,0(1) ++ li 0, SyscallId ++ sc ++ lwz 0,0(1) ++ mtlr 0 ++ addi 1,1,16 ++ blr ++ENDM ++#define STUBCODE_K STUBCODE_U ++#elif defined(_M_MIPS) ++MACRO(STUBCODE_U, Name, SyscallId, ArgCount) ++ li $8, KUSER_SHARED_SYSCALL ++ lw $8,0($8) ++ j $8 ++ nop ++ENDM ++MACRO(STUBCODE_K, Name, SyscallId, ArgCount) ++ j KiSystemService ++ nop ++ENDM ++#else ++#error unsupported architecture ++#endif ++ ++#ifdef _M_IX86 ++MACRO(MAKE_LABEL, Name, StackBytes) ++ PUBLIC _&Name&@&StackBytes ++ _&Name&@&StackBytes: ++ENDM ++MACRO(START_PROC, Name, StackBytes) ++ PUBLIC _&Name&@&StackBytes ++ .PROC _&Name&@&StackBytes ++ENDM ++#else ++MACRO(MAKE_LABEL, Name, StackBytes) ++ PUBLIC &Name ++ &Name: ++ENDM ++MACRO(START_PROC, Name, StackBytes) ++ PUBLIC &Name ++ .PROC &Name ++ENDM ++#endif ++ ++MACRO(STUB_U, Name, ArgCount) ++ MAKE_LABEL Zw&Name, %ArgCount * 4 + MAKE_LABEL Name, %ArgCount * 4 - START_PROC Nt&Name, %ArgCount * 4 - STUBCODE_U Name, SyscallId, %ArgCount - .ENDP -@@ -102,6 +103,7 @@ - ENDM - - MACRO(STUB_K, Name, ArgCount) ++ START_PROC Nt&Name, %ArgCount * 4 ++ STUBCODE_U Name, SyscallId, %ArgCount ++ .ENDP ++ SyscallId = SyscallId + 1 ++ENDM ++ ++MACRO(STUB_K, Name, ArgCount) + MAKE_LABEL Name, %ArgCount * 4 - START_PROC Zw&Name, %ArgCount * 4 - STUBCODE_K Name, SyscallId, %ArgCount - .ENDP ++ START_PROC Zw&Name, %ArgCount * 4 ++ STUBCODE_K Name, SyscallId, %ArgCount ++ .ENDP ++ SyscallId = SyscallId + 1 ++ENDM + +-#ifdef _M_IX86 +-MACRO(MAKE_LABEL, Name, StackBytes) +- PUBLIC _&Name&@&StackBytes +- _&Name&@&StackBytes: +-ENDM +-MACRO(START_PROC, Name, StackBytes) +- PUBLIC _&Name&@&StackBytes +- .PROC _&Name&@&StackBytes +-ENDM +-#else +-MACRO(MAKE_LABEL, Name, StackBytes) +- PUBLIC &Name +- &Name: +-ENDM +-MACRO(START_PROC, Name, StackBytes) +- PUBLIC &Name +- .PROC &Name +-ENDM + #endif +- +-MACRO(STUB_U, Name, ArgCount) +- MAKE_LABEL Zw&Name, %ArgCount * 4 +- START_PROC Nt&Name, %ArgCount * 4 +- STUBCODE_U Name, SyscallId, %ArgCount +- .ENDP +- SyscallId = SyscallId + 1 +-ENDM +- +-MACRO(STUB_K, Name, ArgCount) +- START_PROC Zw&Name, %ArgCount * 4 +- STUBCODE_K Name, SyscallId, %ArgCount +- .ENDP +- SyscallId = SyscallId + 1 +-ENDM +- +-#endif Index: include/psdk/winddi.h =================================================================== ---- include/psdk/winddi.h (revision 62758) +--- include/psdk/winddi.h (revision 69519) +++ include/psdk/winddi.h (working copy) -@@ -2683,7 +2683,7 @@ - _In_ ULONG cjSize, - _Out_bytecap_(cjSize) FONTINFO *pfi); - --#if (NTDDI_VERSION <= NTDDI_WINXP) -+#if 0//(NTDDI_VERSION <= NTDDI_WINXP) - GAMMA_TABLES* - APIENTRY - FONTOBJ_pGetGammaTables( +@@ -2911,7 +2911,7 @@ + _In_ ULONG cjSize, + _Out_bytecap_(cjSize) FONTINFO *pfi); + +-#if (NTDDI_VERSION <= NTDDI_WINXP) ++#if 0//(NTDDI_VERSION <= NTDDI_WINXP) + /* Obsolete in Windows 2000 and later */ + GAMMA_TABLES* + APIENTRY Index: include/reactos/wine/config.h =================================================================== ---- include/reactos/wine/config.h (revision 62758) +--- include/reactos/wine/config.h (revision 69519) +++ include/reactos/wine/config.h (working copy) @@ -1,3 +1,5 @@ -+#include "reactos/buildno.h" -+ - #define __WINE_CONFIG_H - - /* Define to a function attribute for Microsoft hotpatch assembly prefix. */ ++#include "reactos/buildno.h" ++ + #define __WINE_CONFIG_H + + /* Define to a function attribute for Microsoft hotpatch assembly prefix. */ Index: lib/3rdparty/CMakeLists.txt =================================================================== ---- lib/3rdparty/CMakeLists.txt (revision 62758) +--- lib/3rdparty/CMakeLists.txt (revision 69519) +++ lib/3rdparty/CMakeLists.txt (working copy) @@ -2,7 +2,9 @@ - add_subdirectory(adns) - add_subdirectory(bzip2) - add_subdirectory(cardlib) -+if (NOT _ARWINSS_) - add_subdirectory(freetype) -+endif () - add_subdirectory(fullfat) - add_subdirectory(libmpg123) - add_subdirectory(libsamplerate) + add_subdirectory(adns) + add_subdirectory(bzip2) + add_subdirectory(cardlib) ++if (NOT _ARWINSS_) + add_subdirectory(freetype) ++endif () + add_subdirectory(fullfat) + add_subdirectory(libmpg123) + add_subdirectory(libsamplerate) Index: subsystems/win32/csrsrv/init.c =================================================================== ---- subsystems/win32/csrsrv/init.c (revision 62758) +--- subsystems/win32/csrsrv/init.c (revision 69519) +++ subsystems/win32/csrsrv/init.c (working copy) @@ -20,7 +20,7 @@ - /* DATA ***********************************************************************/ - - // Debug Flag --ULONG CsrDebug = 0; // 0xFFFFFFFF; -+ULONG CsrDebug = 0xFFFFFFFF; - - HANDLE CsrHeap = NULL; - HANDLE CsrObjectDirectory = NULL; + /* DATA ***********************************************************************/ + + // Debug Flag +-ULONG CsrDebug = 0; // 0xFFFFFFFF; ++ULONG CsrDebug = 0xFFFFFFFF; + + HANDLE CsrHeap = NULL; + HANDLE CsrObjectDirectory = NULL; Index: win32ss/CMakeLists.txt =================================================================== ---- win32ss/CMakeLists.txt (revision 62758) +--- win32ss/CMakeLists.txt (revision 69519) +++ win32ss/CMakeLists.txt (working copy) -@@ -6,7 +6,10 @@ - PROJECT(WIN32SS) - - add_subdirectory(drivers) -+add_subdirectory(user/winsrv) - -+if (NOT _ARWINSS_) -+ - if(USE_DIBLIB) - add_subdirectory(gdi/diblib) - endif() +@@ -10,7 +10,10 @@ + PROJECT(WIN32SS) + + add_subdirectory(drivers) ++add_subdirectory(user/winsrv) + ++if (NOT _ARWINSS_) ++ + if(USE_DIBLIB) + add_subdirectory(gdi/diblib) + endif() @@ -18,7 +21,6 @@ - add_subdirectory(gdi/gdi32) - add_subdirectory(reactx) - add_subdirectory(user/user32) --add_subdirectory(user/winsrv) - - spec2def(win32k.sys win32k.spec ADD_IMPORTLIB) - + add_subdirectory(gdi/gdi32) + add_subdirectory(reactx) + add_subdirectory(user/user32) +-add_subdirectory(user/winsrv) + + spec2def(win32k.sys win32k.spec ADD_IMPORTLIB) + @@ -243,3 +245,4 @@ - add_asm_files(win32ksys_asm sys-stubs.S) - add_library(win32ksys ${win32ksys_asm}) - set_target_properties(win32ksys PROPERTIES LINKER_LANGUAGE "C") + add_asm_files(win32ksys_asm sys-stubs.S) + add_library(win32ksys ${win32ksys_asm}) + set_target_properties(win32ksys PROPERTIES LINKER_LANGUAGE "C") +endif() # _ARWINSS_ \ No newline at end of file Index: win32ss/drivers/CMakeLists.txt =================================================================== ---- win32ss/drivers/CMakeLists.txt (revision 62758) +--- win32ss/drivers/CMakeLists.txt (revision 69519) +++ win32ss/drivers/CMakeLists.txt (working copy) @@ -1,6 +1,8 @@ - - add_subdirectory(displays) -+if (NOT _ARWINSS_) - add_subdirectory(font) -+endif () - add_subdirectory(miniport) - add_subdirectory(videoprt) - add_subdirectory(watchdog) + + add_subdirectory(displays) ++if (NOT _ARWINSS_) + add_subdirectory(font) ++endif () + add_subdirectory(miniport) + add_subdirectory(videoprt) + add_subdirectory(watchdog) Index: win32ss/include/ntgdihdl.h =================================================================== ---- win32ss/include/ntgdihdl.h (revision 62758) +--- win32ss/include/ntgdihdl.h (revision 69519) +++ win32ss/include/ntgdihdl.h (working copy) -@@ -270,6 +270,7 @@ - DWORD dwCFCount; - } GDI_SHARED_HANDLE_TABLE, *PGDI_SHARED_HANDLE_TABLE; - -+#ifndef _ARWINSS_ - typedef struct _RGN_ATTR - { - ULONG AttrFlags; -@@ -357,6 +358,19 @@ - RGN_ATTR VisRectRegion; - } DC_ATTR, *PDC_ATTR; - -+#else -+ -+typedef struct _DC_ATTR -+{ -+ HDC hdc; -+ HDC hKernelDC; -+ RECT dc_rect; /* DC rectangle relative to drawable */ -+ HRGN region; /* Device region (visible region & clip region) */ -+ int cache_index; /* cache of a currently selected font */ -+} DC_ATTR, *PDC_ATTR; -+ -+#endif -+ - typedef struct _BRUSH_ATTR /* Used with pen too. */ - { - FLONG AttrFlags; +@@ -260,6 +260,7 @@ + DWORD dwCFCount; + } GDI_SHARED_HANDLE_TABLE, *PGDI_SHARED_HANDLE_TABLE; + ++#ifndef _ARWINSS_ + typedef struct _RGN_ATTR + { + ULONG AttrFlags; +@@ -347,6 +348,19 @@ + RGN_ATTR VisRectRegion; + } DC_ATTR, *PDC_ATTR; + ++#else ++ ++typedef struct _DC_ATTR ++{ ++ HDC hdc; ++ HDC hKernelDC; ++ RECT dc_rect; /* DC rectangle relative to drawable */ ++ HRGN region; /* Device region (visible region & clip region) */ ++ int cache_index; /* cache of a currently selected font */ ++} DC_ATTR, *PDC_ATTR; ++ ++#endif ++ + typedef struct _BRUSH_ATTR /* Used with pen too. */ + { + FLONG AttrFlags; Index: win32ss/user/winsrv/consrv/conoutput.c =================================================================== ---- win32ss/user/winsrv/consrv/conoutput.c (revision 62758) +--- win32ss/user/winsrv/consrv/conoutput.c (revision 69519) +++ win32ss/user/winsrv/consrv/conoutput.c (working copy) -@@ -77,9 +77,13 @@ - * Indeed, the palette handle comes from a console app - * calling ourselves, running in CSRSS. - */ -+#ifndef _ARWINSS_ - NtUserConsoleControl(ConsoleMakePalettePublic, - &SetPaletteRequest->PaletteHandle, - sizeof(SetPaletteRequest->PaletteHandle)); -+#else -+ UNIMPLEMENTED; -+#endif - - Status = ConDrvSetConsolePalette(Buffer->Header.Console, - Buffer, +@@ -99,9 +99,13 @@ + * Indeed, the palette handle comes from a console app + * calling ourselves, running in CSRSS. + */ ++#ifndef _ARWINSS_ + NtUserConsoleControl(ConsoleMakePalettePublic, + &SetPaletteRequest->PaletteHandle, + sizeof(SetPaletteRequest->PaletteHandle)); ++#else ++ UNIMPLEMENTED; ++#endif + + Status = ConDrvSetConsolePalette(Buffer->Header.Console, + Buffer, Index: win32ss/user/winsrv/consrv/frontends/gui/conwnd.c =================================================================== ---- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (revision 62758) +--- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (revision 69519) +++ win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (working copy) -@@ -161,7 +161,11 @@ - } - else - { -+#ifndef _ARWINSS_ - NtUserConsoleControl(GuiConsoleWndClassAtom, &WndClassAtom, sizeof(ATOM)); -+#else -+ UNIMPLEMENTED; -+#endif - } - - return (WndClassAtom != 0); +@@ -159,7 +159,11 @@ + } + else + { ++#ifndef _ARWINSS_ + NtUserConsoleControl(GuiConsoleWndClassAtom, &WndClassAtom, sizeof(ATOM)); ++#else ++ UNIMPLEMENTED; ++#endif + } + + return (WndClassAtom != 0); +Index: win32ss/user/winsrv/consrv/frontends/gui/guiterm.c +=================================================================== +--- win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (revision 69519) ++++ win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (working copy) +@@ -160,9 +160,14 @@ + /* Assign this console input thread to this desktop */ + DesktopConsoleThreadInfo.DesktopHandle = GuiInitInfo->Desktop; // Duplicated desktop handle + DesktopConsoleThreadInfo.ThreadId = InputThreadId; ++#ifndef _ARWINSS_ + Status = NtUserConsoleControl(ConsoleCtrlDesktopConsoleThread, + &DesktopConsoleThreadInfo, + sizeof(DesktopConsoleThreadInfo)); ++#else ++ UNIMPLEMENTED; ++ Status = STATUS_UNSUCCESSFUL; ++#endif + if (!NT_SUCCESS(Status)) goto Quit; + + /* Connect this CSR thread to the USER subsystem */ +@@ -295,13 +300,17 @@ + + Quit: + DPRINT("CONSRV: Quit the Input Thread 0x%p, Status = 0x%08lx\n", InputThreadId, Status); +- ++ + /* Remove this console input thread from this desktop */ + // DesktopConsoleThreadInfo.DesktopHandle; + DesktopConsoleThreadInfo.ThreadId = 0; ++#ifndef _ARWINSS_ + NtUserConsoleControl(ConsoleCtrlDesktopConsoleThread, + &DesktopConsoleThreadInfo, + sizeof(DesktopConsoleThreadInfo)); ++#else ++ UNIMPLEMENTED ++#endif + + /* Close the duplicated desktop handle */ + CloseDesktop(DesktopConsoleThreadInfo.DesktopHandle); // NtUserCloseDesktop +@@ -358,11 +367,16 @@ + { + RtlInitUnicodeString(&DesktopPath, L"Default"); + } +- ++#ifndef _ARWINSS_ + hDesk = NtUserResolveDesktop(ConsoleLeaderProcessHandle, + &DesktopPath, + 0, + &hWinSta); ++#else ++ UNIMPLEMENTED ++ hDesk = NULL; ++#endif ++ + DPRINT("NtUserResolveDesktop(DesktopPath = '%wZ') returned hDesk = 0x%p; hWinSta = 0x%p\n", + &DesktopPath, hDesk, hWinSta); + Index: win32ss/user/winsrv/usersrv/init.c =================================================================== ---- win32ss/user/winsrv/usersrv/init.c (revision 62758) +--- win32ss/user/winsrv/usersrv/init.c (revision 69519) +++ win32ss/user/winsrv/usersrv/init.c (working copy) -@@ -95,7 +95,9 @@ - WINAPI - PrivateCsrssManualGuiCheck(LONG Check) - { -+#ifndef _ARWINSS_ - NtUserCallOneParam(Check, ONEPARAM_ROUTINE_CSRSS_GUICHECK); -+#endif - } - - ULONG -@@ -102,7 +104,13 @@ - NTAPI - CreateSystemThreads(PVOID pParam) - { -+#ifndef _ARWINSS_ - NtUserCallOneParam((DWORD)pParam, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); -+#else -+ while (TRUE) -+ { -+ } -+#endif - DPRINT1("This thread should not terminate!\n"); - return 0; - } +@@ -101,7 +101,20 @@ + NTAPI + CreateSystemThreads(PVOID pParam) + { ++#ifndef _ARWINSS_ + NtUserCallOneParam((DWORD)pParam, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); ++#else ++ DWORD WaitRes; ++ HANDLE hDummyEvent; ++ ++ hDummyEvent = CreateEventW(0, FALSE, FALSE, L""); ++ ++ while (TRUE) ++ { ++ WaitRes = WaitForSingleObject(hDummyEvent, INFINITE); ++ } ++ DPRINT1("WaitRes: 0x%x\n", WaitRes); ++#endif + DPRINT1("This thread should not terminate!\n"); + return 0; + } +@@ -173,6 +186,7 @@ + CsrApiPort = CsrQueryApiPort(); + + /* Inform win32k about the API port */ ++#ifndef _ARWINSS_ + Status = NtUserSetInformationThread(NtCurrentThread(), + UserThreadCsrApiPort, + &CsrApiPort, +@@ -181,6 +195,9 @@ + { + return Status; + } ++#else ++ UNIMPLEMENTED ++#endif + } + + /* Check connection info validity */ +@@ -199,9 +216,14 @@ + + /* Pass the request to win32k */ + ConnectInfo->dwDispatchCount = 0; // gDispatchTableValues; ++#ifndef _ARWINSS_ + Status = NtUserProcessConnect(CsrProcess->ProcessHandle, + ConnectInfo, + *ConnectionInfoLength); ++#else ++ Status = STATUS_SUCCESS; ++ UNIMPLEMENTED ++#endif + + return Status; + } +@@ -254,7 +276,11 @@ + } + + /* Set the process creation notify routine for BASE */ ++#ifndef _ARWINSS_ + BaseSetProcessCreateNotify(NtUserNotifyProcessCreate); ++#else ++ UNIMPLEMENTED ++#endif + + /* Initialize the kernel mode subsystem */ + Status = NtUserInitialize(USER_VERSION, Index: win32ss/user/winsrv/usersrv/shutdown.c =================================================================== ---- win32ss/user/winsrv/usersrv/shutdown.c (revision 62758) +--- win32ss/user/winsrv/usersrv/shutdown.c (revision 69519) +++ win32ss/user/winsrv/usersrv/shutdown.c (working copy) -@@ -901,7 +901,11 @@ - NTSTATUS Status; - - /* FIXME Inside 2000 says we should impersonate the caller here */ -+#ifndef _ARWINSS_ - Status = NtUserCallTwoParam(UserProcessId, Flags, TWOPARAM_ROUTINE_EXITREACTOS); -+#else -+ Status = 0; -+#endif - - /* If the message isn't handled, the return value is 0, so 0 doesn't indicate - success. Success is indicated by a 1 return value, if anything besides 0 +@@ -381,7 +381,12 @@ + static BOOLEAN + IsConsoleMode(VOID) + { ++#ifndef _ARWINSS_ + return (BOOLEAN)NtUserCallNoParam(NOPARAM_ROUTINE_ISCONSOLEMODE); ++#else ++ UNIMPLEMENTED ++ return FALSE; ++#endif + } + + +@@ -678,9 +683,14 @@ + while (TRUE) + { + /* Notify Win32k and potentially Winlogon of the shutdown */ ++#ifndef _ARWINSS_ + Status = NtUserSetInformationThread(CsrThread->ThreadHandle, + UserThreadInitiateShutdown, + &Flags, sizeof(Flags)); ++#else ++ Status = STATUS_SUCCESS; ++ UNIMPLEMENTED ++#endif + DPRINT1("Win32k says: %lx\n", Status); + switch (Status) + { +@@ -736,9 +746,13 @@ + // FIXME: If Status == STATUS_CANCELLED, call RecordShutdownReason + + /* Tell Win32k and potentially Winlogon that we're done */ ++#ifndef _ARWINSS_ + NtUserSetInformationThread(CsrThread->ThreadHandle, + UserThreadEndShutdown, + &Status, sizeof(Status)); ++#else ++ UNIMPLEMENTED ++#endif + + DPRINT1("SrvExitWindowsEx returned 0x%08x\n", Status); +

8 years, 11 months

[fireball] 69529: [ARWINSS] - Add latest version of patch to trunk. It contains all the ugly hacks and whatever is needed to make Arwinss "work" in trunk.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Oct 14 19:46:24 2015 New Revision: 69529 URL: http://svn.reactos.org/svn/reactos?rev=69529&view=rev Log: [ARWINSS] - Add latest version of patch to trunk. It contains all the ugly hacks and whatever is needed to make Arwinss "work" in trunk. Added: branches/arwinss/arwinss/trunk.patch (with props) Added: branches/arwinss/arwinss/trunk.patch URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/trunk.patch?rev… ============================================================================== --- branches/arwinss/arwinss/trunk.patch (added) +++ branches/arwinss/arwinss/trunk.patch [iso-8859-1] Wed Oct 14 19:46:24 2015 @@ -0,0 +1,655 @@ +Index: base/system/smss/smsubsys.c +=================================================================== +--- base/system/smss/smsubsys.c (revision 69519) ++++ base/system/smss/smsubsys.c (working copy) +@@ -10,7 +10,7 @@ + + #include "smss.h" + +-#define NDEBUG ++//#define NDEBUG + #include <debug.h> + + /* GLOBALS ********************************************************************/ +Index: base/system/winlogon/winlogon.c +=================================================================== +--- base/system/winlogon/winlogon.c (revision 69519) ++++ base/system/winlogon/winlogon.c (working copy) +@@ -397,7 +397,7 @@ + HandleShutdown(WLSession, WLX_SAS_ACTION_SHUTDOWN_REBOOT); + ExitProcess(1); + } +- ++ERR("WL Desktop: %x\n", WLSession->WinlogonDesktop); + DisplayStatusMessage(WLSession, WLSession->WinlogonDesktop, IDS_REACTOSISSTARTINGUP); + + #if 0 +Index: cmake/baseaddress.cmake +=================================================================== +--- cmake/baseaddress.cmake (revision 69519) ++++ cmake/baseaddress.cmake (working copy) +@@ -2,7 +2,7 @@ + set(baseaddress_kernel32 0x7c770000) + set(baseaddress_msvcrt 0x7c6c0000) + set(baseaddress_advapi32 0x7c610000) +-set(baseaddress_gdi32 0x7c570000) ++set(baseaddress_gdi32 0x7c580000) + set(baseaddress_user32 0x7c3d0000) + set(baseaddress_dhcpcsvc 0x7c380000) + set(baseaddress_dnsapi 0x7c330000) +Index: cmake/config.cmake +=================================================================== +--- cmake/config.cmake (revision 69519) ++++ cmake/config.cmake (working copy) +@@ -58,6 +58,9 @@ + "Whether to compile support for ELF files. + Do not enable unless you know what you're doing.") + ++set(_ARWINSS_ TRUE CACHE BOOL ++"Whether to build and use Wine-based Win32 subsystem.") ++ + set(NSWPAT FALSE CACHE BOOL + "Whether to build apps/libs with features covered by software patents. + If you live in a country where software patents are valid/apply, don't +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt (revision 69519) ++++ CMakeLists.txt (working copy) +@@ -166,6 +166,10 @@ + add_definitions(-D_WINKD_=1) + endif() + ++ if(_ARWINSS_) ++ add_definitions(-D_ARWINSS_=1) ++ endif() ++ + if(CMAKE_VERSION MATCHES "ReactOS") + set(PCH 1 CACHE BOOL "Whether to use precompiled headers") + else() +@@ -279,6 +283,9 @@ + add_subdirectory(subsystems) + add_subdirectory(tools/wpp) + add_subdirectory(win32ss) ++ if (_ARWINSS_) ++ add_subdirectory(arwinss) ++ endif() + + # Create the registry hives + create_registry_hives() +Index: dll/win32/kernel32/client/dllmain.c +=================================================================== +--- dll/win32/kernel32/client/dllmain.c (revision 69519) ++++ dll/win32/kernel32/client/dllmain.c (working copy) +@@ -131,7 +131,7 @@ + SessionId, + WIN_OBJ_DIR); + } +- ++DPRINT1("About to connect to CSR!\n"); + /* Connect to the Base Server */ + Status = CsrClientConnectToServer(SessionDir, + BASESRV_SERVERDLL_INDEX, +Index: dll/win32/msgina/gui.c +=================================================================== +--- dll/win32/msgina/gui.c (revision 69519) ++++ dll/win32/msgina/gui.c (working copy) +@@ -73,6 +73,7 @@ + + /* When SetThreadDesktop is called the system closes the desktop handle when needed + so we have to create a new handle because this handle may still be in use by winlogon */ ++#ifndef _ARWINSS_ + if (!DuplicateHandle ( GetCurrentProcess(), + msg->hDesktop, + GetCurrentProcess(), +@@ -85,6 +86,9 @@ + HeapFree(GetProcessHeap(), 0, lpParam); + return FALSE; + } ++#else ++ hDesk = msg->hDesktop; ++#endif + + if(!SetThreadDesktop(hDesk)) + { +Index: include/asm/syscalls.inc +=================================================================== +--- include/asm/syscalls.inc (revision 69519) ++++ include/asm/syscalls.inc (working copy) +@@ -1,4 +1,4 @@ +- ++ + #ifdef _M_ARM + + #include <ksarm.h> +@@ -52,103 +52,105 @@ + + SyscallId = 0 + +-#ifdef _M_IX86 +-#define KUSER_SHARED_SYSCALL HEX(7ffe0300) +-#define KGDT_R0_CODE 8 +-MACRO(STUBCODE_U, Name, SyscallId, ArgCount) +- StackBytes = 4 * ArgCount +- FPO 0, 0, 0, 0, 0, FRAME_FPO +- mov eax, SyscallId ++#ifdef _M_IX86 ++#define KUSER_SHARED_SYSCALL HEX(7ffe0300) ++#define KGDT_R0_CODE 8 ++MACRO(STUBCODE_U, Name, SyscallId, ArgCount) ++ StackBytes = 4 * ArgCount ++ FPO 0, 0, 0, 0, 0, FRAME_FPO ++ mov eax, SyscallId + mov edx, KUSER_SHARED_SYSCALL + call dword ptr [edx] +- ret StackBytes +-ENDM +-MACRO(STUBCODE_K, Name, SyscallId, ArgCount) +- StackBytes = 4 * &ArgCount +- FPO 0, 0, 0, 0, 0, FRAME_FPO +- mov eax, SyscallId +- lea edx, [esp + 4] +- pushfd +- push KGDT_R0_CODE +- call _KiSystemService +- ret StackBytes +-ENDM +-#elif defined(_M_AMD64) +-MACRO(STUBCODE_U, Name, SyscallId, ArgCount) +- .ENDPROLOG +- mov eax, SyscallId +- mov r10, rcx +- syscall +- ret +-ENDM +-MACRO(STUBCODE_K, Name, SyscallId, ArgCount) +- .ENDPROLOG +- EXTERN Nt&Name:PROC +- lea rax, Nt&Name[rip] +- mov r10, ArgCount * 8 +- jmp KiZwSystemService +-ENDM +-#elif defined(_M_PPC) +-MACRO(STUBCODE_U, Name, SyscallId, ArgCount) +- stwu 1,-16(1) +- mflr 0 +- stw 0,0(1) +- li 0, SyscallId +- sc +- lwz 0,0(1) +- mtlr 0 +- addi 1,1,16 +- blr +-ENDM +-#define STUBCODE_K STUBCODE_U +-#elif defined(_M_MIPS) +-MACRO(STUBCODE_U, Name, SyscallId, ArgCount) +- li $8, KUSER_SHARED_SYSCALL +- lw $8,0($8) +- j $8 +- nop +-ENDM +-MACRO(STUBCODE_K, Name, SyscallId, ArgCount) +- j KiSystemService +- nop +-ENDM +-#else +-#error unsupported architecture +-#endif ++ ret StackBytes ++ENDM ++MACRO(STUBCODE_K, Name, SyscallId, ArgCount) ++ StackBytes = 4 * &ArgCount ++ FPO 0, 0, 0, 0, 0, FRAME_FPO ++ mov eax, SyscallId ++ lea edx, [esp + 4] ++ pushfd ++ push KGDT_R0_CODE ++ call _KiSystemService ++ ret StackBytes ++ENDM ++#elif defined(_M_AMD64) ++MACRO(STUBCODE_U, Name, SyscallId, ArgCount) ++ .ENDPROLOG ++ mov eax, SyscallId ++ mov r10, rcx ++ syscall ++ ret ++ENDM ++MACRO(STUBCODE_K, Name, SyscallId, ArgCount) ++ .ENDPROLOG ++ EXTERN Nt&Name:PROC ++ lea rax, Nt&Name[rip] ++ mov r10, ArgCount * 8 ++ jmp KiZwSystemService ++ENDM ++#elif defined(_M_PPC) ++MACRO(STUBCODE_U, Name, SyscallId, ArgCount) ++ stwu 1,-16(1) ++ mflr 0 ++ stw 0,0(1) ++ li 0, SyscallId ++ sc ++ lwz 0,0(1) ++ mtlr 0 ++ addi 1,1,16 ++ blr ++ENDM ++#define STUBCODE_K STUBCODE_U ++#elif defined(_M_MIPS) ++MACRO(STUBCODE_U, Name, SyscallId, ArgCount) ++ li $8, KUSER_SHARED_SYSCALL ++ lw $8,0($8) ++ j $8 ++ nop ++ENDM ++MACRO(STUBCODE_K, Name, SyscallId, ArgCount) ++ j KiSystemService ++ nop ++ENDM ++#else ++#error unsupported architecture ++#endif ++ ++#ifdef _M_IX86 ++MACRO(MAKE_LABEL, Name, StackBytes) ++ PUBLIC _&Name&@&StackBytes ++ _&Name&@&StackBytes: ++ENDM ++MACRO(START_PROC, Name, StackBytes) ++ PUBLIC _&Name&@&StackBytes ++ .PROC _&Name&@&StackBytes ++ENDM ++#else ++MACRO(MAKE_LABEL, Name, StackBytes) ++ PUBLIC &Name ++ &Name: ++ENDM ++MACRO(START_PROC, Name, StackBytes) ++ PUBLIC &Name ++ .PROC &Name ++ENDM ++#endif ++ ++MACRO(STUB_U, Name, ArgCount) ++ MAKE_LABEL Zw&Name, %ArgCount * 4 ++ MAKE_LABEL Name, %ArgCount * 4 ++ START_PROC Nt&Name, %ArgCount * 4 ++ STUBCODE_U Name, SyscallId, %ArgCount ++ .ENDP ++ SyscallId = SyscallId + 1 ++ENDM ++ ++MACRO(STUB_K, Name, ArgCount) ++ MAKE_LABEL Name, %ArgCount * 4 ++ START_PROC Zw&Name, %ArgCount * 4 ++ STUBCODE_K Name, SyscallId, %ArgCount ++ .ENDP ++ SyscallId = SyscallId + 1 ++ENDM + +-#ifdef _M_IX86 +-MACRO(MAKE_LABEL, Name, StackBytes) +- PUBLIC _&Name&@&StackBytes +- _&Name&@&StackBytes: +-ENDM +-MACRO(START_PROC, Name, StackBytes) +- PUBLIC _&Name&@&StackBytes +- .PROC _&Name&@&StackBytes +-ENDM +-#else +-MACRO(MAKE_LABEL, Name, StackBytes) +- PUBLIC &Name +- &Name: +-ENDM +-MACRO(START_PROC, Name, StackBytes) +- PUBLIC &Name +- .PROC &Name +-ENDM + #endif +- +-MACRO(STUB_U, Name, ArgCount) +- MAKE_LABEL Zw&Name, %ArgCount * 4 +- START_PROC Nt&Name, %ArgCount * 4 +- STUBCODE_U Name, SyscallId, %ArgCount +- .ENDP +- SyscallId = SyscallId + 1 +-ENDM +- +-MACRO(STUB_K, Name, ArgCount) +- START_PROC Zw&Name, %ArgCount * 4 +- STUBCODE_K Name, SyscallId, %ArgCount +- .ENDP +- SyscallId = SyscallId + 1 +-ENDM +- +-#endif +Index: include/psdk/winddi.h +=================================================================== +--- include/psdk/winddi.h (revision 69519) ++++ include/psdk/winddi.h (working copy) +@@ -2911,7 +2911,7 @@ + _In_ ULONG cjSize, + _Out_bytecap_(cjSize) FONTINFO *pfi); + +-#if (NTDDI_VERSION <= NTDDI_WINXP) ++#if 0//(NTDDI_VERSION <= NTDDI_WINXP) + /* Obsolete in Windows 2000 and later */ + GAMMA_TABLES* + APIENTRY +Index: include/reactos/wine/config.h +=================================================================== +--- include/reactos/wine/config.h (revision 69519) ++++ include/reactos/wine/config.h (working copy) +@@ -1,3 +1,5 @@ ++#include "reactos/buildno.h" ++ + #define __WINE_CONFIG_H + + /* Define to a function attribute for Microsoft hotpatch assembly prefix. */ +Index: lib/3rdparty/CMakeLists.txt +=================================================================== +--- lib/3rdparty/CMakeLists.txt (revision 69519) ++++ lib/3rdparty/CMakeLists.txt (working copy) +@@ -2,7 +2,9 @@ + add_subdirectory(adns) + add_subdirectory(bzip2) + add_subdirectory(cardlib) ++if (NOT _ARWINSS_) + add_subdirectory(freetype) ++endif () + add_subdirectory(fullfat) + add_subdirectory(libmpg123) + add_subdirectory(libsamplerate) +Index: subsystems/win32/csrsrv/init.c +=================================================================== +--- subsystems/win32/csrsrv/init.c (revision 69519) ++++ subsystems/win32/csrsrv/init.c (working copy) +@@ -20,7 +20,7 @@ + /* DATA ***********************************************************************/ + + // Debug Flag +-ULONG CsrDebug = 0; // 0xFFFFFFFF; ++ULONG CsrDebug = 0xFFFFFFFF; + + HANDLE CsrHeap = NULL; + HANDLE CsrObjectDirectory = NULL; +Index: win32ss/CMakeLists.txt +=================================================================== +--- win32ss/CMakeLists.txt (revision 69519) ++++ win32ss/CMakeLists.txt (working copy) +@@ -10,7 +10,10 @@ + PROJECT(WIN32SS) + + add_subdirectory(drivers) ++add_subdirectory(user/winsrv) + ++if (NOT _ARWINSS_) ++ + if(USE_DIBLIB) + add_subdirectory(gdi/diblib) + endif() +@@ -18,7 +21,6 @@ + add_subdirectory(gdi/gdi32) + add_subdirectory(reactx) + add_subdirectory(user/user32) +-add_subdirectory(user/winsrv) + + spec2def(win32k.sys win32k.spec ADD_IMPORTLIB) + +@@ -243,3 +245,4 @@ + add_asm_files(win32ksys_asm sys-stubs.S) + add_library(win32ksys ${win32ksys_asm}) + set_target_properties(win32ksys PROPERTIES LINKER_LANGUAGE "C") ++endif() # _ARWINSS_ +\ No newline at end of file +Index: win32ss/drivers/CMakeLists.txt +=================================================================== +--- win32ss/drivers/CMakeLists.txt (revision 69519) ++++ win32ss/drivers/CMakeLists.txt (working copy) +@@ -1,6 +1,8 @@ + + add_subdirectory(displays) ++if (NOT _ARWINSS_) + add_subdirectory(font) ++endif () + add_subdirectory(miniport) + add_subdirectory(videoprt) + add_subdirectory(watchdog) +Index: win32ss/include/ntgdihdl.h +=================================================================== +--- win32ss/include/ntgdihdl.h (revision 69519) ++++ win32ss/include/ntgdihdl.h (working copy) +@@ -260,6 +260,7 @@ + DWORD dwCFCount; + } GDI_SHARED_HANDLE_TABLE, *PGDI_SHARED_HANDLE_TABLE; + ++#ifndef _ARWINSS_ + typedef struct _RGN_ATTR + { + ULONG AttrFlags; +@@ -347,6 +348,19 @@ + RGN_ATTR VisRectRegion; + } DC_ATTR, *PDC_ATTR; + ++#else ++ ++typedef struct _DC_ATTR ++{ ++ HDC hdc; ++ HDC hKernelDC; ++ RECT dc_rect; /* DC rectangle relative to drawable */ ++ HRGN region; /* Device region (visible region & clip region) */ ++ int cache_index; /* cache of a currently selected font */ ++} DC_ATTR, *PDC_ATTR; ++ ++#endif ++ + typedef struct _BRUSH_ATTR /* Used with pen too. */ + { + FLONG AttrFlags; +Index: win32ss/user/winsrv/consrv/conoutput.c +=================================================================== +--- win32ss/user/winsrv/consrv/conoutput.c (revision 69519) ++++ win32ss/user/winsrv/consrv/conoutput.c (working copy) +@@ -99,9 +99,13 @@ + * Indeed, the palette handle comes from a console app + * calling ourselves, running in CSRSS. + */ ++#ifndef _ARWINSS_ + NtUserConsoleControl(ConsoleMakePalettePublic, + &SetPaletteRequest->PaletteHandle, + sizeof(SetPaletteRequest->PaletteHandle)); ++#else ++ UNIMPLEMENTED; ++#endif + + Status = ConDrvSetConsolePalette(Buffer->Header.Console, + Buffer, +Index: win32ss/user/winsrv/consrv/frontends/gui/conwnd.c +=================================================================== +--- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (revision 69519) ++++ win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (working copy) +@@ -159,7 +159,11 @@ + } + else + { ++#ifndef _ARWINSS_ + NtUserConsoleControl(GuiConsoleWndClassAtom, &WndClassAtom, sizeof(ATOM)); ++#else ++ UNIMPLEMENTED; ++#endif + } + + return (WndClassAtom != 0); +Index: win32ss/user/winsrv/consrv/frontends/gui/guiterm.c +=================================================================== +--- win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (revision 69519) ++++ win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (working copy) +@@ -160,9 +160,14 @@ + /* Assign this console input thread to this desktop */ + DesktopConsoleThreadInfo.DesktopHandle = GuiInitInfo->Desktop; // Duplicated desktop handle + DesktopConsoleThreadInfo.ThreadId = InputThreadId; ++#ifndef _ARWINSS_ + Status = NtUserConsoleControl(ConsoleCtrlDesktopConsoleThread, + &DesktopConsoleThreadInfo, + sizeof(DesktopConsoleThreadInfo)); ++#else ++ UNIMPLEMENTED; ++ Status = STATUS_UNSUCCESSFUL; ++#endif + if (!NT_SUCCESS(Status)) goto Quit; + + /* Connect this CSR thread to the USER subsystem */ +@@ -295,13 +300,17 @@ + + Quit: + DPRINT("CONSRV: Quit the Input Thread 0x%p, Status = 0x%08lx\n", InputThreadId, Status); +- ++ + /* Remove this console input thread from this desktop */ + // DesktopConsoleThreadInfo.DesktopHandle; + DesktopConsoleThreadInfo.ThreadId = 0; ++#ifndef _ARWINSS_ + NtUserConsoleControl(ConsoleCtrlDesktopConsoleThread, + &DesktopConsoleThreadInfo, + sizeof(DesktopConsoleThreadInfo)); ++#else ++ UNIMPLEMENTED ++#endif + + /* Close the duplicated desktop handle */ + CloseDesktop(DesktopConsoleThreadInfo.DesktopHandle); // NtUserCloseDesktop +@@ -358,11 +367,16 @@ + { + RtlInitUnicodeString(&DesktopPath, L"Default"); + } +- ++#ifndef _ARWINSS_ + hDesk = NtUserResolveDesktop(ConsoleLeaderProcessHandle, + &DesktopPath, + 0, + &hWinSta); ++#else ++ UNIMPLEMENTED ++ hDesk = NULL; ++#endif ++ + DPRINT("NtUserResolveDesktop(DesktopPath = '%wZ') returned hDesk = 0x%p; hWinSta = 0x%p\n", + &DesktopPath, hDesk, hWinSta); + +Index: win32ss/user/winsrv/usersrv/init.c +=================================================================== +--- win32ss/user/winsrv/usersrv/init.c (revision 69519) ++++ win32ss/user/winsrv/usersrv/init.c (working copy) +@@ -101,7 +101,20 @@ + NTAPI + CreateSystemThreads(PVOID pParam) + { ++#ifndef _ARWINSS_ + NtUserCallOneParam((DWORD)pParam, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); ++#else ++ DWORD WaitRes; ++ HANDLE hDummyEvent; ++ ++ hDummyEvent = CreateEventW(0, FALSE, FALSE, L""); ++ ++ while (TRUE) ++ { ++ WaitRes = WaitForSingleObject(hDummyEvent, INFINITE); ++ } ++ DPRINT1("WaitRes: 0x%x\n", WaitRes); ++#endif + DPRINT1("This thread should not terminate!\n"); + return 0; + } +@@ -173,6 +186,7 @@ + CsrApiPort = CsrQueryApiPort(); + + /* Inform win32k about the API port */ ++#ifndef _ARWINSS_ + Status = NtUserSetInformationThread(NtCurrentThread(), + UserThreadCsrApiPort, + &CsrApiPort, +@@ -181,6 +195,9 @@ + { + return Status; + } ++#else ++ UNIMPLEMENTED ++#endif + } + + /* Check connection info validity */ +@@ -199,9 +216,14 @@ + + /* Pass the request to win32k */ + ConnectInfo->dwDispatchCount = 0; // gDispatchTableValues; ++#ifndef _ARWINSS_ + Status = NtUserProcessConnect(CsrProcess->ProcessHandle, + ConnectInfo, + *ConnectionInfoLength); ++#else ++ Status = STATUS_SUCCESS; ++ UNIMPLEMENTED ++#endif + + return Status; + } +@@ -254,7 +276,11 @@ + } + + /* Set the process creation notify routine for BASE */ ++#ifndef _ARWINSS_ + BaseSetProcessCreateNotify(NtUserNotifyProcessCreate); ++#else ++ UNIMPLEMENTED ++#endif + + /* Initialize the kernel mode subsystem */ + Status = NtUserInitialize(USER_VERSION, +Index: win32ss/user/winsrv/usersrv/shutdown.c +=================================================================== +--- win32ss/user/winsrv/usersrv/shutdown.c (revision 69519) ++++ win32ss/user/winsrv/usersrv/shutdown.c (working copy) +@@ -381,7 +381,12 @@ + static BOOLEAN + IsConsoleMode(VOID) + { ++#ifndef _ARWINSS_ + return (BOOLEAN)NtUserCallNoParam(NOPARAM_ROUTINE_ISCONSOLEMODE); ++#else ++ UNIMPLEMENTED ++ return FALSE; ++#endif + } + + +@@ -678,9 +683,14 @@ + while (TRUE) + { + /* Notify Win32k and potentially Winlogon of the shutdown */ ++#ifndef _ARWINSS_ + Status = NtUserSetInformationThread(CsrThread->ThreadHandle, + UserThreadInitiateShutdown, + &Flags, sizeof(Flags)); ++#else ++ Status = STATUS_SUCCESS; ++ UNIMPLEMENTED ++#endif + DPRINT1("Win32k says: %lx\n", Status); + switch (Status) + { +@@ -736,9 +746,13 @@ + // FIXME: If Status == STATUS_CANCELLED, call RecordShutdownReason + + /* Tell Win32k and potentially Winlogon that we're done */ ++#ifndef _ARWINSS_ + NtUserSetInformationThread(CsrThread->ThreadHandle, + UserThreadEndShutdown, + &Status, sizeof(Status)); ++#else ++ UNIMPLEMENTED ++#endif + + DPRINT1("SrvExitWindowsEx returned 0x%08x\n", Status); + Propchange: branches/arwinss/arwinss/trunk.patch ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 11 months

[sginsberg] 69528: [NTOS] Add super-complicated handling of global pages to KeFlushCurrentTb (pretty much the same code which has been in HalpFlushTLB for the past ~6 years). This should be all tha...

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Oct 14 19:33:35 2015 New Revision: 69528 URL: http://svn.reactos.org/svn/reactos?rev=69528&view=rev Log: [NTOS] Add super-complicated handling of global pages to KeFlushCurrentTb (pretty much the same code which has been in HalpFlushTLB for the past ~6 years). This should be all that is required to make this feature work (everything else being in place already), and *seems* to work fine but is disabled under a switch until tested thoroughly. Global pages, an important optimization that allows for not flushing the whole x86 TLB every time CR3 is changed (typically on context switch to a new process, or during process attach/detach), relies on us doing extra work whenever we do alter a global page. This is likely where any bugs will have to be flushed out! Fixup Ki386EnableGlobalPage while we are at it -- disable/restore interrupts properly, and verify PGE-bit isn't set (nothing should have touched it before this routine, which is responsible for initializing it, so we shouldn't have to disable it). Fix, but disable, the CPU-sync spin as well as there should be no particular reason to do this for PGE-enabling during initialization (no other processor will be messing with PTEs at this stage, as compared to a call to KeFlushEntireTb). Everyone, repeat after me: Global pages are awesome! Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/patpge.c trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Wed Oct 14 19:33:35 2015 @@ -98,6 +98,14 @@ #define ASSERT NT_ASSERT #endif + +// +// Switch for enabling global page support +// + +//#define _GLOBAL_PAGES_ARE_AWESOME_ + + /* Internal Headers */ #include "internal/ntoskrnl.h" #include "config.h" Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Wed Oct 14 19:33:35 2015 @@ -878,8 +878,37 @@ NTAPI KeFlushCurrentTb(VOID) { + +#if !defined(_GLOBAL_PAGES_ARE_AWESOME_) + /* Flush the TLB by resetting CR3 */ __writecr3(__readcr3()); + +#else + + /* Check if global pages are enabled */ + if (KeFeatureBits & KF_GLOBAL_PAGE) + { + ULONG Cr4; + + /* Disable PGE */ + Cr4 = __readcr4() & ~CR4_PGE; + __writecr4(Cr4); + + /* Flush everything */ + __writecr3(__readcr3()); + + /* Re-enable PGE */ + __writecr4(Cr4 | CR4_PGE); + } + else + { + /* No global pages, resetting CR3 is enough */ + __writecr3(__readcr3()); + } + +#endif + } VOID Modified: trunk/reactos/ntoskrnl/ke/i386/patpge.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/patpge.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/patpge.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/patpge.c [iso-8859-1] Wed Oct 14 19:33:35 2015 @@ -17,40 +17,41 @@ /* FUNCTIONS *****************************************************************/ +INIT_SECTION ULONG_PTR NTAPI -INIT_FUNCTION Ki386EnableGlobalPage(IN ULONG_PTR Context) { - PLONG Count = (PLONG)Context; - ULONG Cr4, Cr3; + //PLONG Count; +#if defined(_GLOBAL_PAGES_ARE_AWESOME_) + ULONG Cr4; +#endif + BOOLEAN Enable; /* Disable interrupts */ - _disable(); - - /* Decrease CPU Count and loop until it's reached 0 */ - do {InterlockedDecrement(Count);} while (!*Count); - - /* Now check if this is the Boot CPU */ - if (!KeGetPcr()->Number) - { - /* It is.FIXME: Patch KeFlushCurrentTb */ - } - - /* Now get CR4 and make sure PGE is masked out */ + Enable = KeDisableInterrupts(); + + /* Spin until other processors are ready */ + //Count = (PLONG)Context; + //InterlockedDecrement(Count); + //while (*Count) YieldProcessor(); + +#if defined(_GLOBAL_PAGES_ARE_AWESOME_) + + /* Get CR4 and ensure global pages are disabled */ Cr4 = __readcr4(); - __writecr4(Cr4 & ~CR4_PGE); - - /* Flush the TLB */ - Cr3 = __readcr3(); - __writecr3(Cr3); + ASSERT(!(Cr4 & CR4_PGE)); + + /* Reset CR3 to flush the TLB */ + __writecr3(__readcr3()); /* Now enable PGE */ - DPRINT("Global page support detected but not yet taken advantage of\n"); - //__writecr4(Cr4 | CR4_PGE); - - /* Restore interrupts */ - _enable(); + __writecr4(Cr4 | CR4_PGE); + +#endif + + /* Restore interrupts and return */ + KeRestoreInterrupts(Enable); return 0; } Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Wed Oct 14 19:33:35 2015 @@ -249,15 +249,18 @@ PMMPFN Pfn1; ULONG Flags; +#if defined(_GLOBAL_PAGES_ARE_AWESOME_) + /* Check for global bit */ -#if 0 if (KeFeatureBits & KF_GLOBAL_PAGE) { /* Set it on the template PTE and PDE */ ValidKernelPte.u.Hard.Global = TRUE; ValidKernelPde.u.Hard.Global = TRUE; } + #endif + /* Now templates are ready */ TempPte = ValidKernelPte; TempPde = ValidKernelPde;

8 years, 11 months

← Newer
1
...
21
22
23
24
25
26
27
...
35
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 October 2015