Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 57161: [NTOSKRNL] - Revert r57155 until test issues are fixed
by tfaber＠svn.reactos.org 26 Aug '12

26 Aug '12

Author: tfaber Date: Sun Aug 26 09:22:09 2012 New Revision: 57161 URL: http://svn.reactos.org/svn/reactos?rev=57161&view=rev Log: [NTOSKRNL] - Revert r57155 until test issues are fixed Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Sun Aug 26 09:22:09 2012 @@ -1335,6 +1335,7 @@ } /* Check to see which list this page should go into */ + ASSERT(FALSE); if (Pfn1->u3.e1.Modified == 1) { /* Push it into the modified page list */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Sun Aug 26 09:22:09 2012 @@ -894,10 +894,10 @@ ASSERT(ActualPages <= PageCount); /* Release the working set lock */ -// MiUnlockWorkingSet(PsGetCurrentThread(), +// MiUnlockWorkingSet(PsGetCurrentThread(), // &MmSessionSpace->GlobalVirtualAddress->Vm); - + /* If we did at least one page... */ if (ActualPages) { @@ -974,7 +974,7 @@ { /* Create the PDEs needed for this mapping */ Status = MiSessionCommitPageTables(Base, - (PVOID)((ULONG_PTR)Base + + (PVOID)((ULONG_PTR)Base + Buckets * MI_SYSTEM_VIEW_BUCKET_SIZE)); NT_ASSERT(NT_SUCCESS(Status)); } @@ -1243,37 +1243,6 @@ return STATUS_SUCCESS; } -VOID -NTAPI -MiSubsectionConsistent(IN PSUBSECTION Subsection) -{ - /* ReactOS only supports systems with 4K pages and 4K sectors */ - ASSERT(Subsection->u.SubsectionFlags.SectorEndOffset == 0); - - /* Therefore, then number of PTEs should be equal to the number of sectors */ - if (Subsection->NumberOfFullSectors != Subsection->PtesInSubsection) - { - /* Break and warn if this is inconsistent */ - DPRINT1("Mm: Subsection inconsistent (%x vs %x)\n", - Subsection->NumberOfFullSectors, Subsection->PtesInSubsection); - DbgBreakPoint(); - } -} - -NTSTATUS -NTAPI -MiCreateDataFileMap(IN PFILE_OBJECT File, - OUT PSEGMENT *Segment, - IN PSIZE_T MaximumSize, - IN ULONG SectionPageProtection, - IN ULONG AllocationAttributes, - IN ULONG IgnoreFileSizing) -{ - /* Not yet implemented */ - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - NTSTATUS NTAPI MiCreatePagingFileMap(OUT PSEGMENT *Segment, @@ -2079,15 +2048,15 @@ SECTION Section; PSECTION NewSection; PSUBSECTION Subsection; - PSEGMENT NewSegment, Segment; + PSEGMENT NewSegment; NTSTATUS Status; PCONTROL_AREA ControlArea; - ULONG ProtectionMask, ControlAreaSize, Size, NonPagedCharge, PagedCharge; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - BOOLEAN FileLock = FALSE, KernelCall = FALSE; - KIRQL OldIrql; - PFILE_OBJECT File; - PVOID PreviousSectionPointer; + ULONG ProtectionMask; + + /* ARM3 does not yet support this */ + ASSERT(FileHandle == NULL); + ASSERT(FileObject == NULL); + ASSERT((AllocationAttributes & SEC_LARGE_PAGES) == 0); /* Make the same sanity checks that the Nt interface should've validated */ ASSERT((AllocationAttributes & ~(SEC_COMMIT | SEC_RESERVE | SEC_BASED | @@ -2110,229 +2079,53 @@ ProtectionMask = MiMakeProtectionMask(SectionPageProtection); if (ProtectionMask == MM_INVALID_PROTECTION) return STATUS_INVALID_PAGE_PROTECTION; - /* Check if this is going to be a data or image backed file section */ - if ((FileHandle) || (FileObject)) - { - /* These cannot be mapped with large pages */ - if (AllocationAttributes & SEC_LARGE_PAGES) return STATUS_INVALID_PARAMETER_6; - - /* For now, only support the mechanism through a file handle */ - ASSERT(FileObject == NULL); - - /* Reference the file handle to get the object */ - Status = ObReferenceObjectByHandle(FileHandle, - MmMakeFileAccess[ProtectionMask], - IoFileObjectType, - PreviousMode, - (PVOID*)&File, - NULL); - if (!NT_SUCCESS(Status)) return Status; - - /* Make sure Cc has been doing its job */ - if (!File->SectionObjectPointer) - { - /* This is not a valid file system-based file, fail */ - ObDereferenceObject(File); - return STATUS_INVALID_FILE_FOR_SECTION; - } - - /* Image-file backed sections are not yet supported */ - ASSERT((AllocationAttributes & SEC_IMAGE) == 0); - - /* Compute the size of the control area, and allocate it */ - ControlAreaSize = sizeof(CONTROL_AREA) + sizeof(MSUBSECTION); - ControlArea = ExAllocatePoolWithTag(NonPagedPool, ControlAreaSize, 'aCmM'); - if (!ControlArea) - { - ObDereferenceObject(File); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Zero it out */ - RtlZeroMemory(ControlArea, ControlAreaSize); - - /* Did we get a handle, or an object? */ - if (FileHandle) - { - /* We got a file handle so we have to lock down the file */ -#if 0 - Status = FsRtlAcquireToCreateMappedSection(File, SectionPageProtection); - if (!NT_SUCCESS(Status)) - { - ExFreePool(ControlArea); - ObDereferenceObject(File); - return Status; - } -#else - /* ReactOS doesn't support this API yet, so do nothing */ - Status = STATUS_SUCCESS; -#endif - /* Update the top-level IRP so that drivers know what's happening */ - IoSetTopLevelIrp((PIRP)FSRTL_FSP_TOP_LEVEL_IRP); - FileLock = TRUE; - } - - /* Lock the PFN database while we play with the section pointers */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - - /* Image-file backed sections are not yet supported */ - ASSERT((AllocationAttributes & SEC_IMAGE) == 0); - - /* There should not already be a control area for this file */ - ASSERT(File->SectionObjectPointer->DataSectionObject == NULL); - NewSegment = NULL; - - /* Write down that this CA is being created, and set it */ - ControlArea->u.Flags.BeingCreated = TRUE; - PreviousSectionPointer = File->SectionObjectPointer; - File->SectionObjectPointer->DataSectionObject = ControlArea; - - /* We can release the PFN lock now */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - - /* We don't support previously-mapped file */ - ASSERT(NewSegment == NULL); - - /* Image-file backed sections are not yet supported */ - ASSERT((AllocationAttributes & SEC_IMAGE) == 0); - - /* So we always create a data file map */ - Status = MiCreateDataFileMap(File, - &Segment, - (PSIZE_T)InputMaximumSize, - SectionPageProtection, - AllocationAttributes, - KernelCall); - ASSERT(PreviousSectionPointer == File->SectionObjectPointer); - ASSERT(NT_SUCCESS(Status)); - - /* Check if a maximum size was specified */ - if (!InputMaximumSize->QuadPart) - { - /* Nope, use the segment size */ - Section.SizeOfSection.QuadPart = (LONGLONG)Segment->SizeOfSegment; - } - else - { - /* Yep, use the entered size */ - Section.SizeOfSection.QuadPart = InputMaximumSize->QuadPart; - } - - } - else - { - /* A handle must be supplied with SEC_IMAGE, as this is the no-handle path */ - if (AllocationAttributes & SEC_IMAGE) return STATUS_INVALID_FILE_FOR_SECTION; - - /* Not yet supported */ - ASSERT((AllocationAttributes & SEC_LARGE_PAGES) == 0); - - /* So this must be a pagefile-backed section, create the mappings needed */ - Status = MiCreatePagingFileMap(&NewSegment, - (PSIZE_T)InputMaximumSize, - ProtectionMask, - AllocationAttributes); - ASSERT(NT_SUCCESS(Status)); - - /* Set the size here, and read the control area */ - Section.SizeOfSection.QuadPart = NewSegment->SizeOfSegment; - ControlArea = NewSegment->ControlArea; - } - - /* Did we already have a segment? */ - if (!NewSegment) - { - /* This must be the file path and we created a segment */ - NewSegment = Segment; - ASSERT(File != NULL); - - /* Acquire the PFN lock while we set control area flags */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - - /* We don't support this race condition yet, so assume no waiters */ - ASSERT(ControlArea->WaitingForDeletion == NULL); - ControlArea->WaitingForDeletion = NULL; - - /* Image-file backed sections are not yet supported, nor ROM images */ - ASSERT((AllocationAttributes & SEC_IMAGE) == 0); - ASSERT(Segment->ControlArea->u.Flags.Rom == 0); - - /* Take off the being created flag, and then release the lock */ - ControlArea->u.Flags.BeingCreated = FALSE; - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - } - - /* Check if we locked the file earlier */ - if (FileLock) - { - /* Reset the top-level IRP and release the lock */ - IoSetTopLevelIrp(NULL); - //FsRtlReleaseFile(File); - FileLock = FALSE; - } + /* A handle must be supplied with SEC_IMAGE, and this is the no-handle path */ + if (AllocationAttributes & SEC_IMAGE) return STATUS_INVALID_FILE_FOR_SECTION; + + /* So this must be a pagefile-backed section, create the mappings needed */ + Status = MiCreatePagingFileMap(&NewSegment, + (PSIZE_T)InputMaximumSize, + ProtectionMask, + AllocationAttributes); + ASSERT(NT_SUCCESS(Status)); + ASSERT(NewSegment != NULL); /* Set the initial section object data */ Section.InitialPageProtection = SectionPageProtection; - - /* The mapping created a control area and segment, save the flags */ + Section.SizeOfSection.QuadPart = NewSegment->SizeOfSegment; Section.Segment = NewSegment; + + /* THe mapping created a control area and segment, save the flags */ + ControlArea = NewSegment->ControlArea; Section.u.LongFlags = ControlArea->u.LongFlags; - /* Check if this is a user-mode read-write non-image file mapping */ - if (!(FileObject) && - (SectionPageProtection & (PAGE_READWRITE | PAGE_EXECUTE_READWRITE)) && - (ControlArea->u.Flags.Image == 0) && - (ControlArea->FilePointer != NULL)) - { - /* Add a reference and set the flag */ - Section.u.Flags.UserWritable = 1; - InterlockedIncrement((PLONG)&ControlArea->WritableUserReferences); - } - - /* Check for image mappings or page file mappings */ - if ((ControlArea->u.Flags.Image == 1) || !(ControlArea->FilePointer)) - { - /* Charge the segment size, and allocate a subsection */ - PagedCharge = sizeof(SECTION) + NewSegment->TotalNumberOfPtes * sizeof(MMPTE); - Size = sizeof(SUBSECTION); - } - else - { - /* Charge nothing, and allocate a mapped subsection */ - PagedCharge = 0; - Size = sizeof(MSUBSECTION); - } - - /* Check if this is a normal CA */ + /* ARM3 cannot support these right now, make sure they're not being set */ + ASSERT(ControlArea->u.Flags.Image == 0); + ASSERT(ControlArea->FilePointer == NULL); ASSERT(ControlArea->u.Flags.GlobalOnlyPerSession == 0); ASSERT(ControlArea->u.Flags.Rom == 0); - - /* Charge only a CA, and the subsection is right after */ - NonPagedCharge = sizeof(CONTROL_AREA); + ASSERT(ControlArea->u.Flags.WasPurged == 0); + + /* A pagefile-backed mapping only has one subsection, and this is all ARM3 supports */ Subsection = (PSUBSECTION)(ControlArea + 1); - - /* We only support single-subsection mappings */ - NonPagedCharge += Size; ASSERT(Subsection->NextSubsection == NULL); /* Create the actual section object, with enough space for the prototype PTEs */ - Status = ObCreateObject(PreviousMode, + Status = ObCreateObject(ExGetPreviousMode(), MmSectionObjectType, ObjectAttributes, - PreviousMode, + ExGetPreviousMode(), NULL, sizeof(SECTION), - PagedCharge, - NonPagedCharge, + sizeof(SECTION) + + NewSegment->TotalNumberOfPtes * sizeof(MMPTE), + sizeof(CONTROL_AREA) + sizeof(SUBSECTION), (PVOID*)&NewSection); ASSERT(NT_SUCCESS(Status)); /* Now copy the local section object from the stack into this new object */ RtlCopyMemory(NewSection, &Section, sizeof(SECTION)); NewSection->Address.StartingVpn = 0; - - /* For now, only user calls are supported */ - ASSERT(KernelCall == FALSE); NewSection->u.Flags.UserReference = TRUE; /* Migrate the attribute into a flag */ @@ -2377,13 +2170,6 @@ /* Finally release the lock */ KeReleaseGuardedMutex(&MmSectionBasedMutex); } - - /* Write down if this was a kernel call */ - ControlArea->u.Flags.WasPurged |= KernelCall; - ASSERT(ControlArea->u.Flags.WasPurged == FALSE); - - /* Make sure the segment and the section are the same size, or the section is smaller */ - ASSERT(NewSection->SizeOfSection.QuadPart <= NewSection->Segment->SizeOfSegment); /* Return the object and the creation status */ *SectionObject = (PVOID)NewSection; Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Aug 26 09:22:09 2012 @@ -4860,19 +4860,17 @@ PROS_SECTION_OBJECT *SectionObject = (PROS_SECTION_OBJECT *)Section; /* Check if an ARM3 section is being created instead */ - if (!(AllocationAttributes & SEC_IMAGE) && (AllocationAttributes)) + if (AllocationAttributes & 1) { - if (!(FileObject) && !(FileHandle)) - { - return MmCreateArm3Section(Section, - DesiredAccess, - ObjectAttributes, - MaximumSize, - SectionPageProtection, - AllocationAttributes &~ 1, - FileHandle, - FileObject); - } + DPRINT1("Creating ARM3 section\n"); + return MmCreateArm3Section(Section, + DesiredAccess, + ObjectAttributes, + MaximumSize, + SectionPageProtection, + AllocationAttributes &~ 1, + FileHandle, + FileObject); } /*

1 0

[jgardou] 57160: [OPENGL32_WINETEST] - Sync with wine
by jgardou＠svn.reactos.org 26 Aug '12

26 Aug '12

Author: jgardou Date: Sun Aug 26 09:17:35 2012 New Revision: 57160 URL: http://svn.reactos.org/svn/reactos?rev=57160&view=rev Log: [OPENGL32_WINETEST] - Sync with wine Modified: trunk/rostests/winetests/opengl32/opengl.c Modified: trunk/rostests/winetests/opengl32/opengl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/opengl32/opengl… ============================================================================== --- trunk/rostests/winetests/opengl32/opengl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/opengl32/opengl.c [iso-8859-1] Sun Aug 26 09:17:35 2012 @@ -24,18 +24,29 @@ void WINAPI glClearColor(float red, float green, float blue, float alpha); void WINAPI glClear(unsigned int mask); +#define GL_COLOR 0x1800 +typedef unsigned int GLenum; +typedef int GLint; +void WINAPI glCopyPixels(int x, int y, int width, int height, GLenum type); void WINAPI glFinish(void); +#define GL_NO_ERROR 0x0 +#define GL_INVALID_OPERATION 0x502 +GLenum WINAPI glGetError(void); #define GL_COLOR_BUFFER_BIT 0x00004000 const unsigned char * WINAPI glGetString(unsigned int); #define GL_VENDOR 0x1F00 #define GL_RENDERER 0x1F01 #define GL_VERSION 0x1F02 +#define GL_EXTENSIONS 0x1F03 + +#define GL_VIEWPORT 0x0ba2 +void WINAPI glGetIntegerv(GLenum pname, GLint *params); #define MAX_FORMATS 256 typedef void* HPBUFFERARB; /* WGL_ARB_create_context */ -HGLRC (WINAPI *pwglCreateContextAttribsARB)(HDC hDC, HGLRC hShareContext, const int *attribList); +static HGLRC (WINAPI *pwglCreateContextAttribsARB)(HDC hDC, HGLRC hShareContext, const int *attribList); /* GetLastError */ #define ERROR_INVALID_VERSION_ARB 0x2095 #define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 @@ -106,6 +117,33 @@ #undef GET_PROC } +static BOOL gl_extension_supported(const char *extensions, const char *extension_string) +{ + size_t ext_str_len = strlen(extension_string); + + while (*extensions) + { + const char *start; + size_t len; + + while (isspace(*extensions)) + ++extensions; + start = extensions; + while (!isspace(*extensions) && *extensions) + ++extensions; + + len = extensions - start; + if (!len) + continue; + + if (len == ext_str_len && !memcmp(start, extension_string, ext_str_len)) + { + return TRUE; + } + } + return FALSE; +} + static void test_pbuffers(HDC hdc) { const int iAttribList[] = { WGL_DRAW_TO_PBUFFER_ARB, 1, /* Request pbuffer support */ @@ -171,7 +209,7 @@ trace("iPixelFormat returned by GetPixelFormat: %d\n", res); trace("PixelFormat from wglChoosePixelFormatARB: %d\n", iPixelFormat); - pwglReleasePbufferDCARB(pbuffer, hdc); + pwglReleasePbufferDCARB(pbuffer, pbuffer_hdc); } else skip("Pbuffer test for onscreen pixelformat skipped as no onscreen format with pbuffer capabilities have been found\n"); @@ -351,7 +389,6 @@ { BOOL ret; HGLRC hglrc; - DWORD error; hglrc = wglCreateContext(winhdc); ok( hglrc != 0, "wglCreateContext failed\n" ); @@ -374,9 +411,9 @@ SetLastError( 0xdeadbeef ); ret = wglMakeCurrent( NULL, NULL ); - ok( !ret, "wglMakeCurrent succeeded\n" ); - error = GetLastError(); - ok( error == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got error=%x\n", error); + ok( !ret || broken(ret) /* nt4 */, "wglMakeCurrent succeeded\n" ); + if (!ret) ok( GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got error=%x\n", GetLastError() ); ret = wglMakeCurrent( winhdc, NULL ); ok( ret, "wglMakeCurrent failed\n" ); @@ -387,11 +424,13 @@ ret = wglMakeCurrent( NULL, NULL ); ok( ret, "wglMakeCurrent failed\n" ); + ok( wglGetCurrentContext() == NULL, "wrong context\n" ); + SetLastError( 0xdeadbeef ); ret = wglMakeCurrent( NULL, NULL ); - ok( !ret, "wglMakeCurrent succeeded\n" ); - error = GetLastError(); - ok( error == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got error=%x\n", error); + ok( !ret || broken(ret) /* nt4 */, "wglMakeCurrent succeeded\n" ); + if (!ret) ok( GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got error=%x\n", GetLastError() ); ret = wglMakeCurrent( winhdc, hglrc ); ok( ret, "wglMakeCurrent failed\n" ); @@ -504,36 +543,48 @@ } } -static void test_bitmap_rendering(void) +static void test_bitmap_rendering( BOOL use_dib ) { PIXELFORMATDESCRIPTOR pfd; - int i, iPixelFormat=0; + int i, ret, bpp, iPixelFormat=0; unsigned int nFormats; - HGLRC hglrc; + HGLRC hglrc, hglrc2; BITMAPINFO biDst; - HBITMAP bmpDst, oldDst; + HBITMAP bmpDst, oldDst, bmp2; HDC hdcDst, hdcScreen; - UINT32 *dstBuffer; - - memset(&biDst, 0, sizeof(BITMAPINFO)); - biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - biDst.bmiHeader.biWidth = 2; - biDst.bmiHeader.biHeight = -2; - biDst.bmiHeader.biPlanes = 1; - biDst.bmiHeader.biBitCount = 32; - biDst.bmiHeader.biCompression = BI_RGB; + UINT *dstBuffer = NULL; hdcScreen = CreateCompatibleDC(0); - if(GetDeviceCaps(hdcScreen, BITSPIXEL) != 32) - { - DeleteDC(hdcScreen); - trace("Skipping bitmap rendering test\n"); - return; - } - - hdcDst = CreateCompatibleDC(hdcScreen); - bmpDst = CreateDIBSection(hdcDst, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, NULL, 0); + hdcDst = CreateCompatibleDC(0); + + if (use_dib) + { + bpp = 32; + memset(&biDst, 0, sizeof(BITMAPINFO)); + biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + biDst.bmiHeader.biWidth = 4; + biDst.bmiHeader.biHeight = -4; + biDst.bmiHeader.biPlanes = 1; + biDst.bmiHeader.biBitCount = 32; + biDst.bmiHeader.biCompression = BI_RGB; + + bmpDst = CreateDIBSection(0, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, NULL, 0); + + biDst.bmiHeader.biWidth = 12; + biDst.bmiHeader.biHeight = -12; + biDst.bmiHeader.biBitCount = 16; + bmp2 = CreateDIBSection(0, &biDst, DIB_RGB_COLORS, NULL, NULL, 0); + } + else + { + bpp = GetDeviceCaps( hdcScreen, BITSPIXEL ); + bmpDst = CreateBitmap( 4, 4, 1, bpp, NULL ); + bmp2 = CreateBitmap( 12, 12, 1, bpp, NULL ); + } + oldDst = SelectObject(hdcDst, bmpDst); + + trace( "testing on %s\n", use_dib ? "DIB" : "DDB" ); /* Pick a pixel format by hand because ChoosePixelFormat is unreliable */ nFormats = DescribePixelFormat(hdcDst, 0, 0, NULL); @@ -544,7 +595,7 @@ if((pfd.dwFlags & PFD_DRAW_TO_BITMAP) && (pfd.dwFlags & PFD_SUPPORT_OPENGL) && - (pfd.cColorBits == 32) && + (pfd.cColorBits == bpp) && (pfd.cAlphaBits == 8) ) { iPixelFormat = i; @@ -558,58 +609,126 @@ } else { - SetPixelFormat(hdcDst, iPixelFormat, &pfd); + ret = SetPixelFormat(hdcDst, iPixelFormat, &pfd); + ok( ret, "SetPixelFormat failed\n" ); + ret = GetPixelFormat( hdcDst ); + ok( ret == iPixelFormat, "GetPixelFormat returned %d/%d\n", ret, iPixelFormat ); + ret = SetPixelFormat(hdcDst, iPixelFormat + 1, &pfd); + ok( !ret, "SetPixelFormat succeeded\n" ); hglrc = wglCreateContext(hdcDst); - todo_wine ok(hglrc != NULL, "Unable to create a context\n"); + ok(hglrc != NULL, "Unable to create a context\n"); if(hglrc) { + GLint viewport[4]; wglMakeCurrent(hdcDst, hglrc); + hglrc2 = wglCreateContext(hdcDst); + ok(hglrc2 != NULL, "Unable to create a context\n"); /* Note this is RGBA but we read ARGB back */ glClearColor((float)0x22/0xff, (float)0x33/0xff, (float)0x44/0xff, (float)0x11/0xff); glClear(GL_COLOR_BUFFER_BIT); + glGetIntegerv( GL_VIEWPORT, viewport ); glFinish(); + ok( viewport[0] == 0 && viewport[1] == 0 && viewport[2] == 4 && viewport[3] == 4, + "wrong viewport %d,%d,%d,%d\n", viewport[0], viewport[1], viewport[2], viewport[3] ); /* Note apparently the alpha channel is not supported by the software renderer (bitmap only works using software) */ - ok(dstBuffer[0] == 0x223344, "Expected color=0x223344, received color=%x\n", dstBuffer[0]); + if (dstBuffer) + for (i = 0; i < 16; i++) + ok(dstBuffer[i] == 0x223344 || dstBuffer[i] == 0x11223344, "Received color=%x at %u\n", + dstBuffer[i], i); + + SelectObject(hdcDst, bmp2); + ret = GetPixelFormat( hdcDst ); + ok( ret == iPixelFormat, "GetPixelFormat returned %d/%d\n", ret, iPixelFormat ); + ret = SetPixelFormat(hdcDst, iPixelFormat + 1, &pfd); + ok( !ret, "SetPixelFormat succeeded\n" ); + + /* context still uses the old pixel format and viewport */ + glClearColor((float)0x44/0xff, (float)0x33/0xff, (float)0x22/0xff, (float)0x11/0xff); + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glGetIntegerv( GL_VIEWPORT, viewport ); + ok( viewport[0] == 0 && viewport[1] == 0 && viewport[2] == 4 && viewport[3] == 4, + "wrong viewport %d,%d,%d,%d\n", viewport[0], viewport[1], viewport[2], viewport[3] ); wglMakeCurrent(NULL, NULL); - wglDeleteContext(hglrc); + wglMakeCurrent(hdcDst, hglrc); + glClearColor((float)0x44/0xff, (float)0x55/0xff, (float)0x66/0xff, (float)0x11/0xff); + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glGetIntegerv( GL_VIEWPORT, viewport ); + ok( viewport[0] == 0 && viewport[1] == 0 && viewport[2] == 4 && viewport[3] == 4, + "wrong viewport %d,%d,%d,%d\n", viewport[0], viewport[1], viewport[2], viewport[3] ); + + wglMakeCurrent(hdcDst, hglrc2); + glGetIntegerv( GL_VIEWPORT, viewport ); + ok( viewport[0] == 0 && viewport[1] == 0 && viewport[2] == 12 && viewport[3] == 12, + "wrong viewport %d,%d,%d,%d\n", viewport[0], viewport[1], viewport[2], viewport[3] ); + + wglMakeCurrent(hdcDst, hglrc); + glGetIntegerv( GL_VIEWPORT, viewport ); + ok( viewport[0] == 0 && viewport[1] == 0 && viewport[2] == 4 && viewport[3] == 4, + "wrong viewport %d,%d,%d,%d\n", viewport[0], viewport[1], viewport[2], viewport[3] ); + + SelectObject(hdcDst, bmpDst); + ret = GetPixelFormat( hdcDst ); + ok( ret == iPixelFormat, "GetPixelFormat returned %d/%d\n", ret, iPixelFormat ); + ret = SetPixelFormat(hdcDst, iPixelFormat + 1, &pfd); + ok( !ret, "SetPixelFormat succeeded\n" ); + wglMakeCurrent(hdcDst, hglrc2); + glGetIntegerv( GL_VIEWPORT, viewport ); + ok( viewport[0] == 0 && viewport[1] == 0 && viewport[2] == 12 && viewport[3] == 12, + "wrong viewport %d,%d,%d,%d\n", viewport[0], viewport[1], viewport[2], viewport[3] ); } } SelectObject(hdcDst, oldDst); + DeleteObject(bmp2); DeleteObject(bmpDst); DeleteDC(hdcDst); - DeleteDC(hdcScreen); } struct wgl_thread_param { HANDLE test_finished; + HWND hwnd; HGLRC hglrc; - BOOL hglrc_deleted; + BOOL make_current; + BOOL make_current_error; + BOOL deleted; + DWORD deleted_error; }; static DWORD WINAPI wgl_thread(void *param) { struct wgl_thread_param *p = param; - - p->hglrc_deleted = wglDeleteContext(p->hglrc); + HDC hdc = GetDC( p->hwnd ); + + SetLastError(0xdeadbeef); + p->make_current = wglMakeCurrent(hdc, p->hglrc); + p->make_current_error = GetLastError(); + p->deleted = wglDeleteContext(p->hglrc); + p->deleted_error = GetLastError(); + ReleaseDC( p->hwnd, hdc ); SetEvent(p->test_finished); - return 0; } -static void test_deletecontext(HDC hdc) +static void test_deletecontext(HWND hwnd, HDC hdc) { struct wgl_thread_param thread_params; HGLRC hglrc = wglCreateContext(hdc); HANDLE thread_handle; DWORD res, tid; + SetLastError(0xdeadbeef); + res = wglDeleteContext(NULL); + ok(res == FALSE, "wglDeleteContext succeeded\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected last error to be ERROR_INVALID_HANDLE, got %u\n", GetLastError()); + if(!hglrc) { skip("wglCreateContext failed!\n"); @@ -627,23 +746,79 @@ * This differs from GLX which does allow it but it delays actual deletion until the context becomes not current. */ thread_params.hglrc = hglrc; + thread_params.hwnd = hwnd; thread_params.test_finished = CreateEvent(NULL, FALSE, FALSE, NULL); thread_handle = CreateThread(NULL, 0, wgl_thread, &thread_params, 0, &tid); ok(!!thread_handle, "Failed to create thread, last error %#x.\n", GetLastError()); if(thread_handle) { WaitForSingleObject(thread_handle, INFINITE); - ok(thread_params.hglrc_deleted == FALSE, "Attempt to delete WGL context from another thread passed but should fail!\n"); + ok(!thread_params.make_current, "Attempt to make WGL context from another thread passed\n"); + ok(thread_params.make_current_error == ERROR_BUSY, "Expected last error to be ERROR_BUSY, got %u\n", thread_params.make_current_error); + ok(!thread_params.deleted, "Attempt to delete WGL context from another thread passed\n"); + ok(thread_params.deleted_error == ERROR_BUSY, "Expected last error to be ERROR_BUSY, got %u\n", thread_params.deleted_error); } CloseHandle(thread_params.test_finished); res = wglDeleteContext(hglrc); ok(res == TRUE, "wglDeleteContext failed\n"); + + /* Attempting to delete the same context twice should fail. */ + SetLastError(0xdeadbeef); + res = wglDeleteContext(hglrc); + ok(res == FALSE, "wglDeleteContext succeeded\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected last error to be ERROR_INVALID_HANDLE, got %u\n", GetLastError()); /* WGL makes a context not current when deleting it. This differs from GLX behavior where * deletion takes place when the thread becomes not current. */ hglrc = wglGetCurrentContext(); ok(hglrc == NULL, "A WGL context is active while none was expected\n"); +} + + +static void test_getprocaddress(HDC hdc) +{ + const char *extensions = (const char*)glGetString(GL_EXTENSIONS); + PROC func = NULL; + HGLRC ctx = wglGetCurrentContext(); + + if (!extensions) + { + skip("skipping wglGetProcAddress tests because no GL extensions supported\n"); + return; + } + + /* Core GL 1.0/1.1 functions should not be loadable through wglGetProcAddress. + * Try to load the function with and without a context. + */ + func = wglGetProcAddress("glEnable"); + ok(func == NULL, "Lookup of function glEnable with a context passed, expected a failure\n"); + wglMakeCurrent(hdc, NULL); + func = wglGetProcAddress("glEnable"); + ok(func == NULL, "Lookup of function glEnable without a context passed, expected a failure\n"); + wglMakeCurrent(hdc, ctx); + + /* The goal of the test will be to test behavior of wglGetProcAddress when + * no WGL context is active. Before the test we pick an extension (GL_ARB_multitexture) + * which any GL >=1.2.1 implementation supports. Unfortunately the GDI renderer doesn't + * support it. There aren't any extensions we can use for this test which are supported by + * both GDI and real drivers. + * Note GDI only has GL_EXT_bgra, GL_EXT_paletted_texture and GL_WIN_swap_hint. + */ + if (!gl_extension_supported(extensions, "GL_ARB_multitexture")) + { + skip("skipping test because lack of GL_ARB_multitexture support\n"); + return; + } + + func = wglGetProcAddress("glActiveTextureARB"); + ok(func != NULL, "Unable to lookup glActiveTextureARB, last error %#x\n", GetLastError()); + + /* Temporarily disable the context, so we can see that we can't retrieve functions now. */ + wglMakeCurrent(hdc, NULL); + func = wglGetProcAddress("glActiveTextureARB"); + ok(func == NULL, "Function lookup without a context passed, expected a failure; last error %#x\n", GetLastError()); + wglMakeCurrent(hdc, ctx); } static void test_make_current_read(HDC hdc) @@ -730,7 +905,7 @@ HGLRC gl3Ctx; DWORD error; gl3Ctx = pwglCreateContextAttribsARB(hdc, (HGLRC)0xdeadbeef, 0); - todo_wine ok(gl3Ctx == 0, "pwglCreateContextAttribsARB using an invalid shareList passed\n"); + ok(gl3Ctx == 0, "pwglCreateContextAttribsARB using an invalid shareList passed\n"); error = GetLastError(); /* The Nvidia implementation seems to return hresults instead of win32 error codes */ todo_wine ok(error == ERROR_INVALID_OPERATION || @@ -866,6 +1041,365 @@ DestroyWindow(window); } +static void test_window_dc(void) +{ + PIXELFORMATDESCRIPTOR pf_desc = + { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER, + PFD_TYPE_RGBA, + 24, /* 24-bit color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 32, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + int pixel_format; + HWND window; + RECT vp, r; + HGLRC ctx; + BOOL ret; + HDC dc; + + window = CreateWindowA("static", "opengl32_test", + WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window, "Failed to create window, last error %#x.\n", GetLastError()); + + ShowWindow(window, SW_SHOW); + + dc = GetWindowDC(window); + ok(!!dc, "Failed to get DC.\n"); + + pixel_format = ChoosePixelFormat(dc, &pf_desc); + if (!pixel_format) + { + win_skip("Failed to find pixel format.\n"); + ReleaseDC(window, dc); + DestroyWindow(window); + return; + } + + ret = SetPixelFormat(dc, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#x.\n", GetLastError()); + + ctx = wglCreateContext(dc); + ok(!!ctx, "Failed to create GL context, last error %#x.\n", GetLastError()); + + ret = wglMakeCurrent(dc, ctx); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + GetClientRect(window, &r); + glGetIntegerv(GL_VIEWPORT, (GLint *)&vp); + ok(EqualRect(&r, &vp), "Viewport not equal to client rect.\n"); + + ret = wglMakeCurrent(NULL, NULL); + ok(ret, "Failed to clear current context, last error %#x.\n", GetLastError()); + + ret = wglDeleteContext(ctx); + ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); + + ReleaseDC(window, dc); + DestroyWindow(window); +} + +static void test_destroy(HDC oldhdc) +{ + PIXELFORMATDESCRIPTOR pf_desc = + { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER, + PFD_TYPE_RGBA, + 24, /* 24-bit color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 32, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + int pixel_format; + HWND window; + HGLRC ctx; + BOOL ret; + HDC dc; + GLenum glerr; + DWORD err; + HGLRC oldctx = wglGetCurrentContext(); + + ok(!!oldctx, "Expected to find a valid current context.\n"); + + window = CreateWindowA("static", "opengl32_test", + WS_POPUP, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window, "Failed to create window, last error %#x.\n", GetLastError()); + + dc = GetDC(window); + ok(!!dc, "Failed to get DC.\n"); + + pixel_format = ChoosePixelFormat(dc, &pf_desc); + if (!pixel_format) + { + win_skip("Failed to find pixel format.\n"); + ReleaseDC(window, dc); + DestroyWindow(window); + return; + } + + ret = SetPixelFormat(dc, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#x.\n", GetLastError()); + + ctx = wglCreateContext(dc); + ok(!!ctx, "Failed to create GL context, last error %#x.\n", GetLastError()); + + ret = wglMakeCurrent(dc, ctx); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_NO_ERROR, "Failed glClear, error %#x.\n", glerr); + ret = SwapBuffers(dc); + ok(ret, "Failed SwapBuffers, error %#x.\n", GetLastError()); + + ret = DestroyWindow(window); + ok(ret, "Failed to destroy window, last error %#x.\n", GetLastError()); + + ok(wglGetCurrentContext() == ctx, "Wrong current context.\n"); + + SetLastError(0xdeadbeef); + ret = wglMakeCurrent(dc, ctx); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, + "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); + SetLastError(0xdeadbeef); + ret = SwapBuffers(dc); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, "Unexpected behavior with SwapBuffer, last error %#x.\n", err); + + ok(wglGetCurrentContext() == ctx, "Wrong current context.\n"); + + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_NO_ERROR, "Failed glClear, error %#x.\n", glerr); + SetLastError(0xdeadbeef); + ret = SwapBuffers(dc); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, "Unexpected behavior with SwapBuffer, last error %#x.\n", err); + + ret = wglMakeCurrent(NULL, NULL); + ok(ret, "Failed to clear current context, last error %#x.\n", GetLastError()); + + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_INVALID_OPERATION, "Failed glClear, error %#x.\n", glerr); + SetLastError(0xdeadbeef); + ret = SwapBuffers(dc); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, "Unexpected behavior with SwapBuffer, last error %#x.\n", err); + + SetLastError(0xdeadbeef); + ret = wglMakeCurrent(dc, ctx); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, + "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); + + ok(wglGetCurrentContext() == NULL, "Wrong current context.\n"); + + ret = wglMakeCurrent(oldhdc, oldctx); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + ok(wglGetCurrentContext() == oldctx, "Wrong current context.\n"); + + SetLastError(0xdeadbeef); + ret = wglMakeCurrent(dc, ctx); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, + "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); + + ok(wglGetCurrentContext() == oldctx, "Wrong current context.\n"); + + ret = wglDeleteContext(ctx); + ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); + + ReleaseDC(window, dc); + + ret = wglMakeCurrent(oldhdc, oldctx); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); +} + +static void test_destroy_read(HDC oldhdc) +{ + PIXELFORMATDESCRIPTOR pf_desc = + { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER, + PFD_TYPE_RGBA, + 24, /* 24-bit color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 32, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + int pixel_format; + HWND draw_window, read_window; + HGLRC ctx; + BOOL ret; + HDC read_dc, draw_dc; + GLenum glerr; + DWORD err; + HGLRC oldctx = wglGetCurrentContext(); + + ok(!!oldctx, "Expected to find a valid current context\n"); + + draw_window = CreateWindowA("static", "opengl32_test", + WS_POPUP, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!draw_window, "Failed to create window, last error %#x.\n", GetLastError()); + + draw_dc = GetDC(draw_window); + ok(!!draw_dc, "Failed to get DC.\n"); + + pixel_format = ChoosePixelFormat(draw_dc, &pf_desc); + if (!pixel_format) + { + win_skip("Failed to find pixel format.\n"); + ReleaseDC(draw_window, draw_dc); + DestroyWindow(draw_window); + return; + } + + ret = SetPixelFormat(draw_dc, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#x.\n", GetLastError()); + + read_window = CreateWindowA("static", "opengl32_test", + WS_POPUP, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!read_window, "Failed to create window, last error %#x.\n", GetLastError()); + + read_dc = GetDC(read_window); + ok(!!draw_dc, "Failed to get DC.\n"); + + pixel_format = ChoosePixelFormat(read_dc, &pf_desc); + if (!pixel_format) + { + win_skip("Failed to find pixel format.\n"); + ReleaseDC(read_window, read_dc); + DestroyWindow(read_window); + ReleaseDC(draw_window, draw_dc); + DestroyWindow(draw_window); + return; + } + + ret = SetPixelFormat(read_dc, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#x.\n", GetLastError()); + + ctx = wglCreateContext(draw_dc); + ok(!!ctx, "Failed to create GL context, last error %#x.\n", GetLastError()); + + ret = pwglMakeContextCurrentARB(draw_dc, read_dc, ctx); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + glCopyPixels(0, 0, 640, 480, GL_COLOR); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_NO_ERROR, "Failed glCopyPixel, error %#x.\n", glerr); + ret = SwapBuffers(draw_dc); + ok(ret, "Failed SwapBuffers, error %#x.\n", GetLastError()); + + ret = DestroyWindow(read_window); + ok(ret, "Failed to destroy window, last error %#x.\n", GetLastError()); + + ok(wglGetCurrentContext() == ctx, "Wrong current context.\n"); + + if (0) /* Crashes on AMD on Windows */ + { + glCopyPixels(0, 0, 640, 480, GL_COLOR); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_NO_ERROR, "Failed glCopyPixel, error %#x.\n", glerr); + } + + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_NO_ERROR, "Failed glClear, error %#x.\n", glerr); + ret = SwapBuffers(draw_dc); + ok(ret, "Failed SwapBuffers, error %#x.\n", GetLastError()); + + ret = wglMakeCurrent(NULL, NULL); + ok(ret, "Failed to clear current context, last error %#x.\n", GetLastError()); + + if (0) /* This crashes with Nvidia drivers on Windows. */ + { + SetLastError(0xdeadbeef); + ret = pwglMakeContextCurrentARB(draw_dc, read_dc, ctx); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, + "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); + } + + ret = DestroyWindow(draw_window); + ok(ret, "Failed to destroy window, last error %#x.\n", GetLastError()); + + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_INVALID_OPERATION, "Failed glClear, error %#x.\n", glerr); + SetLastError(0xdeadbeef); + ret = SwapBuffers(draw_dc); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, "Unexpected behavior with SwapBuffer, last error %#x.\n", err); + + SetLastError(0xdeadbeef); + ret = pwglMakeContextCurrentARB(draw_dc, read_dc, ctx); + err = GetLastError(); + ok(!ret && (err == ERROR_INVALID_HANDLE || err == 0xc0070006), + "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); + + ok(wglGetCurrentContext() == NULL, "Wrong current context.\n"); + + wglMakeCurrent(NULL, NULL); + + wglMakeCurrent(oldhdc, oldctx); + ok(wglGetCurrentContext() == oldctx, "Wrong current context.\n"); + + SetLastError(0xdeadbeef); + ret = pwglMakeContextCurrentARB(draw_dc, read_dc, ctx); + err = GetLastError(); + ok(!ret && (err == ERROR_INVALID_HANDLE || err == 0xc0070006), + "Unexpected behavior when making context current, last error %#x.\n", err); + + ok(wglGetCurrentContext() == oldctx, "Wrong current context.\n"); + + ret = wglDeleteContext(ctx); + ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); + + ReleaseDC(read_window, read_dc); + ReleaseDC(draw_window, draw_dc); + + wglMakeCurrent(oldhdc, oldctx); +} + START_TEST(opengl) { HWND hwnd; @@ -920,8 +1454,10 @@ res = SetPixelFormat(hdc, iPixelFormat, &pfd); ok(res, "SetPixelformat failed: %x\n", GetLastError()); - test_bitmap_rendering(); + test_bitmap_rendering( TRUE ); + test_bitmap_rendering( FALSE ); test_minimized(); + test_window_dc(); test_dc(hwnd, hdc); hglrc = wglCreateContext(hdc); @@ -943,6 +1479,10 @@ * any WGL call :( On Wine this would work but not on real Windows because there can be different implementations (software, ICD, MCD). */ init_functions(); + test_getprocaddress(hdc); + test_deletecontext(hwnd, hdc); + test_makecurrent(hdc); + /* The lack of wglGetExtensionsStringARB in general means broken software rendering or the lack of decent OpenGL support, skip tests in such cases */ if (!pwglGetExtensionsStringARB) { @@ -950,9 +1490,8 @@ return; } - test_deletecontext(hdc); - test_makecurrent(hdc); test_setpixelformat(hdc); + test_destroy(hdc); test_sharelists(hdc); test_colorbits(hdc); test_gdi_dbuf(hdc); @@ -965,7 +1504,10 @@ test_opengl3(hdc); if(strstr(wgl_extensions, "WGL_ARB_make_current_read")) + { test_make_current_read(hdc); + test_destroy_read(hdc); + } else skip("WGL_ARB_make_current_read not supported, skipping test\n");

1 0

[tkreuzer] 57159: [PSEH2] PSEH2 uses a special mechanism to deal with nested try blocks inside the same function. Instead of pushing a second exception registration record on the exception list, it...
by tkreuzer＠svn.reactos.org 25 Aug '12

25 Aug '12

Author: tkreuzer Date: Sat Aug 25 22:19:02 2012 New Revision: 57159 URL: http://svn.reactos.org/svn/reactos?rev=57159&view=rev Log: [PSEH2] PSEH2 uses a special mechanism to deal with nested try blocks inside the same function. Instead of pushing a second exception registration record on the exception list, it uses an internal pointer to handle the different try-levels. But when a function using SEH is inlined, the resulting code will push 2 registration frames on the stack. Now it happens with GCC 4.7.1 that these frames get shuffled on the stack, putting one for the inner try on a higher stack address. This is something that RtlUnwind regards as a bug and throws a STATUS_INVALID_UNWIND_TARGET exception. This was the reason for the crashing PSEH2_TEST, when compiled with GCC 4.7.1. To fix this, I added a mechanism that will prevent functions using SEH from being inlined. Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Sat Aug 25 22:19:02 2012 @@ -108,6 +108,14 @@ #ifdef __cplusplus } +#endif + +/* Prevent gcc from inlining functions that use SEH. */ +#if ((__GNUC__ >= 4) && (__GNUC_MINOR__ >= 7)) +extern inline __attribute__((always_inline)) __attribute__((returns_twice)) void _SEH_DontInline() {} +#define __PREVENT_GCC_FROM_INLINING_SEH_FUNCTIONS() _SEH_DontInline(); +#else +#define __PREVENT_GCC_FROM_INLINING_SEH_FUNCTIONS() #endif /* A no-op side effect that scares GCC */ @@ -246,6 +254,7 @@ auto __SEH_DECLARE_FINALLY(_SEHFinally); #define _SEH2_TRY \ + __PREVENT_GCC_FROM_INLINING_SEH_FUNCTIONS() \ __SEH_BEGIN_SCOPE \ { \ __SEH_SCOPE_LOCALS; \

1 0

[ekohl] 57158: [ADVAPI32/LSASRV] - Implement LsaCreateSecret/LsarCreateSecret, LsaOpenSecret/LsarOpenSecret, LsaGetSystemAccessAccount/ LsarGetSystemAccessAccount and LsarSetSystemAccessAccount - I...
by ekohl＠svn.reactos.org 25 Aug '12

25 Aug '12

Author: ekohl Date: Sat Aug 25 15:40:06 2012 New Revision: 57158 URL: http://svn.reactos.org/svn/reactos?rev=57158&view=rev Log: [ADVAPI32/LSASRV] - Implement LsaCreateSecret/LsarCreateSecret, LsaOpenSecret/LsarOpenSecret, LsaGetSystemAccessAccount/ LsarGetSystemAccessAccount and LsarSetSystemAccessAccount - Improve some TRACE messages. Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/include/psdk/ntsecapi.h Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Sat Aug 25 15:40:06 2012 @@ -349,7 +349,7 @@ @ stub LsaClearAuditLog @ stdcall LsaClose(ptr) @ stdcall LsaCreateAccount(ptr ptr long ptr) -@ stub LsaCreateSecret +@ stdcall LsaCreateSecret(ptr ptr long ptr) @ stdcall LsaCreateTrustedDomain(ptr ptr long ptr) @ stdcall LsaCreateTrustedDomainEx(ptr ptr ptr long ptr) @ stdcall LsaDelete(ptr) @@ -364,7 +364,7 @@ @ stdcall LsaFreeMemory(ptr) @ stub LsaGetQuotasForAccount @ stub LsaGetRemoteUserName -@ stub LsaGetSystemAccessAccount +@ stdcall LsaGetSystemAccessAccount(ptr ptr) @ stdcall LsaGetUserName(ptr ptr) @ stub LsaICLookupNames @ stub LsaICLookupNamesWithCreds @@ -380,7 +380,7 @@ @ stdcall LsaOpenAccount(ptr ptr long ptr) @ stdcall LsaOpenPolicy(ptr ptr long ptr) @ stub LsaOpenPolicySce -@ stub LsaOpenSecret +@ stdcall LsaOpenSecret(ptr ptr long ptr) @ stub LsaOpenTrustedDomain @ stdcall LsaOpenTrustedDomainByName(ptr ptr long ptr) @ stdcall LsaQueryDomainInformationPolicy(ptr long ptr) Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sat Aug 25 15:40:06 2012 @@ -152,7 +152,8 @@ LSAPR_USER_RIGHT_SET UserRightSet; NTSTATUS Status; - TRACE("(%p,%p,%p,0x%08x) stub\n", PolicyHandle, AccountSid, UserRights, CountOfRights); + TRACE("LsaAddAccountRights(%p %p %p 0x%08x)\n", + PolicyHandle, AccountSid, UserRights, CountOfRights); UserRightSet.Entries = CountOfRights; UserRightSet.UserRights = (PRPC_UNICODE_STRING)UserRights; @@ -184,7 +185,8 @@ { NTSTATUS Status; - TRACE("(%p,%p) stub\n", AccountHandle, PrivilegeSet); + TRACE("LsaAddPrivilegesToAccount(%p %p)\n", + AccountHandle, PrivilegeSet); RpcTryExcept { @@ -213,7 +215,8 @@ { NTSTATUS Status; - TRACE("(%p,%p,0x%08x,%p)\n", PolicyHandle, AccountSid, DesiredAccess, AccountHandle); + TRACE("LsaCreateAccount(%p %p 0x%08x %p)\n", + PolicyHandle, AccountSid, DesiredAccess, AccountHandle); RpcTryExcept { @@ -221,6 +224,38 @@ AccountSid, DesiredAccess, AccountHandle); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +/* + * @implemented + */ +NTSTATUS +WINAPI +LsaCreateSecret(IN LSA_HANDLE PolicyHandle, + IN PLSA_UNICODE_STRING SecretName, + IN ACCESS_MASK DesiredAccess, + OUT PLSA_HANDLE SecretHandle) +{ + NTSTATUS Status; + + TRACE("LsaCreateSecret(%p %p 0x%08lx %p)\n", + PolicyHandle, SecretName, DesiredAccess, SecretHandle); + + RpcTryExcept + { + Status = LsarCreateSecret((LSAPR_HANDLE)PolicyHandle, + (PRPC_UNICODE_STRING)SecretName, + DesiredAccess, + SecretHandle); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { @@ -441,6 +476,33 @@ { TRACE("(%p)\n", Buffer); return RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); +} + + +/* + * @implemented + */ +NTSTATUS +WINAPI +LsaGetSystemAccessAccount(IN LSA_HANDLE AccountHandle, + OUT PULONG SystemAccess) +{ + NTSTATUS Status; + + TRACE("(%p,%p)\n", AccountHandle, SystemAccess); + + RpcTryExcept + { + Status = LsarGetSystemAccessAccount((LSAPR_HANDLE)AccountHandle, + (ACCESS_MASK *)SystemAccess); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; } @@ -770,6 +832,39 @@ } +NTSTATUS +WINAPI +LsaOpenSecret(IN LSA_HANDLE PolicyHandle, + IN PLSA_UNICODE_STRING SecretName, + IN ACCESS_MASK DesiredAccess, + OUT PLSA_HANDLE SecretHandle) +{ + NTSTATUS Status; + + TRACE("LsaOpenSecret(%p %p 0x%08x %p)\n", + PolicyHandle, SecretName, DesiredAccess, SecretHandle); + + RpcTryExcept + { + *SecretHandle = NULL; + + Status = LsarOpenSecret((LSAPR_HANDLE)PolicyHandle, + (PRPC_UNICODE_STRING)SecretName, + DesiredAccess, + SecretHandle); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + TRACE("LsaOpenSecret() done (Status: 0x%08lx)\n", Status); + + return Status; +} + + /* * @implemented */ Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sat Aug 25 15:40:06 2012 @@ -11,14 +11,15 @@ #include "lsasrv.h" +WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); + + +/* GLOBALS *****************************************************************/ static RTL_CRITICAL_SECTION PolicyHandleTableLock; -WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); - /* FUNCTIONS ***************************************************************/ - VOID LsarStartRpcServer(VOID) @@ -629,8 +630,87 @@ ACCESS_MASK DesiredAccess, LSAPR_HANDLE *SecretHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PLSA_DB_OBJECT PolicyObject; + PLSA_DB_OBJECT SecretsObject = NULL; + PLSA_DB_OBJECT SecretObject = NULL; + LARGE_INTEGER Time; + NTSTATUS Status = STATUS_SUCCESS; + + /* Validate the PolicyHandle */ + Status = LsapValidateDbObject(PolicyHandle, + LsaDbPolicyObject, + POLICY_CREATE_SECRET, + &PolicyObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapValidateDbObject returned 0x%08lx\n", Status); + return Status; + } + + /* Open the Secrets object */ + Status = LsapOpenDbObject(PolicyObject, + L"Secrets", + LsaDbContainerObject, + 0, + &SecretsObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapCreateDbObject (Secrets) failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Get the current time */ + Status = NtQuerySystemTime(&Time); + if (!NT_SUCCESS(Status)) + { + ERR("NtQuerySystemTime failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Create the Secret object */ + Status = LsapCreateDbObject(SecretsObject, + SecretName->Buffer, + LsaDbSecretObject, + DesiredAccess, + &SecretObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapCreateDbObject (Secret) failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Set the CurrentTime attribute */ + Status = LsapSetObjectAttribute(SecretObject, + L"CurrentTime", + (PVOID)&Time, + sizeof(LARGE_INTEGER)); + if (!NT_SUCCESS(Status)) + { + ERR("LsapSetObjectAttribute (CurrentTime) failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Set the OldTime attribute */ + Status = LsapSetObjectAttribute(SecretObject, + L"OldTime", + (PVOID)&Time, + sizeof(LARGE_INTEGER)); + +done: + if (!NT_SUCCESS(Status)) + { + if (SecretObject != NULL) + LsapCloseDbObject(SecretObject); + } + else + { + *SecretHandle = (LSAPR_HANDLE)SecretObject; + } + + if (SecretsObject != NULL) + LsapCloseDbObject(SecretsObject); + + return STATUS_SUCCESS; } @@ -958,8 +1038,28 @@ LSAPR_HANDLE AccountHandle, ACCESS_MASK *SystemAccess) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PLSA_DB_OBJECT AccountObject; + ULONG Size; + NTSTATUS Status; + + /* Validate the account handle */ + Status = LsapValidateDbObject(AccountHandle, + LsaDbAccountObject, + ACCOUNT_VIEW, + &AccountObject); + if (!NT_SUCCESS(Status)) + { + ERR("Invalid handle (Status %lx)\n", Status); + return Status; + } + + /* Get the system access flags */ + Status = LsapGetObjectAttribute(AccountObject, + L"ActSysAc", + SystemAccess, + &Size); + + return Status; } @@ -968,8 +1068,27 @@ LSAPR_HANDLE AccountHandle, ACCESS_MASK SystemAccess) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PLSA_DB_OBJECT AccountObject; + NTSTATUS Status; + + /* Validate the account handle */ + Status = LsapValidateDbObject(AccountHandle, + LsaDbAccountObject, + ACCOUNT_ADJUST_SYSTEM_ACCESS, + &AccountObject); + if (!NT_SUCCESS(Status)) + { + ERR("Invalid handle (Status %lx)\n", Status); + return Status; + } + + /* Set the system access flags */ + Status = LsapSetObjectAttribute(AccountObject, + L"ActSysAc", + &SystemAccess, + sizeof(ACCESS_MASK)); + + return Status; } @@ -1014,8 +1133,61 @@ ACCESS_MASK DesiredAccess, LSAPR_HANDLE *SecretHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PLSA_DB_OBJECT PolicyObject; + PLSA_DB_OBJECT SecretsObject = NULL; + PLSA_DB_OBJECT SecretObject = NULL; + NTSTATUS Status = STATUS_SUCCESS; + + /* Validate the PolicyHandle */ + Status = LsapValidateDbObject(PolicyHandle, + LsaDbPolicyObject, + POLICY_CREATE_SECRET, + &PolicyObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapValidateDbObject returned 0x%08lx\n", Status); + return Status; + } + + /* Open the Secrets object */ + Status = LsapOpenDbObject(PolicyObject, + L"Secrets", + LsaDbContainerObject, + 0, + &SecretsObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapCreateDbObject (Secrets) failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Create the secret object */ + Status = LsapOpenDbObject(SecretsObject, + SecretName->Buffer, + LsaDbSecretObject, + DesiredAccess, + &SecretObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapOpenDbObject (Secret) failed (Status 0x%08lx)\n", Status); + goto done; + } + +done: + if (!NT_SUCCESS(Status)) + { + if (SecretObject != NULL) + LsapCloseDbObject(SecretObject); + } + else + { + *SecretHandle = (LSAPR_HANDLE)SecretObject; + } + + if (SecretsObject != NULL) + LsapCloseDbObject(SecretsObject); + + return STATUS_SUCCESS; } @@ -1147,7 +1319,7 @@ Status = LsapValidateDbObject(PolicyHandle, LsaDbPolicyObject, - 0, /* FIXME */ + ACCOUNT_VIEW, &PolicyObject); if (!NT_SUCCESS(Status)) return Status; Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Sat Aug 25 15:40:06 2012 @@ -679,6 +679,7 @@ NTSTATUS NTAPI LsaClose(LSA_HANDLE); NTSTATUS NTAPI LsaConnectUntrusted(PHANDLE); NTSTATUS NTAPI LsaCreateAccount(LSA_HANDLE, PSID, ACCESS_MASK, PLSA_HANDLE); +NTSTATUS NTAPI LsaCreateSecret(LSA_HANDLE, PLSA_UNICODE_STRING, ACCESS_MASK, PLSA_HANDLE); NTSTATUS NTAPI LsaCreateTrustedDomain(LSA_HANDLE, PLSA_TRUST_INFORMATION, ACCESS_MASK, PLSA_HANDLE); NTSTATUS NTAPI LsaCreateTrustedDomainEx(LSA_HANDLE, PTRUSTED_DOMAIN_INFORMATION_EX, @@ -695,6 +696,7 @@ PVOID*,ULONG,PULONG); NTSTATUS NTAPI LsaFreeMemory(PVOID); NTSTATUS NTAPI LsaFreeReturnBuffer(PVOID); +NTSTATUS NTAPI LsaGetSystemAccessAccount(LSA_HANDLE, PULONG); NTSTATUS NTAPI LsaLogonUser(HANDLE,PLSA_STRING,SECURITY_LOGON_TYPE,ULONG,PVOID, ULONG,PTOKEN_GROUPS,PTOKEN_SOURCE,PVOID*,PULONG, PLUID,PHANDLE,PQUOTA_LIMITS,PNTSTATUS); @@ -711,6 +713,7 @@ NTSTATUS NTAPI LsaOpenAccount(LSA_HANDLE, PSID, ACCESS_MASK, PLSA_HANDLE); NTSTATUS NTAPI LsaOpenPolicy(PLSA_UNICODE_STRING,PLSA_OBJECT_ATTRIBUTES, ACCESS_MASK,PLSA_HANDLE); +NTSTATUS NTAPI LsaOpenSecret(LSA_HANDLE, PLSA_UNICODE_STRING, ACCESS_MASK, PLSA_HANDLE); NTSTATUS NTAPI LsaOpenTrustedDomainByName(LSA_HANDLE, PLSA_UNICODE_STRING, ACCESS_MASK, PLSA_HANDLE); NTSTATUS NTAPI LsaQueryDomainInformationPolicy(LSA_HANDLE, @@ -732,6 +735,7 @@ NTSTATUS NTAPI LsaSetInformationPolicy(LSA_HANDLE,POLICY_INFORMATION_CLASS, PVOID); NTSTATUS NTAPI LsaSetLocalInformationPolicy(LSA_HANDLE, POLICY_LOCAL_INFORMATION_CLASS,PVOID); +NTSTATUS NTAPI LsaSetSystemAccessAccount(LSA_HANDLE, ULONG); NTSTATUS NTAPI LsaSetTrustedDomainInformation(LSA_HANDLE,PSID, TRUSTED_INFORMATION_CLASS,PVOID); NTSTATUS NTAPI LsaSetTrustedDomainInfoByName(LSA_HANDLE,PLSA_UNICODE_STRING,

1 0

[tkreuzer] 57157: [GDI32_APITEST] Fix use of uninitialized variables and remove broken test. See issue #7299 for more details.
by tkreuzer＠svn.reactos.org 24 Aug '12

24 Aug '12

Author: tkreuzer Date: Fri Aug 24 20:25:29 2012 New Revision: 57157 URL: http://svn.reactos.org/svn/reactos?rev=57157&view=rev Log: [GDI32_APITEST] Fix use of uninitialized variables and remove broken test. See issue #7299 for more details. Modified: trunk/rostests/apitests/gdi32/CombineTransform.c Modified: trunk/rostests/apitests/gdi32/CombineTransform.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CombineTra… ============================================================================== --- trunk/rostests/apitests/gdi32/CombineTransform.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CombineTransform.c [iso-8859-1] Fri Aug 24 20:25:29 2012 @@ -54,14 +54,14 @@ BOOL ret; /* Test NULL paramters */ + set_xform(&xform1, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); + set_xform(&xform2, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); SetLastError(ERROR_SUCCESS); ret = CombineTransform(&xform3, &xform1, NULL); ok_int(ret, 0); ret = CombineTransform(&xform3, NULL, &xform2); ok_int(ret, 0); ret = CombineTransform(NULL, &xform1, &xform2); - ok_int(ret, 0); - ret = CombineTransform(&xform3, &xform1, &xform2); ok_int(ret, 0); ok_int(GetLastError(), ERROR_SUCCESS);

1 0

[fireball] 57156: [NTDLL/LDR] - Check result of walking the import descriptor and properly fail in case it wasn't successful. See issue #7289 for more details.
by fireball＠svn.reactos.org 24 Aug '12

24 Aug '12

Author: fireball Date: Fri Aug 24 17:50:56 2012 New Revision: 57156 URL: http://svn.reactos.org/svn/reactos?rev=57156&view=rev Log: [NTDLL/LDR] - Check result of walking the import descriptor and properly fail in case it wasn't successful. See issue #7289 for more details. Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Fri Aug 24 17:50:56 2012 @@ -1479,7 +1479,7 @@ ULONG HeapFlags; PIMAGE_NT_HEADERS NtHeader; LPWSTR NtDllName = NULL; - NTSTATUS Status; + NTSTATUS Status, ImportStatus; NLSTABLEINFO NlsTable; PIMAGE_LOAD_CONFIG_DIRECTORY LoadConfig; PTEB Teb = NtCurrentTeb(); @@ -1989,7 +1989,7 @@ } /* Walk the IAT and load all the DLLs */ - LdrpWalkImportDescriptor(LdrpDefaultPath.Buffer, LdrpImageEntry); + ImportStatus = LdrpWalkImportDescriptor(LdrpDefaultPath.Buffer, LdrpImageEntry); /* Check if relocation is needed */ if (Peb->ImageBaseAddress != (PVOID)NtHeader->OptionalHeader.ImageBase) @@ -2039,6 +2039,9 @@ /* Phase 0 is done */ LdrpLdrDatabaseIsSetup = TRUE; + + /* Check whether all static imports were properly loaded and return here */ + if (!NT_SUCCESS(ImportStatus)) return ImportStatus; /* Initialize TLS */ Status = LdrpInitializeTls();

1 0

[ion] 57155: [NTOSKRNL]: Cleanup MmCreateArm3Section a little bit to handle file-backed sections in the future. [NTOSKRNL]: Remove an ASSERT(FALSE) that was only there for testing. [NTOSKRNL]: Enab...
by ion＠svn.reactos.org 24 Aug '12

24 Aug '12

Author: ion Date: Fri Aug 24 17:17:36 2012 New Revision: 57155 URL: http://svn.reactos.org/svn/reactos?rev=57155&view=rev Log: [NTOSKRNL]: Cleanup MmCreateArm3Section a little bit to handle file-backed sections in the future. [NTOSKRNL]: Remove an ASSERT(FALSE) that was only there for testing. [NTOSKRNL]: Enable richard's ARM3 section code unconditionally for all non-file backed sections. Works4me. Let's see what Testbot says. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Fri Aug 24 17:17:36 2012 @@ -1335,7 +1335,6 @@ } /* Check to see which list this page should go into */ - ASSERT(FALSE); if (Pfn1->u3.e1.Modified == 1) { /* Push it into the modified page list */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Fri Aug 24 17:17:36 2012 @@ -894,10 +894,10 @@ ASSERT(ActualPages <= PageCount); /* Release the working set lock */ -// MiUnlockWorkingSet(PsGetCurrentThread(), +// MiUnlockWorkingSet(PsGetCurrentThread(), // &MmSessionSpace->GlobalVirtualAddress->Vm); - + /* If we did at least one page... */ if (ActualPages) { @@ -974,7 +974,7 @@ { /* Create the PDEs needed for this mapping */ Status = MiSessionCommitPageTables(Base, - (PVOID)((ULONG_PTR)Base + + (PVOID)((ULONG_PTR)Base + Buckets * MI_SYSTEM_VIEW_BUCKET_SIZE)); NT_ASSERT(NT_SUCCESS(Status)); } @@ -1243,6 +1243,37 @@ return STATUS_SUCCESS; } +VOID +NTAPI +MiSubsectionConsistent(IN PSUBSECTION Subsection) +{ + /* ReactOS only supports systems with 4K pages and 4K sectors */ + ASSERT(Subsection->u.SubsectionFlags.SectorEndOffset == 0); + + /* Therefore, then number of PTEs should be equal to the number of sectors */ + if (Subsection->NumberOfFullSectors != Subsection->PtesInSubsection) + { + /* Break and warn if this is inconsistent */ + DPRINT1("Mm: Subsection inconsistent (%x vs %x)\n", + Subsection->NumberOfFullSectors, Subsection->PtesInSubsection); + DbgBreakPoint(); + } +} + +NTSTATUS +NTAPI +MiCreateDataFileMap(IN PFILE_OBJECT File, + OUT PSEGMENT *Segment, + IN PSIZE_T MaximumSize, + IN ULONG SectionPageProtection, + IN ULONG AllocationAttributes, + IN ULONG IgnoreFileSizing) +{ + /* Not yet implemented */ + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS NTAPI MiCreatePagingFileMap(OUT PSEGMENT *Segment, @@ -2048,15 +2079,15 @@ SECTION Section; PSECTION NewSection; PSUBSECTION Subsection; - PSEGMENT NewSegment; + PSEGMENT NewSegment, Segment; NTSTATUS Status; PCONTROL_AREA ControlArea; - ULONG ProtectionMask; - - /* ARM3 does not yet support this */ - ASSERT(FileHandle == NULL); - ASSERT(FileObject == NULL); - ASSERT((AllocationAttributes & SEC_LARGE_PAGES) == 0); + ULONG ProtectionMask, ControlAreaSize, Size, NonPagedCharge, PagedCharge; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + BOOLEAN FileLock = FALSE, KernelCall = FALSE; + KIRQL OldIrql; + PFILE_OBJECT File; + PVOID PreviousSectionPointer; /* Make the same sanity checks that the Nt interface should've validated */ ASSERT((AllocationAttributes & ~(SEC_COMMIT | SEC_RESERVE | SEC_BASED | @@ -2079,53 +2110,229 @@ ProtectionMask = MiMakeProtectionMask(SectionPageProtection); if (ProtectionMask == MM_INVALID_PROTECTION) return STATUS_INVALID_PAGE_PROTECTION; - /* A handle must be supplied with SEC_IMAGE, and this is the no-handle path */ - if (AllocationAttributes & SEC_IMAGE) return STATUS_INVALID_FILE_FOR_SECTION; - - /* So this must be a pagefile-backed section, create the mappings needed */ - Status = MiCreatePagingFileMap(&NewSegment, - (PSIZE_T)InputMaximumSize, - ProtectionMask, - AllocationAttributes); - ASSERT(NT_SUCCESS(Status)); - ASSERT(NewSegment != NULL); + /* Check if this is going to be a data or image backed file section */ + if ((FileHandle) || (FileObject)) + { + /* These cannot be mapped with large pages */ + if (AllocationAttributes & SEC_LARGE_PAGES) return STATUS_INVALID_PARAMETER_6; + + /* For now, only support the mechanism through a file handle */ + ASSERT(FileObject == NULL); + + /* Reference the file handle to get the object */ + Status = ObReferenceObjectByHandle(FileHandle, + MmMakeFileAccess[ProtectionMask], + IoFileObjectType, + PreviousMode, + (PVOID*)&File, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Make sure Cc has been doing its job */ + if (!File->SectionObjectPointer) + { + /* This is not a valid file system-based file, fail */ + ObDereferenceObject(File); + return STATUS_INVALID_FILE_FOR_SECTION; + } + + /* Image-file backed sections are not yet supported */ + ASSERT((AllocationAttributes & SEC_IMAGE) == 0); + + /* Compute the size of the control area, and allocate it */ + ControlAreaSize = sizeof(CONTROL_AREA) + sizeof(MSUBSECTION); + ControlArea = ExAllocatePoolWithTag(NonPagedPool, ControlAreaSize, 'aCmM'); + if (!ControlArea) + { + ObDereferenceObject(File); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Zero it out */ + RtlZeroMemory(ControlArea, ControlAreaSize); + + /* Did we get a handle, or an object? */ + if (FileHandle) + { + /* We got a file handle so we have to lock down the file */ +#if 0 + Status = FsRtlAcquireToCreateMappedSection(File, SectionPageProtection); + if (!NT_SUCCESS(Status)) + { + ExFreePool(ControlArea); + ObDereferenceObject(File); + return Status; + } +#else + /* ReactOS doesn't support this API yet, so do nothing */ + Status = STATUS_SUCCESS; +#endif + /* Update the top-level IRP so that drivers know what's happening */ + IoSetTopLevelIrp((PIRP)FSRTL_FSP_TOP_LEVEL_IRP); + FileLock = TRUE; + } + + /* Lock the PFN database while we play with the section pointers */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Image-file backed sections are not yet supported */ + ASSERT((AllocationAttributes & SEC_IMAGE) == 0); + + /* There should not already be a control area for this file */ + ASSERT(File->SectionObjectPointer->DataSectionObject == NULL); + NewSegment = NULL; + + /* Write down that this CA is being created, and set it */ + ControlArea->u.Flags.BeingCreated = TRUE; + PreviousSectionPointer = File->SectionObjectPointer; + File->SectionObjectPointer->DataSectionObject = ControlArea; + + /* We can release the PFN lock now */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + /* We don't support previously-mapped file */ + ASSERT(NewSegment == NULL); + + /* Image-file backed sections are not yet supported */ + ASSERT((AllocationAttributes & SEC_IMAGE) == 0); + + /* So we always create a data file map */ + Status = MiCreateDataFileMap(File, + &Segment, + (PSIZE_T)InputMaximumSize, + SectionPageProtection, + AllocationAttributes, + KernelCall); + ASSERT(PreviousSectionPointer == File->SectionObjectPointer); + ASSERT(NT_SUCCESS(Status)); + + /* Check if a maximum size was specified */ + if (!InputMaximumSize->QuadPart) + { + /* Nope, use the segment size */ + Section.SizeOfSection.QuadPart = (LONGLONG)Segment->SizeOfSegment; + } + else + { + /* Yep, use the entered size */ + Section.SizeOfSection.QuadPart = InputMaximumSize->QuadPart; + } + + } + else + { + /* A handle must be supplied with SEC_IMAGE, as this is the no-handle path */ + if (AllocationAttributes & SEC_IMAGE) return STATUS_INVALID_FILE_FOR_SECTION; + + /* Not yet supported */ + ASSERT((AllocationAttributes & SEC_LARGE_PAGES) == 0); + + /* So this must be a pagefile-backed section, create the mappings needed */ + Status = MiCreatePagingFileMap(&NewSegment, + (PSIZE_T)InputMaximumSize, + ProtectionMask, + AllocationAttributes); + ASSERT(NT_SUCCESS(Status)); + + /* Set the size here, and read the control area */ + Section.SizeOfSection.QuadPart = NewSegment->SizeOfSegment; + ControlArea = NewSegment->ControlArea; + } + + /* Did we already have a segment? */ + if (!NewSegment) + { + /* This must be the file path and we created a segment */ + NewSegment = Segment; + ASSERT(File != NULL); + + /* Acquire the PFN lock while we set control area flags */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* We don't support this race condition yet, so assume no waiters */ + ASSERT(ControlArea->WaitingForDeletion == NULL); + ControlArea->WaitingForDeletion = NULL; + + /* Image-file backed sections are not yet supported, nor ROM images */ + ASSERT((AllocationAttributes & SEC_IMAGE) == 0); + ASSERT(Segment->ControlArea->u.Flags.Rom == 0); + + /* Take off the being created flag, and then release the lock */ + ControlArea->u.Flags.BeingCreated = FALSE; + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + } + + /* Check if we locked the file earlier */ + if (FileLock) + { + /* Reset the top-level IRP and release the lock */ + IoSetTopLevelIrp(NULL); + //FsRtlReleaseFile(File); + FileLock = FALSE; + } /* Set the initial section object data */ Section.InitialPageProtection = SectionPageProtection; - Section.SizeOfSection.QuadPart = NewSegment->SizeOfSegment; + + /* The mapping created a control area and segment, save the flags */ Section.Segment = NewSegment; - - /* THe mapping created a control area and segment, save the flags */ - ControlArea = NewSegment->ControlArea; Section.u.LongFlags = ControlArea->u.LongFlags; - /* ARM3 cannot support these right now, make sure they're not being set */ - ASSERT(ControlArea->u.Flags.Image == 0); - ASSERT(ControlArea->FilePointer == NULL); + /* Check if this is a user-mode read-write non-image file mapping */ + if (!(FileObject) && + (SectionPageProtection & (PAGE_READWRITE | PAGE_EXECUTE_READWRITE)) && + (ControlArea->u.Flags.Image == 0) && + (ControlArea->FilePointer != NULL)) + { + /* Add a reference and set the flag */ + Section.u.Flags.UserWritable = 1; + InterlockedIncrement((PLONG)&ControlArea->WritableUserReferences); + } + + /* Check for image mappings or page file mappings */ + if ((ControlArea->u.Flags.Image == 1) || !(ControlArea->FilePointer)) + { + /* Charge the segment size, and allocate a subsection */ + PagedCharge = sizeof(SECTION) + NewSegment->TotalNumberOfPtes * sizeof(MMPTE); + Size = sizeof(SUBSECTION); + } + else + { + /* Charge nothing, and allocate a mapped subsection */ + PagedCharge = 0; + Size = sizeof(MSUBSECTION); + } + + /* Check if this is a normal CA */ ASSERT(ControlArea->u.Flags.GlobalOnlyPerSession == 0); ASSERT(ControlArea->u.Flags.Rom == 0); - ASSERT(ControlArea->u.Flags.WasPurged == 0); - - /* A pagefile-backed mapping only has one subsection, and this is all ARM3 supports */ + + /* Charge only a CA, and the subsection is right after */ + NonPagedCharge = sizeof(CONTROL_AREA); Subsection = (PSUBSECTION)(ControlArea + 1); + + /* We only support single-subsection mappings */ + NonPagedCharge += Size; ASSERT(Subsection->NextSubsection == NULL); /* Create the actual section object, with enough space for the prototype PTEs */ - Status = ObCreateObject(ExGetPreviousMode(), + Status = ObCreateObject(PreviousMode, MmSectionObjectType, ObjectAttributes, - ExGetPreviousMode(), + PreviousMode, NULL, sizeof(SECTION), - sizeof(SECTION) + - NewSegment->TotalNumberOfPtes * sizeof(MMPTE), - sizeof(CONTROL_AREA) + sizeof(SUBSECTION), + PagedCharge, + NonPagedCharge, (PVOID*)&NewSection); ASSERT(NT_SUCCESS(Status)); /* Now copy the local section object from the stack into this new object */ RtlCopyMemory(NewSection, &Section, sizeof(SECTION)); NewSection->Address.StartingVpn = 0; + + /* For now, only user calls are supported */ + ASSERT(KernelCall == FALSE); NewSection->u.Flags.UserReference = TRUE; /* Migrate the attribute into a flag */ @@ -2170,6 +2377,13 @@ /* Finally release the lock */ KeReleaseGuardedMutex(&MmSectionBasedMutex); } + + /* Write down if this was a kernel call */ + ControlArea->u.Flags.WasPurged |= KernelCall; + ASSERT(ControlArea->u.Flags.WasPurged == FALSE); + + /* Make sure the segment and the section are the same size, or the section is smaller */ + ASSERT(NewSection->SizeOfSection.QuadPart <= NewSection->Segment->SizeOfSegment); /* Return the object and the creation status */ *SectionObject = (PVOID)NewSection; Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Fri Aug 24 17:17:36 2012 @@ -4860,17 +4860,19 @@ PROS_SECTION_OBJECT *SectionObject = (PROS_SECTION_OBJECT *)Section; /* Check if an ARM3 section is being created instead */ - if (AllocationAttributes & 1) + if (!(AllocationAttributes & SEC_IMAGE) && (AllocationAttributes)) { - DPRINT1("Creating ARM3 section\n"); - return MmCreateArm3Section(Section, - DesiredAccess, - ObjectAttributes, - MaximumSize, - SectionPageProtection, - AllocationAttributes &~ 1, - FileHandle, - FileObject); + if (!(FileObject) && !(FileHandle)) + { + return MmCreateArm3Section(Section, + DesiredAccess, + ObjectAttributes, + MaximumSize, + SectionPageProtection, + AllocationAttributes &~ 1, + FileHandle, + FileObject); + } } /*

1 0

[jgardou] 57154: [CMAKE] - Fix build, sorry
by jgardou＠svn.reactos.org 24 Aug '12

24 Aug '12

Author: jgardou Date: Fri Aug 24 16:29:37 2012 New Revision: 57154 URL: http://svn.reactos.org/svn/reactos?rev=57154&view=rev Log: [CMAKE] - Fix build, sorry Modified: trunk/reactos/dll/opengl/CMakeLists.txt trunk/reactos/dll/win32/CMakeLists.txt Modified: trunk/reactos/dll/opengl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/CMakeLists.txt?… ============================================================================== --- trunk/reactos/dll/opengl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/CMakeLists.txt [iso-8859-1] Fri Aug 24 16:29:37 2012 @@ -1,1 +1,2 @@ -add_subdirectory(mesa) +add_subdirectory(mesa) +add_subdirectory(opengl32) Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Fri Aug 24 16:29:37 2012 @@ -134,7 +134,6 @@ add_subdirectory(olepro32) add_subdirectory(olesvr32) add_subdirectory(olethk32) -add_subdirectory(opengl32) add_subdirectory(pdh) add_subdirectory(pidgen) add_subdirectory(powrprof)

1 0

[jgardou] 57153: [OPENGL] - Add some optimizations (GCC) on compilation of libMesa - Move opengl32 to the opengl directory - Disable ICD refcounting for now, it does more harm than good.
by jgardou＠svn.reactos.org 24 Aug '12

24 Aug '12

Author: jgardou Date: Fri Aug 24 16:28:09 2012 New Revision: 57153 URL: http://svn.reactos.org/svn/reactos?rev=57153&view=rev Log: [OPENGL] - Add some optimizations (GCC) on compilation of libMesa - Move opengl32 to the opengl directory - Disable ICD refcounting for now, it does more harm than good. Added: trunk/reactos/dll/opengl/opengl32/ - copied from r57143, trunk/reactos/dll/win32/opengl32/ Removed: trunk/reactos/dll/win32/opengl32/ Modified: trunk/reactos/dll/opengl/mesa/CMakeLists.txt trunk/reactos/dll/opengl/opengl32/wgl.c Modified: trunk/reactos/dll/opengl/mesa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/CMakeLists… ============================================================================== --- trunk/reactos/dll/opengl/mesa/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/CMakeLists.txt [iso-8859-1] Fri Aug 24 16:28:09 2012 @@ -14,6 +14,8 @@ if(NOT MSVC) add_compile_flags_language("-std=gnu99" "C") add_compile_flags("-Wno-deprecated-declarations") + # optimizations (builtin memcmp is slow on some gcc versions) used in SConsript files + add_compile_flags("-ffast-math -fno-builtin-memcmp") else() include_directories(include/c99) add_compile_flags("/wd4996") Modified: trunk/reactos/dll/opengl/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/wgl.c?… ============================================================================== --- trunk/reactos/dll/opengl/opengl32/wgl.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/opengl32/wgl.c [iso-8859-1] Fri Aug 24 16:28:09 2012 @@ -129,6 +129,8 @@ ROSGL_DeleteDCDataForICD( GLDRIVERDATA *icd ) { GLDCDATA *p, **pptr; + + return; /* synchronize */ if (WaitForSingleObject( OPENGL32_processdata.dcdata_mutex, INFINITE ) ==

1 0

[akhaldi] 57152: [CMAKE/MSVC] * Call cl directly instead of its full path using <CMAKE_C_COMPILER>. Figuring out why it didn't work is left as an exercise for the reader.
by akhaldi＠svn.reactos.org 24 Aug '12

24 Aug '12

Author: akhaldi Date: Fri Aug 24 16:21:33 2012 New Revision: 57152 URL: http://svn.reactos.org/svn/reactos?rev=57152&view=rev Log: [CMAKE/MSVC] * Call cl directly instead of its full path using <CMAKE_C_COMPILER>. Figuring out why it didn't work is left as an exercise for the reader. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=57152… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Fri Aug 24 16:21:33 2012 @@ -53,12 +53,12 @@ # We may temporarily use just the global defines, but this is not a solution as some modules (minihal for example) apply additional definitions to source files, so we get an incorrect build of such targets. get_directory_property(definitions DEFINITIONS) set(CMAKE_ASM_COMPILE_OBJECT - "<CMAKE_C_COMPILER> /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> ${definitions} /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" + "cl /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> ${definitions} /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") else() # NMake Makefiles set(CMAKE_ASM_COMPILE_OBJECT - "<CMAKE_C_COMPILER> /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" + "cl /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") 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