Ros-diffs March 2011

ros-diffs@reactos.org

21 participants
276 discussions

[gadamopoulos] 51116: [win32k] - Simplify BuildWindowStationNameList a bit

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Mar 22 09:59:36 2011 New Revision: 51116 URL: http://svn.reactos.org/svn/reactos?rev=51116&view=rev Log: [win32k] - Simplify BuildWindowStationNameList a bit Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Tue Mar 22 09:59:36 2011 @@ -1110,20 +1110,12 @@ OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status; HANDLE DirectoryHandle; - UNICODE_STRING DirectoryName; + UNICODE_STRING DirectoryName = RTL_CONSTANT_STRING(WINSTA_ROOT_NAME); char InitialBuffer[256], *Buffer; ULONG Context, ReturnLength, BufferSize; DWORD EntryCount; POBJECT_DIRECTORY_INFORMATION DirEntry; WCHAR NullWchar; - - /* - * Generate name of window station directory - */ - if (!IntGetFullWindowStationName(&DirectoryName, NULL, NULL)) - { - return STATUS_INSUFFICIENT_RESOURCES; - } /* * Try to open the directory. @@ -1139,8 +1131,6 @@ &DirectoryHandle, DIRECTORY_QUERY, &ObjectAttributes); - - ExFreePool(DirectoryName.Buffer); if (!NT_SUCCESS(Status)) {

13 years, 7 months

[gadamopoulos] 51115: [ntoskrnl] - Implement calling OkayToCloseProcedure callouts to win32k for desktop and window station objects - Fix a bug that caused ObpCloseHandle to return success even whe...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Mar 22 09:19:26 2011 New Revision: 51115 URL: http://svn.reactos.org/svn/reactos?rev=51115&view=rev Log: [ntoskrnl] - Implement calling OkayToCloseProcedure callouts to win32k for desktop and window station objects - Fix a bug that caused ObpCloseHandle to return success even when OkayToCloseProcedure failed [win32k] - Rewrite SetProcessWindowStation to actually set the current window station and close the previous one - Implement OkayToCloseProcedure callouts from the kernel to prevent closing the current desktop or window station Modified: trunk/reactos/ntoskrnl/ex/win32k.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ps/win32.c trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/include/winsta.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/ntoskrnl/ex/win32k.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/win32k.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] Tue Mar 22 09:19:26 2011 @@ -37,9 +37,45 @@ PKWIN32_PARSEMETHOD_CALLOUT ExpWindowStationObjectParse = NULL; PKWIN32_DELETEMETHOD_CALLOUT ExpWindowStationObjectDelete = NULL; +PKWIN32_OKTOCLOSEMETHOD_CALLOUT ExpWindowStationObjectOkToClose = NULL; +PKWIN32_OKTOCLOSEMETHOD_CALLOUT ExpDesktopObjectOkToClose = NULL; PKWIN32_DELETEMETHOD_CALLOUT ExpDesktopObjectDelete = NULL; /* FUNCTIONS ****************************************************************/ + +NTSTATUS +NTAPI +ExpDesktopOkToClose( IN PEPROCESS Process OPTIONAL, + IN PVOID Object, + IN HANDLE Handle, + IN KPROCESSOR_MODE AccessMode) +{ + WIN32_OKAYTOCLOSEMETHOD_PARAMETERS Parameters; + + Parameters.Process = Process; + Parameters.Object = Object; + Parameters.Handle = Handle; + Parameters.PreviousMode = AccessMode; + + return ExpDesktopObjectOkToClose(&Parameters); +} + +NTSTATUS +NTAPI +ExpWindowStationOkToClose( IN PEPROCESS Process OPTIONAL, + IN PVOID Object, + IN HANDLE Handle, + IN KPROCESSOR_MODE AccessMode) +{ + WIN32_OKAYTOCLOSEMETHOD_PARAMETERS Parameters; + + Parameters.Process = Process; + Parameters.Object = Object; + Parameters.Handle = Handle; + Parameters.PreviousMode = AccessMode; + + return ExpWindowStationObjectOkToClose(&Parameters); +} VOID NTAPI @@ -114,6 +150,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.DeleteProcedure = ExpWinStaObjectDelete; ObjectTypeInitializer.ParseProcedure = ExpWinStaObjectParse; + ObjectTypeInitializer.OkayToCloseProcedure = ExpWindowStationOkToClose; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, @@ -124,6 +161,7 @@ ObjectTypeInitializer.GenericMapping = ExpDesktopMapping; ObjectTypeInitializer.DeleteProcedure = ExpDesktopDelete; ObjectTypeInitializer.ParseProcedure = NULL; + ObjectTypeInitializer.OkayToCloseProcedure = ExpDesktopOkToClose; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] Tue Mar 22 09:19:26 2011 @@ -1752,7 +1752,6 @@ /* Detach and return success */ if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); - Status = STATUS_SUCCESS; } else { Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=51… ============================================================================== --- trunk/reactos/ntoskrnl/ps/win32.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/win32.c [iso-8859-1] Tue Mar 22 09:19:26 2011 @@ -20,6 +20,8 @@ PGDI_BATCHFLUSH_ROUTINE KeGdiFlushUserBatch = NULL; extern PKWIN32_PARSEMETHOD_CALLOUT ExpWindowStationObjectParse; extern PKWIN32_DELETEMETHOD_CALLOUT ExpWindowStationObjectDelete; +extern PKWIN32_OKTOCLOSEMETHOD_CALLOUT ExpWindowStationObjectOkToClose; +extern PKWIN32_OKTOCLOSEMETHOD_CALLOUT ExpDesktopObjectOkToClose; extern PKWIN32_DELETEMETHOD_CALLOUT ExpDesktopObjectDelete; extern PKWIN32_POWEREVENT_CALLOUT PopEventCallout; @@ -116,6 +118,8 @@ PspW32ThreadCallout = CalloutData->ThreadCallout; ExpWindowStationObjectParse = CalloutData->WindowStationParseProcedure; ExpWindowStationObjectDelete = CalloutData->WindowStationDeleteProcedure; + ExpWindowStationObjectOkToClose = CalloutData->WindowStationOkToCloseProcedure; + ExpDesktopObjectOkToClose = CalloutData->DesktopOkToCloseProcedure; ExpDesktopObjectDelete = CalloutData->DesktopDeleteProcedure; PopEventCallout = CalloutData->PowerEventCallout; KeGdiFlushUserBatch = CalloutData->BatchFlushRoutine; Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] Tue Mar 22 09:19:26 2011 @@ -69,6 +69,9 @@ VOID APIENTRY IntDesktopObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters); +NTSTATUS NTAPI +IntDesktopOkToClose(PWIN32_OKAYTOCLOSEMETHOD_PARAMETERS Parameters); + LRESULT CALLBACK IntDesktopWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Tue Mar 22 09:19:26 2011 @@ -166,6 +166,7 @@ PCLS pclsPrivateList; PCLS pclsPublicList; INT cThreads; + HDESK hdeskStartup; DWORD dwhmodLibLoadedMask; HANDLE ahmodLibLoaded[CLIBS]; struct _WINSTATION_OBJECT *prpwinsta; Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] Tue Mar 22 09:19:26 2011 @@ -82,6 +82,9 @@ APIENTRY IntWinStaObjectParse(PWIN32_PARSEMETHOD_PARAMETERS Parameters); +NTSTATUS NTAPI +IntWinstaOkToClose(PWIN32_OKAYTOCLOSEMETHOD_PARAMETERS Parameters); + NTSTATUS FASTCALL IntValidateWindowStationHandle( HWINSTA WindowStation, @@ -106,4 +109,7 @@ PWINSTATION_OBJECT FASTCALL IntGetWinStaObj(VOID); +BOOL FASTCALL +UserSetProcessWindowStation(HWINSTA hWindowStation); + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Tue Mar 22 09:19:26 2011 @@ -119,6 +119,7 @@ { DPRINT("Destroying W32 process PID:%d at IRQ level: %lu\n", Process->UniqueProcessId, KeGetCurrentIrql()); Win32Process->W32PF_flags |= W32PF_TERMINATED; + if (Win32Process->InputIdleEvent) { EngFreeMem((PVOID)Win32Process->InputIdleEvent); @@ -144,6 +145,9 @@ { LogonProcess = NULL; } + + UserSetProcessWindowStation(NULL); + } RETURN( STATUS_SUCCESS); @@ -220,25 +224,14 @@ { if(hWinSta != NULL) { - if(Process != CsrProcess) + if(!UserSetProcessWindowStation(hWinSta)) { - HWINSTA hProcessWinSta = (HWINSTA)InterlockedCompareExchangePointer((PVOID)&Process->Win32WindowStation, (PVOID)hWinSta, NULL); - if(hProcessWinSta != NULL) - { - /* our process is already assigned to a different window station, we don't need the handle anymore */ - NtClose(hWinSta); - } - } - else - { - NtClose(hWinSta); + DPRINT1("Failed to set process window station\n"); } } if (hDesk != NULL) { - Win32Thread->rpdesk = NULL; - Win32Thread->hdesk = NULL; if (!IntSetThreadDesktop(hDesk, FALSE)) { DPRINT1("Unable to set thread desktop\n"); @@ -441,6 +434,8 @@ CalloutData.ProcessCallout = Win32kProcessCallback; CalloutData.ThreadCallout = Win32kThreadCallback; CalloutData.BatchFlushRoutine = NtGdiFlushUserBatch; + CalloutData.DesktopOkToCloseProcedure = IntDesktopOkToClose; + CalloutData.WindowStationOkToCloseProcedure = IntWinstaOkToClose; /* Register our per-process and per-thread structures. */ PsEstablishWin32Callouts((PWIN32_CALLOUTS_FPNS)&CalloutData); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Tue Mar 22 09:19:26 2011 @@ -166,6 +166,29 @@ RemoveEntryList(&Desktop->ListEntry); IntFreeDesktopHeap(Desktop); +} + +NTSTATUS NTAPI +IntDesktopOkToClose(PWIN32_OKAYTOCLOSEMETHOD_PARAMETERS Parameters) +{ + PTHREADINFO pti; + + pti = PsGetCurrentThreadWin32Thread(); + + if( pti == NULL) + { + /* This happens when we leak desktop handles */ + return TRUE; + } + + /* Do not allow the current desktop or the initial desktop to be closed */ + if( Parameters->Handle == pti->ppi->hdeskStartup || + Parameters->Handle == pti->hdesk) + { + return FALSE; + } + + return TRUE; } /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Tue Mar 22 09:19:26 2011 @@ -187,6 +187,21 @@ return STATUS_OBJECT_TYPE_MISMATCH; } +NTSTATUS NTAPI +IntWinstaOkToClose(PWIN32_OKAYTOCLOSEMETHOD_PARAMETERS Parameters) +{ + PPROCESSINFO ppi; + + ppi = PsGetCurrentProcessWin32Process(); + + if(Parameters->Handle == ppi->hwinsta) + { + return FALSE; + } + + return TRUE; +} + /* PRIVATE FUNCTIONS **********************************************************/ /* @@ -915,6 +930,57 @@ return WinStaObj; } +BOOL FASTCALL +UserSetProcessWindowStation(HWINSTA hWindowStation) +{ + PPROCESSINFO ppi; + NTSTATUS Status; + HWINSTA hwinstaOld; + PWINSTATION_OBJECT NewWinSta = NULL, OldWinSta; + + ppi = PsGetCurrentProcessWin32Process(); + + if(hWindowStation !=NULL) + { + Status = IntValidateWindowStationHandle( hWindowStation, + KernelMode, + 0, + &NewWinSta); + if (!NT_SUCCESS(Status)) + { + DPRINT("Validation of window station handle (0x%X) failed\n", + hWindowStation); + SetLastNtError(Status); + return FALSE; + } + } + + OldWinSta = ppi->prpwinsta; + hwinstaOld = ppi->hwinsta; + + /* + * FIXME - don't allow changing the window station if there are threads that are attached to desktops and own gui objects + */ + + InterlockedExchangePointer(&PsGetCurrentProcess()->Win32WindowStation, hWindowStation); + + ppi->prpwinsta = NewWinSta; + ppi->hwinsta = hWindowStation; + + + if(OldWinSta != NULL) + { + ObDereferenceObject(OldWinSta); + } + + if(hwinstaOld != NULL) + { + ZwClose(hwinstaOld); + } + + return TRUE; +} + /* * NtUserSetProcessWindowStation * @@ -934,44 +1000,15 @@ BOOL APIENTRY NtUserSetProcessWindowStation(HWINSTA hWindowStation) { - PWINSTATION_OBJECT NewWinSta; - NTSTATUS Status; - - DPRINT("About to set process window station with handle (0x%X)\n", - hWindowStation); - - if(PsGetCurrentProcess() == CsrProcess) - { - DPRINT1("CSRSS is not allowed to change it's window station!!!\n"); - EngSetLastError(ERROR_ACCESS_DENIED); - return FALSE; - } - - Status = IntValidateWindowStationHandle( - hWindowStation, - KernelMode, - 0, - &NewWinSta); - - if (!NT_SUCCESS(Status)) - { - DPRINT("Validation of window station handle (0x%X) failed\n", - hWindowStation); - SetLastNtError(Status); - return FALSE; - } - - /* - * FIXME - don't allow changing the window station if there are threads that are attached to desktops and own gui objects - */ - - /* FIXME - dereference the old window station, etc... */ - InterlockedExchangePointer(&PsGetCurrentProcess()->Win32WindowStation, hWindowStation); - - DPRINT("PsGetCurrentProcess()->Win32WindowStation 0x%X\n", - PsGetCurrentProcess()->Win32WindowStation); - - return TRUE; + BOOL ret; + + UserEnterExclusive(); + + ret = UserSetProcessWindowStation(hWindowStation); + + UserLeave(); + + return ret; } /*

13 years, 7 months

[pschweitzer] 51114: [NTDLL] Fixed build

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Mar 22 06:53:56 2011 New Revision: 51114 URL: http://svn.reactos.org/svn/reactos?rev=51114&view=rev Log: [NTDLL] Fixed build Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Tue Mar 22 06:53:56 2011 @@ -16,6 +16,7 @@ /* GLOBALS *******************************************************************/ PLDR_DATA_TABLE_ENTRY LdrpLoadedDllHandleCache; +LIST_ENTRY LdrpHashTable[LDR_HASH_TABLE_ENTRIES]; #define LDR_GET_HASH_ENTRY(x) (RtlUpcaseUnicodeChar((x)) & (LDR_HASH_TABLE_ENTRIES - 1))

13 years, 7 months

[fireball] 51113: [NTDLL/LDR] - Implement misc utility functions needed for monstrous LdrpInitializeProcess(). Currently unused.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Mar 21 22:58:47 2011 New Revision: 51113 URL: http://svn.reactos.org/svn/reactos?rev=51113&view=rev Log: [NTDLL/LDR] - Implement misc utility functions needed for monstrous LdrpInitializeProcess(). Currently unused. Modified: trunk/reactos/dll/ntdll/include/ntdllp.h trunk/reactos/dll/ntdll/ldr/ldrutils.c Modified: trunk/reactos/dll/ntdll/include/ntdllp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdllp.h… ============================================================================== --- trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] Mon Mar 21 22:58:47 2011 @@ -8,7 +8,7 @@ /* INCLUDES ******************************************************************/ -extern BOOLEAN ShowSnaps; +#define LDR_HASH_TABLE_ENTRIES 32 typedef struct _LDRP_TLS_DATA { @@ -24,6 +24,8 @@ /* Global data */ extern RTL_CRITICAL_SECTION LdrpLoaderLock; extern BOOLEAN LdrpInLdrInit; +extern LIST_ENTRY LdrpHashTable[LDR_HASH_TABLE_ENTRIES]; +extern BOOLEAN ShowSnaps; /* ldrinit.c */ NTSTATUS NTAPI LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL); @@ -34,6 +36,7 @@ VOID NTAPI LdrpTlsCallback(PVOID BaseAddress, ULONG Reason); BOOLEAN NTAPI LdrpCallDllEntry(PDLLMAIN_FUNC EntryPoint, PVOID BaseAddress, ULONG Reason, PVOID Context); NTSTATUS NTAPI LdrpInitializeProcess(PCONTEXT Context, PVOID SystemArgument1); +VOID NTAPI LdrpInitFailure(NTSTATUS Status); /* ldrpe.c */ @@ -48,6 +51,11 @@ IN BOOLEAN Static, IN LPSTR DllName); +NTSTATUS NTAPI +LdrpWalkImportDescriptor(IN LPWSTR DllPath OPTIONAL, + IN PLDR_DATA_TABLE_ENTRY LdrEntry); + + /* ldrutils.c */ NTSTATUS NTAPI LdrpGetProcedureAddress(IN PVOID BaseAddress, @@ -55,6 +63,13 @@ IN ULONG Ordinal, OUT PVOID *ProcedureAddress, IN BOOLEAN ExecuteInit); + +PLDR_DATA_TABLE_ENTRY NTAPI +LdrpAllocateDataTableEntry(IN PVOID BaseAddress); + +VOID NTAPI +LdrpInsertMemoryTableEntry(IN PLDR_DATA_TABLE_ENTRY LdrEntry); + NTSTATUS NTAPI LdrpLoadDll(IN BOOLEAN Redirected, IN PWSTR DllPath OPTIONAL, @@ -65,6 +80,26 @@ ULONG NTAPI LdrpClearLoadInProgress(); + +BOOLEAN NTAPI +LdrpCheckForLoadedDll(IN PWSTR DllPath, + IN PUNICODE_STRING DllName, + IN BOOLEAN Flag, + IN BOOLEAN RedirectedDll, + OUT PLDR_DATA_TABLE_ENTRY *LdrEntry); + +NTSTATUS NTAPI +LdrpMapDll(IN PWSTR SearchPath OPTIONAL, + IN PWSTR DllPath2, + IN PWSTR DllName OPTIONAL, + IN PULONG DllCharacteristics, + IN BOOLEAN Static, + IN BOOLEAN Redirect, + OUT PLDR_DATA_TABLE_ENTRY *DataTableEntry); + +PVOID NTAPI +LdrpFetchAddressOfEntryPoint(PVOID ImageBase); + /* FIXME: Cleanup this mess */ typedef NTSTATUS (NTAPI *PEPFUNC)(PPEB); Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Mon Mar 21 22:58:47 2011 @@ -17,6 +17,8 @@ PLDR_DATA_TABLE_ENTRY LdrpLoadedDllHandleCache; +#define LDR_GET_HASH_ENTRY(x) (RtlUpcaseUnicodeChar((x)) & (LDR_HASH_TABLE_ENTRIES - 1)) + /* FUNCTIONS *****************************************************************/ BOOLEAN @@ -80,6 +82,85 @@ /* Do nothing */ } _SEH2_END; +} + +PVOID +NTAPI +LdrpFetchAddressOfEntryPoint(PVOID ImageBase) +{ + PIMAGE_NT_HEADERS NtHeaders; + ULONG_PTR EntryPoint; + + /* Get entry point offset from NT headers */ + NtHeaders = RtlImageNtHeader(ImageBase); + EntryPoint = NtHeaders->OptionalHeader.AddressOfEntryPoint; + + /* If it's 0 - return so */ + if (!EntryPoint) return NULL; + + /* Add image base */ + EntryPoint += (ULONG_PTR)ImageBase; + + /* Return calculated pointer */ + return (PVOID)EntryPoint; +} + +NTSTATUS +NTAPI +LdrpMapDll(IN PWSTR SearchPath OPTIONAL, + IN PWSTR DllPath2, + IN PWSTR DllName OPTIONAL, + IN PULONG DllCharacteristics, + IN BOOLEAN Static, + IN BOOLEAN Redirect, + OUT PLDR_DATA_TABLE_ENTRY *DataTableEntry) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + +PLDR_DATA_TABLE_ENTRY +NTAPI +LdrpAllocateDataTableEntry(IN PVOID BaseAddress) +{ + PLDR_DATA_TABLE_ENTRY LdrEntry = NULL; + PIMAGE_NT_HEADERS NtHeader = RtlImageNtHeader(BaseAddress); + + /* Make sure the header is valid */ + if (NtHeader) + { + /* Allocate an entry */ + LdrEntry = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(LDR_DATA_TABLE_ENTRY)); + + /* Make sure we got one */ + if (LdrEntry) + { + /* Set it up */ + LdrEntry->DllBase = BaseAddress; + LdrEntry->SizeOfImage = NtHeader->OptionalHeader.SizeOfImage; + LdrEntry->TimeDateStamp = NtHeader->FileHeader.TimeDateStamp; + } + } + + /* Return the entry */ + return LdrEntry; +} + +VOID +NTAPI +LdrpInsertMemoryTableEntry(IN PLDR_DATA_TABLE_ENTRY LdrEntry) +{ + PPEB_LDR_DATA PebData = NtCurrentPeb()->Ldr; + ULONG i; + + /* Get the Hash entry */ + i = LDR_GET_HASH_ENTRY(LdrEntry->BaseDllName.Buffer[0]); + + InsertTailList(&LdrpHashTable[i], &LdrEntry->HashLinks); + InsertTailList(&PebData->InLoadOrderModuleList, &LdrEntry->InLoadOrderLinks); + InsertTailList(&PebData->InMemoryOrderModuleList, &LdrEntry->InMemoryOrderModuleList); } BOOLEAN

13 years, 7 months

[rharabien] 51112: Fix for r51111. Fixes build...

by rharabien＠svn.reactos.org

Author: rharabien Date: Mon Mar 21 18:30:17 2011 New Revision: 51112 URL: http://svn.reactos.org/svn/reactos?rev=51112&view=rev Log: Fix for r51111. Fixes build... Modified: trunk/reactos/dll/win32/gdi32/objects/text.c Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] Mon Mar 21 18:30:17 2011 @@ -1,5 +1,7 @@ #include "precomp.h" +#define NDEBUG +#include <debug.h> /* * @implemented

13 years, 7 months

[rharabien] 51111: [GDI32] GetTextExtentExPointW doesn't fail if nMaxExtent is negative (only ANSI version does) Fixes gdi32:GetTextExtentExPoint apitest

by rharabien＠svn.reactos.org

Author: rharabien Date: Mon Mar 21 17:58:08 2011 New Revision: 51111 URL: http://svn.reactos.org/svn/reactos?rev=51111&view=rev Log: [GDI32] GetTextExtentExPointW doesn't fail if nMaxExtent is negative (only ANSI version does) Fixes gdi32:GetTextExtentExPoint apitest Modified: trunk/reactos/dll/win32/gdi32/objects/text.c Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] Mon Mar 21 17:58:08 2011 @@ -194,11 +194,9 @@ ) { + /* Windows doesn't check nMaxExtent validity in unicode version */ if(nMaxExtent < -1) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + DPRINT("nMaxExtent is invalid: %d\n", nMaxExtent); return NtGdiGetTextExtentExW ( hdc, (LPWSTR)lpszStr, cchString, nMaxExtent, (PULONG)lpnFit, (PULONG)alpDx, lpSize, 0 );

13 years, 7 months

[rharabien] 51110: Fix gdi32:SetSysColors apitest

by rharabien＠svn.reactos.org

Author: rharabien Date: Mon Mar 21 14:52:08 2011 New Revision: 51110 URL: http://svn.reactos.org/svn/reactos?rev=51110&view=rev Log: Fix gdi32:SetSysColors apitest Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] Mon Mar 21 14:52:08 2011 @@ -156,8 +156,8 @@ /* Stock objects */ -BOOL FASTCALL -IntSetSysColors(UINT nColors, INT *Elements, COLORREF *Colors); +VOID FASTCALL +IntSetSysColors(UINT nColors, CONST INT *Elements, CONST COLORREF *Colors); HGDIOBJ FASTCALL IntGetSysColorBrush(INT Object); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Mon Mar 21 14:52:08 2011 @@ -538,36 +538,40 @@ IN CONST COLORREF *lpaRgbValues, FLONG Flags) { - DWORD Ret = FALSE; - NTSTATUS Status = STATUS_SUCCESS; - UserEnterExclusive(); - _SEH2_TRY - { - ProbeForRead(lpaElements, + DWORD Ret = TRUE; + NTSTATUS Status = STATUS_SUCCESS; + + if (cElements == 0) + return TRUE; + + UserEnterExclusive(); + _SEH2_TRY + { + ProbeForRead(lpaElements, sizeof(INT), 1); - ProbeForRead(lpaRgbValues, - sizeof(INT), + ProbeForRead(lpaRgbValues, + sizeof(COLORREF), 1); // Developers: We are thread locked and calling gdi. - Ret = IntSetSysColors(cElements, (INT*)lpaElements, (COLORREF*)lpaRgbValues); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { + IntSetSysColors(cElements, lpaElements, lpaRgbValues); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - if (!NT_SUCCESS(Status)) - { + } + _SEH2_END; + if (!NT_SUCCESS(Status)) + { SetLastNtError(Status); Ret = FALSE; - } - if (Ret) - { - UserSendNotifyMessage(HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0); - } - UserLeave(); - return Ret; + } + if (Ret) + { + UserSendNotifyMessage(HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0); + } + UserLeave(); + return Ret; } DWORD Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] Mon Mar 21 14:52:08 2011 @@ -216,8 +216,8 @@ return ((Object < 0) || (NB_STOCK_OBJECTS <= Object)) ? NULL : StockObjects[Object]; } -BOOL FASTCALL -IntSetSysColors(UINT nColors, INT *Elements, COLORREF *Colors) +VOID FASTCALL +IntSetSysColors(UINT nColors, CONST INT *Elements, CONST COLORREF *Colors) { UINT i; @@ -234,7 +234,6 @@ Elements++; Colors++; } - return nColors > 0; } HGDIOBJ FASTCALL

13 years, 7 months

[rharabien] 51109: Make sure rectangle is not inverted in Rectangle function Fixes gdi32:Rectangle apitest

by rharabien＠svn.reactos.org

Author: rharabien Date: Mon Mar 21 14:47:06 2011 New Revision: 51109 URL: http://svn.reactos.org/svn/reactos?rev=51109&view=rev Log: Make sure rectangle is not inverted in Rectangle function Fixes gdi32:Rectangle apitest Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Mon Mar 21 14:47:06 2011 @@ -545,10 +545,11 @@ return PATH_Rectangle ( dc, LeftRect, TopRect, RightRect, BottomRect ); } - DestRect.left = LeftRect; - DestRect.right = RightRect; - DestRect.top = TopRect; - DestRect.bottom = BottomRect; + /* Make sure rectangle is not inverted */ + DestRect.left = min(LeftRect, RightRect); + DestRect.right = max(LeftRect, RightRect); + DestRect.top = min(TopRect, BottomRect); + DestRect.bottom = max(TopRect, BottomRect); IntLPtoDP(dc, (LPPOINT)&DestRect, 2);

13 years, 7 months

[rharabien] 51108: Fix ProbeForRead. It wasn't ever checking if memory can be accessed. Thanks to big-endian it wasn't breaking MmUserProbeAddress as well. Code is now nearly the same as in ProbeFo...

by rharabien＠svn.reactos.org

Author: rharabien Date: Mon Mar 21 14:43:56 2011 New Revision: 51108 URL: http://svn.reactos.org/svn/reactos?rev=51108&view=rev Log: Fix ProbeForRead. It wasn't ever checking if memory can be accessed. Thanks to big-endian it wasn't breaking MmUserProbeAddress as well. Code is now nearly the same as in ProbeForWrite. It shouldn't break anything. If it does, it's not bug in this code. :) Modified: trunk/reactos/ntoskrnl/ex/exintrin.c Modified: trunk/reactos/ntoskrnl/ex/exintrin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/exintrin.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/exintrin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/exintrin.c [iso-8859-1] Mon Mar 21 14:43:56 2011 @@ -103,6 +103,8 @@ IN SIZE_T Length, IN ULONG Alignment) { + ULONG_PTR Last, Current = (ULONG_PTR)Address; + CHAR Temp; PAGED_CODE(); /* Only probe if we have a valid length */ @@ -115,18 +117,31 @@ (Alignment == 8) || (Alignment == 16)); - /* Check for correct alignment */ - if (((ULONG_PTR)Address & (Alignment - 1)) != 0) + /* Check the alignment */ + if ((Current & (Alignment - 1)) != 0) { /* Incorrect alignment */ ExRaiseDatatypeMisalignment(); } - else if (((ULONG_PTR)Address + Length) < (ULONG_PTR)Address || - ((ULONG_PTR)Address + Length) > (ULONG_PTR)MmUserProbeAddress) + + /* Get the end address */ + Last = Current + Length - 1; + if ((Last < Current) || (Last >= (ULONG_PTR)MmUserProbeAddress)) + { + /* Raise an access violation */ + ExRaiseAccessViolation(); + } + + /* Round down to the last page */ + Last = PAGE_ROUND_DOWN(Last) + PAGE_SIZE; + do { /* Attempt a read */ - *(volatile CHAR* const)MmUserProbeAddress = 0; - } + Temp = *(volatile CHAR*)Current; + + /* Go to the next address */ + Current = PAGE_ROUND_DOWN(Current) + PAGE_SIZE; + } while (Current != Last); } }

13 years, 7 months

[rharabien] 51107: Improve GetClipRgn and SetSysColors apitests

by rharabien＠svn.reactos.org

Author: rharabien Date: Mon Mar 21 14:36:32 2011 New Revision: 51107 URL: http://svn.reactos.org/svn/reactos?rev=51107&view=rev Log: Improve GetClipRgn and SetSysColors apitests Modified: trunk/rostests/apitests/gdi32/GetClipRgn.c trunk/rostests/apitests/gdi32/SetSysColors.c Modified: trunk/rostests/apitests/gdi32/GetClipRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetClipRgn… ============================================================================== --- trunk/rostests/apitests/gdi32/GetClipRgn.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetClipRgn.c [iso-8859-1] Mon Mar 21 14:36:32 2011 @@ -14,6 +14,7 @@ HWND hWnd; HDC hDC; HRGN hrgn;//, hrgn2; + int ret; /* Create a window */ hWnd = CreateWindowW(L"BUTTON", L"TestWindow", WS_OVERLAPPEDWINDOW | WS_VISIBLE, @@ -25,13 +26,15 @@ /* Test invalid DC */ SetLastError(ERROR_SUCCESS); - ok(GetClipRgn((HDC)0x12345, hrgn) == -1, "\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "\n"); + ret = GetClipRgn((HDC)0x12345, hrgn); + ok(ret == -1, "Expected -1, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); /* Test invalid hrgn */ SetLastError(ERROR_SUCCESS); - ok(GetClipRgn(hDC, (HRGN)0x12345) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); + ret = GetClipRgn(hDC, (HRGN)0x12345); + ok(ret == 0, "Expected 0, got %d\n", ret); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", GetLastError()); ReleaseDC(hWnd, hDC); DestroyWindow(hWnd); Modified: trunk/rostests/apitests/gdi32/SetSysColors.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetSysColo… ============================================================================== --- trunk/rostests/apitests/gdi32/SetSysColors.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetSysColors.c [iso-8859-1] Mon Mar 21 14:36:32 2011 @@ -10,16 +10,15 @@ #include <windows.h> #define TEST(x) ok(x, #x"\n") -#define RTEST(x) ok(x, #x"\n") #define NUM_SYSCOLORS 31 void Test_SetSysColors() { INT i; - INT nElements[NUM_SYSCOLORS]; + INT nElements[NUM_SYSCOLORS+1]; COLORREF crOldColors[NUM_SYSCOLORS]; - COLORREF crColors[3] = {RGB(212, 208, 200),2,3}; + COLORREF crColors[NUM_SYSCOLORS+1]; /* First save the Old colors */ for (i = 0; i < NUM_SYSCOLORS; i++) @@ -27,13 +26,30 @@ nElements[i] = i; crOldColors[i] = GetSysColor(i); } - - TEST((UINT)SetSysColors(0, nElements, crColors) == 1); - RTEST((UINT)SetSysColors(1, nElements, crColors) == 1); - RTEST((UINT)SetSysColors(2, nElements, crColors) == 1); + + for (i = 0; i < NUM_SYSCOLORS+1; i++) + crColors[i] = RGB(i, 255-i, i*3); + nElements[NUM_SYSCOLORS] = nElements[0]; + + SetLastError(0xdeadbeef); + ok(SetSysColors(-1, nElements, crColors) == FALSE, "Expected FALSE, got TRUE\n"); + ok(GetLastError() == ERROR_NOACCESS, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + ok(SetSysColors(0, nElements, crColors) == TRUE, "Expected TRUE, got FALSE\n"); + ok(SetSysColors(0, NULL, crColors) == TRUE, "Expected TRUE, got FALSE\n"); + ok(SetSysColors(0, nElements, NULL) == TRUE, "Expected TRUE, got FALSE\n"); + ok(SetSysColors(1, NULL, crColors) == FALSE, "Expected FALSE, got TRUE\n"); + ok(GetLastError() == ERROR_NOACCESS, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + ok(SetSysColors(1, nElements, NULL) == FALSE, "Expected FALSE, got TRUE\n"); + ok(GetLastError() == ERROR_NOACCESS, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + ok(SetSysColors(1, nElements, crColors) == TRUE, "Expected TRUE, got FALSE\n"); + ok(SetSysColors(NUM_SYSCOLORS, nElements, crColors) == TRUE, "Expected TRUE, got FALSE\n"); + for (i = 0; i < NUM_SYSCOLORS; i++) + ok(GetSysColor(nElements[i]) == crColors[i], "Expected %06lx, got %06lx\n", crColors[i], GetSysColor(nElements[i])); /* try more than NUM_SYSCOLORS */ - RTEST((UINT)SetSysColors(55, nElements, crColors) == 1); + ok(SetSysColors(NUM_SYSCOLORS+1, nElements, crColors) == TRUE, "Expected TRUE, got FALSE\n"); + nElements[NUM_SYSCOLORS] = 10000; + ok(SetSysColors(NUM_SYSCOLORS+1, nElements, crColors) == TRUE, "Expected TRUE, got FALSE\n"); /* restore old SysColors */ SetSysColors(NUM_SYSCOLORS, nElements, crOldColors);

13 years, 7 months

← Newer
1
...
8
9
10
11
12
13
14
...
28
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 March 2011