Ros-diffs June 2008

ros-diffs@reactos.org

23 participants
435 discussions

[greatlrd] 33797: merge down changes from win32k-gdi-dx 1. Cleanup the layout it was mix of space and tab for whitespace 2. dllmain add same behoirs as xp/vista
by greatlrd＠svn.reactos.org 01 Jun '08

01 Jun '08

Author: greatlrd Date: Sun Jun 1 02:54:17 2008 New Revision: 33797 URL: http://svn.reactos.org/svn/reactos?rev=33797&view=rev Log: merge down changes from win32k-gdi-dx 1. Cleanup the layout it was mix of space and tab for whitespace 2. dllmain add same behoirs as xp/vista Modified: trunk/reactos/dll/win32/gdi32/main/dllmain.c Modified: trunk/reactos/dll/win32/gdi32/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/main/dllma… ============================================================================== --- trunk/reactos/dll/win32/gdi32/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/main/dllmain.c [iso-8859-1] Sun Jun 1 02:54:17 2008 @@ -15,18 +15,26 @@ PGDIHANDLECACHE GdiHandleCache = NULL; /* - * GDI32.DLL doesn't have an entry point. The initialization is done by a call + * GDI32.DLL does have an entry point for disable threadlibrarycall,. The initialization is done by a call * to GdiDllInitialize(). This call is done from the entry point of USER32.DLL. */ BOOL WINAPI DllMain ( - HANDLE hDll, - DWORD dwReason, - LPVOID lpReserved - ) + HANDLE hDll, + DWORD dwReason, + LPVOID lpReserved) { - return TRUE; + switch (dwReason) + { + case DLL_PROCESS_ATTACH : + DisableThreadLibraryCalls(hDll); + break; + + default: + break; + } + return TRUE; } @@ -34,15 +42,15 @@ WINAPI GdiProcessSetup (VOID) { - hProcessHeap = GetProcessHeap(); + hProcessHeap = GetProcessHeap(); - /* map the gdi handle table to user space */ - GdiHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; - GdiSharedHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; - GdiDevCaps = &GdiSharedHandleTable->DevCaps; - CurrentProcessId = NtCurrentTeb()->Cid.UniqueProcess; - GDI_BatchLimit = (DWORD) NtCurrentTeb()->ProcessEnvironmentBlock->GdiDCAttributeList; - GdiHandleCache = (PGDIHANDLECACHE)NtCurrentTeb()->ProcessEnvironmentBlock->GdiHandleBuffer; + /* map the gdi handle table to user space */ + GdiHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; + GdiSharedHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; + GdiDevCaps = &GdiSharedHandleTable->DevCaps; + CurrentProcessId = NtCurrentTeb()->Cid.UniqueProcess; + GDI_BatchLimit = (DWORD) NtCurrentTeb()->ProcessEnvironmentBlock->GdiDCAttributeList; + GdiHandleCache = (PGDIHANDLECACHE)NtCurrentTeb()->ProcessEnvironmentBlock->GdiHandleBuffer; } @@ -52,34 +60,33 @@ BOOL WINAPI GdiDllInitialize ( - HANDLE hDll, - DWORD dwReason, - LPVOID lpReserved - ) + HANDLE hDll, + DWORD dwReason, + LPVOID lpReserved) { - switch (dwReason) - { - case DLL_PROCESS_ATTACH: - GdiProcessSetup (); - break; + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + GdiProcessSetup (); + break; - case DLL_THREAD_ATTACH: - NtCurrentTeb()->GdiTebBatch.Offset = 0; - NtCurrentTeb()->GdiBatchCount = 0; - break; + case DLL_THREAD_ATTACH: + NtCurrentTeb()->GdiTebBatch.Offset = 0; + NtCurrentTeb()->GdiBatchCount = 0; + break; - default: - return FALSE; - } + default: + return FALSE; + } - // Very simple, the list will fill itself as it is needed. - if(!SetStockObjects) - { - RtlZeroMemory( &stock_objects, NB_STOCK_OBJECTS); //Assume Ros is dirty. - SetStockObjects = TRUE; - } + // Very simple, the list will fill itself as it is needed. + if(!SetStockObjects) + { + RtlZeroMemory( &stock_objects, NB_STOCK_OBJECTS); //Assume Ros is dirty. + SetStockObjects = TRUE; + } - return TRUE; + return TRUE; } /* EOF */

1 0

[jimtabor] 33796: Sorry again... NtGdiCreateEnhMetaFile will be converted to NtGdiCreateMetafileDC. Keeping the original code for now.
by jimtabor＠svn.reactos.org 01 Jun '08

01 Jun '08

Author: jimtabor Date: Sun Jun 1 00:40:53 2008 New Revision: 33796 URL: http://svn.reactos.org/svn/reactos?rev=33796&view=rev Log: Sorry again... NtGdiCreateEnhMetaFile will be converted to NtGdiCreateMetafileDC. Keeping the original code for now. Modified: trunk/reactos/subsystems/win32/win32k/objects/metafile.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/subsystems/win32/win32k/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/metafile.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/metafile.c [iso-8859-1] Sun Jun 1 00:40:53 2008 @@ -23,243 +23,6 @@ #define NDEBUG #include <debug.h> -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 ); - } - - phmf = GDIOBJ_AllocObjWithHandle(GdiHandleTable, GDI_OBJECT_TYPE_ENHMETAFILE); - if (phmf != NULL) - { - hmf = phmf->BaseObject.hHmgr; - if (Dc->hFile != NULL) - { - phmf->on_disk = TRUE; - } - else - { - phmf->on_disk = FALSE; - } - phmf->emh = Dc->emh; - GDIOBJ_UnlockObjByPtr(GdiHandleTable, phmf); - } - - Dc->emh = NULL; /* So it won't be deleted */ - DC_UnlockDc(Dc); - NtGdiDeleteObjectApp(hDC); - return hmf; -} - -HENHMETAFILE -STDCALL -NtGdiCopyEnhMetaFile(HENHMETAFILE Src, - LPCWSTR File) -{ - UNIMPLEMENTED; - return 0; -} // // @@ -268,11 +31,14 @@ // HDC STDCALL -NtGdiCreateEnhMetaFile(HDC hDCRef, - LPCWSTR File, - CONST LPRECT Rect, - LPCWSTR Description) +NtGdiCreateMetafileDC(IN HDC hdc) { + + UNIMPLEMENTED; + return NULL; + + +#if 0 PDC Dc; HDC ret = NULL; DWORD length = 0; @@ -467,114 +233,8 @@ } return ret; +#endif } -BOOL -STDCALL -NtGdiDeleteEnhMetaFile(HENHMETAFILE emf) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL -STDCALL -NtGdiEnumEnhMetaFile(HDC hDC, - HENHMETAFILE emf, - ENHMFENUMPROC EnhMetaFunc, - LPVOID Data, - CONST LPRECT Rect) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL -STDCALL -NtGdiGdiComment(HDC hDC, - UINT Size, - CONST LPBYTE Data) -{ - UNIMPLEMENTED; - return FALSE; -} - -HENHMETAFILE -STDCALL -NtGdiGetEnhMetaFile(LPCWSTR MetaFile) -{ - UNIMPLEMENTED; - return 0; -} - -UINT -STDCALL -NtGdiGetEnhMetaFileBits(HENHMETAFILE hemf, - UINT BufSize, - LPBYTE Buffer) -{ - UNIMPLEMENTED; - return 0; -} - -UINT -STDCALL -NtGdiGetEnhMetaFileDescription(HENHMETAFILE hemf, - UINT BufSize, - LPWSTR Description) -{ - UNIMPLEMENTED; - return 0; -} - -UINT -STDCALL -NtGdiGetEnhMetaFileHeader(HENHMETAFILE hemf, - UINT BufSize, - LPENHMETAHEADER emh) -{ - UNIMPLEMENTED; - return 0; -} - -UINT -STDCALL -NtGdiGetEnhMetaFilePaletteEntries(HENHMETAFILE hemf, - UINT Entries, - LPPALETTEENTRY pe) -{ - UNIMPLEMENTED; - return 0; -} - -BOOL -STDCALL -NtGdiPlayEnhMetaFile(HDC hDC, - HENHMETAFILE hemf, - CONST PRECT Rect) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL -STDCALL -NtGdiPlayEnhMetaFileRecord(HDC hDC, - LPHANDLETABLE Handletable, - CONST ENHMETARECORD *EnhMetaRecord, - UINT Handles) -{ - UNIMPLEMENTED; - return FALSE; -} - -HENHMETAFILE -STDCALL -NtGdiSetEnhMetaFileBits(UINT BufSize, - CONST PBYTE Data) -{ - UNIMPLEMENTED; - return 0; -} /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Sun Jun 1 00:40:53 2008 @@ -1668,19 +1668,6 @@ /* * @unimplemented */ - -HDC -APIENTRY -NtGdiCreateMetafileDC(IN HDC hdc) -{ - UNIMPLEMENTED; - return NULL; -} - - - /* - * @unimplemented - */ HBITMAP APIENTRY NtGdiClearBitmapAttributes( 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sun Jun 1 00:40:53 2008 @@ -160,6 +160,7 @@ <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

[jimtabor] 33795: Sorry, , , NtGdiCreateEnhMetaFile will be converted to
by jimtabor＠svn.reactos.org 01 Jun '08

01 Jun '08

Author: jimtabor Date: Sun Jun 1 00:22:42 2008 New Revision: 33795 URL: http://svn.reactos.org/svn/reactos?rev=33795&view=rev Log: Sorry,,, NtGdiCreateEnhMetaFile will be converted to Modified: trunk/reactos/dll/win32/gdi32/objects/enhmfile.c 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/enhmfile.c [iso-8859-1] Sun Jun 1 00:22:42 2008 @@ -17,240 +17,6 @@ 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

1 0

[zguo] 33794: Update to the new VM wizard, to check for a valid path in creating one.
by zguo＠svn.reactos.org 01 Jun '08

01 Jun '08

Author: zguo Date: Sat May 31 20:22:57 2008 New Revision: 33794 URL: http://svn.reactos.org/svn/reactos?rev=33794&view=rev Log: Update to the new VM wizard, to check for a valid path in creating one. Modified: trunk/tools/RosTE/GUI/NewVMWizard.cs trunk/tools/RosTE/GUI/Properties/Resources.Designer.cs Modified: trunk/tools/RosTE/GUI/NewVMWizard.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/NewVMWizard.cs?rev… ============================================================================== --- trunk/tools/RosTE/GUI/NewVMWizard.cs [iso-8859-1] (original) +++ trunk/tools/RosTE/GUI/NewVMWizard.cs [iso-8859-1] Sat May 31 20:22:57 2008 @@ -4,6 +4,7 @@ using System.Data; using System.Drawing; using System.Text; +using System.Text.RegularExpressions; using System.Windows.Forms; using System.IO; @@ -81,9 +82,9 @@ private void wizardDefaultDirPage_CloseFromNext(object sender, Gui.Wizard.PageEventArgs e) { - if (defaultDirTxtBox.Text == "") - { - MessageBox.Show("You must enter a name", "Error"); + if (!Directory.Exists(defaultDirTxtBox.Text)) + { + MessageBox.Show("You must enter a valid path", "Error"); e.Page = defaultDirInfoPage; } } @@ -147,22 +148,22 @@ private void wizardHardDiskPage_Enter(object sender, EventArgs e) { - DriveInfo di = new DriveInfo(defaultDirTxtBox.Text); - long AvailInMB = di.AvailableFreeSpace / (long)Math.Pow(1024, 2); - - if (AvailInMB > 20480) AvailInMB = 20480; - - harddiskTrkBar.Minimum = 100; - harddiskTrkBar.Maximum = Convert.ToInt32(AvailInMB); - harddiskTrkBar.SmallChange = 100; - harddiskTrkBar.TickFrequency = 50; - harddiskUpDwn.Minimum = 100; - harddiskUpDwn.Maximum = harddiskTrkBar.Maximum; - harddiskUpDwn.Increment = 100; - - harddiskDiskLab.Text = di.Name; - harddiskDiskSizeLab.Text = Convert.ToString(AvailInMB) + " MB"; - harddiskRecMinLab.Text = "100 MB"; + DriveInfo di = new DriveInfo(defaultDirTxtBox.Text); + long AvailInMB = di.AvailableFreeSpace / (long)Math.Pow(1024, 2); + + if (AvailInMB > 20480) AvailInMB = 20480; + + harddiskTrkBar.Minimum = 100; + harddiskTrkBar.Maximum = Convert.ToInt32(AvailInMB); + harddiskTrkBar.SmallChange = 100; + harddiskTrkBar.TickFrequency = 50; + harddiskUpDwn.Minimum = 100; + harddiskUpDwn.Maximum = harddiskTrkBar.Maximum; + harddiskUpDwn.Increment = 100; + + harddiskDiskLab.Text = di.Name; + harddiskDiskSizeLab.Text = Convert.ToString(AvailInMB) + " MB"; + harddiskRecMinLab.Text = "100 MB"; } private void wizardMemoryPage_Enter(object sender, EventArgs e) @@ -225,7 +226,8 @@ private void defaultDirInfoPage_Enter(object sender, EventArgs e) { - defaultDirTxtBox.Text = mainConf.DefVmPath + '\\' + VMName; + if(mainConf.DefVmPath != null && mainConf.DefVmPath != "") + defaultDirTxtBox.Text = mainConf.DefVmPath + '\\' + VMName; } } } Modified: trunk/tools/RosTE/GUI/Properties/Resources.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Properties/Resourc… ============================================================================== --- trunk/tools/RosTE/GUI/Properties/Resources.Designer.cs [iso-8859-1] (original) +++ trunk/tools/RosTE/GUI/Properties/Resources.Designer.cs [iso-8859-1] Sat May 31 20:22:57 2008 @@ -1,7 +1,7 @@ ï»¿//------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. -// Runtime Version:2.0.50727.312 +// Runtime Version:2.0.50727.1433 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated.

1 0

[tkreuzer] 33793: IntGdiLineTo: the dc pen might be deleted, don't assert, instead fall back to BLACK_PEN, fixes a crash when using FF
by tkreuzer＠svn.reactos.org 01 Jun '08

01 Jun '08

Author: tkreuzer Date: Sat May 31 19:54:08 2008 New Revision: 33793 URL: http://svn.reactos.org/svn/reactos?rev=33793&view=rev Log: IntGdiLineTo: the dc pen might be deleted, don't assert, instead fall back to BLACK_PEN, fixes a crash when using FF Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] Sat May 31 19:54:08 2008 @@ -142,8 +142,12 @@ /* get BRUSHOBJ from current pen. */ PenBrushObj = PENOBJ_LockPen( Dc_Attr->hpen ); - /* FIXME - PenBrushObj can be NULL!!!! Don't assert here! */ - ASSERT(PenBrushObj); + if (!PenBrushObj) + { + /* default to BLACK_PEN */ + PenBrushObj = PENOBJ_LockPen(NtGdiGetStockObject(BLACK_PEN)); + ASSERT(PenBrushObj); + } if (!(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL)) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2008