Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 18868: implement Hal WaitForVerticalBlank
by greatlrd＠svn.reactos.com 30 Oct '05

30 Oct '05

implement Hal WaitForVerticalBlank Modified: trunk/reactos/lib/ddraw/hal/ddraw.c Modified: trunk/reactos/lib/ddraw/main/ddraw.c Modified: trunk/reactos/lib/ddraw/rosdraw.h Modified: trunk/reactos/lib/ddraw/soft/ddraw.c _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw.c --- trunk/reactos/lib/ddraw/hal/ddraw.c 2005-10-30 06:02:18 UTC (rev 18867) +++ trunk/reactos/lib/ddraw/hal/ddraw.c 2005-10-30 07:41:33 UTC (rev 18868) @@ -369,18 +369,46 @@ } mem.lpDD = &This->DirectDrawGlobal; + mem.ddRVal = DDERR_NOTPALETTIZED; + if (This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemo ry(&mem) != DDHAL_DRIVER_HANDLED) { return DDERR_NODRIVERSUPPORT; } - ddscaps->dwCaps = mem.DDSCaps.dwCaps; ddscaps->dwCaps2 = mem.ddsCapsEx.dwCaps2; ddscaps->dwCaps3 = mem.ddsCapsEx.dwCaps3; ddscaps->dwCaps4 = mem.ddsCapsEx.dwCaps4; *total = mem.dwTotal; *free = mem.dwFree; - + return mem.ddRVal; } + +HRESULT Hal_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags,HANDLE h) +{ + + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + DDHAL_WAITFORVERTICALBLANKDATA WaitVectorData; + + if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK)) + { + return DDERR_NODRIVERSUPPORT; + } + + WaitVectorData.lpDD = &This->DirectDrawGlobal; + WaitVectorData.dwFlags = dwFlags; + WaitVectorData.hEvent = (DWORD)h; + WaitVectorData.ddRVal = DDERR_NOTPALETTIZED; + + if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.WaitForVerticalBlank(&WaitVecto rData) != DDHAL_DRIVER_HANDLED) + { + return DDERR_NODRIVERSUPPORT; + } + + return WaitVectorData.ddRVal; + + return DD_OK; +} _____ Modified: trunk/reactos/lib/ddraw/main/ddraw.c --- trunk/reactos/lib/ddraw/main/ddraw.c 2005-10-30 06:02:18 UTC (rev 18867) +++ trunk/reactos/lib/ddraw/main/ddraw.c 2005-10-30 07:41:33 UTC (rev 18868) @@ -407,8 +407,16 @@ HRESULT WINAPI Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, HANDLE h) { - - DX_STUB; + + DWORD ret; + + if((ret = Hal_DirectDraw_WaitForVerticalBlank( iface, dwFlags, h)) == DD_OK) + return ret; + + if((ret = Hel_DirectDraw_WaitForVerticalBlank( iface, dwFlags, h)) == DD_OK) + return ret; + + return DDERR_NOTINITIALIZED; } HRESULT WINAPI Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, @@ -416,7 +424,7 @@ { DWORD ret; - if((ret = Hal_DirectDraw_GetAvailableVidMem (iface,ddscaps,total,free)) == DD_OK) + if((ret = Hal_DirectDraw_GetAvailableVidMem (iface,ddscaps,total,free)) == DD_OK) return ret; if((ret = Hel_DirectDraw_GetAvailableVidMem (iface,ddscaps,total,free)) == DD_OK) _____ Modified: trunk/reactos/lib/ddraw/rosdraw.h --- trunk/reactos/lib/ddraw/rosdraw.h 2005-10-30 06:02:18 UTC (rev 18867) +++ trunk/reactos/lib/ddraw/rosdraw.h 2005-10-30 07:41:33 UTC (rev 18868) @@ -89,17 +89,25 @@ VOID Hal_DirectDraw_Release (LPDIRECTDRAW7 iface); HRESULT Hal_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, - LPDWORD total, LPDWORD free); + LPDWORD total, LPDWORD free); +HRESULT Hal_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, + HANDLE h); + + HRESULT Hel_DirectDraw_Initialize (LPDIRECTDRAW7 iface); HRESULT Hel_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 iface); VOID Hel_DirectDraw_Release (LPDIRECTDRAW7 iface); HRESULT Hel_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, - LPDWORD total, LPDWORD free); + LPDWORD total, LPDWORD free); +HRESULT Hel_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, + HANDLE h); + + /*********** Macros ***********/ #define DX_STUB \ _____ Modified: trunk/reactos/lib/ddraw/soft/ddraw.c --- trunk/reactos/lib/ddraw/soft/ddraw.c 2005-10-30 06:02:18 UTC (rev 18867) +++ trunk/reactos/lib/ddraw/soft/ddraw.c 2005-10-30 07:41:33 UTC (rev 18868) @@ -31,3 +31,9 @@ { DX_STUB; } + + +HRESULT Hel_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags,HANDLE h) +{ + DX_STUB; +}

1 0

[turner] 18867: add gettype.exe to the bootcd
by turner＠svn.reactos.com 30 Oct '05

30 Oct '05

add gettype.exe to the bootcd Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-10-30 06:01:29 UTC (rev 18866) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-10-30 06:02:18 UTC (rev 18867) @@ -178,6 +178,7 @@ subsys\system\ibrowser\ibrowser.exe 1 subsys\system\msiexec\msiexec.exe 1 subsys\system\notepad\notepad.exe 1 +subsys\system\gettype\gettype.exe 1 subsys\system\regedit\regedit.exe 4 subsys\system\regedit\clb\clb.dll 1 subsys\system\regsvr32\regsvr32.exe 1

1 0

[turner] 18866: add gettype.exe clone. It works in windows and partially in ROS. I will look into the reason it doesn't more tomorrow.
by turner＠svn.reactos.com 30 Oct '05

30 Oct '05

add gettype.exe clone. It works in windows and partially in ROS. I will look into the reason it doesn't more tomorrow. Modified: trunk/reactos/subsys/system/directory.xml Added: trunk/reactos/subsys/system/gettype/ Added: trunk/reactos/subsys/system/gettype/gettype.c Added: trunk/reactos/subsys/system/gettype/gettype.xml _____ Modified: trunk/reactos/subsys/system/directory.xml --- trunk/reactos/subsys/system/directory.xml 2005-10-30 05:56:45 UTC (rev 18865) +++ trunk/reactos/subsys/system/directory.xml 2005-10-30 06:01:29 UTC (rev 18866) @@ -17,6 +17,9 @@ <directory name="explorer"> <xi:include href="explorer/explorer.xml" /> </directory> +<directory name="gettype"> + <xi:include href="gettype/gettype.xml" /> +</directory> <directory name="hostname"> <xi:include href="hostname/hostname.xml" /> </directory> _____ Added: trunk/reactos/subsys/system/gettype/gettype.c --- trunk/reactos/subsys/system/gettype/gettype.c 2005-10-30 05:56:45 UTC (rev 18865) +++ trunk/reactos/subsys/system/gettype/gettype.c 2005-10-30 06:01:29 UTC (rev 18866) @@ -0,0 +1,231 @@ +/* + * ReactOS Win32 Applications + * Copyright (C) 2005 ReactOS Team + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS arp utility + * FILE: apps/utils/gettype/gettype.c + * PURPOSE: + * PROGRAMMERS: Brandon Turner (turnerb7(a)msu.edu) + * REVISIONS: + * GM 30/10/05 Created + * + * FIXME: gettype only supports local computer. + */ +#include <windows.h> +#include <tchar.h> +#include <stdio.h> + +enum +{ + GETTYPE_ROLE = 0x001, + GETTYPE_HELP = 0x002, + GETTYPE_SP = 0x004, + GETTYPE_VER = 0x008, + GETTYPE_MINV = 0x010, + GETTYPE_MAJV = 0x020, + GETTYPE_TYPE = 0x040, + GETTYPE_BUILD = 0x080 +}; + +void GetBasicInfo(OSVERSIONINFOEX osvi, char * HostName, char * OSName, char * Version, char * Role, char * Components) +{ + /* Host Name - COMPUTERNAME*/ + DWORD bufCharCount = 1024; + GetComputerName(HostName, &bufCharCount); + + /* OSName - Windows XP Home Editition */ + if(osvi.dwMajorVersion == 4) + { + _tcscpy(OSName, _T("Microsoft Windows NT 4.0 ")); + } + else if(osvi.dwMajorVersion == 5) + { + if(osvi.dwMajorVersion == 0) + { + _tcscpy(OSName, _T("Microsoft Windows 2000 ")); + } + else if(osvi.dwMinorVersion == 1) + { + _tcscpy(OSName, _T("Microsoft Windows XP ")); + } + else if(osvi.dwMinorVersion == 2) + { + _tcscpy(OSName, _T("Microsoft Windows Server 2003 ")); + } + } + else if(osvi.dwMajorVersion == 6) + { + _tcscpy(OSName, _T("Microsoft Windows Vista ")); + } + else + { + _tcscpy(OSName, _T("Microsoft Windows ")); + } + + if(osvi.wSuiteMask & VER_SUITE_BLADE) + _tcscat(OSName, _T("Web Edition")); + if(osvi.wSuiteMask & VER_SUITE_DATACENTER) + _tcscat(OSName, _T("Datacenter")); + if(osvi.wSuiteMask & VER_SUITE_ENTERPRISE) + _tcscat(OSName, _T("Enterprise")); + if(osvi.wSuiteMask & VER_SUITE_EMBEDDEDNT) + _tcscat(OSName, _T("Embedded")); + if(osvi.wSuiteMask & VER_SUITE_PERSONAL) + _tcscat(OSName, _T("Home Edition")); + if(osvi.wSuiteMask & VER_SUITE_SMALLBUSINESS_RESTRICTED && osvi.wSuiteMask & VER_SUITE_SMALLBUSINESS) + _tcscat(OSName, _T("Small Bussiness Edition")); + + /* Version - 5.1 Build 2600 Serivce Pack 2 */ + _stprintf(Version, _T("%d.%d Build %d %s"),(int)osvi.dwMajorVersion,(int)osvi.dwMinorVersion,(int)osvi.dwBuild Number, osvi.szCSDVersion); + + /* Role - Workgroup / Server / Domain Controller */ + if(osvi.wProductType == VER_NT_DOMAIN_CONTROLLER) + _tcscpy(Role, _T("Domain Controller")); + else if(osvi.wProductType == VER_NT_SERVER) + _tcscpy(Role, _T("Server")); + else if(osvi.wProductType == VER_NT_WORKSTATION) + _tcscpy(Role, _T("Workgroup")); + + /* Components - N/A */ + BOOL bCompInstalled = FALSE; + _tcscpy(Components, ""); + if(osvi.wSuiteMask & VER_SUITE_BACKOFFICE) + { + _tcscat(Components, _T("Microsoft BackOffice")); + bCompInstalled = TRUE; + } + if(osvi.wSuiteMask & VER_SUITE_TERMINAL) + { + if(bCompInstalled) + _tcscat(OSName, ";"); + _tcscat(Components, _T("Terminal Services")); + bCompInstalled = TRUE; + } + if(!bCompInstalled) + _tcscat(Components, _T("Not Installed")); + +} +int main (int argc, char *argv[]) +{ + DWORD Operations; + INT i = 0; + OSVERSIONINFOEX osvi; + + /* get the struct we will pull all the info from */ + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); + if(!GetVersionEx((OSVERSIONINFO*)&osvi)) + return 255; + + /* no params, just print some info */ + if(argc == 1) + { + TCHAR HostName[1024] = _T(""); + TCHAR OSName[1024] = _T(""); + TCHAR VersionInfo[1024] = _T(""); + TCHAR Role[1024] = _T(""); + TCHAR Components[1024] = _T(""); + GetBasicInfo(osvi, HostName, OSName, VersionInfo, Role, Components); + _tprintf(_T("\nHostname: %s\nName: %s\nVersion: %s\nRole: %s\nComponent: %s\n"),HostName, OSName, VersionInfo, Role, Components); + return 0; + } + + /* read the commands */ + for (i = 1; i < argc; i++) + { + if(!_tcsicmp(argv[i], _T("/ROLE"))) + Operations |= GETTYPE_ROLE; + else if(!_tcsicmp(argv[i], _T("/VER"))) + Operations |= GETTYPE_VER; + else if(!_tcsicmp(argv[i], _T("/MAJV"))) + Operations |= GETTYPE_MAJV; + else if(!_tcsicmp(argv[i], _T("/MINV"))) + Operations |= GETTYPE_MINV; + else if(!_tcsicmp(argv[i], _T("/SP"))) + Operations |= GETTYPE_SP; + else if(!_tcsicmp(argv[i], _T("/BUILD"))) + Operations |= GETTYPE_BUILD; + else if(!_tcsicmp(argv[i], _T("/TYPE"))) + Operations |= GETTYPE_TYPE; + else if(!_tcsicmp(argv[i], _T("/?"))) + Operations |= GETTYPE_HELP; + else + { + _tprintf(_T("Unsupported parameter")); + return 255; + } + } + + /* preform the operations */ + if(Operations & GETTYPE_VER) + { + INT VersionNumber = 0; + VersionNumber = osvi.dwMajorVersion * 1000; + VersionNumber += (osvi.dwMinorVersion * 100); + return VersionNumber; + } + else if(Operations & GETTYPE_MAJV) + { + INT VersionNumber = 0; + VersionNumber = osvi.dwMajorVersion; + return VersionNumber; + } + else if(Operations & GETTYPE_MINV) + { + INT VersionNumber = 0; + VersionNumber = osvi.dwMinorVersion; + return VersionNumber; + } + else if(Operations & GETTYPE_ROLE) + { + if(osvi.wProductType == VER_NT_DOMAIN_CONTROLLER) + return 1; + else if(osvi.wProductType == VER_NT_SERVER) + return 2; + else if(osvi.wProductType == VER_NT_WORKSTATION) + return 3; + } + else if(Operations & GETTYPE_SP) + { + INT SPNumber = 0; + SPNumber = osvi.wServicePackMajor; + return SPNumber; + } + else if(Operations & GETTYPE_BUILD) + { + INT BuildNumber = 0; + BuildNumber = osvi.dwBuildNumber; + return BuildNumber; + } + else if(Operations & GETTYPE_TYPE) + { + if(osvi.dwMajorVersion == 5) + { + if(osvi.dwMinorVersion == 1) + { + if(osvi.wSuiteMask & VER_SUITE_PERSONAL) + return 1; + else + return 2; + } + else if(osvi.dwMinorVersion == 2) + { + if(osvi.wSuiteMask & VER_SUITE_BLADE) + return 6; + else if(osvi.wSuiteMask & VER_SUITE_DATACENTER) + return 5; + else if(osvi.wSuiteMask & VER_SUITE_ENTERPRISE) + return 4; + else + return 3; + } + } + } + else if(Operations & GETTYPE_HELP) + { + _tprintf(_T("GETTYPE [/ROLE | /SP | /VER | /MAJV | /MINV | /TYPE | /BUILD]")); + return 0; + } + + return 255; +} Property changes on: trunk/reactos/subsys/system/gettype/gettype.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/gettype/gettype.xml --- trunk/reactos/subsys/system/gettype/gettype.xml 2005-10-30 05:56:45 UTC (rev 18865) +++ trunk/reactos/subsys/system/gettype/gettype.xml 2005-10-30 06:01:29 UTC (rev 18866) @@ -0,0 +1,7 @@ +<module name="gettype" type="win32cui" installbase="system32" installname="gettype.exe"> + <include base="gettype">.</include> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <file>gettype.c</file> +</module> Property changes on: trunk/reactos/subsys/system/gettype/gettype.xml ___________________________________________________________________ Name: svn:eol-style + native

1 0

[turner] 18865: add definitions for VER_SUITE_SINGLEUSERTS and VER_SUITE_EMBEDDEDNT
by turner＠svn.reactos.com 30 Oct '05

30 Oct '05

add definitions for VER_SUITE_SINGLEUSERTS and VER_SUITE_EMBEDDEDNT Modified: trunk/reactos/w32api/include/winnt.h _____ Modified: trunk/reactos/w32api/include/winnt.h --- trunk/reactos/w32api/include/winnt.h 2005-10-30 01:06:56 UTC (rev 18864) +++ trunk/reactos/w32api/include/winnt.h 2005-10-30 05:56:45 UTC (rev 18865) @@ -1367,7 +1367,9 @@ #define VER_SUITE_BACKOFFICE 4 #define VER_SUITE_TERMINAL 16 #define VER_SUITE_SMALLBUSINESS_RESTRICTED 32 +#define VER_SUITE_EMBEDDEDNT 64 #define VER_SUITE_DATACENTER 128 +#define VER_SUITE_SINGLEUSERTS 256 #define VER_SUITE_PERSONAL 512 #define VER_SUITE_BLADE 1024 #define WT_EXECUTEDEFAULT 0x00000000

1 0

[greatlrd] 18864: Implement Hal GetAvailableVidMem and is it working in windows
by greatlrd＠svn.reactos.com 30 Oct '05

30 Oct '05

Implement Hal GetAvailableVidMem and is it working in windows Modified: trunk/reactos/lib/ddraw/hal/ddraw.c Modified: trunk/reactos/lib/ddraw/main/ddraw.c Modified: trunk/reactos/lib/ddraw/rosdraw.h Modified: trunk/reactos/lib/ddraw/soft/ddraw.c _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw.c --- trunk/reactos/lib/ddraw/hal/ddraw.c 2005-10-29 23:40:05 UTC (rev 18863) +++ trunk/reactos/lib/ddraw/hal/ddraw.c 2005-10-30 01:06:56 UTC (rev 18864) @@ -354,3 +354,33 @@ if(This->DirectDrawGlobal.lpD3DGlobalDriverData) HeapFree(GetProcessHeap(), 0, (PVOID)This->DirectDrawGlobal.lpD3DGlobalDriverData); } + + +HRESULT Hal_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, + LPDWORD total, LPDWORD free) +{ + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + DDHAL_GETAVAILDRIVERMEMORYDATA mem; + + if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.dwFlags & DDHAL_MISCCB32_GETAVAILDRIVERMEMORY)) + { + return DDERR_NODRIVERSUPPORT; + } + + mem.lpDD = &This->DirectDrawGlobal; + if (This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemo ry(&mem) != DDHAL_DRIVER_HANDLED) + { + return DDERR_NODRIVERSUPPORT; + } + + + ddscaps->dwCaps = mem.DDSCaps.dwCaps; + ddscaps->dwCaps2 = mem.ddsCapsEx.dwCaps2; + ddscaps->dwCaps3 = mem.ddsCapsEx.dwCaps3; + ddscaps->dwCaps4 = mem.ddsCapsEx.dwCaps4; + *total = mem.dwTotal; + *free = mem.dwFree; + + return mem.ddRVal; +} _____ Modified: trunk/reactos/lib/ddraw/main/ddraw.c --- trunk/reactos/lib/ddraw/main/ddraw.c 2005-10-29 23:40:05 UTC (rev 18863) +++ trunk/reactos/lib/ddraw/main/ddraw.c 2005-10-30 01:06:56 UTC (rev 18864) @@ -352,7 +352,8 @@ DDCOLORKEY ddckCKSrcOverlay; DDCOLORKEY ddckCKSrcBlt; */ - + + RtlCopyMemory(&pDDSD->ddpfPixelFormat,&This->DirectDrawGlobal.vmiData.dd pfDisplay,sizeof(DDPIXELFORMAT)); RtlCopyMemory(&pDDSD->ddsCaps,&This->DirectDrawGlobal.ddCaps,sizeof(DDCO RECAPS)); @@ -412,9 +413,18 @@ HRESULT WINAPI Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, LPDWORD total, LPDWORD free) -{ - - DX_STUB; +{ + DWORD ret; + + if((ret = Hal_DirectDraw_GetAvailableVidMem (iface,ddscaps,total,free)) == DD_OK) + return ret; + + if((ret = Hel_DirectDraw_GetAvailableVidMem (iface,ddscaps,total,free)) == DD_OK) + return ret; + + + return DDERR_NOTINITIALIZED; + } HRESULT WINAPI Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7 iface, HDC hdc, _____ Modified: trunk/reactos/lib/ddraw/rosdraw.h --- trunk/reactos/lib/ddraw/rosdraw.h 2005-10-29 23:40:05 UTC (rev 18863) +++ trunk/reactos/lib/ddraw/rosdraw.h 2005-10-30 01:06:56 UTC (rev 18864) @@ -88,10 +88,18 @@ HRESULT Hal_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 iface); VOID Hal_DirectDraw_Release (LPDIRECTDRAW7 iface); +HRESULT Hal_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, + LPDWORD total, LPDWORD free); + + HRESULT Hel_DirectDraw_Initialize (LPDIRECTDRAW7 iface); HRESULT Hel_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 iface); VOID Hel_DirectDraw_Release (LPDIRECTDRAW7 iface); +HRESULT Hel_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, + LPDWORD total, LPDWORD free); + + /*********** Macros ***********/ #define DX_STUB \ _____ Modified: trunk/reactos/lib/ddraw/soft/ddraw.c --- trunk/reactos/lib/ddraw/soft/ddraw.c 2005-10-29 23:40:05 UTC (rev 18863) +++ trunk/reactos/lib/ddraw/soft/ddraw.c 2005-10-30 01:06:56 UTC (rev 18864) @@ -24,3 +24,10 @@ VOID Hel_DirectDraw_Release (LPDIRECTDRAW7 iface) { } + + +HRESULT Hel_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, + LPDWORD total, LPDWORD free) +{ + DX_STUB; +}

1 0

[weiden] 18863: protect access to buffers in NtOpenProcess
by weiden＠svn.reactos.com 29 Oct '05

29 Oct '05

protect access to buffers in NtOpenProcess Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-10-29 23:28:12 UTC (rev 18862) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-10-29 23:40:05 UTC (rev 18863) @@ -873,7 +873,6 @@ IN HANDLE DebugPort OPTIONAL, IN HANDLE ExceptionPort OPTIONAL) { - HANDLE hProcess; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; @@ -903,9 +902,8 @@ } else { - /* Create a user Process, do NOT pass the pointer to the handle supplied - by the caller directly!!! */ - Status = PspCreateProcess(&hProcess, + /* Create a user Process */ + Status = PspCreateProcess(ProcessHandle, DesiredAccess, ObjectAttributes, ParentProcess, @@ -913,18 +911,6 @@ SectionHandle, DebugPort, ExceptionPort); - if (NT_SUCCESS(Status)) - { - _SEH_TRY - { - *ProcessHandle = hProcess; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } } /* Return Status */ @@ -941,21 +927,67 @@ IN POBJECT_ATTRIBUTES ObjectAttributes, IN PCLIENT_ID ClientId) { - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - NTSTATUS Status = STATUS_INVALID_PARAMETER; - PEPROCESS Process; + KPROCESSOR_MODE PreviousMode; + CLIENT_ID SafeClientId; + ULONG Attributes = 0; + HANDLE hProcess; + BOOLEAN HasObjectName = FALSE; PETHREAD Thread = NULL; + PEPROCESS Process = NULL; + NTSTATUS Status = STATUS_SUCCESS; - DPRINT("NtOpenProcess(ProcessHandle %x, DesiredAccess %x, " - "ObjectAttributes %x, ClientId %x { UniP %d, UniT %d })\n", - ProcessHandle, DesiredAccess, ObjectAttributes, ClientId, - ClientId->UniqueProcess, ClientId->UniqueThread); - PAGED_CODE(); + PreviousMode = KeGetPreviousMode(); + + /* Probe the paraemeters */ + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWriteHandle(ProcessHandle); + + if(ClientId != NULL) + { + ProbeForRead(ClientId, + sizeof(CLIENT_ID), + sizeof(ULONG)); + + SafeClientId = *ClientId; + ClientId = &SafeClientId; + } + + /* just probe the object attributes structure, don't capture it + completely. This is done later if necessary */ + ProbeForRead(ObjectAttributes, + sizeof(OBJECT_ATTRIBUTES), + sizeof(ULONG)); + HasObjectName = (ObjectAttributes->ObjectName != NULL); + Attributes = ObjectAttributes->Attributes; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) return Status; + } + else + { + HasObjectName = (ObjectAttributes->ObjectName != NULL); + Attributes = ObjectAttributes->Attributes; + } + + if (HasObjectName && ClientId != NULL) + { + /* can't pass both, n object name and a client id */ + return STATUS_INVALID_PARAMETER_MIX; + } + /* Open by name if one was given */ DPRINT("Checking type\n"); - if (ObjectAttributes->ObjectName) /* FIXME - neither probed nor protected! */ + if (HasObjectName) { /* Open it */ DPRINT("Opening by name\n"); @@ -965,36 +997,30 @@ PreviousMode, DesiredAccess, NULL, - ProcessHandle); + &hProcess); - if (Status != STATUS_SUCCESS) + if (!NT_SUCCESS(Status)) { DPRINT1("Could not open object by name\n"); } - - /* Return Status */ - DPRINT("Found: %x\n", ProcessHandle); - return(Status); } - else if (ClientId) + else if (ClientId != NULL) { /* Open by Thread ID */ - if (ClientId->UniqueThread) /* FIXME - neither probed nor protected! */ + if (ClientId->UniqueThread) { /* Get the Process */ - DPRINT("Opening by Thread ID: %x\n", ClientId->UniqueThread); /* FIXME - neither probed nor protected! */ - Status = PsLookupProcessThreadByCid(ClientId, /* FIXME - neither probed nor protected! */ + DPRINT("Opening by Thread ID: %x\n", ClientId->UniqueThread); + Status = PsLookupProcessThreadByCid(ClientId, &Process, &Thread); - DPRINT("Found: %x\n", Process); } else { /* Get the Process */ - DPRINT("Opening by Process ID: %x\n", ClientId->UniqueProcess); /* FIXME - neither probed nor protected! */ - Status = PsLookupProcessByProcessId(ClientId->UniqueProcess, /* FIXME - neither probed nor protected! */ + DPRINT("Opening by Process ID: %x\n", ClientId->UniqueProcess); + Status = PsLookupProcessByProcessId(ClientId->UniqueProcess, &Process); - DPRINT("Found: %x\n", Process); } if(!NT_SUCCESS(Status)) @@ -1005,12 +1031,12 @@ /* Open the Process Object */ Status = ObOpenObjectByPointer(Process, - ObjectAttributes->Attributes, /* FIXME - neither probed nor protected! */ + Attributes, NULL, DesiredAccess, PsProcessType, PreviousMode, - ProcessHandle); /* FIXME - neither probed nor protected! */ + &hProcess); if(!NT_SUCCESS(Status)) { DPRINT1("Failure to open process\n"); @@ -1022,7 +1048,26 @@ /* Dereference the Process */ ObDereferenceObject(Process); } + else + { + /* neither an object name nor a client id was passed */ + return STATUS_INVALID_PARAMETER_MIX; + } + /* Write back the handle */ + if(NT_SUCCESS(Status)) + { + _SEH_TRY + { + *ProcessHandle = hProcess; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + return Status; } /* EOF */

1 0

[greatlrd] 18862: Cover the most hal startup process it now time start implement hal in ddraw.dll
by greatlrd＠svn.reactos.com 29 Oct '05

29 Oct '05

Cover the most hal startup process it now time start implement hal in ddraw.dll But we still does not doing the whole startup process right. Modified: trunk/reactos/lib/ddraw/hal/ddraw.c Modified: trunk/reactos/lib/ddraw/rosdraw.h _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw.c --- trunk/reactos/lib/ddraw/hal/ddraw.c 2005-10-29 22:58:14 UTC (rev 18861) +++ trunk/reactos/lib/ddraw/hal/ddraw.c 2005-10-29 23:28:12 UTC (rev 18862) @@ -135,6 +135,10 @@ windows nt, it is in use for all os, and it always pont to DirectDrawGlobal.hDD */ + /* FIXME add all callback that have been commect out to gpl */ + /* FIXME free the memmor that being alloc when ddraw.dll exists */ + /* FIXME add check for DriverInfo if the handle or not */ + DDHAL_GETDRIVERINFODATA DriverInfo; memset(&DriverInfo,0, sizeof(DDHAL_GETDRIVERINFODATA)); DriverInfo.dwSize = sizeof(DDHAL_GETDRIVERINFODATA); @@ -154,7 +158,7 @@ DDHAL_DDMISCELLANEOUSCALLBACKS misc; DriverInfo.guidInfo = GUID_D3DCallbacks; DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + DriverInfo.dwExpectedSize = sizeof(); This->HalInfo.GetDriverInfo( &DriverInfo);*/ /* Get the D3DCallbacks2 */ @@ -177,7 +181,7 @@ /* Problem with include files DriverInfo.guidInfo = GUID_D3DCaps; DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + DriverInfo.dwExpectedSize = sizeof(); This->HalInfo.GetDriverInfo( &DriverInfo); */ @@ -191,21 +195,22 @@ /* Get the D3DParseUnknownCommandCallback */ - /* + /* D3dDrawPrimitives2 callback where should it be fill in DriverInfo.guidInfo = GUID_D3DParseUnknownCommandCallback; DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); - This->HalInfo.GetDriverInfo( &DriverInfo); + DriverInfo.dwExpectedSize = sizeof(); + This->HalInfo.GetDriverInfo( &DriverInfo); */ - /* Get the GetHeapAlignment */ - /* + /* Get the GetHeapAlignment */ + /* where should it be fill in DriverInfo.guidInfo = GUID_GetHeapAlignment; DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + DriverInfo.dwExpectedSize = sizeof(); This->HalInfo.GetDriverInfo( &DriverInfo); */ + /* Get the KernelCallbacks */ DriverInfo.guidInfo = GUID_KernelCallbacks; DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDKernel; @@ -229,12 +234,13 @@ /* Get the Miscellaneous2Callbacks */ - /* + /* Not in the DDRAWI_DIRECTDRAW_GBL we map it up as private + Contain CreatesurfaceEx and other nice callbacks */ DriverInfo.guidInfo = GUID_Miscellaneous2Callbacks; - DriverInfo.lpvData = &misc; + DriverInfo.lpvData = &This->Misc2Callback; DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); This->HalInfo.GetDriverInfo( &DriverInfo); - */ + /* Get the MotionCompCallbacks */ DriverInfo.guidInfo = GUID_MotionCompCallbacks; @@ -244,68 +250,79 @@ /* Get the NonLocalVidMemCaps */ - /* + This->DirectDrawGlobal.lpddNLVCaps = (LPDDNONLOCALVIDMEMCAPS)HeapAlloc(GetProcessHeap(), 0, sizeof(DDNONLOCALVIDMEMCAPS)); DriverInfo.guidInfo = GUID_NonLocalVidMemCaps; - DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpddNLVCaps; + DriverInfo.dwExpectedSize = sizeof(DDNONLOCALVIDMEMCAPS); This->HalInfo.GetDriverInfo( &DriverInfo); - */ + /* Get the NTCallbacks */ - /* + /* Fill in wher DriverInfo.guidInfo = GUID_NTCallbacks; DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + DriverInfo.dwExpectedSize = sizeof(); This->HalInfo.GetDriverInfo( &DriverInfo); */ /* Get the NTPrivateDriverCaps */ - /* + /* Fill in wher DriverInfo.guidInfo = GUID_NTPrivateDriverCaps; DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + DriverInfo.dwExpectedSize = sizeof(); This->HalInfo.GetDriverInfo( &DriverInfo); */ /* Get the UpdateNonLocalHeap */ - /* + /* Fill in where DriverInfo.guidInfo = GUID_UpdateNonLocalHeap; DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + DriverInfo.dwExpectedSize = sizeof(); This->HalInfo.GetDriverInfo( &DriverInfo); */ - /* Get the VideoPortCallbacks */ - /* Problem with include files + /* Get the VideoPortCallbacks */ DriverInfo.guidInfo = GUID_VideoPortCallbacks; DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDVideoPort; - DriverInfo.dwExpectedSize = sizeof(HALDDVideoPort); + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDVIDEOPORTCALLBACKS); This->HalInfo.GetDriverInfo( &DriverInfo); - */ - + /* Get the VideoPortCaps */ - /* + This->DirectDrawGlobal.lpDDVideoPortCaps = (LPDDVIDEOPORTCAPS)HeapAlloc(GetProcessHeap(), 0, sizeof(DDVIDEOPORTCAPS)); DriverInfo.guidInfo = GUID_VideoPortCaps; - DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpDDVideoPortCaps; + DriverInfo.dwExpectedSize = sizeof(DDVIDEOPORTCAPS); This->HalInfo.GetDriverInfo( &DriverInfo); - */ + /* Get the ZPixelFormats */ - /* + This->DirectDrawGlobal.lpZPixelFormats = (LPDDPIXELFORMAT)HeapAlloc(GetProcessHeap(), 0, sizeof(DDPIXELFORMAT)); DriverInfo.guidInfo = GUID_ZPixelFormats; - DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpZPixelFormats; + DriverInfo.dwExpectedSize = sizeof(DDPIXELFORMAT); This->HalInfo.GetDriverInfo( &DriverInfo); - */ - /* FIXME add setup for one call ot get memmory */ + + /* Setup some info from the callbacks we got */ + /* FIXME do more callbacks and fill the gpl struct */ - /* now all insate of HAL is done and we hopply do not have forget anything*/ + DDHAL_GETAVAILDRIVERMEMORYDATA mem; + mem.lpDD = &This->DirectDrawGlobal; + + This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemor y(&mem); + This->DirectDrawGlobal.ddCaps.dwVidMemFree = mem.dwFree; + This->DirectDrawGlobal.ddCaps.dwVidMemTotal = mem.dwTotal; + + + + + + /* Now all setup for HAL is done and we hopply do not have forget anything */ + return DD_OK; } _____ Modified: trunk/reactos/lib/ddraw/rosdraw.h --- trunk/reactos/lib/ddraw/rosdraw.h 2005-10-29 22:58:14 UTC (rev 18861) +++ trunk/reactos/lib/ddraw/rosdraw.h 2005-10-29 23:28:12 UTC (rev 18862) @@ -20,6 +20,7 @@ IDirectDrawVtbl* lpVtbl_v1; DDRAWI_DIRECTDRAW_GBL DirectDrawGlobal; + DDHAL_DDMISCELLANEOUSCALLBACKS Misc2Callback; DDHALINFO HalInfo; HWND window;

1 0

[weiden] 18861: release the keep-alive reference of the process object
by weiden＠svn.reactos.com 29 Oct '05

29 Oct '05

release the keep-alive reference of the process object Modified: trunk/reactos/ntoskrnl/ps/kill.c _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-10-29 22:15:10 UTC (rev 18860) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-10-29 22:58:14 UTC (rev 18861) @@ -524,6 +524,9 @@ ObKillProcess(Process); KeSetProcess(&Process->Pcb, IO_NO_INCREMENT); + + /* release the keep-alive reference of the process object */ + ObDereferenceObject(Process); return(STATUS_SUCCESS); }

1 0

[weiden] 18860: - don't dereference the section object in MmCreateProcessAddressSpace
by weiden＠svn.reactos.com 29 Oct '05

29 Oct '05

- don't dereference the section object in MmCreateProcessAddressSpace - properly handle object references in PspCreateProcess Modified: trunk/reactos/ntoskrnl/mm/process.c Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/mm/process.c --- trunk/reactos/ntoskrnl/mm/process.c 2005-10-29 21:33:57 UTC (rev 18859) +++ trunk/reactos/ntoskrnl/mm/process.c 2005-10-29 22:15:10 UTC (rev 18860) @@ -473,10 +473,8 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to map process Image\n"); - ObDereferenceObject(Section); goto exit; } - ObDereferenceObject(Section); /* Save the pointer */ Process->SectionBaseAddress = ImageBase; _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-10-29 21:33:57 UTC (rev 18859) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-10-29 22:15:10 UTC (rev 18860) @@ -183,8 +183,8 @@ IN HANDLE ExceptionPort OPTIONAL) { HANDLE hProcess; - PEPROCESS Process; - PEPROCESS pParentProcess; + PEPROCESS Process = NULL; + PEPROCESS pParentProcess = NULL; PEPORT pDebugPort = NULL; PEPORT pExceptionPort = NULL; PSECTION_OBJECT SectionObject = NULL; @@ -194,6 +194,7 @@ KAFFINITY Affinity; HANDLE_TABLE_ENTRY CidEntry; DirectoryTableBase.QuadPart = (ULONGLONG)0; + BOOLEAN ProcessCreated = FALSE; DPRINT("PspCreateProcess(ObjectAttributes %x)\n", ObjectAttributes); @@ -210,7 +211,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to reference the parent process: Status: 0x%x\n", Status); - return(Status); + goto Cleanup; } /* Inherit Parent process's Affinity. */ @@ -242,7 +243,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to reference the debug port: Status: 0x%x\n", Status); - goto exitdereferenceobjects; + goto Cleanup; } } @@ -259,7 +260,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to reference the exception port: Status: 0x%x\n", Status); - goto exitdereferenceobjects; + goto Cleanup; } } @@ -267,7 +268,7 @@ if (SectionHandle != NULL) { Status = ObReferenceObjectByHandle(SectionHandle, - 0, + SECTION_MAP_EXECUTE, MmSectionObjectType, PreviousMode, (PVOID*)&SectionObject, @@ -275,7 +276,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to reference process image section: Status: 0x%x\n", Status); - goto exitdereferenceobjects; + goto Cleanup; } } @@ -294,7 +295,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create process object, Status: 0x%x\n", Status); - goto exitdereferenceobjects; + goto Cleanup; } /* Clean up the Object */ @@ -350,8 +351,7 @@ if (!NT_SUCCESS(Status)) { DbgPrint("PspInitializeProcessSecurity failed (Status %x)\n", Status); - ObDereferenceObject(Process); - goto exitdereferenceobjects; + goto Cleanup; } /* Create the Process' Address Space */ @@ -360,8 +360,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create Address Space\n"); - ObDereferenceObject(Process); - goto exitdereferenceobjects; + goto Cleanup; } if (SectionObject) @@ -380,8 +379,8 @@ if(!Process->UniqueProcessId) { DPRINT1("Failed to create CID handle\n"); - ObDereferenceObject(Process); - goto exitdereferenceobjects; + Status = STATUS_UNSUCCESSFUL; /* FIXME - what error should we return? */ + goto Cleanup; } /* FIXME: Insert into Job Object */ @@ -394,13 +393,8 @@ if (!NT_SUCCESS(Status)) { DbgPrint("NtCreateProcess() Peb creation failed: Status %x\n",Status); - ObDereferenceObject(Process); - goto exitdereferenceobjects; + goto Cleanup; } - - /* Let's take advantage of this time to kill the reference too */ - ObDereferenceObject(pParentProcess); - pParentProcess = NULL; } /* W00T! The process can now be activated */ @@ -408,6 +402,8 @@ ExAcquireFastMutex(&PspActiveProcessMutex); InsertTailList(&PsActiveProcessHead, &Process->ActiveProcessLinks); ExReleaseFastMutex(&PspActiveProcessMutex); + + ProcessCreated = TRUE; /* FIXME: SeCreateAccessStateEx */ @@ -419,38 +415,36 @@ 0, NULL, &hProcess); - if (!NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { - DPRINT1("Could not get a handle to the Process Object\n"); - ObDereferenceObject(Process); - goto exitdereferenceobjects; + /* Set the Creation Time */ + KeQuerySystemTime(&Process->CreateTime); + + DPRINT("Done. Returning handle: %x\n", hProcess); + _SEH_TRY + { + *ProcessHandle = hProcess; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } _SEH_END; + /* FIXME: ObGetObjectSecurity(Process, &SecurityDescriptor) + SeAccessCheck + */ } - /* Set the Creation Time */ - KeQuerySystemTime(&Process->CreateTime); - - DPRINT("Done. Returning handle: %x\n", hProcess); - _SEH_TRY +Cleanup: + if(pParentProcess != NULL) ObDereferenceObject(pParentProcess); + if (!ProcessCreated) { - *ProcessHandle = hProcess; + if(SectionObject != NULL) ObDereferenceObject(SectionObject); + if(pExceptionPort != NULL) ObDereferenceObject(pExceptionPort); + if(pDebugPort != NULL) ObDereferenceObject(pDebugPort); + if(Process != NULL) ObDereferenceObject(Process); } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } _SEH_END; - /* FIXME: ObGetObjectSecurity(Process, &SecurityDescriptor) - SeAccessCheck - */ - ObDereferenceObject(Process); return Status; - -exitdereferenceobjects: - if(SectionObject != NULL) ObDereferenceObject(SectionObject); - if(pExceptionPort != NULL) ObDereferenceObject(pExceptionPort); - if(pDebugPort != NULL) ObDereferenceObject(pDebugPort); - if(pParentProcess != NULL) ObDereferenceObject(pParentProcess); - return Status; } /* PUBLIC FUNCTIONS *****************************************************************/

1 0

[weiden] 18859: - protect access to buffers in NtCreateThread and NtOpenThread
by weiden＠svn.reactos.com 29 Oct '05

29 Oct '05

- protect access to buffers in NtCreateThread and NtOpenThread - fix incorrect usage of PSEH in NtCreateThread Modified: trunk/reactos/ntoskrnl/ps/security.c Modified: trunk/reactos/ntoskrnl/ps/thread.c _____ Modified: trunk/reactos/ntoskrnl/ps/security.c --- trunk/reactos/ntoskrnl/ps/security.c 2005-10-29 21:20:50 UTC (rev 18858) +++ trunk/reactos/ntoskrnl/ps/security.c 2005-10-29 21:33:57 UTC (rev 18859) @@ -308,14 +308,14 @@ ImpersonationLevel = 0; } - PsImpersonateClient(Thread, - Token, - FALSE, - FALSE, - ImpersonationLevel); + Status = PsImpersonateClient(Thread, + Token, + FALSE, + FALSE, + ImpersonationLevel); if (Token != NULL) ObDereferenceObject(Token); - return(STATUS_SUCCESS); + return Status; } /* @@ -379,10 +379,7 @@ Thread->ImpersonationInfo->EffectiveOnly = EffectiveOnly; Thread->ImpersonationInfo->Token = Token; - ObReferenceObjectByPointer(Token, - 0, - SepTokenObjectType, - KernelMode); + ObReferenceObject(Token); Thread->ActiveImpersonationInfo = TRUE; _____ Modified: trunk/reactos/ntoskrnl/ps/thread.c --- trunk/reactos/ntoskrnl/ps/thread.c 2005-10-29 21:20:50 UTC (rev 18858) +++ trunk/reactos/ntoskrnl/ps/thread.c 2005-10-29 21:33:57 UTC (rev 18859) @@ -587,6 +587,8 @@ IN BOOLEAN CreateSuspended) { INITIAL_TEB SafeInitialTeb; + CONTEXT SafeContext; + NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); @@ -595,6 +597,11 @@ if(KeGetPreviousMode() != KernelMode) { + if (ThreadContext == NULL) { + DPRINT1("No context for User-Mode Thread!!\n"); + return STATUS_INVALID_PARAMETER; + } + _SEH_TRY { ProbeForWriteHandle(ThreadHandle); @@ -608,40 +615,37 @@ if(ThreadContext != NULL) { - ProbeForRead(ThreadContext, - sizeof(CONTEXT), - sizeof(ULONG)); - - } else { - - DPRINT1("No context for User-Mode Thread!!\n"); - return STATUS_INVALID_PARAMETER; + ProbeForRead(ThreadContext, + sizeof(CONTEXT), + sizeof(ULONG)); + SafeContext = *ThreadContext; + ThreadContext = &SafeContext; } ProbeForRead(InitialTeb, sizeof(INITIAL_TEB), sizeof(ULONG)); + SafeInitialTeb = *InitialTeb; + InitialTeb = &SafeInitialTeb; } _SEH_HANDLE { - return _SEH_GetExceptionCode(); + Status = _SEH_GetExceptionCode(); } _SEH_END; + + if (!NT_SUCCESS(Status)) return Status; } - /* Use probed data for the Initial TEB */ - SafeInitialTeb = *InitialTeb; /* FIXME - not protected! */ - InitialTeb = &SafeInitialTeb; - /* Call the shared function */ - return PspCreateThread(ThreadHandle, /* FIXME - not protected! */ + return PspCreateThread(ThreadHandle, DesiredAccess, ObjectAttributes, ProcessHandle, NULL, - ClientId, /* FIXME - not protected! */ - ThreadContext, /* FIXME - not protected! */ - InitialTeb, /* FIXME - not protected! */ + ClientId, + ThreadContext, + InitialTeb, CreateSuspended, NULL, NULL); @@ -654,17 +658,21 @@ STDCALL NtOpenThread(OUT PHANDLE ThreadHandle, IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN POBJECT_ATTRIBUTES ObjectAttributes, IN PCLIENT_ID ClientId OPTIONAL) { - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + KPROCESSOR_MODE PreviousMode; CLIENT_ID SafeClientId; - HANDLE hThread = 0; + ULONG Attributes = 0; + HANDLE hThread = NULL; NTSTATUS Status = STATUS_SUCCESS; PETHREAD Thread; + BOOLEAN HasObjectName = FALSE; PAGED_CODE(); + PreviousMode = KeGetPreviousMode(); + /* Probe the paraemeters */ if(PreviousMode != KernelMode) { @@ -681,6 +689,14 @@ SafeClientId = *ClientId; ClientId = &SafeClientId; } + + /* just probe the object attributes structure, don't capture it + completely. This is done later if necessary */ + ProbeForRead(ObjectAttributes, + sizeof(OBJECT_ATTRIBUTES), + sizeof(ULONG)); + HasObjectName = (ObjectAttributes->ObjectName != NULL); + Attributes = ObjectAttributes->Attributes; } _SEH_HANDLE { @@ -690,9 +706,20 @@ if(!NT_SUCCESS(Status)) return Status; } + else + { + HasObjectName = (ObjectAttributes->ObjectName != NULL); + Attributes = ObjectAttributes->Attributes; + } + + if (HasObjectName && ClientId != NULL) + { + /* can't pass both, n object name and a client id */ + return STATUS_INVALID_PARAMETER_MIX; + } /* Open by name if one was given */ - if (ObjectAttributes->ObjectName) /* FIXME - neither probed nor protected! */ + if (HasObjectName) { /* Open it */ Status = ObOpenObjectByName(ObjectAttributes, @@ -703,22 +730,19 @@ NULL, &hThread); - if (Status != STATUS_SUCCESS) + if (!NT_SUCCESS(Status)) { DPRINT1("Could not open object by name\n"); } - /* FIXME - would be a good idea to return the handle in case of success! */ - /* Return Status */ - return(Status); } - else if (ClientId) + else if (ClientId != NULL) { /* Open by Thread ID */ - if (ClientId->UniqueProcess) /* FIXME - neither probed nor protected! */ + if (ClientId->UniqueProcess) { /* Get the Process */ - DPRINT("Opening by Process ID: %x\n", ClientId->UniqueProcess); /* FIXME - neither probed nor protected! */ - Status = PsLookupProcessThreadByCid(ClientId, /* FIXME - neither probed nor protected! */ + DPRINT("Opening by Process ID: %x\n", ClientId->UniqueProcess); + Status = PsLookupProcessThreadByCid(ClientId, NULL, &Thread); } @@ -738,7 +762,7 @@ /* Open the Thread Object */ Status = ObOpenObjectByPointer(Thread, - ObjectAttributes->Attributes, /* FIXME - neither probed nor protected! */ + Attributes, NULL, DesiredAccess, PsThreadType, @@ -752,6 +776,11 @@ /* Dereference the thread */ ObDereferenceObject(Thread); } + else + { + /* neither an object name nor a client id was passed */ + return STATUS_INVALID_PARAMETER_MIX; + } /* Write back the handle */ if(NT_SUCCESS(Status))

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