Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 55645: [NTOSKRNL/MM] - First drop of a new implementation of NtAllocateVirtualMemory. Very incomplete, don't hesitate to drop in and complete it. For now, only MEM_RESERVE is kind of supp...
by jgardou＠svn.reactos.org 16 Feb '12

16 Feb '12

Author: jgardou Date: Thu Feb 16 17:24:15 2012 New Revision: 55645 URL: http://svn.reactos.org/svn/reactos?rev=55645&view=rev Log: [NTOSKRNL/MM] - First drop of a new implementation of NtAllocateVirtualMemory. Very incomplete, don't hesitate to drop in and complete it. For now, only MEM_RESERVE is kind of supported, as well as MEM_RESERVE|MEM_COMMIT Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Thu Feb 16 17:24:15 2012 @@ -2773,4 +2773,359 @@ return Status; } +#ifdef __USE_ARM3__ +/* +* @implemented +*/ +NTSTATUS +NTAPI +NtAllocateVirtualMemory(IN HANDLE ProcessHandle, + IN OUT PVOID* UBaseAddress, + IN ULONG_PTR ZeroBits, + IN OUT PSIZE_T URegionSize, + IN ULONG AllocationType, + IN ULONG Protect) +{ + PEPROCESS Process; + ULONG Type; + NTSTATUS Status = STATUS_SUCCESS; + PVOID BaseAddress; + ULONG RegionSize; + PMMVAD Vad; + PMMADDRESS_NODE ParentNode; + ULONG_PTR StartVpn, EndVpn; + PHYSICAL_ADDRESS BoundaryAddressMultiple; + PEPROCESS CurrentProcess = PsGetCurrentProcess(); + KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); + KAPC_STATE ApcState; + ULONG ProtectionMask; + BOOLEAN Attached = FALSE; + BoundaryAddressMultiple.QuadPart = 0; + TABLE_SEARCH_RESULT Result; + + PAGED_CODE(); + + /* Check for valid Zero bits */ + if (ZeroBits > 21) + { + DPRINT1("Too many zero bits\n"); + return STATUS_INVALID_PARAMETER_3; + } + + /* Check for valid Allocation Types */ + if ((AllocationType & ~(MEM_COMMIT | MEM_RESERVE | MEM_RESET | MEM_PHYSICAL | + MEM_TOP_DOWN | MEM_WRITE_WATCH))) + { + DPRINT1("Invalid Allocation Type\n"); + return STATUS_INVALID_PARAMETER_5; + } + + /* Check for at least one of these Allocation Types to be set */ + if (!(AllocationType & (MEM_COMMIT | MEM_RESERVE | MEM_RESET))) + { + DPRINT1("No memory allocation base type\n"); + return STATUS_INVALID_PARAMETER_5; + } + + /* MEM_RESET is an exclusive flag, make sure that is valid too */ + if ((AllocationType & MEM_RESET) && (AllocationType != MEM_RESET)) + { + DPRINT1("Invalid use of MEM_RESET\n"); + return STATUS_INVALID_PARAMETER_5; + } + + /* Check if large pages are being used */ + if (AllocationType & MEM_LARGE_PAGES) + { + /* Large page allocations MUST be committed */ + if (!(AllocationType & MEM_COMMIT)) + { + DPRINT1("Must supply MEM_COMMIT with MEM_LARGE_PAGES\n"); + return STATUS_INVALID_PARAMETER_5; + } + + /* These flags are not allowed with large page allocations */ + if (AllocationType & (MEM_PHYSICAL | MEM_RESET | MEM_WRITE_WATCH)) + { + DPRINT1("Using illegal flags with MEM_LARGE_PAGES\n"); + return STATUS_INVALID_PARAMETER_5; + } + } + + /* MEM_WRITE_WATCH can only be used if MEM_RESERVE is also used */ + if ((AllocationType & MEM_WRITE_WATCH) && !(AllocationType & MEM_RESERVE)) + { + DPRINT1("MEM_WRITE_WATCH used without MEM_RESERVE\n"); + return STATUS_INVALID_PARAMETER_5; + } + + /* MEM_PHYSICAL can only be used if MEM_RESERVE is also used */ + if ((AllocationType & MEM_PHYSICAL) && !(AllocationType & MEM_RESERVE)) + { + DPRINT1("MEM_WRITE_WATCH used without MEM_RESERVE\n"); + return STATUS_INVALID_PARAMETER_5; + } + + /* Check for valid MEM_PHYSICAL usage */ + if (AllocationType & MEM_PHYSICAL) + { + /* Only these flags are allowed with MEM_PHYSIAL */ + if (AllocationType & ~(MEM_RESERVE | MEM_TOP_DOWN | MEM_PHYSICAL)) + { + DPRINT1("Using illegal flags with MEM_PHYSICAL\n"); + return STATUS_INVALID_PARAMETER_5; + } + + /* Then make sure PAGE_READWRITE is used */ + if (Protect != PAGE_READWRITE) + { + DPRINT1("MEM_PHYSICAL used without PAGE_READWRITE\n"); + return STATUS_INVALID_PARAMETER_6; + } + } + + /* Calculate the protection mask and make sure it's valid */ + ProtectionMask = MiMakeProtectionMask(Protect); + if (ProtectionMask == MM_INVALID_PROTECTION) + { + DPRINT1("Invalid protection mask\n"); + return STATUS_INVALID_PAGE_PROTECTION; + } + + /* Enter SEH */ + _SEH2_TRY + { + /* Check for user-mode parameters */ + if (PreviousMode != KernelMode) + { + /* Make sure they are writable */ + ProbeForWritePointer(UBaseAddress); + ProbeForWriteUlong(URegionSize); + } + + /* Capture their values */ + BaseAddress = *UBaseAddress; + RegionSize = *URegionSize; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + /* Make sure there's a size specified */ + if (!RegionSize) + { + DPRINT1("Region size is invalid (zero)\n"); + return STATUS_INVALID_PARAMETER_4; + } + + RegionSize = PAGE_ROUND_UP((ULONG_PTR)BaseAddress + RegionSize) - + PAGE_ROUND_DOWN(BaseAddress); + BaseAddress = (PVOID)PAGE_ROUND_DOWN(BaseAddress); + StartVpn = (ULONG_PTR)BaseAddress >> PAGE_SHIFT; + EndVpn = ((ULONG_PTR)BaseAddress + RegionSize - 1) >> PAGE_SHIFT; + + /* Make sure the allocation isn't past the VAD area */ + if (BaseAddress >= MM_HIGHEST_VAD_ADDRESS) + { + DPRINT1("Virtual allocation base above User Space\n"); + return STATUS_INVALID_PARAMETER_2; + } + + /* Make sure the allocation wouldn't overflow past the VAD area */ + if ((((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1) - (ULONG_PTR)BaseAddress) < RegionSize) + { + DPRINT1("Region size would overflow into kernel-memory\n"); + return STATUS_INVALID_PARAMETER_4; + } + + /* Check if this is for the current process */ + if (ProcessHandle == NtCurrentProcess()) + { + /* We already have the current process, no need to go through Ob */ + Process = CurrentProcess; + } + else + { + /* Reference the handle for correct permissions */ + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Check if not running in the current process */ + if (CurrentProcess != Process) + { + /* Attach to it */ + KeStackAttachProcess(&Process->Pcb, &ApcState); + Attached = TRUE; + } + } + + /* Check for large page allocations */ + if (AllocationType & MEM_LARGE_PAGES) + { + /* The lock memory privilege is required */ + if (!SeSinglePrivilegeCheck(SeLockMemoryPrivilege, PreviousMode)) + { + /* Fail without it */ + DPRINT1("Privilege not held for MEM_LARGE_PAGES\n"); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + return STATUS_PRIVILEGE_NOT_HELD; + } + } + + + /* + * Copy on Write is reserved for system use. This case is a certain failure + * but there may be other cases...needs more testing + */ + if ((!BaseAddress || (AllocationType & MEM_RESERVE)) && + (Protect & (PAGE_WRITECOPY | PAGE_EXECUTE_WRITECOPY))) + { + DPRINT1("Copy on write is not supported by VirtualAlloc\n"); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + return STATUS_INVALID_PAGE_PROTECTION; + } + + Type = (AllocationType & MEM_COMMIT) ? MEM_COMMIT : MEM_RESERVE; + DPRINT("Type %x\n", Type); + + /* Lock the process address space */ + KeAcquireGuardedMutex(&Process->AddressCreationLock); + + if(BaseAddress != 0) + { + /* + * An address was provided. Let's see if we've already + * something there + */ + if(MiCheckForConflictingNode(StartVpn, EndVpn, &Process->VadRoot) != NULL) + { + /* Can't reserve twice the same range */ + if(AllocationType & MEM_RESERVE) + { + Status = STATUS_CONFLICTING_ADDRESSES; + DPRINT1("Trying to reserve twice the same range.\n"); + goto cleanup; + } + /* Great there's already something there. What shall we do ? */ + if(AllocationType == MEM_RESET) + { + UNIMPLEMENTED; + /* Reset the dirty bits for each PTEs */ + goto cleanup; + } + else + { + ASSERT(AllocationType & MEM_COMMIT); + UNIMPLEMENTED; + /* Mark the VAD as committed */ + goto cleanup; + } + } + + /* There's nothing */ + if(!(AllocationType & MEM_RESERVE)) + { + Status = STATUS_ACCESS_DENIED; + goto cleanup; + } + + /* Now we can reserve our chunk of memory */ + goto buildVad; + } + + /* No base address was given. */ + if(!(AllocationType & MEM_RESERVE)) + { + DPRINT1("Providing NULL base address witout MEM_RESERVE.\n"); + ASSERT(FALSE); + Status = STATUS_INVALID_PARAMETER_5; + goto cleanup; + } + + /* Find an empty range in Address Space */ + if(AllocationType & MEM_TOP_DOWN) + { + /* Top down allocation */ + Result = MiFindEmptyAddressRangeDownTree(RegionSize, + (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS, + (ZeroBits > PAGE_SHIFT) ? 1 << ZeroBits : PAGE_SIZE, + &Process->VadRoot, + (PULONG_PTR)&BaseAddress, + &ParentNode); + + if(Result == TableFoundNode) + { + /* This means failure */ + Status = STATUS_NO_MEMORY; + goto cleanup; + } + } + else + { + /* Good old bottom up allocation */ + Status = MiFindEmptyAddressRangeInTree(RegionSize, + (ZeroBits > PAGE_SHIFT) ? 1 << ZeroBits : PAGE_SIZE, + &Process->VadRoot, + &ParentNode, + (PULONG_PTR)&BaseAddress); + if(!NT_SUCCESS(Status)) + { + /* Failed... */ + goto cleanup; + } + } + StartVpn = (ULONG_PTR)BaseAddress >> PAGE_SHIFT; + EndVpn = ((ULONG_PTR)BaseAddress + RegionSize - 1) >> PAGE_SHIFT; + + /* Build the Vad */ +buildVad: + Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD), TAG_MVAD); + if(!Vad) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + RtlZeroMemory(Vad, sizeof(MMVAD)); + + /* Set min/max */ + Vad->StartingVpn = StartVpn; + Vad->EndingVpn = EndVpn; + /* Set protection */ + Vad->u.VadFlags.Protection = ProtectionMask; + /* Should it be already marked as committed ? */ + if(AllocationType & MEM_COMMIT) + Vad->u.VadFlags.MemCommit = 1; + if(AllocationType & MEM_PHYSICAL) + { + UNIMPLEMENTED; + Vad->u.VadFlags.VadType = VadAwe; + } + /* Add it */ + MiLockProcessWorkingSet(Process, PsGetCurrentThread()); + MiInsertVad(Vad, Process); + MiUnlockProcessWorkingSet(Process, PsGetCurrentThread()); + + /* we're done */ +cleanup: + KeReleaseGuardedMutex(&Process->AddressCreationLock); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + + *UBaseAddress = BaseAddress; + *URegionSize = RegionSize; + DPRINT("*UBaseAddress %x *URegionSize %x\n", BaseAddress, RegionSize); + + return Status; +} +#endif /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Thu Feb 16 17:24:15 2012 @@ -528,6 +528,7 @@ return Status; } +#ifndef __USE_ARM3__ /* * @implemented */ @@ -900,6 +901,7 @@ return(STATUS_SUCCESS); } +#endif // __USE_ARM3__ static VOID MmFreeVirtualMemoryPage(PVOID Context,

1 0

[jgardou] 55644: [NTOSKRNL] - One can't only use MEM_COMMIT for reserving memory
by jgardou＠svn.reactos.org 16 Feb '12

16 Feb '12

Author: jgardou Date: Thu Feb 16 17:24:01 2012 New Revision: 55644 URL: http://svn.reactos.org/svn/reactos?rev=55644&view=rev Log: [NTOSKRNL] - One can't only use MEM_COMMIT for reserving memory Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=556… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Thu Feb 16 17:24:01 2012 @@ -400,7 +400,7 @@ (PVOID*)&ProcessParams, 0, &Size, - MEM_COMMIT, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); if (!NT_SUCCESS(Status)) { @@ -429,7 +429,7 @@ &EnvironmentPtr, 0, &Size, - MEM_COMMIT, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); if (!NT_SUCCESS(Status)) {

1 0

[jgardou] 55643: [NTOSKRNL/MM] - fix returned value in case of failure in MiFindEmptyAddressRangeDownTree
by jgardou＠svn.reactos.org 16 Feb '12

16 Feb '12

Author: jgardou Date: Thu Feb 16 17:22:54 2012 New Revision: 55643 URL: http://svn.reactos.org/svn/reactos?rev=55643&view=rev Log: [NTOSKRNL/MM] - fix returned value in case of failure in MiFindEmptyAddressRangeDownTree Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] Thu Feb 16 17:22:54 2012 @@ -380,7 +380,7 @@ /* Compute page length, make sure the boundary address is valid */ Length = ROUND_TO_PAGES(Length); PageCount = Length >> PAGE_SHIFT; - if ((BoundaryAddress + 1) < Length) return STATUS_NO_MEMORY; + if ((BoundaryAddress + 1) < Length) return TableFoundNode; /* Check if the table is empty */ if (Table->NumberGenericTableElements == 0)

1 0

[pschweitzer] 55642: [CABMAN] Get rid of MAX_PATH
by pschweitzer＠svn.reactos.org 16 Feb '12

16 Feb '12

Author: pschweitzer Date: Thu Feb 16 17:21:10 2012 New Revision: 55642 URL: http://svn.reactos.org/svn/reactos?rev=55642&view=rev Log: [CABMAN] Get rid of MAX_PATH Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cabman/cabinet.h trunk/reactos/tools/cabman/cabman.h trunk/reactos/tools/cabman/dfp.cxx Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] Thu Feb 16 17:21:10 2012 @@ -512,7 +512,7 @@ strcpy(DestPath, DestinationPath); ConvertPath(DestPath, false); if (strlen(DestPath) > 0) - NormalizePath(DestPath, MAX_PATH); + NormalizePath(DestPath, PATH_MAX); } ULONG CCabinet::AddSearchCriteria(char* SearchCriteria) @@ -1030,8 +1030,8 @@ #if defined(_WIN32) FILETIME FileTime; #endif - CHAR DestName[MAX_PATH]; - CHAR TempName[MAX_PATH]; + CHAR DestName[PATH_MAX]; + CHAR TempName[PATH_MAX]; Status = LocateFile(FileName, &File); if (Status != CAB_STATUS_SUCCESS) @@ -2086,8 +2086,8 @@ { bool bRet = false; char* pszFile; - char szFilePath[MAX_PATH]; - char szFile[MAX_PATH]; + char szFilePath[PATH_MAX]; + char szFile[PATH_MAX]; PSEARCH_CRITERIA Criteria; ULONG Status; @@ -2554,7 +2554,7 @@ return CAB_STATUS_INVALID_CAB; } - File->FileName = (char*)AllocateMemory(MAX_PATH); + File->FileName = (char*)AllocateMemory(PATH_MAX); if (!File->FileName) { DPRINT(MIN_TRACE, ("Insufficient memory.\n")); @@ -2562,7 +2562,7 @@ } /* Read file name */ - Status = ReadString(File->FileName, MAX_PATH); + Status = ReadString(File->FileName, PATH_MAX); if (Status != CAB_STATUS_SUCCESS) return Status; @@ -3654,7 +3654,7 @@ &File->File.FileTime); #else struct stat stbuf; - char buf[MAX_PATH]; + char buf[PATH_MAX]; // Check for an absolute path if (IsSeparator(File->FileName[0])) @@ -3698,7 +3698,7 @@ File->File.Attributes = (USHORT)(Attributes & 0x37); #else struct stat stbuf; - char buf[MAX_PATH]; + char buf[PATH_MAX]; // Check for an absolute path if (IsSeparator(File->FileName[0])) Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] Thu Feb 16 17:21:10 2012 @@ -16,9 +16,6 @@ #include <time.h> #include <typedefs.h> #include <unistd.h> -#ifndef MAX_PATH -#define MAX_PATH 260 -#endif #endif #include <stdlib.h> @@ -303,7 +300,7 @@ ULONG ReadBlock(PCFDATA Data, void* Buffer, PULONG BytesRead); ULONG WriteBlock(PCFDATA Data, void* Buffer, PULONG BytesWritten); private: - char FullName[MAX_PATH]; + char FullName[PATH_MAX]; bool FileCreated; FILEHANDLE FileHandle; }; @@ -449,8 +446,8 @@ ULONG FolderUncompSize; // Uncompressed size of folder ULONG BytesLeftInBlock; // Number of bytes left in current block bool ReuseBlock; - char DestPath[MAX_PATH]; - char CabinetReservedFile[MAX_PATH]; + char DestPath[PATH_MAX]; + char CabinetReservedFile[PATH_MAX]; void* CabinetReservedFileBuffer; ULONG CabinetReservedFileSize; FILEHANDLE FileHandle; Modified: trunk/reactos/tools/cabman/cabman.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.h?rev=… ============================================================================== --- trunk/reactos/tools/cabman/cabman.h [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabman.h [iso-8859-1] Thu Feb 16 17:21:10 2012 @@ -38,7 +38,7 @@ bool ProcessAll; ULONG Mode; bool PromptOnOverwrite; - char FileName[MAX_PATH]; + char FileName[PATH_MAX]; }; /* EOF */ Modified: trunk/reactos/tools/cabman/dfp.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.cxx?rev=5… ============================================================================== --- trunk/reactos/tools/cabman/dfp.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/dfp.cxx [iso-8859-1] Thu Feb 16 17:21:10 2012 @@ -123,7 +123,7 @@ void CDFParser::WriteInfLine(char* InfLine) { - char buf[MAX_PATH]; + char buf[PATH_MAX]; char eolbuf[2]; char* destpath; #if defined(_WIN32) @@ -432,7 +432,7 @@ strcpy(FileRelativePath, Path); ConvertPath(FileRelativePath, false); if (strlen(FileRelativePath) > 0) - NormalizePath(FileRelativePath, MAX_PATH); + NormalizePath(FileRelativePath, PATH_MAX); } @@ -498,7 +498,7 @@ * true if a cabinet name was returned, false if not */ { - char Buffer[MAX_PATH]; + char Buffer[PATH_MAX]; ULONG i; int j; char ch; @@ -1107,11 +1107,11 @@ ULONG Status; ULONG i, j; char ch; - char SrcName[MAX_PATH]; - char DstName[MAX_PATH]; - char InfLine[MAX_PATH]; + char SrcName[PATH_MAX]; + char DstName[PATH_MAX]; + char InfLine[PATH_MAX]; char Options[128]; - char BaseFilename[MAX_PATH]; + char BaseFilename[PATH_MAX]; *SrcName = '\0'; *DstName = '\0';

1 0

[pschweitzer] 55641: [CABMAN] Attempt to fix 2. MAX_PATH shouldn't be defined/used any longer
by pschweitzer＠svn.reactos.org 16 Feb '12

16 Feb '12

Author: pschweitzer Date: Thu Feb 16 17:13:38 2012 New Revision: 55641 URL: http://svn.reactos.org/svn/reactos?rev=55641&view=rev Log: [CABMAN] Attempt to fix 2. MAX_PATH shouldn't be defined/used any longer Modified: trunk/reactos/tools/cabman/cabinet.h Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] Thu Feb 16 17:13:38 2012 @@ -16,15 +16,15 @@ #include <time.h> #include <typedefs.h> #include <unistd.h> -#endif - #ifndef MAX_PATH #define MAX_PATH 260 #endif +#endif #include <stdlib.h> #include <stdio.h> #include <string.h> +#include <limits.h> #if defined(_WIN32) #define DIR_SEPARATOR_CHAR '\\'

1 0

[pschweitzer] 55640: [CABMAN] Fix Windows build
by pschweitzer＠svn.reactos.org 16 Feb '12

16 Feb '12

Author: pschweitzer Date: Thu Feb 16 17:02:28 2012 New Revision: 55640 URL: http://svn.reactos.org/svn/reactos?rev=55640&view=rev Log: [CABMAN] Fix Windows build Modified: trunk/reactos/tools/cabman/cabinet.h Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] Thu Feb 16 17:02:28 2012 @@ -16,9 +16,10 @@ #include <time.h> #include <typedefs.h> #include <unistd.h> +#endif + #ifndef MAX_PATH #define MAX_PATH 260 -#endif #endif #include <stdlib.h>

1 0

[pschweitzer] 55639: [CABMAN] Ensure line reading buffer is big enough to hold complete paths. Remove a magic value usage accordingly.
by pschweitzer＠svn.reactos.org 16 Feb '12

16 Feb '12

Author: pschweitzer Date: Thu Feb 16 16:50:16 2012 New Revision: 55639 URL: http://svn.reactos.org/svn/reactos?rev=55639&view=rev Log: [CABMAN] Ensure line reading buffer is big enough to hold complete paths. Remove a magic value usage accordingly. Modified: trunk/reactos/tools/cabman/dfp.cxx trunk/reactos/tools/cabman/dfp.h Modified: trunk/reactos/tools/cabman/dfp.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.cxx?rev=5… ============================================================================== --- trunk/reactos/tools/cabman/dfp.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/dfp.cxx [iso-8859-1] Thu Feb 16 16:50:16 2012 @@ -1281,7 +1281,7 @@ return false; i = 0; - while (((j = CurrentOffset + i) < FileBufferSize) && (i < 127) && + while (((j = CurrentOffset + i) < FileBufferSize) && (i < sizeof(Line) - 1) && ((ch = FileBuffer[j]) != 0x0D && (ch = FileBuffer[j]) != 0x0A)) { Line[i] = ch; Modified: trunk/reactos/tools/cabman/dfp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.h?rev=556… ============================================================================== --- trunk/reactos/tools/cabman/dfp.h [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/dfp.h [iso-8859-1] Thu Feb 16 16:50:16 2012 @@ -97,7 +97,7 @@ char* FileBuffer; ULONG FileBufferSize; ULONG CurrentOffset; - char Line[128]; + char Line[PATH_MAX + 6]; /* "PATH" xEOL */ ULONG LineLength; ULONG CurrentLine; ULONG CurrentChar;

1 0

[ion] 55638: [CSRSRV]: Improve ClientConnectionThread a bit to make it look a bit more like CSRSRV2 and add some extra functionality. [CSRSRV]: Port from CSRSRV2 and use CsrApiPortInitialize instea...
by ion＠svn.reactos.org 16 Feb '12

16 Feb '12

Author: ion Date: Thu Feb 16 16:40:15 2012 New Revision: 55638 URL: http://svn.reactos.org/svn/reactos?rev=55638&view=rev Log: [CSRSRV]: Improve ClientConnectionThread a bit to make it look a bit more like CSRSRV2 and add some extra functionality. [CSRSRV]: Port from CSRSRV2 and use CsrApiPortInitialize instead of CsrpCreateListenPort. This will set appropriate SDs and also wait for all threads to be ready. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c trunk/reactos/subsystems/win32/csrss/csrsrv/init.c trunk/reactos/subsystems/win32/csrss/include/api.h Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Thu Feb 16 16:40:15 2012 @@ -19,6 +19,7 @@ static unsigned ApiDefinitionsCount = 0; static PCSRSS_API_DEFINITION ApiDefinitions = NULL; +UNICODE_STRING CsrApiPortName; /* FUNCTIONS *****************************************************************/ @@ -301,6 +302,129 @@ /* Return success */ return STATUS_SUCCESS; +} + +/*++ + * @name CsrApiPortInitialize + * + * The CsrApiPortInitialize routine initializes the LPC Port used for + * communications with the Client/Server Runtime (CSR) and initializes the + * static thread that will handle connection requests and APIs. + * + * @param None + * + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL + * othwerwise. + * + * @remarks None. + * + *--*/ +NTSTATUS +NTAPI +CsrApiPortInitialize(VOID) +{ + ULONG Size; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + HANDLE hRequestEvent, hThread; + CLIENT_ID ClientId; + PLIST_ENTRY ListHead, NextEntry; + PCSR_THREAD ServerThread; + + /* Calculate how much space we'll need for the Port Name */ + Size = CsrDirectoryName.Length + sizeof(CSR_PORT_NAME) + sizeof(WCHAR); + + /* Create the buffer for it */ + CsrApiPortName.Buffer = RtlAllocateHeap(CsrHeap, 0, Size); + if (!CsrApiPortName.Buffer) return STATUS_NO_MEMORY; + + /* Setup the rest of the empty string */ + CsrApiPortName.Length = 0; + CsrApiPortName.MaximumLength = (USHORT)Size; + RtlAppendUnicodeStringToString(&CsrApiPortName, &CsrDirectoryName); + RtlAppendUnicodeToString(&CsrApiPortName, UNICODE_PATH_SEP); + RtlAppendUnicodeToString(&CsrApiPortName, CSR_PORT_NAME); + if (CsrDebug & 1) + { + DPRINT1("CSRSS: Creating %wZ port and associated threads\n", &CsrApiPortName); + DPRINT1("CSRSS: sizeof( CONNECTINFO ) == %ld sizeof( API_MSG ) == %ld\n", + sizeof(CSR_CONNECTION_INFO), sizeof(CSR_API_MESSAGE)); + } + + /* FIXME: Create a Security Descriptor */ + + /* Initialize the Attributes */ + InitializeObjectAttributes(&ObjectAttributes, + &CsrApiPortName, + 0, + NULL, + NULL /* FIXME*/); + + /* Create the Port Object */ + Status = NtCreatePort(&hApiPort, //&CsrApiPort, + &ObjectAttributes, + sizeof(CSR_CONNECTION_INFO), + sizeof(CSR_API_MESSAGE), + 16 * PAGE_SIZE); + if (NT_SUCCESS(Status)) + { + /* Create the event the Port Thread will use */ + Status = NtCreateEvent(&hRequestEvent, + EVENT_ALL_ACCESS, + NULL, + SynchronizationEvent, + FALSE); + if (NT_SUCCESS(Status)) + { + /* Create the Request Thread */ + Status = RtlCreateUserThread(NtCurrentProcess(), + NULL, + TRUE, + 0, + 0, + 0, + (PVOID)ClientConnectionThread,//CsrApiRequestThread, + (PVOID)hRequestEvent, + &hThread, + &ClientId); + if (NT_SUCCESS(Status)) + { + /* Add this as a static thread to CSRSRV */ + CsrAddStaticServerThread(hThread, &ClientId, CsrThreadIsServerThread); + + /* Get the Thread List Pointers */ + ListHead = &CsrRootProcess->ThreadList; + NextEntry = ListHead->Flink; + + /* Start looping the list */ + while (NextEntry != ListHead) + { + /* Get the Thread */ + ServerThread = CONTAINING_RECORD(NextEntry, CSR_THREAD, Link); + + /* Start it up */ + Status = NtResumeThread(ServerThread->ThreadHandle, NULL); + + /* Is this a Server Thread? */ + if (ServerThread->Flags & CsrThreadIsServerThread) + { + /* If so, then wait for it to initialize */ + Status = NtWaitForSingleObject(hRequestEvent, FALSE, NULL); + ASSERT(NT_SUCCESS(Status)); + } + + /* Next thread */ + NextEntry = NextEntry->Flink; + } + + /* We don't need this anymore */ + NtClose(hRequestEvent); + } + } + } + + /* Return */ + return Status; } PBASE_STATIC_SERVER_DATA BaseStaticServerData; @@ -685,8 +809,7 @@ } NTSTATUS WINAPI -CsrpHandleConnectionRequest (PPORT_MESSAGE Request, - IN HANDLE hApiListenPort) +CsrpHandleConnectionRequest (PPORT_MESSAGE Request) { NTSTATUS Status; HANDLE ServerPort = NULL, ServerThread = NULL; @@ -780,7 +903,7 @@ 0, 0, (PTHREAD_START_ROUTINE)ClientConnectionThread, - ServerPort, + NULL, & ServerThread, &ClientId); if (!NT_SUCCESS(Status)) @@ -849,74 +972,130 @@ VOID WINAPI -ClientConnectionThread(HANDLE ServerPort) +ClientConnectionThread(IN PVOID Parameter) { + PTEB Teb = NtCurrentTeb(); + LARGE_INTEGER TimeOut; NTSTATUS Status; BYTE RawRequest[LPC_MAX_DATA_LENGTH]; PCSR_API_MESSAGE Request = (PCSR_API_MESSAGE)RawRequest; PCSR_API_MESSAGE Reply; PCSR_PROCESS ProcessData; PCSR_THREAD ServerThread; + ULONG MessageType; DPRINT("CSR: %s called\n", __FUNCTION__); + + /* Setup LPC loop port and message */ + Reply = NULL; +// ReplyPort = CsrApiPort; /* Connect to user32 */ while (!CsrConnectToUser()) { + /* Set up the timeout for the connect (30 seconds) */ + TimeOut.QuadPart = -30 * 1000 * 1000 * 10; + /* Keep trying until we get a response */ - NtCurrentTeb()->Win32ClientInfo[0] = 0; - //NtDelayExecution(FALSE, &TimeOut); - } - - /* Reply must be NULL at the first call to NtReplyWaitReceivePort */ - ServerThread = NtCurrentTeb()->CsrClientThread; - Reply = NULL; - - /* Loop and reply/wait for a new message */ - for (;;) - { + Teb->Win32ClientInfo[0] = 0; + NtDelayExecution(FALSE, &TimeOut); + } + + /* Get our thread */ + ServerThread = Teb->CsrClientThread; + + /* If we got an event... */ + if (Parameter) + { + /* Set it, to let stuff waiting on us load */ + Status = NtSetEvent((HANDLE)Parameter, NULL); + ASSERT(NT_SUCCESS(Status)); + + /* Increase the Thread Counts */ + //_InterlockedIncrement(&CsrpStaticThreadCount); + //_InterlockedIncrement(&CsrpDynamicThreadTotal); + } + + /* Now start the loop */ + while (TRUE) + { + /* Make sure the real CID is set */ + Teb->RealClientId = Teb->ClientId; + + /* Debug check */ + if (Teb->CountOfOwnedCriticalSections) + { + DPRINT1("CSRSRV: FATAL ERROR. CsrThread is Idle while holding %lu critical sections\n", + Teb->CountOfOwnedCriticalSections); + DPRINT1("CSRSRV: Last Receive Message %lx ReplyMessage %lx\n", + &Request, Reply); + DbgBreakPoint(); + } + /* Send the reply and wait for a new request */ Status = NtReplyWaitReceivePort(hApiPort, 0, &Reply->Header, &Request->Header); - /* Client died, continue */ - if (Status == STATUS_INVALID_CID) - { - Reply = NULL; - continue; - } - - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtReplyWaitReceivePort failed: %lx\n", Status); - break; - } + /* Check if we didn't get success */ + if (Status != STATUS_SUCCESS) + { + /* Was it a failure or another success code? */ + if (!NT_SUCCESS(Status)) + { + /* Check for specific status cases */ + if ((Status != STATUS_INVALID_CID) && + (Status != STATUS_UNSUCCESSFUL))// && +// ((Status == STATUS_INVALID_HANDLE) || (ReplyPort == CsrApiPort))) + { + /* Notify the debugger */ + DPRINT1("CSRSS: ReceivePort failed - Status == %X\n", Status); + //DPRINT1("CSRSS: ReplyPortHandle %lx CsrApiPort %lx\n", ReplyPort, CsrApiPort); + } + + /* We failed big time, so start out fresh */ + Reply = NULL; + //ReplyPort = CsrApiPort; + continue; + } + else + { + /* A bizare "success" code, just try again */ + DPRINT1("NtReplyWaitReceivePort returned \"success\" status 0x%x\n", Status); + continue; + } + } + + /* Use whatever Client ID we got */ + Teb->RealClientId = Request->Header.ClientId; + + /* Get the Message Type */ + MessageType = Request->Header.u2.s2.Type; /* If the connection was closed, handle that */ - if (Request->Header.u2.s2.Type == LPC_PORT_CLOSED) + if (MessageType == LPC_PORT_CLOSED) { DPRINT("Port died, oh well\n"); CsrFreeProcessData( Request->Header.ClientId.UniqueProcess ); break; } - if (Request->Header.u2.s2.Type == LPC_CONNECTION_REQUEST) - { - CsrpHandleConnectionRequest((PPORT_MESSAGE)Request, ServerPort); + if (MessageType == LPC_CONNECTION_REQUEST) + { + CsrpHandleConnectionRequest((PPORT_MESSAGE)Request); Reply = NULL; continue; } - if (Request->Header.u2.s2.Type == LPC_CLIENT_DIED) + if (MessageType == LPC_CLIENT_DIED) { DPRINT("Client died, oh well\n"); Reply = NULL; continue; } - if ((Request->Header.u2.s2.Type != LPC_ERROR_EVENT) && - (Request->Header.u2.s2.Type != LPC_REQUEST)) + if ((MessageType != LPC_ERROR_EVENT) && + (MessageType != LPC_REQUEST)) { DPRINT1("CSR: received message %d\n", Request->Header.u2.s2.Type); Reply = NULL; @@ -932,7 +1111,7 @@ if (ProcessData == NULL) { DPRINT1("Message %d: Unable to find data for process 0x%x\n", - Request->Header.u2.s2.Type, + MessageType, Request->Header.ClientId.UniqueProcess); break; } @@ -944,7 +1123,7 @@ } /* Check if we got a hard error */ - if (Request->Header.u2.s2.Type == LPC_ERROR_EVENT) + if (MessageType == LPC_ERROR_EVENT) { /* Call the Handler */ CsrHandleHardError(ProcessData, (PHARDERROR_MSG)Request); @@ -972,7 +1151,9 @@ // NtClose(ServerPort); DPRINT("CSR: %s done\n", __FUNCTION__); - RtlExitUserThread(STATUS_SUCCESS); + /* We're out of the loop for some reason, terminate! */ + NtTerminateThread(NtCurrentThread(), Status); + //return Status; } /*++ Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Thu Feb 16 16:40:15 2012 @@ -175,57 +175,6 @@ CSRSS_DEFINE_API(SET_SHUTDOWN_PARAMETERS, CsrSetShutdownParameters), { 0, 0, NULL } }; - -static NTSTATUS WINAPI -CsrpCreateListenPort (IN LPWSTR Name, - IN OUT PHANDLE Port, - IN PTHREAD_START_ROUTINE ListenThread) -{ - NTSTATUS Status = STATUS_SUCCESS; - OBJECT_ATTRIBUTES PortAttributes; - UNICODE_STRING PortName; - HANDLE ServerThread; - CLIENT_ID ClientId; - - DPRINT("CSR: %s called\n", __FUNCTION__); - - RtlInitUnicodeString (& PortName, Name); - InitializeObjectAttributes (& PortAttributes, - & PortName, - 0, - NULL, - NULL); - Status = NtCreatePort ( Port, - & PortAttributes, - sizeof(SB_CONNECTION_INFO), - sizeof(SB_API_MSG), - 32 * sizeof(SB_API_MSG)); - if(!NT_SUCCESS(Status)) - { - DPRINT1("CSR: %s: NtCreatePort failed (Status=%08lx)\n", - __FUNCTION__, Status); - return Status; - } - Status = RtlCreateUserThread(NtCurrentProcess(), - NULL, - TRUE, - 0, - 0, - 0, - (PTHREAD_START_ROUTINE) ListenThread, - *Port, - &ServerThread, - &ClientId); - - if (ListenThread == (PVOID)ClientConnectionThread) - { - CsrAddStaticServerThread(ServerThread, &ClientId, 0); - } - - NtResumeThread(ServerThread, NULL); - NtClose(ServerThread); - return Status; -} /* === INIT ROUTINES === */ @@ -1150,10 +1099,13 @@ DPRINT1("CSRSRV failed in %s with status %lx\n", "CsrApiRegisterDefinitions", Status); } - Status = CsrpCreateListenPort(L"\\Windows\\ApiPort", &hApiPort, (PTHREAD_START_ROUTINE)ClientConnectionThread); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSRSRV failed in %s with status %lx\n", "CsrpCreateApiPort", Status); + /* Now initialize our API Port */ + Status = CsrApiPortInitialize(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSRSRV:%s: CsrApiPortInitialize failed (Status=%08lx)\n", + __FUNCTION__, Status); + return Status; } Status = CsrpInitWin32Csr(); Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] Thu Feb 16 16:40:15 2012 @@ -235,6 +235,12 @@ extern LIST_ENTRY CsrThreadHashTable[256]; extern PCSR_PROCESS CsrRootProcess; extern RTL_CRITICAL_SECTION ProcessDataLock, CsrWaitListsLock; +extern UNICODE_STRING CsrDirectoryName; +extern ULONG CsrDebug; + +NTSTATUS +NTAPI +CsrApiPortInitialize(VOID); BOOLEAN NTAPI

1 0

[ion] 55637: [CSRSRV]: Move the CsrSv* APIs to session.c where they belong. Also enable most of the code in CsrSbCreateSession now since it works, minus one hack needed since we don't have a real B...
by ion＠svn.reactos.org 16 Feb '12

16 Feb '12

Author: ion Date: Thu Feb 16 16:21:48 2012 New Revision: 55637 URL: http://svn.reactos.org/svn/reactos?rev=55637&view=rev Log: [CSRSRV]: Move the CsrSv* APIs to session.c where they belong. Also enable most of the code in CsrSbCreateSession now since it works, minus one hack needed since we don't have a real BaseSrv yet. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c trunk/reactos/subsystems/win32/csrss/csrsrv/session.c trunk/reactos/subsystems/win32/csrss/include/api.h Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Thu Feb 16 16:21:48 2012 @@ -17,19 +17,8 @@ /* GLOBALS *******************************************************************/ -extern HANDLE hApiPort; - static unsigned ApiDefinitionsCount = 0; static PCSRSS_API_DEFINITION ApiDefinitions = NULL; - -PCHAR CsrServerSbApiName[5] = -{ - "SbCreateSession", - "SbTerminateSession", - "SbForeignSessionComplete", - "SbCreateProcess", - "Unknown Csr Sb Api Number" -}; /* FUNCTIONS *****************************************************************/ @@ -1050,391 +1039,4 @@ RtlFreeHeap(CsrHeap, 0, RemoteCaptureBuffer); } -/* SESSION MANAGER FUNCTIONS**************************************************/ - -/*++ - * @name CsrSbCreateSession - * - * The CsrSbCreateSession API is called by the Session Manager whenever a new - * session is created. - * - * @param ApiMessage - * Pointer to the Session Manager API Message. - * - * @return TRUE in case of success, FALSE othwerwise. - * - * @remarks The CsrSbCreateSession routine will initialize a new CSR NT - * Session and allocate a new CSR Process for the subsystem process. - * - *--*/ -BOOLEAN -NTAPI -CsrSbCreateSession(IN PSB_API_MSG ApiMessage) -{ - PSB_CREATE_SESSION_MSG CreateSession = &ApiMessage->CreateSession; - HANDLE hProcess, hThread; -// PCSR_PROCESS CsrProcess; - NTSTATUS Status; - KERNEL_USER_TIMES KernelTimes; - //PCSR_THREAD CsrThread; - //PVOID ProcessData; - //ULONG i; - - /* Save the Process and Thread Handles */ - hProcess = CreateSession->ProcessInfo.ProcessHandle; - hThread = CreateSession->ProcessInfo.ThreadHandle; - -#if 0 - /* Lock the Processes */ - CsrAcquireProcessLock(); - - /* Allocate a new process */ - CsrProcess = CsrAllocateProcess(); - if (!CsrProcess) - { - /* Fail */ - ApiMessage->ReturnValue = STATUS_NO_MEMORY; - CsrReleaseProcessLock(); - return TRUE; - } -#endif - - /* Set the exception port */ - Status = NtSetInformationProcess(hProcess, - ProcessExceptionPort, - &hApiPort,//&CsrApiPort, - sizeof(HANDLE)); - - /* Check for success */ - if (!NT_SUCCESS(Status)) - { - /* Fail the request */ -#if 0 - CsrDeallocateProcess(CsrProcess); - CsrReleaseProcessLock(); -#endif - /* Strange as it seems, NTSTATUSes are actually returned */ - return (BOOLEAN)STATUS_NO_MEMORY; - } - - /* Get the Create Time */ - Status = NtQueryInformationThread(hThread, - ThreadTimes, - &KernelTimes, - sizeof(KERNEL_USER_TIMES), - NULL); - - /* Check for success */ - if (!NT_SUCCESS(Status)) - { - /* Fail the request */ -#if 0 - CsrDeallocateProcess(CsrProcess); - CsrReleaseProcessLock(); -#endif - - /* Strange as it seems, NTSTATUSes are actually returned */ - return (BOOLEAN)Status; - } - - /* Allocate a new Thread */ -#if 0 - CsrThread = CsrAllocateThread(CsrProcess); - if (!CsrThread) - { - /* Fail the request */ - CsrDeallocateProcess(CsrProcess); - CsrReleaseProcessLock(); - - ApiMessage->ReturnValue = STATUS_NO_MEMORY; - return TRUE; - } - - /* Setup the Thread Object */ - CsrThread->CreateTime = KernelTimes.CreateTime; - CsrThread->ClientId = CreateSession->ProcessInfo.ClientId; - CsrThread->ThreadHandle = hThread; - ProtectHandle(hThread); - CsrThread->Flags = 0; - - /* Insert it into the Process List */ - CsrInsertThread(CsrProcess, CsrThread); - - /* Setup Process Data */ - CsrProcess->ClientId = CreateSession->ProcessInfo.ClientId; - CsrProcess->ProcessHandle = hProcess; - CsrProcess->NtSession = CsrAllocateNtSession(CreateSession->SessionId); - - /* Set the Process Priority */ - CsrSetBackgroundPriority(CsrProcess); - - /* Get the first data location */ - ProcessData = &CsrProcess->ServerData[CSR_SERVER_DLL_MAX]; - - /* Loop every DLL */ - for (i = 0; i < CSR_SERVER_DLL_MAX; i++) - { - /* Check if the DLL is loaded and has Process Data */ - if (CsrLoadedServerDll[i] && CsrLoadedServerDll[i]->SizeOfProcessData) - { - /* Write the pointer to the data */ - CsrProcess->ServerData[i] = ProcessData; - - /* Move to the next data location */ - ProcessData = (PVOID)((ULONG_PTR)ProcessData + - CsrLoadedServerDll[i]->SizeOfProcessData); - } - else - { - /* Nothing for this Process */ - CsrProcess->ServerData[i] = NULL; - } - } - - /* Insert the Process */ - CsrInsertProcess(NULL, NULL, CsrProcess); -#endif - /* Activate the Thread */ - ApiMessage->ReturnValue = NtResumeThread(hThread, NULL); - - /* Release lock and return */ -// CsrReleaseProcessLock(); - return TRUE; -} - -/*++ - * @name CsrSbForeignSessionComplete - * - * The CsrSbForeignSessionComplete API is called by the Session Manager - * whenever a foreign session is completed (ie: terminated). - * - * @param ApiMessage - * Pointer to the Session Manager API Message. - * - * @return TRUE in case of success, FALSE othwerwise. - * - * @remarks The CsrSbForeignSessionComplete API is not yet implemented. - * - *--*/ -BOOLEAN -NTAPI -CsrSbForeignSessionComplete(IN PSB_API_MSG ApiMessage) -{ - /* Deprecated/Unimplemented in NT */ - ApiMessage->ReturnValue = STATUS_NOT_IMPLEMENTED; - return TRUE; -} - -/*++ - * @name CsrSbTerminateSession - * - * The CsrSbTerminateSession API is called by the Session Manager - * whenever a foreign session should be destroyed. - * - * @param ApiMessage - * Pointer to the Session Manager API Message. - * - * @return TRUE in case of success, FALSE othwerwise. - * - * @remarks The CsrSbTerminateSession API is not yet implemented. - * - *--*/ -BOOLEAN -NTAPI -CsrSbTerminateSession(IN PSB_API_MSG ApiMessage) -{ - ApiMessage->ReturnValue = STATUS_NOT_IMPLEMENTED; - return TRUE; -} - -/*++ - * @name CsrSbCreateProcess - * - * The CsrSbCreateProcess API is called by the Session Manager - * whenever a foreign session is created and a new process should be started. - * - * @param ApiMessage - * Pointer to the Session Manager API Message. - * - * @return TRUE in case of success, FALSE othwerwise. - * - * @remarks The CsrSbCreateProcess API is not yet implemented. - * - *--*/ -BOOLEAN -NTAPI -CsrSbCreateProcess(IN PSB_API_MSG ApiMessage) -{ - ApiMessage->ReturnValue = STATUS_NOT_IMPLEMENTED; - return TRUE; -} - -PSB_API_ROUTINE CsrServerSbApiDispatch[5] = -{ - CsrSbCreateSession, - CsrSbTerminateSession, - CsrSbForeignSessionComplete, - CsrSbCreateProcess, - NULL -}; - -/*++ - * @name CsrSbApiHandleConnectionRequest - * - * The CsrSbApiHandleConnectionRequest routine handles and accepts a new - * connection request to the SM API LPC Port. - * - * @param ApiMessage - * Pointer to the incoming CSR API Message which contains the - * connection request. - * - * @return STATUS_SUCCESS in case of success, or status code which caused - * the routine to error. - * - * @remarks None. - * - *--*/ -NTSTATUS -NTAPI -CsrSbApiHandleConnectionRequest(IN PSB_API_MSG Message) -{ - NTSTATUS Status; - REMOTE_PORT_VIEW RemotePortView; - HANDLE hPort; - - /* Set the Port View Structure Length */ - RemotePortView.Length = sizeof(REMOTE_PORT_VIEW); - - /* Accept the connection */ - Status = NtAcceptConnectPort(&hPort, - NULL, - (PPORT_MESSAGE)Message, - TRUE, - NULL, - &RemotePortView); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSRSS: Sb Accept Connection failed %lx\n", Status); - return Status; - } - - /* Complete the Connection */ - Status = NtCompleteConnectPort(hPort); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSRSS: Sb Complete Connection failed %lx\n",Status); - } - - /* Return status */ - return Status; -} - -/*++ - * @name CsrSbApiRequestThread - * - * The CsrSbApiRequestThread routine handles incoming messages or connection - * requests on the SM API LPC Port. - * - * @param Parameter - * System-default user-defined parameter. Unused. - * - * @return The thread exit code, if the thread is terminated. - * - * @remarks Before listening on the port, the routine will first attempt - * to connect to the user subsystem. - * - *--*/ -VOID -NTAPI -CsrSbApiRequestThread(IN PVOID Parameter) -{ - NTSTATUS Status; - SB_API_MSG ReceiveMsg; - PSB_API_MSG ReplyMsg = NULL; - PVOID PortContext; - ULONG MessageType; - - /* Start the loop */ - while (TRUE) - { - /* Wait for a message to come in */ - Status = NtReplyWaitReceivePort(CsrSbApiPort, - &PortContext, - &ReplyMsg->h, - &ReceiveMsg.h); - - /* Check if we didn't get success */ - if (Status != STATUS_SUCCESS) - { - /* If we only got a warning, keep going */ - if (NT_SUCCESS(Status)) continue; - - /* We failed big time, so start out fresh */ - ReplyMsg = NULL; - DPRINT1("CSRSS: ReceivePort failed - Status == %X\n", Status); - continue; - } - - /* Save the message type */ - MessageType = ReceiveMsg.h.u2.s2.Type; - - /* Check if this is a connection request */ - if (MessageType == LPC_CONNECTION_REQUEST) - { - /* Handle connection request */ - CsrSbApiHandleConnectionRequest(&ReceiveMsg); - - /* Start over */ - ReplyMsg = NULL; - continue; - } - - /* Check if the port died */ - if (MessageType == LPC_PORT_CLOSED) - { - /* Close the handle if we have one */ - if (PortContext) NtClose((HANDLE)PortContext); - - /* Client died, start over */ - ReplyMsg = NULL; - continue; - } - else if (MessageType == LPC_CLIENT_DIED) - { - /* Client died, start over */ - ReplyMsg = NULL; - continue; - } - - /* - * It's an API Message, check if it's within limits. If it's not, the - * NT Behaviour is to set this to the Maximum API. - */ - if (ReceiveMsg.ApiNumber > SbpMaxApiNumber) - { - ReceiveMsg.ApiNumber = SbpMaxApiNumber; - DPRINT1("CSRSS: %lx is invalid Sb ApiNumber\n", ReceiveMsg.ApiNumber); - } - - /* Reuse the message */ - ReplyMsg = &ReceiveMsg; - - /* Make sure that the message is supported */ - if (ReceiveMsg.ApiNumber < SbpMaxApiNumber) - { - /* Call the API */ - if (!CsrServerSbApiDispatch[ReceiveMsg.ApiNumber](&ReceiveMsg)) - { - /* It failed, so return nothing */ - ReplyMsg = NULL; - } - } - else - { - /* We don't support this API Number */ - ReplyMsg->ReturnValue = STATUS_NOT_IMPLEMENTED; - } - } -} - /* EOF */ Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/session.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/session.c [iso-8859-1] Thu Feb 16 16:21:48 2012 @@ -18,6 +18,15 @@ RTL_CRITICAL_SECTION CsrNtSessionLock; LIST_ENTRY CsrNtSessionList; +PCHAR CsrServerSbApiName[5] = +{ + "SbCreateSession", + "SbTerminateSession", + "SbForeignSessionComplete", + "SbCreateProcess", + "Unknown Csr Sb Api Number" +}; + /* PRIVATE FUNCTIONS *********************************************************/ /*++ @@ -172,4 +181,388 @@ } } +/* SESSION MANAGER FUNCTIONS**************************************************/ + +/*++ + * @name CsrSbCreateSession + * + * The CsrSbCreateSession API is called by the Session Manager whenever a new + * session is created. + * + * @param ApiMessage + * Pointer to the Session Manager API Message. + * + * @return TRUE in case of success, FALSE othwerwise. + * + * @remarks The CsrSbCreateSession routine will initialize a new CSR NT + * Session and allocate a new CSR Process for the subsystem process. + * + *--*/ +BOOLEAN +NTAPI +CsrSbCreateSession(IN PSB_API_MSG ApiMessage) +{ + PSB_CREATE_SESSION_MSG CreateSession = &ApiMessage->CreateSession; + HANDLE hProcess, hThread; + PCSR_PROCESS CsrProcess; + NTSTATUS Status; + KERNEL_USER_TIMES KernelTimes; + PCSR_THREAD CsrThread; + //PVOID ProcessData; + //ULONG i; + + /* Save the Process and Thread Handles */ + hProcess = CreateSession->ProcessInfo.ProcessHandle; + hThread = CreateSession->ProcessInfo.ThreadHandle; + + /* Lock the Processes */ + CsrAcquireProcessLock(); + + /* Allocate a new process */ + CsrProcess = CsrAllocateProcess(); + if (!CsrProcess) + { + /* Fail */ + ApiMessage->ReturnValue = STATUS_NO_MEMORY; + CsrReleaseProcessLock(); + return TRUE; + } + + /* Set the exception port */ + Status = NtSetInformationProcess(hProcess, + ProcessExceptionPort, + &hApiPort,//&CsrApiPort, + sizeof(HANDLE)); + + /* Check for success */ + if (!NT_SUCCESS(Status)) + { + /* Fail the request */ + CsrDeallocateProcess(CsrProcess); + CsrReleaseProcessLock(); + + /* Strange as it seems, NTSTATUSes are actually returned */ + return (BOOLEAN)STATUS_NO_MEMORY; + } + + /* Get the Create Time */ + Status = NtQueryInformationThread(hThread, + ThreadTimes, + &KernelTimes, + sizeof(KERNEL_USER_TIMES), + NULL); + + /* Check for success */ + if (!NT_SUCCESS(Status)) + { + /* Fail the request */ + CsrDeallocateProcess(CsrProcess); + CsrReleaseProcessLock(); + + /* Strange as it seems, NTSTATUSes are actually returned */ + return (BOOLEAN)Status; + } + + /* Allocate a new Thread */ + CsrThread = CsrAllocateThread(CsrProcess); + if (!CsrThread) + { + /* Fail the request */ + CsrDeallocateProcess(CsrProcess); + CsrReleaseProcessLock(); + + ApiMessage->ReturnValue = STATUS_NO_MEMORY; + return TRUE; + } + + /* Setup the Thread Object */ + CsrThread->CreateTime = KernelTimes.CreateTime; + CsrThread->ClientId = CreateSession->ProcessInfo.ClientId; + CsrThread->ThreadHandle = hThread; + ProtectHandle(hThread); + CsrThread->Flags = 0; + + /* Insert it into the Process List */ + CsrInsertThread(CsrProcess, CsrThread); + + /* Setup Process Data */ + CsrProcess->ClientId = CreateSession->ProcessInfo.ClientId; + CsrProcess->ProcessHandle = hProcess; + CsrProcess->NtSession = CsrAllocateNtSession(CreateSession->SessionId); + + /* Set the Process Priority */ + CsrSetBackgroundPriority(CsrProcess); +#if 0 + /* Get the first data location */ + ProcessData = &CsrProcess->ServerData[CSR_SERVER_DLL_MAX]; + + /* Loop every DLL */ + for (i = 0; i < CSR_SERVER_DLL_MAX; i++) + { + /* Check if the DLL is loaded and has Process Data */ + if (CsrLoadedServerDll[i] && CsrLoadedServerDll[i]->SizeOfProcessData) + { + /* Write the pointer to the data */ + CsrProcess->ServerData[i] = ProcessData; + + /* Move to the next data location */ + ProcessData = (PVOID)((ULONG_PTR)ProcessData + + CsrLoadedServerDll[i]->SizeOfProcessData); + } + else + { + /* Nothing for this Process */ + CsrProcess->ServerData[i] = NULL; + } + } +#else + /* HACKZ: should go in BaseSrv part of CreateCallback done in Insert below */ + RtlInitializeCriticalSection(&CsrProcess->HandleTableLock); +#endif + /* Insert the Process */ + CsrInsertProcess(NULL, NULL, CsrProcess); + + /* Activate the Thread */ + ApiMessage->ReturnValue = NtResumeThread(hThread, NULL); + + /* Release lock and return */ + CsrReleaseProcessLock(); + return TRUE; +} + +/*++ + * @name CsrSbForeignSessionComplete + * + * The CsrSbForeignSessionComplete API is called by the Session Manager + * whenever a foreign session is completed (ie: terminated). + * + * @param ApiMessage + * Pointer to the Session Manager API Message. + * + * @return TRUE in case of success, FALSE othwerwise. + * + * @remarks The CsrSbForeignSessionComplete API is not yet implemented. + * + *--*/ +BOOLEAN +NTAPI +CsrSbForeignSessionComplete(IN PSB_API_MSG ApiMessage) +{ + /* Deprecated/Unimplemented in NT */ + ApiMessage->ReturnValue = STATUS_NOT_IMPLEMENTED; + return TRUE; +} + +/*++ + * @name CsrSbTerminateSession + * + * The CsrSbTerminateSession API is called by the Session Manager + * whenever a foreign session should be destroyed. + * + * @param ApiMessage + * Pointer to the Session Manager API Message. + * + * @return TRUE in case of success, FALSE othwerwise. + * + * @remarks The CsrSbTerminateSession API is not yet implemented. + * + *--*/ +BOOLEAN +NTAPI +CsrSbTerminateSession(IN PSB_API_MSG ApiMessage) +{ + ApiMessage->ReturnValue = STATUS_NOT_IMPLEMENTED; + return TRUE; +} + +/*++ + * @name CsrSbCreateProcess + * + * The CsrSbCreateProcess API is called by the Session Manager + * whenever a foreign session is created and a new process should be started. + * + * @param ApiMessage + * Pointer to the Session Manager API Message. + * + * @return TRUE in case of success, FALSE othwerwise. + * + * @remarks The CsrSbCreateProcess API is not yet implemented. + * + *--*/ +BOOLEAN +NTAPI +CsrSbCreateProcess(IN PSB_API_MSG ApiMessage) +{ + ApiMessage->ReturnValue = STATUS_NOT_IMPLEMENTED; + return TRUE; +} + +PSB_API_ROUTINE CsrServerSbApiDispatch[5] = +{ + CsrSbCreateSession, + CsrSbTerminateSession, + CsrSbForeignSessionComplete, + CsrSbCreateProcess, + NULL +}; + +/*++ + * @name CsrSbApiHandleConnectionRequest + * + * The CsrSbApiHandleConnectionRequest routine handles and accepts a new + * connection request to the SM API LPC Port. + * + * @param ApiMessage + * Pointer to the incoming CSR API Message which contains the + * connection request. + * + * @return STATUS_SUCCESS in case of success, or status code which caused + * the routine to error. + * + * @remarks None. + * + *--*/ +NTSTATUS +NTAPI +CsrSbApiHandleConnectionRequest(IN PSB_API_MSG Message) +{ + NTSTATUS Status; + REMOTE_PORT_VIEW RemotePortView; + HANDLE hPort; + + /* Set the Port View Structure Length */ + RemotePortView.Length = sizeof(REMOTE_PORT_VIEW); + + /* Accept the connection */ + Status = NtAcceptConnectPort(&hPort, + NULL, + (PPORT_MESSAGE)Message, + TRUE, + NULL, + &RemotePortView); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSRSS: Sb Accept Connection failed %lx\n", Status); + return Status; + } + + /* Complete the Connection */ + Status = NtCompleteConnectPort(hPort); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSRSS: Sb Complete Connection failed %lx\n",Status); + } + + /* Return status */ + return Status; +} + +/*++ + * @name CsrSbApiRequestThread + * + * The CsrSbApiRequestThread routine handles incoming messages or connection + * requests on the SM API LPC Port. + * + * @param Parameter + * System-default user-defined parameter. Unused. + * + * @return The thread exit code, if the thread is terminated. + * + * @remarks Before listening on the port, the routine will first attempt + * to connect to the user subsystem. + * + *--*/ +VOID +NTAPI +CsrSbApiRequestThread(IN PVOID Parameter) +{ + NTSTATUS Status; + SB_API_MSG ReceiveMsg; + PSB_API_MSG ReplyMsg = NULL; + PVOID PortContext; + ULONG MessageType; + + /* Start the loop */ + while (TRUE) + { + /* Wait for a message to come in */ + Status = NtReplyWaitReceivePort(CsrSbApiPort, + &PortContext, + &ReplyMsg->h, + &ReceiveMsg.h); + + /* Check if we didn't get success */ + if (Status != STATUS_SUCCESS) + { + /* If we only got a warning, keep going */ + if (NT_SUCCESS(Status)) continue; + + /* We failed big time, so start out fresh */ + ReplyMsg = NULL; + DPRINT1("CSRSS: ReceivePort failed - Status == %X\n", Status); + continue; + } + + /* Save the message type */ + MessageType = ReceiveMsg.h.u2.s2.Type; + + /* Check if this is a connection request */ + if (MessageType == LPC_CONNECTION_REQUEST) + { + /* Handle connection request */ + CsrSbApiHandleConnectionRequest(&ReceiveMsg); + + /* Start over */ + ReplyMsg = NULL; + continue; + } + + /* Check if the port died */ + if (MessageType == LPC_PORT_CLOSED) + { + /* Close the handle if we have one */ + if (PortContext) NtClose((HANDLE)PortContext); + + /* Client died, start over */ + ReplyMsg = NULL; + continue; + } + else if (MessageType == LPC_CLIENT_DIED) + { + /* Client died, start over */ + ReplyMsg = NULL; + continue; + } + + /* + * It's an API Message, check if it's within limits. If it's not, the + * NT Behaviour is to set this to the Maximum API. + */ + if (ReceiveMsg.ApiNumber > SbpMaxApiNumber) + { + ReceiveMsg.ApiNumber = SbpMaxApiNumber; + DPRINT1("CSRSS: %lx is invalid Sb ApiNumber\n", ReceiveMsg.ApiNumber); + } + + /* Reuse the message */ + ReplyMsg = &ReceiveMsg; + + /* Make sure that the message is supported */ + if (ReceiveMsg.ApiNumber < SbpMaxApiNumber) + { + /* Call the API */ + if (!CsrServerSbApiDispatch[ReceiveMsg.ApiNumber](&ReceiveMsg)) + { + /* It failed, so return nothing */ + ReplyMsg = NULL; + } + } + else + { + /* We don't support this API Number */ + ReplyMsg->ReturnValue = STATUS_NOT_IMPLEMENTED; + } + } +} + /* EOF */ Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] Thu Feb 16 16:21:48 2012 @@ -91,7 +91,7 @@ LIST_ENTRY ListLink; LIST_ENTRY ThreadList; struct _CSR_PROCESS *Parent; -// PCSR_NT_SESSION NtSession; + PCSR_NT_SESSION NtSession; ULONG ExpectedVersion; HANDLE ClientPort; ULONG_PTR ClientViewBase; @@ -229,6 +229,7 @@ NTAPI CsrReleaseCapturedArguments(IN PCSR_API_MESSAGE ApiMessage); +extern HANDLE hApiPort; extern HANDLE CsrSmApiPort; extern HANDLE CsrSbApiPort; extern LIST_ENTRY CsrThreadHashTable[256];

1 0

[tkreuzer] 55636: [WIN32K] - Modify NtGdiSelectBitmap to correctly handle the case of pdc->dclevel.pSurface == 0 - Small code improvement without functional change for rtlstr functions
by tkreuzer＠svn.reactos.org 16 Feb '12

16 Feb '12

Author: tkreuzer Date: Thu Feb 16 16:05:25 2012 New Revision: 55636 URL: http://svn.reactos.org/svn/reactos?rev=55636&view=rev Log: [WIN32K] - Modify NtGdiSelectBitmap to correctly handle the case of pdc->dclevel.pSurface == 0 - Small code improvement without functional change for rtlstr functions Modified: trunk/reactos/subsystems/win32/win32k/misc/rtlstr.c trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c Modified: trunk/reactos/subsystems/win32/win32k/misc/rtlstr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/rtlstr.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/misc/rtlstr.c [iso-8859-1] Thu Feb 16 16:05:25 2012 @@ -3,7 +3,6 @@ * FILE: subsystems/win32/win32k/misc/rtlstr.c * PURPOSE: Large Strings * PROGRAMMER: - * UPDATE HISTORY: * */ @@ -12,11 +11,13 @@ #include <win32k.h> /* FUNCTIONS *****************************************************************/ + VOID NTAPI -RtlInitLargeAnsiString(IN OUT PLARGE_ANSI_STRING DestinationString, - IN PCSZ SourceString, - IN INT Unknown) +RtlInitLargeAnsiString( + IN OUT PLARGE_ANSI_STRING DestinationString, + IN PCSZ SourceString, + IN INT Unknown) { ULONG DestSize; @@ -38,9 +39,10 @@ VOID NTAPI -RtlInitLargeUnicodeString(IN OUT PLARGE_UNICODE_STRING DestinationString, - IN PCWSTR SourceString, - IN INT Unknown) +RtlInitLargeUnicodeString( + IN OUT PLARGE_UNICODE_STRING DestinationString, + IN PCWSTR SourceString, + IN INT Unknown) { ULONG DestSize; @@ -62,21 +64,29 @@ BOOL NTAPI -RtlLargeStringToUnicodeString( PUNICODE_STRING DestinationString, - PLARGE_STRING SourceString) +RtlLargeStringToUnicodeString( + PUNICODE_STRING DestinationString, + PLARGE_STRING SourceString) { - ANSI_STRING AnsiString; + ANSI_STRING AnsiString; - RtlInitUnicodeString(DestinationString, NULL); - if (DestinationString && SourceString && SourceString->bAnsi) - { - RtlInitAnsiString(&AnsiString, (LPSTR)SourceString->Buffer); - return NT_SUCCESS(RtlAnsiStringToUnicodeString(DestinationString, &AnsiString, TRUE)); - } - else if (DestinationString && SourceString) - { - return RtlCreateUnicodeString(DestinationString, SourceString->Buffer); - } - else - return FALSE; + /* Check parameters */ + if (!DestinationString || !SourceString) return FALSE; + + /* Check if size if ok */ + // We can't do this atm and truncate the string instead. + //if (SourceString->Length > 0xffff) return FALSE; + + RtlInitUnicodeString(DestinationString, NULL); + + if (SourceString->bAnsi) + { + RtlInitAnsiString(&AnsiString, (LPSTR)SourceString->Buffer); + return NT_SUCCESS(RtlAnsiStringToUnicodeString(DestinationString, &AnsiString, TRUE)); + } + else + { + return RtlCreateUnicodeString(DestinationString, SourceString->Buffer); + } } + Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] Thu Feb 16 16:05:25 2012 @@ -263,7 +263,7 @@ PDC pdc; PDC_ATTR pdcattr; HBITMAP hbmpOld; - PSURFACE psurfNew; + PSURFACE psurfNew, psurfOld; HRGN hVisRgn; SIZEL sizlBitmap = {1, 1}; HDC hdcOld; @@ -287,17 +287,8 @@ return NULL; } - /* Check if there was a bitmap selected before */ - if (pdc->dclevel.pSurface) - { - /* Return its handle */ - hbmpOld = pdc->dclevel.pSurface->BaseObject.hHmgr; - } - else - { - /* Return default bitmap */ - hbmpOld = StockObjects[DEFAULT_BITMAP]; - } + /* Save the old bitmap */ + psurfOld = pdc->dclevel.pSurface; /* Check if the default bitmap was passed */ if (hbmp == StockObjects[DEFAULT_BITMAP]) @@ -342,14 +333,26 @@ } } - /* Select the new surface, release the old */ - DC_vSelectSurface(pdc, psurfNew); - - /* Set the new size */ - pdc->dclevel.sizl = sizlBitmap; - - /* Release one reference we added */ - SURFACE_ShareUnlockSurface(psurfNew); + /* Select the new bitmap */ + pdc->dclevel.pSurface = psurfNew; + + /* Check if there was a bitmap selected before */ + if (psurfOld) + { + /* Get the old bitmap's handle */ + hbmpOld = psurfOld->BaseObject.hHmgr; + + /* Reset hdc of the old bitmap,it isn't selected anymore */ + psurfOld->hdc = NULL; + + /* Dereference the old bitmap */ + SURFACE_ShareUnlockSurface(psurfOld); + } + else + { + /* Return default bitmap */ + hbmpOld = StockObjects[DEFAULT_BITMAP]; + } /* Mark the dc brushes invalid */ pdcattr->ulDirty_ |= DIRTY_FILL | DIRTY_LINE;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs