Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 47218: Revert part of 47209. Hope this time is the good one
by jgardou＠svn.reactos.org 15 May '10

15 May '10

Author: jgardou Date: Sat May 15 11:59:42 2010 New Revision: 47218 URL: http://svn.reactos.org/svn/reactos?rev=47218&view=rev Log: Revert part of 47209. Hope this time is the good one Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c [iso-8859-1] Sat May 15 11:59:42 2010 @@ -24,8 +24,6 @@ TEST(NtGdiDeleteObjectApp(hDC) != 0); - TEST(NtGdiDeleteObjectApp(hDC) != 0); - return APISTATUS_NORMAL; }

1 0

[jgardou] 47217: [WIN32K] - clean up some debugging code - set NULL owner when setting BASEFLAG_READY_TO_DIE, so that the handle can be freed.
by jgardou＠svn.reactos.org 15 May '10

15 May '10

Author: jgardou Date: Sat May 15 11:57:36 2010 New Revision: 47217 URL: http://svn.reactos.org/svn/reactos?rev=47217&view=rev Log: [WIN32K] - clean up some debugging code - set NULL owner when setting BASEFLAG_READY_TO_DIE, so that the handle can be freed. Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/gdiobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Sat May 15 11:57:36 2010 @@ -631,11 +631,22 @@ } else if (Object->ulShareCount != 0) { + NTSTATUS Status; + PEPROCESS OldProcess; Object->BaseFlags |= BASEFLAG_READY_TO_DIE; DPRINT("Object %p, ulShareCount = %d\n", Object->hHmgr, Object->ulShareCount); - //GDIDBG_TRACECALLER(); - //GDIDBG_TRACESHARELOCKER(GDI_HANDLE_GET_INDEX(hObj)); - (void)InterlockedExchangePointer((PVOID*)&Entry->ProcessId, PrevProcId); + /* Set NULL owner. Do the work here to avoid race conditions */ + Status = PsLookupProcessByProcessId((HANDLE)((ULONG_PTR)PrevProcId & ~0x1), &OldProcess); + if (NT_SUCCESS(Status)) + { + PPROCESSINFO W32Process = (PPROCESSINFO)OldProcess->Win32Process; + if (W32Process != NULL) + { + InterlockedDecrement(&W32Process->GDIHandleCount); + } + ObDereferenceObject(OldProcess); + } + (void)InterlockedExchangePointer((PVOID*)&Entry->ProcessId, NULL); /* Don't wait on shared locks */ return FALSE; } @@ -1037,11 +1048,6 @@ { if (Object->Tid != Thread) { - GDIDBG_TRACELOOP(hObj, Object->Tid, Thread); - GDIDBG_TRACECALLER(); - GDIDBG_TRACELOCKER(hObj); - GDIDBG_TRACEALLOCATOR(hObj); - /* Unlock the handle table entry. */ (void)InterlockedExchangePointer((PVOID*)&Entry->ProcessId, PrevProcId);

1 0

[cgutman] 47216: [NTOSKRNL] - Fix a bug that broke /NODEBUG and /CRASHDEBUG
by cgutman＠svn.reactos.org 15 May '10

15 May '10

Author: cgutman Date: Sat May 15 05:21:54 2010 New Revision: 47216 URL: http://svn.reactos.org/svn/reactos?rev=47216&view=rev Log: [NTOSKRNL] - Fix a bug that broke /NODEBUG and /CRASHDEBUG Modified: trunk/reactos/ntoskrnl/kd/kdinit.c Modified: trunk/reactos/ntoskrnl/kd/kdinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdinit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdinit.c [iso-8859-1] Sat May 15 05:21:54 2010 @@ -166,8 +166,8 @@ /* XXX Check for settings that we support */ if (strstr(CommandLine, "BREAK")) KdpEarlyBreak = TRUE; if (strstr(CommandLine, "NODEBUG")) KdDebuggerEnabled = FALSE; - if (strstr(CommandLine, "CRASHDEBUG")) KdDebuggerEnabled = FALSE; - if (strstr(CommandLine, "DEBUG")) + else if (strstr(CommandLine, "CRASHDEBUG")) KdDebuggerEnabled = FALSE; + else if (strstr(CommandLine, "DEBUG")) { /* Enable on the serial port */ KdDebuggerEnabled = TRUE;

1 0

[tkreuzer] 47215: [NTOSKRNL] Fix paramter parsing in KdbpGetCommandLineSettings. Fixes KDSERIAL
by tkreuzer＠svn.reactos.org 15 May '10

15 May '10

Author: tkreuzer Date: Sat May 15 05:02:10 2010 New Revision: 47215 URL: http://svn.reactos.org/svn/reactos?rev=47215&view=rev Log: [NTOSKRNL] Fix paramter parsing in KdbpGetCommandLineSettings. Fixes KDSERIAL Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=47… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Sat May 15 05:02:10 2010 @@ -1697,7 +1697,7 @@ while (p1 && (p2 = strchr(p1, ' '))) { - p2++; + p2 += 2; if (!_strnicmp(p2, "KDSERIAL", 8)) {

1 0

[tkreuzer] 47214: [OLEAUT32_WINETEST] Skip crashing tests test_apm and test_enhmetafile See issue #5396 for more details.
by tkreuzer＠svn.reactos.org 15 May '10

15 May '10

Author: tkreuzer Date: Sat May 15 03:30:24 2010 New Revision: 47214 URL: http://svn.reactos.org/svn/reactos?rev=47214&view=rev Log: [OLEAUT32_WINETEST] Skip crashing tests test_apm and test_enhmetafile See issue #5396 for more details. Modified: trunk/rostests/winetests/oleaut32/olepicture.c Modified: trunk/rostests/winetests/oleaut32/olepicture.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/olepic… ============================================================================== --- trunk/rostests/winetests/oleaut32/olepicture.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/olepicture.c [iso-8859-1] Sat May 15 03:30:24 2010 @@ -720,9 +720,11 @@ if (0) test_pic(pngimage, sizeof(pngimage)); test_empty_image(); test_empty_image_2(); - test_apm(); + skip("skipping test_apm, see bug 5396\n"); + //test_apm(); test_metafile(); - test_enhmetafile(); + skip("skipping test_enhmetafile, see bug 5396\n"); + //test_enhmetafile(); test_Invoke(); test_OleCreatePictureIndirect();

1 0

[tkreuzer] 47213: [WIN32CSR] Fix display of harderror message box for STATUS_UNHANDLED_EXCEPTION
by tkreuzer＠svn.reactos.org 15 May '10

15 May '10

Author: tkreuzer Date: Sat May 15 03:05:09 2010 New Revision: 47213 URL: http://svn.reactos.org/svn/reactos?rev=47213&view=rev Log: [WIN32CSR] Fix display of harderror message box for STATUS_UNHANDLED_EXCEPTION Modified: trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c [iso-8859-1] Sat May 15 03:05:09 2010 @@ -223,7 +223,7 @@ ANSI_STRING FormatA; PRTL_MESSAGE_RESOURCE_ENTRY MessageResource; PWSTR FormatString; - ULONG Size; + ULONG Size, ExceptionCode; /* Get the file name of the client process */ CsrpGetClientFileName(&FileNameU, hProcess); @@ -310,8 +310,10 @@ /* Check if this is an exception message */ if (Message->Status == STATUS_UNHANDLED_EXCEPTION) { + ExceptionCode = Parameters[0]; + /* Handle special cases */ - if (Parameters[0] == STATUS_ACCESS_VIOLATION) + if (ExceptionCode == STATUS_ACCESS_VIOLATION) { Parameters[0] = Parameters[1]; Parameters[1] = Parameters[3]; @@ -319,7 +321,7 @@ else Parameters[2] = (ULONG_PTR)L"read"; MessageResource = NULL; } - else if (Parameters[0] == STATUS_IN_PAGE_ERROR) + else if (ExceptionCode == STATUS_IN_PAGE_ERROR) { Parameters[0] = Parameters[1]; Parameters[1] = Parameters[3]; @@ -339,7 +341,7 @@ Status = RtlFindMessage(GetModuleHandleW(L"ntdll"), (ULONG_PTR)RT_MESSAGETABLE, LANG_NEUTRAL, - Parameters[0], + ExceptionCode, &MessageResource); if (NT_SUCCESS(Status)) @@ -356,6 +358,7 @@ RtlInitAnsiString(&FormatA, MessageResource->Text); RtlAnsiStringToUnicodeString(&FormatU, &FormatA, TRUE); } + FormatString = FormatU.Buffer; } else { @@ -368,9 +371,8 @@ } /* Calculate length of text buffer */ - TextStringU->MaximumLength = wcslen(FormatString) * sizeof(WCHAR) + - SizeOfStrings + 42 * sizeof(WCHAR); - + TextStringU->MaximumLength = FormatU.Length + SizeOfStrings + 42 * sizeof(WCHAR); + /* Allocate a buffer for the text */ TextStringU->Buffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY,

1 0

[tkreuzer] 47212: [GDIPLUS_WINETEST] Comment out GdipDisposeImage in 3 places, where it was crashing See issue #5395 for more details.
by tkreuzer＠svn.reactos.org 15 May '10

15 May '10

Author: tkreuzer Date: Sat May 15 02:12:14 2010 New Revision: 47212 URL: http://svn.reactos.org/svn/reactos?rev=47212&view=rev Log: [GDIPLUS_WINETEST] Comment out GdipDisposeImage in 3 places, where it was crashing See issue #5395 for more details. Modified: trunk/rostests/winetests/gdiplus/graphics.c Modified: trunk/rostests/winetests/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/graphic… ============================================================================== --- trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] Sat May 15 02:12:14 2010 @@ -2353,7 +2353,8 @@ expect(Ok, status); expect(0xdeadbeef, color); GdipDeleteGraphics(graphics); - GdipDisposeImage((GpImage*)bitmap); + skip("skipping GdipDisposeImage, see bug 5395\n"); + //GdipDisposeImage((GpImage*)bitmap); status = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat64bppARGB, NULL, &bitmap); expect(Ok, status); @@ -2363,7 +2364,8 @@ expect(Ok, status); expect(0xdeadbeef, color); GdipDeleteGraphics(graphics); - GdipDisposeImage((GpImage*)bitmap); + skip("skipping GdipDisposeImage, see bug 5395\n"); + //GdipDisposeImage((GpImage*)bitmap); status = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat64bppPARGB, NULL, &bitmap); expect(Ok, status); @@ -2373,7 +2375,8 @@ expect(Ok, status); expect(0xdeadbeef, color); GdipDeleteGraphics(graphics); - GdipDisposeImage((GpImage*)bitmap); + skip("skipping GdipDisposeImage, see bug 5395\n"); + //GdipDisposeImage((GpImage*)bitmap); status = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat16bppRGB565, NULL, &bitmap); expect(Ok, status);

1 0

[jgardou] 47211: [ROSTESTS] - something went wrong with previous commit...
by jgardou＠svn.reactos.org 14 May '10

14 May '10

Author: jgardou Date: Sat May 15 01:21:04 2010 New Revision: 47211 URL: http://svn.reactos.org/svn/reactos?rev=47211&view=rev Log: [ROSTESTS] - something went wrong with previous commit... Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c [iso-8859-1] Sat May 15 01:21:04 2010 @@ -49,26 +49,6 @@ /* Make sure */ TEST(NtUserCallOneParam((DWORD_PTR)hdc, ONEPARAM_ROUTINE_RELEASEDC) == 0); - /* Delete a display DC */ - SetLastError(0); - hdc = CreateDC("DISPLAY", NULL, NULL, NULL); - ASSERT(IsHandleValid(hdc) == 1); - TEST(NtGdiDeleteObjectApp(hdc) != 0); - TEST(GetLastError() == 0); - TEST(IsHandleValid(hdc) == 1); - TEST(SelectObject(hdc, GetStockObject(WHITE_PEN)) == NULL); - TESTX(GetLastError() == ERROR_INVALID_PARAMETER, "GetLasterror returned 0x%08x\n", (unsigned int)GetLastError()); - - /* Once more */ - SetLastError(0); - hdc = GetDC(0); - ASSERT(IsHandleValid(hdc) == 1); - TEST(NtGdiDeleteObjectApp(hdc) != 0); - TEST(GetLastError() == 0); - TEST(IsHandleValid(hdc) == 1); - TEST(SelectObject(hdc, GetStockObject(WHITE_PEN)) == NULL); - TESTX(GetLastError() == ERROR_INVALID_PARAMETER, "GetLasterror returned 0x%08x\n", (unsigned int)GetLastError()); - /* Delete a brush */ SetLastError(0); hbrush = CreateSolidBrush(0x123456);

1 0

[jgardou] 47210: [ROSTESTS] - more tests for direct DC creation/deletion
by jgardou＠svn.reactos.org 14 May '10

14 May '10

Author: jgardou Date: Sat May 15 01:19:16 2010 New Revision: 47210 URL: http://svn.reactos.org/svn/reactos?rev=47210&view=rev Log: [ROSTESTS] - more tests for direct DC creation/deletion Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c [iso-8859-1] Sat May 15 01:19:16 2010 @@ -21,6 +21,8 @@ /* The default pen should be GetStockObject(BLACK_PEN) */ hObj = SelectObject(hDC, GetStockObject(WHITE_PEN)); TEST(hObj == GetStockObject(BLACK_PEN)); + + TEST(NtGdiDeleteObjectApp(hDC) != 0); TEST(NtGdiDeleteObjectApp(hDC) != 0); Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c [iso-8859-1] Sat May 15 01:19:16 2010 @@ -5,6 +5,7 @@ HDC hdc; HBITMAP hbmp; HBRUSH hbrush; + HPEN hpen; /* Try to delete 0 */ SetLastError(0); @@ -23,7 +24,31 @@ TEST(NtGdiDeleteObjectApp(hdc) == 1); TEST(GetLastError() == 0); TEST(IsHandleValid(hdc) == 0); - + + /* Delete a display DC */ + SetLastError(0); + hdc = CreateDC("DISPLAY", NULL, NULL, NULL); + ASSERT(IsHandleValid(hdc) == 1); + TEST((hpen=SelectObject(hdc, GetStockObject(WHITE_PEN))) != NULL); + SelectObject(hdc, hpen); + TEST(NtGdiDeleteObjectApp(hdc) != 0); + TEST(GetLastError() == 0); + TEST(IsHandleValid(hdc) == 1); + TEST(SelectObject(hdc, GetStockObject(WHITE_PEN)) == NULL); + TESTX(GetLastError() == ERROR_INVALID_PARAMETER, "GetLasterror returned 0x%08x\n", (unsigned int)GetLastError()); + + /* Once more */ + SetLastError(0); + hdc = GetDC(0); + ASSERT(IsHandleValid(hdc) == 1); + TEST(NtGdiDeleteObjectApp(hdc) != 0); + TEST(GetLastError() == 0); + TEST(IsHandleValid(hdc) == 1); + TEST(SelectObject(hdc, GetStockObject(WHITE_PEN)) == NULL); + TESTX(GetLastError() == ERROR_INVALID_PARAMETER, "GetLasterror returned 0x%08x\n", (unsigned int)GetLastError()); + /* Make sure */ + TEST(NtUserCallOneParam((DWORD_PTR)hdc, ONEPARAM_ROUTINE_RELEASEDC) == 0); + /* Delete a display DC */ SetLastError(0); hdc = CreateDC("DISPLAY", NULL, NULL, NULL);

1 0

[tkreuzer] 47209: [GDI32_WINETEST] Skip test in gdi32_winetest metafile, that crashes See issue #5392 for more details.
by tkreuzer＠svn.reactos.org 14 May '10

14 May '10

Author: tkreuzer Date: Sat May 15 01:13:13 2010 New Revision: 47209 URL: http://svn.reactos.org/svn/reactos?rev=47209&view=rev Log: [GDI32_WINETEST] Skip test in gdi32_winetest metafile, that crashes See issue #5392 for more details. Modified: trunk/rostests/winetests/gdi32/metafile.c Modified: trunk/rostests/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.… ============================================================================== --- trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] Sat May 15 01:13:13 2010 @@ -1427,10 +1427,11 @@ const ENHMETARECORD *emr1 = (const ENHMETARECORD *)(bits + offset1); const ENHMETARECORD *emr2 = (const ENHMETARECORD *)(buf + offset2); - trace("%s: EMF record %u, size %u/record %u, size %u\n", - desc, emr1->iType, emr1->nSize, emr2->iType, emr2->nSize); - - if (!match_emf_record(emr1, emr2, desc, ignore_scaling)) return -1; + skip("skipping match_emf_record(), bug 5392\n"); +// trace("%s: EMF record %u, size %u/record %u, size %u\n", +// desc, emr1->iType, emr1->nSize, emr2->iType, emr2->nSize); + +// if (!match_emf_record(emr1, emr2, desc, ignore_scaling)) return -1; /* We have already bailed out if iType or nSize don't match */ offset1 += emr1->nSize;

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