Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 31612: - Finish Wine-20080105 import.
by fireball＠svn.reactos.org 05 Jan '08

05 Jan '08

Author: fireball Date: Sat Jan 5 21:01:28 2008 New Revision: 31612 URL: http://svn.reactos.org/svn/reactos?rev=31612&view=rev Log: - Finish Wine-20080105 import. Modified: vendor/wine/tools/widl/current/client.c vendor/wine/tools/widl/current/header.c vendor/wine/tools/widl/current/header.h vendor/wine/tools/widl/current/parser.h vendor/wine/tools/widl/current/parser.l vendor/wine/tools/widl/current/parser.y vendor/wine/tools/widl/current/proxy.c vendor/wine/tools/widl/current/server.c vendor/wine/tools/widl/current/typegen.c vendor/wine/tools/widl/current/typegen.h vendor/wine/tools/widl/current/typelib.c vendor/wine/tools/widl/current/utils.c vendor/wine/tools/widl/current/utils.h vendor/wine/tools/widl/current/widl.c vendor/wine/tools/widl/current/widl.h vendor/wine/tools/widl/current/widl.man.in vendor/wine/tools/widl/current/widltypes.h vendor/wine/tools/widl/current/write_msft.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: vendor/wine/tools/widl/current/client.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/current/client.c?… Modified: vendor/wine/tools/widl/current/header.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/current/header.c?… Modified: vendor/wine/tools/widl/current/header.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/current/header.h?… Modified: vendor/wine/tools/widl/current/parser.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/current/parser.h?… Modified: vendor/wine/tools/widl/current/parser.l URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/current/parser.l?… Modified: vendor/wine/tools/widl/current/parser.y URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/current/parser.y?… Modified: vendor/wine/tools/widl/current/proxy.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/current/proxy.c?r… Modified: vendor/wine/tools/widl/current/server.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/current/server.c?… Modified: vendor/wine/tools/widl/current/typegen.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/current/typegen.c… Modified: vendor/wine/tools/widl/current/typegen.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/current/typegen.h… Modified: vendor/wine/tools/widl/current/typelib.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/current/typelib.c… Modified: vendor/wine/tools/widl/current/utils.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/current/utils.c?r… Modified: vendor/wine/tools/widl/current/utils.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/current/utils.h?r… Modified: vendor/wine/tools/widl/current/widl.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/current/widl.c?re… Modified: vendor/wine/tools/widl/current/widl.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/current/widl.h?re… Modified: vendor/wine/tools/widl/current/widl.man.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/current/widl.man.… Modified: vendor/wine/tools/widl/current/widltypes.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/current/widltypes… Modified: vendor/wine/tools/widl/current/write_msft.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/current/write_msf…

1 0

[fireball] 31611: - Finish up 0.9.44 widl import. - Import Wine-20080105 widl.
by fireball＠svn.reactos.org 05 Jan '08

05 Jan '08

Author: fireball Date: Sat Jan 5 20:55:26 2008 New Revision: 31611 URL: http://svn.reactos.org/svn/reactos?rev=31611&view=rev Log: - Finish up 0.9.44 widl import. - Import Wine-20080105 widl. Added: vendor/wine/tools/widl/Wine-20080105/ vendor/wine/tools/widl/Wine-20080105/Makefile.in (with props) vendor/wine/tools/widl/Wine-20080105/client.c (with props) vendor/wine/tools/widl/Wine-20080105/hash.c (with props) vendor/wine/tools/widl/Wine-20080105/hash.h (with props) vendor/wine/tools/widl/Wine-20080105/header.c (with props) vendor/wine/tools/widl/Wine-20080105/header.h (with props) vendor/wine/tools/widl/Wine-20080105/parser.h (with props) vendor/wine/tools/widl/Wine-20080105/parser.l (with props) vendor/wine/tools/widl/Wine-20080105/parser.y (with props) vendor/wine/tools/widl/Wine-20080105/proxy.c (with props) vendor/wine/tools/widl/Wine-20080105/server.c (with props) vendor/wine/tools/widl/Wine-20080105/typegen.c (with props) vendor/wine/tools/widl/Wine-20080105/typegen.h (with props) vendor/wine/tools/widl/Wine-20080105/typelib.c (with props) vendor/wine/tools/widl/Wine-20080105/typelib.h (with props) vendor/wine/tools/widl/Wine-20080105/typelib_struct.h (with props) vendor/wine/tools/widl/Wine-20080105/utils.c (with props) vendor/wine/tools/widl/Wine-20080105/utils.h (with props) vendor/wine/tools/widl/Wine-20080105/widl.c (with props) vendor/wine/tools/widl/Wine-20080105/widl.h (with props) vendor/wine/tools/widl/Wine-20080105/widl.man.in (with props) vendor/wine/tools/widl/Wine-20080105/widltypes.h (with props) vendor/wine/tools/widl/Wine-20080105/write_msft.c (with props) vendor/wine/tools/widl/current/ - copied from r31610, vendor/wine/tools/widl/Wine-0_9_44/ [This mail would be too long, it was shortened to contain the URLs only.] Added: vendor/wine/tools/widl/Wine-20080105/Makefile.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080105/Mak… Added: vendor/wine/tools/widl/Wine-20080105/client.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080105/cli… Added: vendor/wine/tools/widl/Wine-20080105/hash.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080105/has… Added: vendor/wine/tools/widl/Wine-20080105/hash.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080105/has… Added: vendor/wine/tools/widl/Wine-20080105/header.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080105/hea… Added: vendor/wine/tools/widl/Wine-20080105/header.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080105/hea… Added: vendor/wine/tools/widl/Wine-20080105/parser.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080105/par… Added: vendor/wine/tools/widl/Wine-20080105/parser.l URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080105/par… Added: vendor/wine/tools/widl/Wine-20080105/parser.y URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080105/par… Added: vendor/wine/tools/widl/Wine-20080105/proxy.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080105/pro… Added: vendor/wine/tools/widl/Wine-20080105/server.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080105/ser… Added: vendor/wine/tools/widl/Wine-20080105/typegen.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080105/typ… Added: vendor/wine/tools/widl/Wine-20080105/typegen.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080105/typ… Added: vendor/wine/tools/widl/Wine-20080105/typelib.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080105/typ… Added: vendor/wine/tools/widl/Wine-20080105/typelib.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080105/typ… Added: vendor/wine/tools/widl/Wine-20080105/typelib_struct.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080105/typ… Added: vendor/wine/tools/widl/Wine-20080105/utils.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080105/uti… Added: vendor/wine/tools/widl/Wine-20080105/utils.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080105/uti… Added: vendor/wine/tools/widl/Wine-20080105/widl.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080105/wid… Added: vendor/wine/tools/widl/Wine-20080105/widl.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080105/wid… Added: vendor/wine/tools/widl/Wine-20080105/widl.man.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080105/wid… Added: vendor/wine/tools/widl/Wine-20080105/widltypes.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080105/wid… Added: vendor/wine/tools/widl/Wine-20080105/write_msft.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-20080105/wri…

1 0

[fireball] 31610: - Import widl from Wine-0.9.44.
by fireball＠svn.reactos.org 05 Jan '08

05 Jan '08

Author: fireball Date: Sat Jan 5 20:41:22 2008 New Revision: 31610 URL: http://svn.reactos.org/svn/reactos?rev=31610&view=rev Log: - Import widl from Wine-0.9.44. Added: vendor/wine/tools/widl/ vendor/wine/tools/widl/Wine-0_9_44/ vendor/wine/tools/widl/Wine-0_9_44/Makefile.in (with props) vendor/wine/tools/widl/Wine-0_9_44/client.c (with props) vendor/wine/tools/widl/Wine-0_9_44/hash.c (with props) vendor/wine/tools/widl/Wine-0_9_44/hash.h (with props) vendor/wine/tools/widl/Wine-0_9_44/header.c (with props) vendor/wine/tools/widl/Wine-0_9_44/header.h (with props) vendor/wine/tools/widl/Wine-0_9_44/parser.h (with props) vendor/wine/tools/widl/Wine-0_9_44/parser.l (with props) vendor/wine/tools/widl/Wine-0_9_44/parser.y (with props) vendor/wine/tools/widl/Wine-0_9_44/proxy.c (with props) vendor/wine/tools/widl/Wine-0_9_44/server.c (with props) vendor/wine/tools/widl/Wine-0_9_44/typegen.c (with props) vendor/wine/tools/widl/Wine-0_9_44/typegen.h (with props) vendor/wine/tools/widl/Wine-0_9_44/typelib.c (with props) vendor/wine/tools/widl/Wine-0_9_44/typelib.h (with props) vendor/wine/tools/widl/Wine-0_9_44/typelib_struct.h (with props) vendor/wine/tools/widl/Wine-0_9_44/utils.c (with props) vendor/wine/tools/widl/Wine-0_9_44/utils.h (with props) vendor/wine/tools/widl/Wine-0_9_44/widl.c (with props) vendor/wine/tools/widl/Wine-0_9_44/widl.h (with props) vendor/wine/tools/widl/Wine-0_9_44/widl.man.in (with props) vendor/wine/tools/widl/Wine-0_9_44/widltypes.h (with props) vendor/wine/tools/widl/Wine-0_9_44/write_msft.c (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: vendor/wine/tools/widl/Wine-0_9_44/Makefile.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-0_9_44/Makef… Added: vendor/wine/tools/widl/Wine-0_9_44/client.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-0_9_44/clien… Added: vendor/wine/tools/widl/Wine-0_9_44/hash.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-0_9_44/hash.… Added: vendor/wine/tools/widl/Wine-0_9_44/hash.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-0_9_44/hash.… Added: vendor/wine/tools/widl/Wine-0_9_44/header.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-0_9_44/heade… Added: vendor/wine/tools/widl/Wine-0_9_44/header.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-0_9_44/heade… Added: vendor/wine/tools/widl/Wine-0_9_44/parser.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-0_9_44/parse… Added: vendor/wine/tools/widl/Wine-0_9_44/parser.l URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-0_9_44/parse… Added: vendor/wine/tools/widl/Wine-0_9_44/parser.y URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-0_9_44/parse… Added: vendor/wine/tools/widl/Wine-0_9_44/proxy.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-0_9_44/proxy… Added: vendor/wine/tools/widl/Wine-0_9_44/server.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-0_9_44/serve… Added: vendor/wine/tools/widl/Wine-0_9_44/typegen.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-0_9_44/typeg… Added: vendor/wine/tools/widl/Wine-0_9_44/typegen.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-0_9_44/typeg… Added: vendor/wine/tools/widl/Wine-0_9_44/typelib.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-0_9_44/typel… Added: vendor/wine/tools/widl/Wine-0_9_44/typelib.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-0_9_44/typel… Added: vendor/wine/tools/widl/Wine-0_9_44/typelib_struct.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-0_9_44/typel… Added: vendor/wine/tools/widl/Wine-0_9_44/utils.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-0_9_44/utils… Added: vendor/wine/tools/widl/Wine-0_9_44/utils.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-0_9_44/utils… Added: vendor/wine/tools/widl/Wine-0_9_44/widl.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-0_9_44/widl.… Added: vendor/wine/tools/widl/Wine-0_9_44/widl.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-0_9_44/widl.… Added: vendor/wine/tools/widl/Wine-0_9_44/widl.man.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-0_9_44/widl.… Added: vendor/wine/tools/widl/Wine-0_9_44/widltypes.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-0_9_44/widlt… Added: vendor/wine/tools/widl/Wine-0_9_44/write_msft.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/tools/widl/Wine-0_9_44/write…

1 0

[jimtabor] 31609: Patch by Stefan100 stefan__100__ at hotmail.com. Remove EnhMeta calls from win32k and ntgdibad.h.
by jimtabor＠svn.reactos.org 05 Jan '08

05 Jan '08

Author: jimtabor Date: Sat Jan 5 20:35:23 2008 New Revision: 31609 URL: http://svn.reactos.org/svn/reactos?rev=31609&view=rev Log: Patch by Stefan100 stefan__100__ at hotmail.com. Remove EnhMeta calls from win32k and ntgdibad.h. Modified: trunk/reactos/dll/win32/gdi32/objects/enhmfile.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/icm.c trunk/reactos/subsystems/win32/win32k/objects/wingl.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/dll/win32/gdi32/objects/enhmfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/en… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/enhmfile.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/enhmfile.c Sat Jan 5 20:35:23 2008 @@ -1,20 +1,261 @@ #include "precomp.h" +#define NDEBUG +#include <debug.h> + + + /* - * @unimplemented + * @unimplemented */ HENHMETAFILE -STDCALL +WINAPI CloseEnhMetaFile( HDC hdc) { - return NtGdiCloseEnhMetaFile(hdc); -} - + UNIMPLEMENTED; + return 0; +} + +#if 0 +/* Previous implementation in win32k */ +HENHMETAFILE +STDCALL +NtGdiCloseEnhMetaFile(HDC hDC) +{ + LPENHMETAHEADER emh; + HANDLE hmf = 0; + PDD_ENHMETAFILEOBJ phmf; + HANDLE hMapping = 0; + EMREOF emr; + PDC Dc; + + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + + + + Dc = DC_LockDc(hDC); + if (Dc == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return NULL; + } + + emr.emr.iType = EMR_EOF; + emr.emr.nSize = sizeof(EMREOF); + emr.nPalEntries = 0; + emr.offPalEntries = 0; + emr.nSizeLast = emr.emr.nSize; + + if(Dc->hFile) + { + Status = NtWriteFile(Dc->hFile, NULL, NULL, NULL, &Iosb, (PVOID)&emr, emr.emr.nSize, NULL, NULL); + if (Status == STATUS_PENDING) + { + Status = NtWaitForSingleObject(Dc->hFile,FALSE,NULL); + if (NT_SUCCESS(Status)) + { + Status = Iosb.Status; + } + } + + if (NT_SUCCESS(Status)) + { + DWORD len = Dc->emh->nBytes + emr.emr.nSize; + /* always resize the buffer */ + emh = EngAllocMem(FL_ZERO_MEMORY, len, 0); + if (emh != NULL) + { + memcpy(emh,Dc->emh,Dc->emh->nBytes); + EngFreeMem(Dc->emh); + Dc->emh = emh; + + memcpy(Dc->emh + Dc->emh->nBytes, &emr, emr.emr.nSize); + } + else + { + EngFreeMem(Dc->emh); + Dc->emh=NULL; + } + + } + else + { + Dc->hFile = NULL; + DPRINT1("Write to EnhMetaFile fail\n"); + } + } + + Dc->emh->nBytes += emr.emr.nSize; + Dc->emh->nRecords++; + + if(Dc->emh->rclFrame.left > Dc->emh->rclFrame.right) + { + Dc->emh->rclFrame.left = Dc->emh->rclBounds.left * Dc->emh->szlMillimeters.cx * 100 / Dc->emh->szlDevice.cx; + Dc->emh->rclFrame.top = Dc->emh->rclBounds.top * Dc->emh->szlMillimeters.cy * 100 / Dc->emh->szlDevice.cy; + Dc->emh->rclFrame.right = Dc->emh->rclBounds.right * Dc->emh->szlMillimeters.cx * 100 / Dc->emh->szlDevice.cx; + Dc->emh->rclFrame.bottom = Dc->emh->rclBounds.bottom * Dc->emh->szlMillimeters.cy * 100 / Dc->emh->szlDevice.cy; + } + + if (Dc->hFile) /* disk based metafile */ + { + FILE_POSITION_INFORMATION FilePosition; + LARGE_INTEGER Distance ; + IO_STATUS_BLOCK IoStatusBlock; + + POBJECT_ATTRIBUTES ObjectAttributes = NULL; + ACCESS_MASK DesiredAccess; + PLARGE_INTEGER SectionSize = NULL; + DWORD flProtect; + ULONG Attributes; + LARGE_INTEGER SectionOffset; + ULONG ViewSize; + ULONG Protect; + LPVOID ViewBase; + + Distance.u.LowPart = 0; + Distance.u.HighPart = 0; + FilePosition.CurrentByteOffset.QuadPart = Distance.QuadPart; + + DPRINT1("Trying write to metafile and map it\n"); + + Status = NtSetInformationFile(Dc->hFile, &IoStatusBlock, &FilePosition, + sizeof(FILE_POSITION_INFORMATION), FilePositionInformation); + + if (!NT_SUCCESS(Status)) + { + // SetLastErrorByStatus(Status); + SetLastWin32Error(ERROR_INVALID_HANDLE); + + NtClose( Dc->hFile ); + DC_UnlockDc(Dc); + NtGdiDeleteObjectApp(hDC); + + DPRINT1("NtSetInformationFile fail\n"); + return hmf; + } + + if (FilePosition.CurrentByteOffset.u.LowPart != 0) + { + // SetLastErrorByStatus(Status); + SetLastWin32Error(ERROR_INVALID_HANDLE); + + NtClose( Dc->hFile ); + DC_UnlockDc(Dc); + NtGdiDeleteObjectApp(hDC); + DPRINT1("FilePosition.CurrentByteOffset.u.LowPart is not 0\n"); + return hmf; + } + + Status = NtWriteFile(Dc->hFile, NULL, NULL, NULL, &Iosb, (PVOID)&Dc->emh, sizeof(*Dc->emh), NULL, NULL); + if (Status == STATUS_PENDING) + { + Status = NtWaitForSingleObject(Dc->hFile,FALSE,NULL); + if (NT_SUCCESS(Status)) + { + Status = Iosb.Status; + } + } + + if (!NT_SUCCESS(Status)) + { + NtClose( Dc->hFile ); + DC_UnlockDc(Dc); + NtGdiDeleteObjectApp(hDC); + DPRINT1("fail to write 0\n"); + return hmf; + } + + EngFreeMem(Dc->emh); + + /* create maping */ + DesiredAccess = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ; + Attributes = (PAGE_READONLY & (SEC_FILE | SEC_IMAGE | SEC_RESERVE | SEC_NOCACHE | SEC_COMMIT)); + flProtect = PAGE_READONLY ^ (PAGE_READONLY & (SEC_FILE | SEC_IMAGE | SEC_RESERVE | SEC_NOCACHE | SEC_COMMIT)); + + if (!Attributes) Attributes = SEC_COMMIT; + + if (Dc->hFile == INVALID_HANDLE_VALUE) + { + Dc->hFile = NULL; + if (!SectionSize) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + hMapping = NULL; + DPRINT1("fail !SectionSize \n"); + } + } + else + { + Status = NtCreateSection(&hMapping, DesiredAccess, ObjectAttributes, SectionSize, flProtect, Attributes, Dc->hFile); + if (!NT_SUCCESS(Status)) + { + //SetLastErrorByStatus(Status); + SetLastWin32Error(ERROR_INVALID_HANDLE); + hMapping = NULL; + DPRINT1("fail NtCreateSection \n"); + } + } + + /* MapViewOfFile */ + SectionOffset.LowPart = 0; + SectionOffset.HighPart = 0; + ViewBase = NULL; + ViewSize = 0; + + Protect = PAGE_READONLY; + + Status = ZwMapViewOfSection(&hMapping, NtCurrentProcess(), &ViewBase, 0, + 0, &SectionOffset, &ViewSize, ViewShare, 0, Protect); + if (!NT_SUCCESS(Status)) + { + //SetLastErrorByStatus(Status); + SetLastWin32Error(ERROR_INVALID_HANDLE); + Dc->emh = NULL; + DPRINT1("fail ZwMapViewOfSection \n"); + } + else + { + Dc->emh = ViewBase; + } + /* Close */ + if (hMapping != NULL) + NtClose( hMapping ); + if (Dc->hFile != NULL) + NtClose( Dc->hFile ); + } + + hmf = GDIOBJ_AllocObj(GdiHandleTable, GDI_OBJECT_TYPE_ENHMETAFILE); + if (hmf != NULL) + { + phmf = GDIOBJ_LockObj(GdiHandleTable, hmf, GDI_OBJECT_TYPE_ENHMETAFILE); + if (phmf != NULL) + { + if (Dc->hFile != NULL) + { + phmf->on_disk = TRUE; + } + else + { + phmf->on_disk = FALSE; + } + GDIOBJ_UnlockObjByPtr(GdiHandleTable, phmf); + phmf->emh = Dc->emh; + } + } + + Dc->emh = NULL; /* So it won't be deleted */ + DC_UnlockDc(Dc); + NtGdiDeleteObjectApp(hDC); + return hmf; +} +#endif #if 0 // Remove once new EnhMetaFile support is implemented. - -HDC WINAPI CreateEnhMetaFileW( +HDC +WINAPI +CreateEnhMetaFileW( HDC hDC, /* [in] optional reference DC */ LPCWSTR filename, /* [in] optional filename for disk metafiles */ const RECT* rect, /* [in] optional bounding rectangle */ @@ -144,29 +385,15 @@ } #endif + /* - * @implemented + * @unimplemented */ HENHMETAFILE -STDCALL -CopyEnhMetaFileW( - HENHMETAFILE hemfSrc, - LPCWSTR lpszFile - ) -{ - return NtGdiCopyEnhMetaFile ( hemfSrc, lpszFile ); -} - - -/* - * @implemented - */ -HENHMETAFILE -STDCALL +WINAPI CopyEnhMetaFileA( HENHMETAFILE hemfSrc, - LPCSTR lpszFile - ) + LPCSTR lpszFile) { NTSTATUS Status; LPWSTR lpszFileW; @@ -177,7 +404,7 @@ SetLastError (RtlNtStatusToDosError(Status)); else { - rc = NtGdiCopyEnhMetaFile ( hemfSrc, lpszFileW ); + rc = NULL; HEAP_free ( lpszFileW ); } @@ -186,32 +413,15 @@ /* - * @implemented + * @unimplemented */ HDC -STDCALL -CreateEnhMetaFileW( - HDC hdcRef, - LPCWSTR lpFileName, - CONST RECT *lpRect, - LPCWSTR lpDescription - ) -{ - return NtGdiCreateEnhMetaFile ( hdcRef, lpFileName, (CONST LPRECT)lpRect, lpDescription ); -} - - -/* - * @implemented - */ -HDC -STDCALL +WINAPI CreateEnhMetaFileA( HDC hdcRef, LPCSTR lpFileName, CONST RECT *lpRect, - LPCSTR lpDescription - ) + LPCSTR lpDescription) { NTSTATUS Status; LPWSTR lpFileNameW, lpDescriptionW; @@ -237,7 +447,7 @@ return rc; } - rc = NtGdiCreateEnhMetaFile (hdcRef, lpFileNameW, (CONST LPRECT)lpRect, lpDescriptionW ); + rc = NULL; if (lpDescriptionW != NULL) HEAP_free ( lpDescriptionW ); @@ -248,27 +458,16 @@ return rc; } + + + /* - * @implemented + * @unimplemented */ HENHMETAFILE -STDCALL -GetEnhMetaFileW( - LPCWSTR lpszMetaFile - ) -{ - return NtGdiGetEnhMetaFile ( lpszMetaFile ); -} - - -/* - * @implemented - */ -HENHMETAFILE -STDCALL +WINAPI GetEnhMetaFileA( - LPCSTR lpszMetaFile - ) + LPCSTR lpszMetaFile) { NTSTATUS Status; LPWSTR lpszMetaFileW; @@ -279,7 +478,7 @@ SetLastError (RtlNtStatusToDosError(Status)); else { - rc = NtGdiGetEnhMetaFile ( lpszMetaFileW ); + rc = NULL; HEAP_free ( lpszMetaFileW ); } @@ -289,34 +488,17 @@ /* - * @implemented + * @unimplemented */ UINT -STDCALL -GetEnhMetaFileDescriptionW( - HENHMETAFILE hemf, - UINT cchBuffer, - LPWSTR lpszDescription - ) -{ - return NtGdiGetEnhMetaFileDescription ( hemf, cchBuffer, lpszDescription ); -} - - -/* - * @implemented - */ -UINT -STDCALL +WINAPI GetEnhMetaFileDescriptionA( HENHMETAFILE hemf, UINT cchBuffer, - LPSTR lpszDescription - ) + LPSTR lpszDescription) { NTSTATUS Status; LPWSTR lpszDescriptionW; - UINT rc; if ( lpszDescription && cchBuffer ) { @@ -329,8 +511,6 @@ } else lpszDescriptionW = NULL; - - rc = NtGdiGetEnhMetaFileDescription ( hemf, cchBuffer, lpszDescriptionW ); if ( lpszDescription && cchBuffer ) { @@ -347,6 +527,54 @@ } } - return rc; -} - + return 0; +} + + + +/* Unimplemented functions */ + +HENHMETAFILE +WINAPI +CopyEnhMetaFileW( + HENHMETAFILE hemfSrc, + LPCWSTR lpszFile) +{ + UNIMPLEMENTED; + return 0; +} + + +HENHMETAFILE +WINAPI +GetEnhMetaFileW( + LPCWSTR lpszMetaFile) +{ + UNIMPLEMENTED; + return 0; +} + + +UINT +WINAPI +GetEnhMetaFileDescriptionW( + HENHMETAFILE hemf, + UINT cchBuffer, + LPWSTR lpszDescription) +{ + UNIMPLEMENTED; + return 0; +} + + +HDC +WINAPI +CreateEnhMetaFileW( + HDC hdcRef, + LPCWSTR lpFileName, + LPCRECT lpRect, + LPCWSTR lpDescription) +{ + UNIMPLEMENTED; + return 0; +} Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Sat Jan 5 20:35:23 2008 @@ -85,27 +85,6 @@ NtGdiAddFontResource(PUNICODE_STRING Filename, DWORD fl); -/* Metafiles are user mode */ -HENHMETAFILE -STDCALL -NtGdiCloseEnhMetaFile ( - HDC hDC - ); - -/* Does not exist */ -BOOL -STDCALL -NtGdiColorMatchToTarget(HDC hDC, - HDC hDCTarget, - DWORD Action); - -/* Metafiles are user mode */ -HENHMETAFILE -STDCALL -NtGdiCopyEnhMetaFile ( - HENHMETAFILE Src, - LPCWSTR File - ); /* Use NtGdiCreateDIBitmapInternal */ HBITMAP @@ -119,35 +98,7 @@ UINT Usage ); -/* Metafiles are user mode */ -HDC -STDCALL -NtGdiCreateEnhMetaFile ( - HDC hDCRef, - LPCWSTR File, - CONST LPRECT Rect, - LPCWSTR Description - ); - - - -/* Meta are user-mode. */ -BOOL -STDCALL -NtGdiDeleteEnhMetaFile ( - HENHMETAFILE emf - ); - -/* Meta are user-mode. */ -BOOL -STDCALL -NtGdiEnumEnhMetaFile ( - HDC hDC, - HENHMETAFILE emf, - ENHMFENUMPROC EnhMetaFunc, - LPVOID Data, - CONST LPRECT Rect - ); + /* Should be done in user-mode. */ int @@ -156,13 +107,6 @@ LPCWSTR FaceName, FONTENUMPROCW FontFunc, LPARAM lParam); - -/* Should be done in user-mode. */ -INT -STDCALL -NtGdiEnumICMProfiles(HDC hDC, - LPWSTR lpstrBuffer, - UINT cch ); /* Use NtGdiExtTextOutW with 0, 0 at the end. */ BOOL @@ -179,98 +123,13 @@ /* Should be done in user-mode. */ BOOL STDCALL -NtGdiGdiComment ( - HDC hDC, - UINT Size, - CONST LPBYTE Data - ); - -/* Should be done in user-mode. */ -BOOL -STDCALL NtGdiGetAspectRatioFilterEx(HDC hDC, LPSIZE AspectRatio); -/* Use NtGdiGetColorSpaceforBitmap. */ -HCOLORSPACE -STDCALL -NtGdiGetColorSpace(HDC hDC); - -/* Meta are user-mode. */ -HENHMETAFILE -STDCALL -NtGdiGetEnhMetaFile ( - LPCWSTR MetaFile - ); - -/* Meta are user-mode. */ -UINT -STDCALL -NtGdiGetEnhMetaFileBits ( - HENHMETAFILE hemf, - UINT BufSize, - LPBYTE Buffer - ); - -/* Meta are user-mode. */ -UINT -STDCALL -NtGdiGetEnhMetaFileDescription ( - HENHMETAFILE hemf, - UINT BufSize, - LPWSTR Description - ); - -/* Meta are user-mode. */ -UINT -STDCALL -NtGdiGetEnhMetaFileHeader ( - HENHMETAFILE hemf, - UINT BufSize, - LPENHMETAHEADER emh - ); - -/* Meta are user-mode. */ -UINT -STDCALL -NtGdiGetEnhMetaFilePaletteEntries ( - HENHMETAFILE hemf, - UINT Entries, - LPPALETTEENTRY pe - ); - -/* Meta are user-mode. */ -UINT -STDCALL -NtGdiGetEnhMetaFilePixelFormat(HENHMETAFILE hEMF, - DWORD BufSize, - CONST PPIXELFORMATDESCRIPTOR pfd); - /* Should be done in user-mode. */ DWORD STDCALL NtGdiGetFontLanguageInfo(HDC hDC); - -/* Should be done in user-mode. */ -BOOL -STDCALL -NtGdiGetICMProfile(HDC hDC, - LPDWORD NameSize, - LPWSTR Filename); - -/* Should be done in user-mode. */ -BOOL -STDCALL -NtGdiGetLogColorSpace(HCOLORSPACE hColorSpace, - LPLOGCOLORSPACEW Buffer, - DWORD Size); - -/* Should be done in user-mode using shared GDI Objects. */ -INT -STDCALL -NtGdiGetPixelFormat(HDC hDC); - - /* Use NtGdiGetDCPoint with GdiGetViewPortExt */ BOOL STDCALL NtGdiGetViewportExtEx(HDC hDC, LPSIZE viewportExt); @@ -302,25 +161,6 @@ int XOffset, int YOffset, LPPOINT Point - ); - -/* Metafiles are user-mode. */ -BOOL -STDCALL -NtGdiPlayEnhMetaFile ( - HDC hDC, - HENHMETAFILE hemf, - CONST PRECT Rect - ); - -/* Metafiles are user-mode. */ -BOOL -STDCALL -NtGdiPlayEnhMetaFileRecord ( - HDC hDC, - LPHANDLETABLE Handletable, - CONST ENHMETARECORD * EnhMetaRecord, - UINT Handles ); /* Use NtGdiPolyTextOutW with 0 at the end. */ @@ -354,20 +194,6 @@ CONST BITMAPINFO * bmi, UINT ColorUse ); - -/* Metafiles are user-mode. */ -HENHMETAFILE -STDCALL -NtGdiSetEnhMetaFileBits ( - UINT BufSize, - CONST PBYTE Data - ); - -/* Should be done in user-mode. */ -BOOL -STDCALL -NtGdiSetICMProfile(HDC hDC, - LPWSTR Filename); /* Needs to be done in user-mode, using shared GDI Object Attributes. */ DWORD @@ -434,14 +260,6 @@ DWORD ROP ); -/* Needs to be done in user-mode. */ -BOOL -STDCALL -NtGdiUpdateICMRegKey(DWORD Reserved, - LPWSTR CMID, - LPWSTR Filename, - UINT Command); - #endif /* WIN32K_NTGDI_BAD_INCLUDED */ Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/icm.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/icm.c Sat Jan 5 20:35:23 2008 @@ -23,16 +23,6 @@ #define NDEBUG #include <debug.h> -BOOL -STDCALL -NtGdiColorMatchToTarget(HDC hDC, - HDC hDCTarget, - DWORD Action) -{ - UNIMPLEMENTED; - return FALSE; -} - HANDLE APIENTRY NtGdiCreateColorSpace( @@ -49,29 +39,6 @@ { UNIMPLEMENTED; return FALSE; -} - -INT -STDCALL -NtGdiEnumICMProfiles(HDC hDC, - LPWSTR lpstrBuffer, - UINT cch ) -{ - /* - * FIXME - build list of file names into lpstrBuffer. - * (MULTI-SZ would probably be best format) - * return (needed) length of buffer in bytes - */ - UNIMPLEMENTED; - return 0; -} - -HCOLORSPACE -STDCALL -NtGdiGetColorSpace(HDC hDC) -{ - /* FIXME: Need to to whatever GetColorSpace actually does */ - return 0; } BOOL @@ -162,26 +129,6 @@ return FALSE; } return Ret; -} - -BOOL -STDCALL -NtGdiGetICMProfile(HDC hDC, - LPDWORD NameSize, - LPWSTR Filename) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL -STDCALL -NtGdiGetLogColorSpace(HCOLORSPACE hColorSpace, - LPLOGCOLORSPACEW Buffer, - DWORD Size) -{ - UNIMPLEMENTED; - return FALSE; } BOOL @@ -401,24 +348,4 @@ return 0; } -BOOL -STDCALL -NtGdiSetICMProfile(HDC hDC, - LPWSTR Filename) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL -STDCALL -NtGdiUpdateICMRegKey(DWORD Reserved, - LPWSTR CMID, - LPWSTR Filename, - UINT Command) -{ - UNIMPLEMENTED; - return FALSE; -} - /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/objects/wingl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/wingl.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/wingl.c Sat Jan 5 20:35:23 2008 @@ -44,23 +44,6 @@ return 0; } -UINT -STDCALL -NtGdiGetEnhMetaFilePixelFormat(HENHMETAFILE hEMF, - DWORD BufSize, - CONST PPIXELFORMATDESCRIPTOR pfd) -{ - UNIMPLEMENTED; - return 0; -} - -INT -STDCALL -NtGdiGetPixelFormat(HDC hDC) -{ - UNIMPLEMENTED; - return 0; -} BOOL APIENTRY Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Sat Jan 5 20:35:23 2008 @@ -677,20 +677,17 @@ NtGdiDrawStream 3 # # -#ReactOS specify syscall +#ReactOS specific syscalls NtGdiSetDIBits 7 -NtGdiSetEnhMetaFileBits 2 -NtGdiSetICMProfile 2 NtGdiSetMapperFlags 2 NtGdiSetViewportExtEx 4 NtGdiSetViewportOrgEx 4 NtGdiSetWindowExtEx 4 NtGdiSetWindowOrgEx 4 NtGdiStretchDIBits 13 -NtGdiUpdateICMRegKey 4 NtUserBuildMenuItemList 4 NtUserCreateCursorIconHandle 2 -NtUserEnumClipboardFormats 1 +NtUserEnumClipboardFormats 1 NtUserGetActiveWindow 0 NtUserGetCapture 0 NtUserGetClassLong 3 @@ -713,7 +710,7 @@ NtUserMonitorFromRect 2 NtUserMonitorFromWindow 2 NtUserRegisterClassEx 6 -NtUserRegisterClipboardFormat 1 +NtUserRegisterClipboardFormat 1 NtUserSendMessage 5 NtUserSendMessageCallback 6 NtUserSendMessageTimeout 8 @@ -721,36 +718,16 @@ NtUserSetScrollBarInfo 3 NtUserGetDesktopWindow 0 NtGdiAddFontResource 2 -NtGdiCloseEnhMetaFile 1 -NtGdiColorMatchToTarget 3 -NtGdiCopyEnhMetaFile 2 NtGdiCreateDIBitmap 6 -NtGdiCreateEnhMetaFile 4 NtGdiCreateScalableFontResource 4 -NtGdiDeleteEnhMetaFile 1 -NtGdiEnumEnhMetaFile 5 NtGdiEnumFonts 4 -NtGdiEnumICMProfiles 3 NtGdiExtTextOut 8 -NtGdiGdiComment 3 NtGdiGetAspectRatioFilterEx 2 -NtGdiGetColorSpace 1 -NtGdiGetEnhMetaFile 1 -NtGdiGetEnhMetaFileBits 3 -NtGdiGetEnhMetaFileDescription 3 -NtGdiGetEnhMetaFileHeader 3 -NtGdiGetEnhMetaFilePaletteEntries 3 -NtGdiGetEnhMetaFilePixelFormat 3 NtGdiGetFontFamilyInfo 4 NtGdiGetFontLanguageInfo 1 -NtGdiGetICMProfile 3 -NtGdiGetLogColorSpace 3 -NtGdiGetPixelFormat 1 NtGdiGetTextExtentPoint32 4 NtGdiOffsetViewportOrgEx 4 NtGdiOffsetWindowOrgEx 4 -NtGdiPlayEnhMetaFile 3 -NtGdiPlayEnhMetaFileRecord 4 NtGdiPolyTextOut 3 NtGdiRealizePalette 1 NtGdiRemoveFontResource 1 Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild Sat Jan 5 20:35:23 2008 @@ -157,7 +157,6 @@ <file>gdiobj.c</file> <file>icm.c</file> <file>line.c</file> - <file>metafile.c</file> <file>palobj.c</file> <file>path.c</file> <file>pen.c</file>

1 0

[hpoussin] 31608: Be compatible with MS Windows 2003 SP1 syscall list
by hpoussin＠svn.reactos.org 05 Jan '08

05 Jan '08

Author: hpoussin Date: Sat Jan 5 20:29:44 2008 New Revision: 31608 URL: http://svn.reactos.org/svn/reactos?rev=31608&view=rev Log: Be compatible with MS Windows 2003 SP1 syscall list Modified: trunk/reactos/ntoskrnl/config/ntapi.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c trunk/reactos/ntoskrnl/sysfuncs.lst Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c Sat Jan 5 20:29:44 2008 @@ -864,6 +864,15 @@ NTSTATUS NTAPI +NtRenameKey(IN HANDLE KeyHandle, + IN PUNICODE_STRING ReplacementName) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI NtReplaceKey(IN POBJECT_ATTRIBUTES ObjectAttributes, IN HANDLE Key, IN POBJECT_ATTRIBUTES ReplacedObjectAttributes) Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Sat Jan 5 20:29:44 2008 @@ -3340,3 +3340,25 @@ /* Return status */ return Status; } + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +NtCancelDeviceWakeupRequest(IN HANDLE DeviceHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +NtRequestDeviceWakeup(IN HANDLE DeviceHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} Modified: trunk/reactos/ntoskrnl/sysfuncs.lst URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/sysfuncs.lst?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/sysfuncs.lst (original) +++ trunk/reactos/ntoskrnl/sysfuncs.lst Sat Jan 5 20:29:44 2008 @@ -21,6 +21,7 @@ NtAreMappedFilesTheSame 2 NtAssignProcessToJobObject 2 NtCallbackReturn 3 +NtCancelDeviceWakeupRequest 1 NtCancelIoFile 2 NtCancelTimer 2 NtClearEvent 1 @@ -138,8 +139,8 @@ NtPlugPlayControl 3 NtPowerInformation 5 NtPrivilegeCheck 3 +NtPrivilegeObjectAuditAlarm 6 NtPrivilegedServiceAuditAlarm 5 -NtPrivilegeObjectAuditAlarm 6 NtProtectVirtualMemory 5 NtPulseEvent 2 NtQueryAttributesFile 2 @@ -197,11 +198,13 @@ NtReleaseSemaphore 3 NtRemoveIoCompletion 5 NtRemoveProcessDebug 2 +NtRenameKey 2 NtReplaceKey 3 NtReplyPort 2 NtReplyWaitReceivePort 4 NtReplyWaitReceivePortEx 5 NtReplyWaitReplyPort 2 +NtRequestDeviceWakeup 1 NtRequestPort 2 NtRequestWaitReplyPort 3 NtRequestWakeupLatency 1

1 0

[hpoussin] 31607: Add NtRenameKey prototype
by hpoussin＠svn.reactos.org 05 Jan '08

05 Jan '08

Author: hpoussin Date: Sat Jan 5 20:28:07 2008 New Revision: 31607 URL: http://svn.reactos.org/svn/reactos?rev=31607&view=rev Log: Add NtRenameKey prototype Modified: trunk/reactos/include/ndk/cmfuncs.h Modified: trunk/reactos/include/ndk/cmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cmfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cmfuncs.h (original) +++ trunk/reactos/include/ndk/cmfuncs.h Sat Jan 5 20:28:07 2008 @@ -261,6 +261,14 @@ NTSYSCALLAPI NTSTATUS NTAPI +NtRenameKey( + IN HANDLE KeyHandle, + IN PUNICODE_STRING ReplacementName +); + +NTSYSCALLAPI +NTSTATUS +NTAPI NtReplaceKey( IN POBJECT_ATTRIBUTES ObjectAttributes, IN HANDLE Key,

1 0

[pschweitzer] 31606: Zero memory before use
by pschweitzer＠svn.reactos.org 05 Jan '08

05 Jan '08

Author: pschweitzer Date: Sat Jan 5 16:15:54 2008 New Revision: 31606 URL: http://svn.reactos.org/svn/reactos?rev=31606&view=rev Log: Zero memory before use Modified: trunk/reactos/drivers/filesystems/ntfs/volinfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/volinfo.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/volinfo.c Sat Jan 5 16:15:54 2008 @@ -181,6 +181,7 @@ FsInformationClass = Stack->Parameters.QueryVolume.FsInformationClass; BufferLength = Stack->Parameters.QueryVolume.Length; SystemBuffer = Irp->AssociatedIrp.SystemBuffer; + RtlZeroMemory(SystemBuffer, BufferLength); DPRINT("FsInformationClass %d\n", FsInformationClass); DPRINT("SystemBuffer %p\n", SystemBuffer);

1 0

[akorotaev] 31605: Forgot to rename these files
by akorotaev＠svn.reactos.org 05 Jan '08

05 Jan '08

Author: akorotaev Date: Sat Jan 5 15:15:43 2008 New Revision: 31605 URL: http://svn.reactos.org/svn/reactos?rev=31605&view=rev Log: Forgot to rename these files Added: branches/cache_manager_rewrite/mm/mdlsup.c - copied unchanged from r31604, branches/cache_manager_rewrite/mm/mdl.c branches/cache_manager_rewrite/mm/procsup.c - copied unchanged from r31604, branches/cache_manager_rewrite/mm/process.c Removed: branches/cache_manager_rewrite/mm/mdl.c branches/cache_manager_rewrite/mm/process.c Removed: branches/cache_manager_rewrite/mm/mdl.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/mdl.c?… ============================================================================== --- branches/cache_manager_rewrite/mm/mdl.c (original) +++ branches/cache_manager_rewrite/mm/mdl.c (removed) @@ -1,967 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/mdl.c - * PURPOSE: Manipulates MDLs - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - */ - -/* INCLUDES ****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, MmInitializeMdlImplementation) -#endif - -/* GLOBALS *******************************************************************/ - -#define TAG_MDL TAG('M', 'D', 'L', ' ') - -#define MI_MDL_MAPPING_REGION_SIZE (256*1024*1024) - -static PVOID MiMdlMappingRegionBase = NULL; -static RTL_BITMAP MiMdlMappingRegionAllocMap; -static ULONG MiMdlMappingRegionHint; -static KSPIN_LOCK MiMdlMappingRegionLock; -extern ULONG MmPageArraySize; - -/* -MDL Flags desc. - -MDL_PAGES_LOCKED MmProbeAndLockPages has been called for this mdl -MDL_SOURCE_IS_NONPAGED_POOL mdl has been build by MmBuildMdlForNonPagedPool -MDL_PARTIAL mdl has been built by IoBuildPartialMdl -MDL_MAPPING_CAN_FAIL in case of an error, MmMapLockedPages will return NULL instead of to bugcheck -MDL_MAPPED_TO_SYSTEM_VA mdl has been mapped into kernel space using MmMapLockedPages -MDL_PARTIAL_HAS_BEEN_MAPPED mdl flagged MDL_PARTIAL has been mapped into kernel space using MmMapLockedPages -*/ - -/* FUNCTIONS *****************************************************************/ - - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -MmAdvanceMdl ( - IN PMDL Mdl, - IN ULONG NumberOfBytes - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -VOID -INIT_FUNCTION -NTAPI -MmInitializeMdlImplementation(VOID) -{ - MEMORY_AREA* Result; - NTSTATUS Status; - PVOID Buffer; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - - BoundaryAddressMultiple.QuadPart = 0; - MiMdlMappingRegionHint = 0; - MiMdlMappingRegionBase = NULL; - - MmLockAddressSpace(MmGetKernelAddressSpace()); - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_MDL_MAPPING, - &MiMdlMappingRegionBase, - MI_MDL_MAPPING_REGION_SIZE, - PAGE_READWRITE, - &Result, - FALSE, - 0, - BoundaryAddressMultiple); - if (!NT_SUCCESS(Status)) - { - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - KEBUGCHECK(0); - } - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - - Buffer = ExAllocatePoolWithTag(NonPagedPool, - MI_MDL_MAPPING_REGION_SIZE / (PAGE_SIZE * 8), - TAG_MDL); - - RtlInitializeBitMap(&MiMdlMappingRegionAllocMap, Buffer, MI_MDL_MAPPING_REGION_SIZE / PAGE_SIZE); - RtlClearAllBits(&MiMdlMappingRegionAllocMap); - - KeInitializeSpinLock(&MiMdlMappingRegionLock); -} - - -PVOID -NTAPI -MmGetMdlPageAddress(PMDL Mdl, PVOID Offset) -{ - PPFN_NUMBER MdlPages; - - MdlPages = (PPFN_NUMBER)(Mdl + 1); - - return((PVOID)MdlPages[((ULONG_PTR)Offset) / PAGE_SIZE]); -} - - -/* - * @implemented - */ -VOID STDCALL -MmUnlockPages(PMDL Mdl) -/* - * FUNCTION: Unlocks the physical pages described by a given MDL - * ARGUMENTS: - * MemoryDescriptorList = MDL describing the buffer to be unlocked - * NOTES: The memory described by the specified MDL must have been locked - * previously by a call to MmProbeAndLockPages. As the pages unlocked, the - * MDL is updated - * - * May be called in any process context. - */ -{ - ULONG i; - PPFN_NUMBER MdlPages; - PFN_NUMBER Page; - - /* - * MmProbeAndLockPages MUST have been called to lock this mdl! - * - * Windows will bugcheck if you pass MmUnlockPages an mdl that hasn't been - * locked with MmLockAndProbePages, but (for now) we'll be more forgiving... - */ - if (!(Mdl->MdlFlags & MDL_PAGES_LOCKED)) - { - DPRINT1("MmUnlockPages called for non-locked mdl!\n"); - return; - } - - /* If mdl buffer is mapped io space -> do nothing */ - if (Mdl->MdlFlags & MDL_IO_SPACE) - { - Mdl->MdlFlags &= ~MDL_PAGES_LOCKED; - return; - } - - /* Automagically undo any calls to MmGetSystemAddressForMdl's for this mdl */ - if (Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA) - { - MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); - } - - /* - * FIXME: I don't know whether this right, but it looks sensible - */ - if ((Mdl->MdlFlags & MDL_SOURCE_IS_NONPAGED_POOL) || - (Mdl->MdlFlags & MDL_IO_PAGE_READ)) - { - return; - } - - - MdlPages = (PPFN_NUMBER)(Mdl + 1); - for (i=0; i<(PAGE_ROUND_UP(Mdl->ByteCount+Mdl->ByteOffset)/PAGE_SIZE); i++) - { - Page = MdlPages[i]; - MmUnlockPage(Page); - MmDereferencePage(Page); - } - - Mdl->MdlFlags &= ~MDL_PAGES_LOCKED; -} - - -/* - * @unimplemented - */ -PVOID -STDCALL -MmMapLockedPagesWithReservedMapping ( - IN PVOID MappingAddress, - IN ULONG PoolTag, - IN PMDL MemoryDescriptorList, - IN MEMORY_CACHING_TYPE CacheType - ) -{ - UNIMPLEMENTED; - return 0; -} - - -/* - * @implemented - */ -VOID STDCALL -MmUnmapLockedPages(PVOID BaseAddress, PMDL Mdl) -/* - * FUNCTION: Releases a mapping set up by a preceding call to MmMapLockedPages - * ARGUMENTS: - * BaseAddress = Base virtual address to which the pages were mapped - * MemoryDescriptorList = MDL describing the mapped pages - * - * User space unmappings _must_ be done from the original process context! - */ -{ - KIRQL oldIrql; - ULONG i; - ULONG PageCount; - ULONG Base; - - DPRINT("MmUnmapLockedPages(BaseAddress %x, Mdl %x)\n", BaseAddress, Mdl); - - /* - * In this case, the MDL has the same system address as the base address - * so there is no need to free it - */ - if ((Mdl->MdlFlags & MDL_SOURCE_IS_NONPAGED_POOL) && - (BaseAddress >= MmSystemRangeStart)) - { - return; - } - - - /* Calculate the number of pages we mapped. */ - PageCount = PAGE_ROUND_UP(Mdl->ByteCount + Mdl->ByteOffset) / PAGE_SIZE; - - /* - * Docs says that BaseAddress should be a _base_ address, but every example - * I've seen pass the actual address. -Gunnar - */ - BaseAddress = PAGE_ALIGN(BaseAddress); - - /* Unmap all the pages. */ - for (i = 0; i < PageCount; i++) - { - MmDeleteVirtualMapping(Mdl->Process, - (char*)BaseAddress + (i * PAGE_SIZE), - FALSE, - NULL, - NULL); - } - - if (BaseAddress >= MmSystemRangeStart) - { - ASSERT(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA); - - KeAcquireSpinLock(&MiMdlMappingRegionLock, &oldIrql); - /* Deallocate all the pages used. */ - Base = (ULONG)((char*)BaseAddress - (char*)MiMdlMappingRegionBase) / PAGE_SIZE; - - RtlClearBits(&MiMdlMappingRegionAllocMap, Base, PageCount); - - MiMdlMappingRegionHint = min (MiMdlMappingRegionHint, Base); - - KeReleaseSpinLock(&MiMdlMappingRegionLock, oldIrql); - - /* Reset the MDL state. */ - Mdl->MdlFlags &= ~MDL_MAPPED_TO_SYSTEM_VA; - Mdl->MappedSystemVa = NULL; - - } - else - { - MEMORY_AREA *Marea; - - ASSERT(Mdl->Process == PsGetCurrentProcess()); - - Marea = MmLocateMemoryAreaByAddress( (PMADDRESS_SPACE)&(Mdl->Process)->VadRoot, BaseAddress ); - if (Marea == NULL) - { - DPRINT1( "Couldn't open memory area when unmapping user-space pages!\n" ); - KEBUGCHECK(0); - } - - MmFreeMemoryArea( (PMADDRESS_SPACE)&(Mdl->Process)->VadRoot, Marea, NULL, NULL ); - - Mdl->Process = NULL; - } - -} - - -/* - * @unimplemented - */ -VOID -STDCALL -MmUnmapReservedMapping ( - IN PVOID BaseAddress, - IN ULONG PoolTag, - IN PMDL MemoryDescriptorList - ) -{ - UNIMPLEMENTED; -} - - -VOID -NTAPI -MmBuildMdlFromPages(PMDL Mdl, PPFN_TYPE Pages) -{ - memcpy(Mdl + 1, Pages, sizeof(PFN_TYPE) * (PAGE_ROUND_UP(Mdl->ByteOffset+Mdl->ByteCount)/PAGE_SIZE)); - - /* FIXME: this flag should be set by the caller perhaps? */ - Mdl->MdlFlags |= MDL_IO_PAGE_READ; -} - - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -MmPrefetchPages ( - IN ULONG NumberOfLists, - IN PREAD_LIST *ReadLists - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -MmProtectMdlSystemAddress ( - IN PMDL MemoryDescriptorList, - IN ULONG NewProtect - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* - * @implemented - */ -VOID STDCALL MmProbeAndLockPages (PMDL Mdl, - KPROCESSOR_MODE AccessMode, - LOCK_OPERATION Operation) -/* - * FUNCTION: Probes the specified pages, makes them resident and locks them - * ARGUMENTS: - * Mdl = MDL to probe - * AccessMode = Access at which to probe the buffer - * Operation = Operation to probe for - * - * This function can be seen as a safe version of MmBuildMdlForNonPagedPool - * used in cases where you know that the mdl address is paged memory or - * you don't know where the mdl address comes from. MmProbeAndLockPages will - * work no matter what kind of mdl address you have. - */ -{ - PPFN_TYPE MdlPages; - ULONG i, j; - ULONG NrPages; - NTSTATUS Status; - KPROCESSOR_MODE Mode; - PFN_TYPE Page; - PEPROCESS CurrentProcess = PsGetCurrentProcess(); - PMADDRESS_SPACE AddressSpace; - - DPRINT("MmProbeAndLockPages(Mdl %x)\n", Mdl); - - ASSERT(!(Mdl->MdlFlags & (MDL_PAGES_LOCKED|MDL_MAPPED_TO_SYSTEM_VA|MDL_PARTIAL| - MDL_IO_SPACE|MDL_SOURCE_IS_NONPAGED_POOL))); - - MdlPages = (PPFN_TYPE)(Mdl + 1); - NrPages = PAGE_ROUND_UP(Mdl->ByteOffset + Mdl->ByteCount) / PAGE_SIZE; - - /* mdl must have enough page entries */ - ASSERT(NrPages <= (Mdl->Size - sizeof(MDL))/sizeof(PFN_TYPE)); - - - if (Mdl->StartVa >= MmSystemRangeStart && - MmGetPfnForProcess(NULL, Mdl->StartVa) >= MmPageArraySize) - { - /* phys addr is not phys memory so this must be io memory */ - - for (i = 0; i < NrPages; i++) - { - MdlPages[i] = MmGetPfnForProcess(NULL, (char*)Mdl->StartVa + (i*PAGE_SIZE)); - } - - Mdl->MdlFlags |= MDL_PAGES_LOCKED|MDL_IO_SPACE; - return; - } - - - if (Mdl->StartVa >= MmSystemRangeStart) - { - /* FIXME: why isn't AccessMode used? */ - Mode = KernelMode; - Mdl->Process = NULL; - AddressSpace = MmGetKernelAddressSpace(); - } - else - { - /* FIXME: why isn't AccessMode used? */ - Mode = UserMode; - Mdl->Process = CurrentProcess; - AddressSpace = (PMADDRESS_SPACE)&(CurrentProcess)->VadRoot; - } - - - /* - * Lock the pages - */ - MmLockAddressSpace(AddressSpace); - - for (i = 0; i < NrPages; i++) - { - PVOID Address; - - Address = (char*)Mdl->StartVa + (i*PAGE_SIZE); - - /* - * FIXME: skip the probing/access stuff if buffer is nonpaged kernel space? - * -Gunnar - */ - - if (!MmIsPagePresent(NULL, Address)) - { - Status = MmAccessFault(FALSE, Address, Mode, NULL); - if (!NT_SUCCESS(Status)) - { - for (j = 0; j < i; j++) - { - Page = MdlPages[j]; - if (Page < MmPageArraySize) - { - MmUnlockPage(Page); - MmDereferencePage(Page); - } - } - MmUnlockAddressSpace(AddressSpace); - ExRaiseStatus(STATUS_ACCESS_VIOLATION); - } - } - else - { - MmLockPage(MmGetPfnForProcess(NULL, Address)); - } - - if ((Operation == IoWriteAccess || Operation == IoModifyAccess) && - (!(MmGetPageProtect(NULL, (PVOID)Address) & PAGE_READWRITE))) - { - Status = MmAccessFault(TRUE, Address, Mode, NULL); - if (!NT_SUCCESS(Status)) - { - for (j = 0; j < i; j++) - { - Page = MdlPages[j]; - if (Page < MmPageArraySize) - { - MmUnlockPage(Page); - MmDereferencePage(Page); - } - } - MmUnlockAddressSpace(AddressSpace); - ExRaiseStatus(STATUS_ACCESS_VIOLATION); - } - } - Page = MmGetPfnForProcess(NULL, Address); - MdlPages[i] = Page; - if (Page >= MmPageArraySize) - Mdl->MdlFlags |= MDL_IO_SPACE; - else - MmReferencePage(Page); - } - - MmUnlockAddressSpace(AddressSpace); - Mdl->MdlFlags |= MDL_PAGES_LOCKED; -} - - -/* - * @unimplemented - */ -VOID -STDCALL -MmProbeAndLockProcessPages ( - IN OUT PMDL MemoryDescriptorList, - IN PEPROCESS Process, - IN KPROCESSOR_MODE AccessMode, - IN LOCK_OPERATION Operation - ) -{ - UNIMPLEMENTED; -} - - -/* - * @unimplemented - */ -VOID -STDCALL -MmProbeAndLockSelectedPages( - IN OUT PMDL MemoryDescriptorList, - IN LARGE_INTEGER PageList[], - IN KPROCESSOR_MODE AccessMode, - IN LOCK_OPERATION Operation - ) -{ - UNIMPLEMENTED; -} - - -/* - * @implemented - */ -ULONG STDCALL MmSizeOfMdl (PVOID Base, - ULONG Length) -/* - * FUNCTION: Returns the number of bytes to allocate for an MDL describing - * the given address range - * ARGUMENTS: - * Base = base virtual address - * Length = number of bytes to map - */ -{ - ULONG len; - - len = ADDRESS_AND_SIZE_TO_SPAN_PAGES(Base,Length); - - return(sizeof(MDL)+(len*sizeof(PFN_TYPE))); -} - - -/* - * @implemented - */ -VOID STDCALL -MmBuildMdlForNonPagedPool (PMDL Mdl) -/* - * FUNCTION: Fills in the corresponding physical page array of a given - * MDL for a buffer in nonpaged system space - * ARGUMENTS: - * Mdl = Points to an MDL that supplies a virtual address, - * byte offset and length - * - * This function can be seen as a fast version of MmProbeAndLockPages in case - * you _know_ that the mdl address is within nonpaged kernel space. - */ -{ - ULONG i; - ULONG PageCount; - PPFN_TYPE MdlPages; - - /* - * mdl buffer must (at least) be in kernel space, thou this doesn't - * necesarely mean that the buffer in within _nonpaged_ kernel space... - */ - ASSERT(Mdl->StartVa >= MmSystemRangeStart); - - PageCount = PAGE_ROUND_UP(Mdl->ByteOffset + Mdl->ByteCount) / PAGE_SIZE; - MdlPages = (PPFN_TYPE)(Mdl + 1); - - /* mdl must have enough page entries */ - ASSERT(PageCount <= (Mdl->Size - sizeof(MDL))/sizeof(PFN_TYPE)); - - for (i=0; i < PageCount; i++) - { - *MdlPages++ = MmGetPfnForProcess(NULL, (char*)Mdl->StartVa + (i * PAGE_SIZE)); - } - - Mdl->MdlFlags |= MDL_SOURCE_IS_NONPAGED_POOL; - Mdl->Process = NULL; - Mdl->MappedSystemVa = (char*)Mdl->StartVa + Mdl->ByteOffset; -} - - -/* - * @implemented - */ -PMDL STDCALL -MmCreateMdl (PMDL Mdl, - PVOID Base, - ULONG Length) -/* - * FUNCTION: Allocates and initalizes an MDL - * ARGUMENTS: - * MemoryDescriptorList = Points to MDL to initalize. If this is - * NULL then one is allocated - * Base = Base virtual address of the buffer - * Length = Length in bytes of the buffer - * RETURNS: A pointer to initalized MDL - */ -{ - if (Mdl == NULL) - { - ULONG Size; - - Size = MmSizeOfMdl(Base,Length); - Mdl = - (PMDL)ExAllocatePoolWithTag(NonPagedPool, Size, TAG_MDL); - if (Mdl == NULL) - { - return(NULL); - } - } - - MmInitializeMdl(Mdl, (char*)Base, Length); - - return(Mdl); -} - - -/* - * @unimplemented - */ -VOID STDCALL -MmMapMemoryDumpMdl (PVOID Unknown0) -/* - * FIXME: Has something to do with crash dumps. Do we want to implement - * this? - */ -{ - UNIMPLEMENTED; -} - - -/* - * @implemented - */ -PMDL STDCALL -MmAllocatePagesForMdl ( IN PHYSICAL_ADDRESS LowAddress, - IN PHYSICAL_ADDRESS HighAddress, - IN PHYSICAL_ADDRESS SkipBytes, - IN SIZE_T Totalbytes ) -{ - /* - MmAllocatePagesForMdl allocates zero-filled, nonpaged, physical memory pages to an MDL - - MmAllocatePagesForMdlSearch the PFN database for free, zeroed or standby - pagesAllocates pages and puts in MDLDoes not map pages (caller responsibility) - Designed to be used by an AGP driver - - LowAddress is the lowest acceptable physical address it wants to allocate - and HighAddress is the highest. SkipBytes are the number of bytes that the - kernel should keep free above LowAddress and below the address at which it - starts to allocate physical memory. TotalBytes are the number of bytes that - the driver wants to allocate. The return value of the function is a MDL - that if non-zero describes the physical memory the kernel has given the - driver. To access portions of the memory the driver must create sub-MDLs - from the returned MDL that describe appropriate portions of the physical - memory. When a driver wants to access physical memory described by a - sub-MDL it must map the sub-MDL using MmGetSystemAddressForMdlSafe. - - Konstantin Gusev - */ - - PMDL Mdl; - PPFN_TYPE Pages; - ULONG NumberOfPagesWanted, NumberOfPagesAllocated; - ULONG Ret; - - DPRINT("MmAllocatePagesForMdl - LowAddress = 0x%I64x, HighAddress = 0x%I64x, " - "SkipBytes = 0x%I64x, Totalbytes = 0x%x\n", - LowAddress.QuadPart, HighAddress.QuadPart, - SkipBytes.QuadPart, Totalbytes); - - /* SkipBytes must be a multiple of the page size */ - if ((SkipBytes.QuadPart % PAGE_SIZE) != 0) - { - DPRINT1("Warning: SkipBytes is not a multiple of PAGE_SIZE\n"); - return NULL; - } - - /* Allocate memory for the MDL */ - Mdl = MmCreateMdl(NULL, 0, Totalbytes); - if (Mdl == NULL) - { - return NULL; - } - - /* Allocate pages into the MDL */ - NumberOfPagesAllocated = 0; - NumberOfPagesWanted = PAGE_ROUND_UP(Mdl->ByteCount + Mdl->ByteOffset) / PAGE_SIZE; - Pages = (PPFN_TYPE)(Mdl + 1); - while (NumberOfPagesWanted > 0) - { - Ret = MmAllocPagesSpecifyRange( - MC_NPPOOL, - LowAddress, - HighAddress, - NumberOfPagesWanted, - Pages + NumberOfPagesAllocated); - if (Ret == (ULONG)-1) - break; - - NumberOfPagesAllocated += Ret; - NumberOfPagesWanted -= Ret; - - if (SkipBytes.QuadPart == 0) - break; - LowAddress.QuadPart += SkipBytes.QuadPart; - HighAddress.QuadPart += SkipBytes.QuadPart; - } - - if (NumberOfPagesAllocated == 0) - { - ExFreePool(Mdl); - Mdl = NULL; - } - else if (NumberOfPagesWanted > 0) - { - Mdl->ByteCount = (ULONG)(NumberOfPagesAllocated * PAGE_SIZE); - /* FIXME: I don't know if Mdl->Size should also be changed -- blight */ - } - return Mdl; -} - - -/* - * @implemented - */ -VOID STDCALL -MmFreePagesFromMdl ( IN PMDL Mdl ) -{ - /* - Drivers use the MmFreePagesFromMdl, the kernel-mode equivalent of - FreeUserPhysicalPages, to free the physical memory it has allocated with - MmAllocatePagesForMdl. This function is also prototyped in ntddk.h: - - Note that a driver is responsible for deallocating the MDL returned by - MmAllocatePagesForMdl with a call to ExFreePool, since MmFreePagesFromMdl - does not free the MDL. - - Konstantin Gusev - - */ - PPFN_TYPE Pages; - LONG NumberOfPages; - - NumberOfPages = PAGE_ROUND_UP(Mdl->ByteCount + Mdl->ByteOffset) / PAGE_SIZE; - Pages = (PPFN_TYPE)(Mdl + 1); - - while (--NumberOfPages >= 0) - { - MmDereferencePage(Pages[NumberOfPages]); - } -} - - -/* - * @implemented - */ -PVOID STDCALL -MmMapLockedPagesSpecifyCache ( IN PMDL Mdl, - IN KPROCESSOR_MODE AccessMode, - IN MEMORY_CACHING_TYPE CacheType, - IN PVOID BaseAddress, - IN ULONG BugCheckOnFailure, - IN MM_PAGE_PRIORITY Priority) -{ - PVOID Base; - PULONG MdlPages; - KIRQL oldIrql; - ULONG PageCount; - ULONG StartingOffset; - PEPROCESS CurrentProcess; - NTSTATUS Status; - ULONG Protect; - - DPRINT("MmMapLockedPagesSpecifyCache(Mdl 0x%x, AccessMode 0x%x, CacheType 0x%x, " - "BaseAddress 0x%x, BugCheckOnFailure 0x%x, Priority 0x%x)\n", - Mdl, AccessMode, CacheType, BaseAddress, BugCheckOnFailure, Priority); - - /* FIXME: Implement Priority */ - (void) Priority; - - Protect = PAGE_READWRITE; - if (CacheType == MmNonCached) - Protect |= PAGE_NOCACHE; - else if (CacheType == MmWriteCombined) - DPRINT("CacheType MmWriteCombined not supported!\n"); - - /* Calculate the number of pages required. */ - PageCount = PAGE_ROUND_UP(Mdl->ByteCount + Mdl->ByteOffset) / PAGE_SIZE; - - if (AccessMode != KernelMode) - { - MEMORY_AREA *Result; - LARGE_INTEGER BoundaryAddressMultiple; - NTSTATUS Status; - - /* pretty sure you can't map partial mdl's to user space */ - ASSERT(!(Mdl->MdlFlags & MDL_PARTIAL)); - - BoundaryAddressMultiple.QuadPart = 0; - Base = BaseAddress; - - CurrentProcess = PsGetCurrentProcess(); - - MmLockAddressSpace((PMADDRESS_SPACE)&CurrentProcess->VadRoot); - Status = MmCreateMemoryArea((PMADDRESS_SPACE)&CurrentProcess->VadRoot, - MEMORY_AREA_MDL_MAPPING, - &Base, - PageCount * PAGE_SIZE, - Protect, - &Result, - (Base != NULL), - 0, - BoundaryAddressMultiple); - MmUnlockAddressSpace((PMADDRESS_SPACE)&CurrentProcess->VadRoot); - if (!NT_SUCCESS(Status)) - { - if (Mdl->MdlFlags & MDL_MAPPING_CAN_FAIL) - { - return NULL; - } - - /* Throw exception */ - ExRaiseStatus(STATUS_ACCESS_VIOLATION); - ASSERT(0); - } - - Mdl->Process = (PEPROCESS)CurrentProcess; - } - else /* if (AccessMode == KernelMode) */ - { - /* can't map mdl twice */ - ASSERT(!(Mdl->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA|MDL_PARTIAL_HAS_BEEN_MAPPED))); - /* can't map mdl buildt from non paged pool into kernel space */ - ASSERT(!(Mdl->MdlFlags & (MDL_SOURCE_IS_NONPAGED_POOL))); - - CurrentProcess = NULL; - - /* Allocate that number of pages from the mdl mapping region. */ - KeAcquireSpinLock(&MiMdlMappingRegionLock, &oldIrql); - - StartingOffset = RtlFindClearBitsAndSet(&MiMdlMappingRegionAllocMap, PageCount, MiMdlMappingRegionHint); - - if (StartingOffset == 0xffffffff) - { - KeReleaseSpinLock(&MiMdlMappingRegionLock, oldIrql); - - DPRINT1("Out of MDL mapping space\n"); - - if ((Mdl->MdlFlags & MDL_MAPPING_CAN_FAIL) || !BugCheckOnFailure) - { - return NULL; - } - - KEBUGCHECK(0); - } - - Base = (PVOID)((ULONG_PTR)MiMdlMappingRegionBase + StartingOffset * PAGE_SIZE); - - if (MiMdlMappingRegionHint == StartingOffset) - { - MiMdlMappingRegionHint += PageCount; - } - - KeReleaseSpinLock(&MiMdlMappingRegionLock, oldIrql); - - Mdl->Process = NULL; - } - - /* Set the virtual mappings for the MDL pages. */ - MdlPages = (PULONG)(Mdl + 1); - - if (Mdl->MdlFlags & MDL_IO_SPACE) - Status = MmCreateVirtualMappingUnsafe(CurrentProcess, - Base, - Protect, - MdlPages, - PageCount); - else - Status = MmCreateVirtualMapping(CurrentProcess, - Base, - Protect, - MdlPages, - PageCount); - if (!NT_SUCCESS(Status)) - { - DbgPrint("Unable to create virtual mapping\n"); - if (Mdl->MdlFlags & MDL_MAPPING_CAN_FAIL) - { - return NULL; - } - if (AccessMode != KernelMode) - { - /* Throw exception */ - ExRaiseStatus(STATUS_ACCESS_VIOLATION); - ASSERT(0); - } - else /* AccessMode == KernelMode */ - { - if (!BugCheckOnFailure) - return NULL; - - /* FIXME: Use some bugcheck code instead of 0 */ - KEBUGCHECK(0); - } - } - - /* Mark the MDL has having being mapped. */ - if (AccessMode == KernelMode) - { - if (Mdl->MdlFlags & MDL_PARTIAL) - { - Mdl->MdlFlags |= MDL_PARTIAL_HAS_BEEN_MAPPED; - } - else - { - Mdl->MdlFlags |= MDL_MAPPED_TO_SYSTEM_VA; - } - Mdl->MappedSystemVa = (char*)Base + Mdl->ByteOffset; - } - else - DPRINT1("UserMode mapping - returning 0x%x\n", (ULONG)Base + Mdl->ByteOffset); - - return((char*)Base + Mdl->ByteOffset); -} - - -/* - * @implemented - */ -PVOID STDCALL -MmMapLockedPages(PMDL Mdl, KPROCESSOR_MODE AccessMode) -/* - * FUNCTION: Maps the physical pages described by a given MDL - * ARGUMENTS: - * Mdl = Points to an MDL updated by MmProbeAndLockPages, MmBuildMdlForNonPagedPool, - * MmAllocatePagesForMdl or IoBuildPartialMdl. - * AccessMode = Specifies the portion of the address space to map the - * pages. - * RETURNS: The base virtual address that maps the locked pages for the - * range described by the MDL - * - * If mapping into user space, pages are mapped into current address space. - */ -{ - return MmMapLockedPagesSpecifyCache(Mdl, - AccessMode, - MmCached, - NULL, - TRUE, - NormalPagePriority); -} - - -/* EOF */ - - - - - - - - - Removed: branches/cache_manager_rewrite/mm/process.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/proces… ============================================================================== --- branches/cache_manager_rewrite/mm/process.c (original) +++ branches/cache_manager_rewrite/mm/process.c (removed) @@ -1,687 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/process.c - * PURPOSE: Memory functions related to Processes - * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -extern ULONG NtMajorVersion; -extern ULONG NtMinorVersion; -extern ULONG NtOSCSDVersion; -extern ULONG NtGlobalFlag; -extern MM_SYSTEMSIZE MmSystemSize; - -#define MM_HIGHEST_VAD_ADDRESS \ - (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) - -/* FUNCTIONS *****************************************************************/ - -NTSTATUS -NTAPI -MmSetMemoryPriorityProcess(IN PEPROCESS Process, - IN UCHAR MemoryPriority) -{ - UCHAR OldPriority; - - /* Check if we have less then 16MB of Physical Memory */ - if ((MmSystemSize == MmSmallSystem) && - (MmStats.NrTotalPages < ((15 * 1024 * 1024) / PAGE_SIZE))) - { - /* Always use background priority */ - MemoryPriority = 0; - } - - /* Save the old priority and update it */ - OldPriority = Process->Vm.Flags.MemoryPriority; - Process->Vm.Flags.MemoryPriority = MemoryPriority; - - /* Return the old priority */ - return OldPriority; -} - -LCID -NTAPI -MmGetSessionLocaleId(VOID) -{ - PEPROCESS Process; - PAGED_CODE(); - - /* Get the current process */ - Process = PsGetCurrentProcess(); - - /* Check if it's the Session Leader */ - if (Process->Vm.Flags.SessionLeader) - { - /* Make sure it has a valid Session */ - if (Process->Session) - { - /* Get the Locale ID */ -#if ROS_HAS_SESSIONS - return ((PMM_SESSION_SPACE)Process->Session)->LocaleId; -#endif - } - } - - /* Not a session leader, return the default */ - return PsDefaultThreadLocaleId; -} - -PVOID -STDCALL -MiCreatePebOrTeb(PEPROCESS Process, - PVOID BaseAddress) -{ - NTSTATUS Status; - PMADDRESS_SPACE ProcessAddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; - PMEMORY_AREA MemoryArea; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - PVOID AllocatedBase = BaseAddress; - BoundaryAddressMultiple.QuadPart = 0; - - /* Acquire the Lock */ - MmLockAddressSpace(ProcessAddressSpace); - - /* - * Create a Peb or Teb. - * Loop until it works, decreasing by PAGE_SIZE each time. The logic here - * is that a PEB allocation should never fail since the address is free, - * while TEB allocation can fail, and we should simply try the address - * below. Is there a nicer way of doing this automagically? (ie: findning) - * a gap region? -- Alex - */ - do { - DPRINT("Trying to allocate: %x\n", AllocatedBase); - Status = MmCreateMemoryArea(ProcessAddressSpace, - MEMORY_AREA_PEB_OR_TEB, - &AllocatedBase, - PAGE_SIZE, - PAGE_READWRITE, - &MemoryArea, - TRUE, - 0, - BoundaryAddressMultiple); - AllocatedBase = RVA(AllocatedBase, -PAGE_SIZE); - } while (Status != STATUS_SUCCESS); - - /* Initialize the Region */ - MmInitializeRegion(&MemoryArea->Data.VirtualMemoryData.RegionListHead, - PAGE_SIZE, - MEM_COMMIT, - PAGE_READWRITE); - - /* Reserve the pages */ - MmReserveSwapPages(PAGE_SIZE); - - /* Unlock Address Space */ - DPRINT("Returning\n"); - MmUnlockAddressSpace(ProcessAddressSpace); - return RVA(AllocatedBase, PAGE_SIZE); -} - -VOID -MiFreeStackPage(PVOID Context, - MEMORY_AREA* MemoryArea, - PVOID Address, - PFN_TYPE Page, - SWAPENTRY SwapEntry, - BOOLEAN Dirty) -{ - ASSERT(SwapEntry == 0); - if (Page) MmReleasePageMemoryConsumer(MC_NPPOOL, Page); -} - -VOID -STDCALL -MmDeleteKernelStack(PVOID Stack, - BOOLEAN GuiStack) -{ - /* Lock the Address Space */ - MmLockAddressSpace(MmGetKernelAddressSpace()); - - /* Delete the Stack */ - MmFreeMemoryAreaByPtr(MmGetKernelAddressSpace(), - Stack, - MiFreeStackPage, - NULL); - - /* Unlock the Address Space */ - MmUnlockAddressSpace(MmGetKernelAddressSpace()); -} - -VOID -STDCALL -MmDeleteTeb(PEPROCESS Process, - PTEB Teb) -{ - PMADDRESS_SPACE ProcessAddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; - PMEMORY_AREA MemoryArea; - - /* Lock the Address Space */ - MmLockAddressSpace(ProcessAddressSpace); - - MemoryArea = MmLocateMemoryAreaByAddress(ProcessAddressSpace, (PVOID)Teb); - if (MemoryArea) - { - /* Delete the Teb */ - MmFreeVirtualMemory(Process, MemoryArea); - } - - /* Unlock the Address Space */ - MmUnlockAddressSpace(ProcessAddressSpace); -} - -PVOID -STDCALL -MmCreateKernelStack(BOOLEAN GuiStack) -{ - PMEMORY_AREA StackArea; - ULONG i; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - ULONG StackSize = GuiStack ? KERNEL_LARGE_STACK_SIZE : KERNEL_STACK_SIZE; - PFN_TYPE Page[KERNEL_LARGE_STACK_SIZE / PAGE_SIZE]; - PVOID KernelStack = NULL; - NTSTATUS Status; - - /* Initialize the Boundary Address */ - BoundaryAddressMultiple.QuadPart = 0; - - /* Lock the Kernel Address Space */ - MmLockAddressSpace(MmGetKernelAddressSpace()); - - /* Create a MAREA for the Kernel Stack */ - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_KERNEL_STACK, - &KernelStack, - StackSize, - PAGE_READWRITE, - &StackArea, - FALSE, - 0, - BoundaryAddressMultiple); - - /* Unlock the Address Space */ - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - - /* Check for Success */ - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to create thread stack\n"); - KEBUGCHECK(0); - } - - /* - * Mark the Stack in use. - * Note: Currently we mark all 60KB in use for a GUI Thread. - * We should only do this inside MmGrowKernelStack. TODO! - */ - for (i = 0; i < (StackSize / PAGE_SIZE); i++) - { - Status = MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &Page[i]); - } - - /* Create a Virtual Mapping for it */ - Status = MmCreateVirtualMapping(NULL, - KernelStack, - PAGE_READWRITE, - Page, - StackSize / PAGE_SIZE); - - /* Check for success */ - if (!NT_SUCCESS(Status)) - { - DPRINT1("Could not create Virtual Mapping for Kernel Stack\n"); - KEBUGCHECK(0); - } - - /* Return the stack */ - return KernelStack; -} - -/* - * @implemented - */ -NTSTATUS -STDCALL -MmGrowKernelStack(PVOID StackPointer) -{ - PETHREAD Thread = PsGetCurrentThread(); - - /* Make sure we have reserved space for our grow */ - ASSERT(((PCHAR)Thread->Tcb.StackBase - (PCHAR)Thread->Tcb.StackLimit) <= - (KERNEL_LARGE_STACK_SIZE + PAGE_SIZE)); - - /* - * We'll give you three more pages. - * NOTE: See note in MmCreateKernelStack. These pages are already being reserved. - * It would be more efficient to only grow them (commit them) here. - */ - Thread->Tcb.StackLimit -= KERNEL_STACK_SIZE; - - /* Return success */ - return STATUS_SUCCESS; -} - -NTSTATUS -STDCALL -MmCreatePeb(PEPROCESS Process) -{ - PPEB Peb = NULL; - LARGE_INTEGER SectionOffset; - SIZE_T ViewSize = 0; - PVOID TableBase = NULL; - PIMAGE_NT_HEADERS NtHeaders; - PIMAGE_LOAD_CONFIG_DIRECTORY ImageConfigData; - NTSTATUS Status; - KAFFINITY ProcessAffinityMask = 0; - SectionOffset.QuadPart = (ULONGLONG)0; - DPRINT("MmCreatePeb\n"); - - /* Allocate the PEB */ - Peb = MiCreatePebOrTeb(Process, - (PVOID)((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1)); - ASSERT(Peb == (PVOID)0x7FFDF000); - - /* Map NLS Tables */ - DPRINT("Mapping NLS\n"); - Status = MmMapViewOfSection(ExpNlsSectionPointer, - (PEPROCESS)Process, - &TableBase, - 0, - 0, - &SectionOffset, - &ViewSize, - ViewShare, - MEM_TOP_DOWN, - PAGE_READONLY); - if (!NT_SUCCESS(Status)) - { - DPRINT1("MmMapViewOfSection() failed (Status %lx)\n", Status); - return(Status); - } - DPRINT("TableBase %p ViewSize %lx\n", TableBase, ViewSize); - - /* Attach to Process */ - KeAttachProcess(&Process->Pcb); - - /* Initialize the PEB */ - DPRINT("Allocated: %x\n", Peb); - RtlZeroMemory(Peb, sizeof(PEB)); - - /* Set up data */ - DPRINT("Setting up PEB\n"); - Peb->ImageBaseAddress = Process->SectionBaseAddress; - Peb->InheritedAddressSpace = 0; - Peb->Mutant = NULL; - - /* NLS */ - Peb->AnsiCodePageData = (PCHAR)TableBase + ExpAnsiCodePageDataOffset; - Peb->OemCodePageData = (PCHAR)TableBase + ExpOemCodePageDataOffset; - Peb->UnicodeCaseTableData = (PCHAR)TableBase + ExpUnicodeCaseTableDataOffset; - - /* Default Version Data (could get changed below) */ - Peb->OSMajorVersion = NtMajorVersion; - Peb->OSMinorVersion = NtMinorVersion; - Peb->OSBuildNumber = 2195; - Peb->OSPlatformId = 2; /* VER_PLATFORM_WIN32_NT */ - Peb->OSCSDVersion = NtOSCSDVersion; - - /* Heap and Debug Data */ - Peb->NumberOfProcessors = KeNumberProcessors; - Peb->BeingDebugged = (BOOLEAN)(Process->DebugPort != NULL ? TRUE : FALSE); - Peb->NtGlobalFlag = NtGlobalFlag; - /*Peb->HeapSegmentReserve = MmHeapSegmentReserve; - Peb->HeapSegmentCommit = MmHeapSegmentCommit; - Peb->HeapDeCommitTotalFreeThreshold = MmHeapDeCommitTotalFreeThreshold; - Peb->HeapDeCommitFreeBlockThreshold = MmHeapDeCommitFreeBlockThreshold;*/ - Peb->NumberOfHeaps = 0; - Peb->MaximumNumberOfHeaps = (PAGE_SIZE - sizeof(PEB)) / sizeof(PVOID); - Peb->ProcessHeaps = (PVOID*)Peb + 1; - - /* Image Data */ - if ((NtHeaders = RtlImageNtHeader(Peb->ImageBaseAddress))) - { - /* Write subsystem data */ - Peb->ImageSubSystem = NtHeaders->OptionalHeader.Subsystem; - Peb->ImageSubSystemMajorVersion = NtHeaders->OptionalHeader.MajorSubsystemVersion; - Peb->ImageSubSystemMinorVersion = NtHeaders->OptionalHeader.MinorSubsystemVersion; - - /* Write Version Data */ - if (NtHeaders->OptionalHeader.Win32VersionValue) - { - Peb->OSMajorVersion = NtHeaders->OptionalHeader.Win32VersionValue & 0xFF; - Peb->OSMinorVersion = (NtHeaders->OptionalHeader.Win32VersionValue >> 8) & 0xFF; - Peb->OSBuildNumber = (NtHeaders->OptionalHeader.Win32VersionValue >> 16) & 0x3FFF; - - /* Set the Platform ID */ - Peb->OSPlatformId = (NtHeaders->OptionalHeader.Win32VersionValue >> 30) ^ 2; - } - - /* Check if the image is not safe for SMP */ - if (NtHeaders->FileHeader.Characteristics & IMAGE_FILE_UP_SYSTEM_ONLY) - { - /* FIXME: Choose one randomly */ - Peb->ImageProcessAffinityMask = 1; - } - else - { - /* Use affinity from Image Header */ - Peb->ImageProcessAffinityMask = ProcessAffinityMask; - } - - _SEH_TRY - { - /* Get the Image Config Data too */ - ImageConfigData = RtlImageDirectoryEntryToData(Peb->ImageBaseAddress, - TRUE, - IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, - &ViewSize); - - ProbeForRead(ImageConfigData, - sizeof(IMAGE_LOAD_CONFIG_DIRECTORY), - sizeof(ULONG)); - - /* Process the image config data overrides if specfied. */ - if (ImageConfigData != NULL) - { - if (ImageConfigData->CSDVersion) - { - Peb->OSCSDVersion = ImageConfigData->CSDVersion; - } - if (ImageConfigData->ProcessAffinityMask) - { - ProcessAffinityMask = ImageConfigData->ProcessAffinityMask; - } - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - - /* Misc data */ - Peb->SessionId = Process->Session; - Process->Peb = Peb; - - /* Detach from the Process */ - KeDetachProcess(); - - DPRINT("MmCreatePeb: Peb created at %p\n", Peb); - return Status; -} - -PTEB -STDCALL -MmCreateTeb(PEPROCESS Process, - PCLIENT_ID ClientId, - PINITIAL_TEB InitialTeb) -{ - PTEB Teb; - BOOLEAN Attached = FALSE; - - /* Attach to the process */ - DPRINT("MmCreateTeb\n"); - if (Process != PsGetCurrentProcess()) - { - /* Attach to Target */ - KeAttachProcess(&Process->Pcb); - Attached = TRUE; - } - - /* Allocate the TEB */ - Teb = MiCreatePebOrTeb(Process, - (PVOID)((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1)); - - /* Initialize the PEB */ - RtlZeroMemory(Teb, sizeof(TEB)); - - /* Set TIB Data */ - Teb->Tib.ExceptionList = (PVOID)0xFFFFFFFF; - Teb->Tib.Version = 1; - Teb->Tib.Self = (PNT_TIB)Teb; - - /* Set TEB Data */ - Teb->Cid = *ClientId; - Teb->RealClientId = *ClientId; - Teb->ProcessEnvironmentBlock = Process->Peb; - Teb->CurrentLocale = PsDefaultThreadLocaleId; - - /* Store stack information from InitialTeb */ - if(InitialTeb != NULL) - { - Teb->Tib.StackBase = InitialTeb->StackBase; - Teb->Tib.StackLimit = InitialTeb->StackLimit; - Teb->DeallocationStack = InitialTeb->AllocatedStackBase; - } - - /* Return TEB Address */ - DPRINT("Allocated: %x\n", Teb); - if (Attached) KeDetachProcess(); - return Teb; -} - -NTSTATUS -STDCALL -MmCreateProcessAddressSpace(IN PEPROCESS Process, - IN PROS_SECTION_OBJECT Section OPTIONAL, - IN POBJECT_NAME_INFORMATION *AuditName OPTIONAL) -{ - NTSTATUS Status; - PMADDRESS_SPACE ProcessAddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; - PVOID BaseAddress; - PMEMORY_AREA MemoryArea; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - SIZE_T ViewSize = 0; - PVOID ImageBase = 0; - BoundaryAddressMultiple.QuadPart = 0; - - /* Initialize the Addresss Space */ - MmInitializeAddressSpace(Process, ProcessAddressSpace); - - /* Acquire the Lock */ - MmLockAddressSpace(ProcessAddressSpace); - - /* Protect the highest 64KB of the process address space */ - BaseAddress = (PVOID)MmUserProbeAddress; - Status = MmCreateMemoryArea(ProcessAddressSpace, - MEMORY_AREA_NO_ACCESS, - &BaseAddress, - 0x10000, - PAGE_NOACCESS, - &MemoryArea, - FALSE, - 0, - BoundaryAddressMultiple); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to protect last 64KB\n"); - goto exit; - } - - /* Protect the 60KB above the shared user page */ - BaseAddress = (char*)USER_SHARED_DATA + PAGE_SIZE; - Status = MmCreateMemoryArea(ProcessAddressSpace, - MEMORY_AREA_NO_ACCESS, - &BaseAddress, - 0x10000 - PAGE_SIZE, - PAGE_NOACCESS, - &MemoryArea, - FALSE, - 0, - BoundaryAddressMultiple); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to protect the memory above the shared user page\n"); - goto exit; - } - - /* Create the shared data page */ - BaseAddress = (PVOID)USER_SHARED_DATA; - Status = MmCreateMemoryArea(ProcessAddressSpace, - MEMORY_AREA_SHARED_DATA, - &BaseAddress, - PAGE_SIZE, - PAGE_EXECUTE_READ, - &MemoryArea, - FALSE, - 0, - BoundaryAddressMultiple); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to create Shared User Data\n"); - goto exit; - } - - /* The process now has an address space */ - Process->HasAddressSpace = TRUE; - - /* Check if there's a Section Object */ - if (Section) - { - UNICODE_STRING FileName; - PWCHAR szSrc; - PCHAR szDest; - USHORT lnFName = 0; - - /* Unlock the Address Space */ - DPRINT("Unlocking\n"); - MmUnlockAddressSpace(ProcessAddressSpace); - - DPRINT("Mapping process image. Section: %p, Process: %p, ImageBase: %p\n", - Section, Process, &ImageBase); - Status = MmMapViewOfSection(Section, - (PEPROCESS)Process, - (PVOID*)&ImageBase, - 0, - 0, - NULL, - &ViewSize, - 0, - MEM_COMMIT, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to map process Image\n"); - return Status; - } - - /* Save the pointer */ - Process->SectionBaseAddress = ImageBase; - - /* Determine the image file name and save it to EPROCESS */ - DPRINT("Getting Image name\n"); - FileName = Section->FileObject->FileName; - szSrc = (PWCHAR)(FileName.Buffer + FileName.Length); - while (szSrc >= FileName.Buffer) - { - /* Make sure this isn't a backslash */ - if (*--szSrc == OBJ_NAME_PATH_SEPARATOR) - { - /* If so, stop it here */ - szSrc++; - break; - } - else - { - /* Otherwise, keep going */ - lnFName++; - } - } - - /* Copy the to the process and truncate it to 15 characters if necessary */ - szDest = Process->ImageFileName; - lnFName = min(lnFName, sizeof(Process->ImageFileName) - 1); - while (lnFName--) *szDest++ = (UCHAR)*szSrc++; - *szDest = UNICODE_NULL; - - /* Check if caller wants an audit name */ - if (AuditName) - { - /* Setup the audit name */ - SeInitializeProcessAuditName(Section->FileObject, - FALSE, - AuditName); - } - - /* Return status to caller */ - return Status; - } - -exit: - /* Unlock the Address Space */ - DPRINT("Unlocking\n"); - MmUnlockAddressSpace(ProcessAddressSpace); - - /* Return status to caller */ - return Status; -} - -VOID -NTAPI -MmCleanProcessAddressSpace(IN PEPROCESS Process) -{ - /* FIXME: Add part of MmDeleteProcessAddressSpace here */ -} - -NTSTATUS -NTAPI -MmDeleteProcessAddressSpace(PEPROCESS Process) -{ - PVOID Address; - PMEMORY_AREA MemoryArea; - - DPRINT("MmDeleteProcessAddressSpace(Process %x (%s))\n", Process, - Process->ImageFileName); - - MmLockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); - - while ((MemoryArea = ((PMADDRESS_SPACE)&Process->VadRoot)->MemoryAreaRoot) != NULL) - { - switch (MemoryArea->Type) - { - case MEMORY_AREA_SECTION_VIEW: - Address = (PVOID)MemoryArea->StartingAddress; - MmUnlockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); - MmUnmapViewOfSection(Process, Address); - MmLockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); - break; - - case MEMORY_AREA_VIRTUAL_MEMORY: - case MEMORY_AREA_PEB_OR_TEB: - MmFreeVirtualMemory(Process, MemoryArea); - break; - - case MEMORY_AREA_SHARED_DATA: - case MEMORY_AREA_NO_ACCESS: - MmFreeMemoryArea((PMADDRESS_SPACE)&Process->VadRoot, - MemoryArea, - NULL, - NULL); - break; - - case MEMORY_AREA_MDL_MAPPING: - KEBUGCHECK(PROCESS_HAS_LOCKED_PAGES); - break; - - default: - KEBUGCHECK(0); - } - } - - Mmi386ReleaseMmInfo(Process); - - MmUnlockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); - MmDestroyAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); - - DPRINT("Finished MmReleaseMmInfo()\n"); - return(STATUS_SUCCESS); -}

1 0

[cfinck] 31604: Attempt to fix build :)
by cfinck＠svn.reactos.org 05 Jan '08

05 Jan '08

Author: cfinck Date: Sat Jan 5 14:51:51 2008 New Revision: 31604 URL: http://svn.reactos.org/svn/reactos?rev=31604&view=rev Log: Attempt to fix build :) Modified: trunk/reactos/include/psdk/ddrawgdi.h Modified: trunk/reactos/include/psdk/ddrawgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddrawgdi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ddrawgdi.h (original) +++ trunk/reactos/include/psdk/ddrawgdi.h Sat Jan 5 14:51:51 2008 @@ -161,4 +161,4 @@ LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1, LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl2 ); -#endif +#endif

1 0

[greatlrd] 31603: add #ifndef _DDRAWGDI_ so we can use this file more and once. and gcc does not complain if it include twice
by greatlrd＠svn.reactos.org 05 Jan '08

05 Jan '08

Author: greatlrd Date: Sat Jan 5 14:07:31 2008 New Revision: 31603 URL: http://svn.reactos.org/svn/reactos?rev=31603&view=rev Log: add #ifndef _DDRAWGDI_ so we can use this file more and once. and gcc does not complain if it include twice Modified: trunk/reactos/include/psdk/ddrawgdi.h Modified: trunk/reactos/include/psdk/ddrawgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddrawgdi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ddrawgdi.h (original) +++ trunk/reactos/include/psdk/ddrawgdi.h Sat Jan 5 14:07:31 2008 @@ -17,6 +17,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef _DDRAWGDI_ +#define _DDRAWGDI_ #include <d3dhal.h> /* Define the real export names */ @@ -159,3 +161,4 @@ LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1, LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl2 ); +#endif

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