Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gschneider] 42309: Don't try to delete non existing XLateObjects (NULL brushes return those for example)
by gschneider＠svn.reactos.org 30 Jul '09

30 Jul '09

Author: gschneider Date: Thu Jul 30 23:12:06 2009 New Revision: 42309 URL: http://svn.reactos.org/svn/reactos?rev=42309&view=rev Log: Don't try to delete non existing XLateObjects (NULL brushes return those for example) Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] Thu Jul 30 23:12:06 2009 @@ -61,7 +61,10 @@ EBRUSHOBJ_vSetSolidBrushColor(&pdc->eboFill, pdcattr->crPenClr, pxlo); } - EngDeleteXlate(pxlo); + if (pxlo != NULL) + { + EngDeleteXlate(pxlo); + } /* Clear flags */ pdcattr->ulDirty_ &= ~(DIRTY_FILL | DC_BRUSH_DIRTY); @@ -117,7 +120,10 @@ EBRUSHOBJ_vSetSolidBrushColor(&pdc->eboLine, pdcattr->crPenClr, pxlo); } - EngDeleteXlate(pxlo); + if (pxlo != NULL) + { + EngDeleteXlate(pxlo); + } /* Clear flags */ pdcattr->ulDirty_ &= ~(DIRTY_LINE | DC_PEN_DIRTY);

1 0

[fireball] 42308: - Use a default MIX value instead of 0.
by fireball＠svn.reactos.org 30 Jul '09

30 Jul '09

Author: fireball Date: Thu Jul 30 21:06:21 2009 New Revision: 42308 URL: http://svn.reactos.org/svn/reactos?rev=42308&view=rev Log: - Use a default MIX value instead of 0. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c [iso-8859-1] Thu Jul 30 21:06:21 2009 @@ -118,7 +118,7 @@ /* Draw pen-based polygon */ if (!(pDC->pLineBrush->flAttrs & GDIBRUSH_IS_NULL)) { - Mix = 0;//ROP2_TO_MIX(pdcattr->jROP2); + Mix = ROP2_TO_MIX(R2_COPYPEN);/*pdcattr->jROP2*/ for (i=0; i<count-1; i++) { bRet = GreLineTo(&pDC->pBitmap->SurfObj, Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] Thu Jul 30 21:06:21 2009 @@ -59,7 +59,7 @@ /* Draw pen-based rectangle */ if (!(pDC->pLineBrush->flAttrs & GDIBRUSH_IS_NULL)) { - Mix = 0;//ROP2_TO_MIX(pdcattr->jROP2); + Mix = ROP2_TO_MIX(R2_COPYPEN);/*pdcattr->jROP2*/ GreLineTo(&pDC->pBitmap->SurfObj, NULL,//dc->rosdc.CombinedClip, &pDC->pLineBrush->BrushObj, @@ -129,7 +129,7 @@ /* Draw pen-based polygon */ if (!(pDC->pLineBrush->flAttrs & GDIBRUSH_IS_NULL)) { - Mix = 0;//ROP2_TO_MIX(pdcattr->jROP2); + Mix = ROP2_TO_MIX(R2_COPYPEN);/*pdcattr->jROP2*/ for (i=0; i<count-1; i++) { bRet = GreLineTo(&pDC->pBitmap->SurfObj,

1 0

[fireball] 42307: - Use Xlate object in GreBitBlt. Icons are still black, but have correct shape now.
by fireball＠svn.reactos.org 30 Jul '09

30 Jul '09

Author: fireball Date: Thu Jul 30 20:52:03 2009 New Revision: 42307 URL: http://svn.reactos.org/svn/reactos?rev=42307&view=rev Log: - Use Xlate object in GreBitBlt. Icons are still black, but have correct shape now. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c branches/arwinss/reactos/subsystems/win32/win32k/include/xlateobj.h Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] Thu Jul 30 20:52:03 2009 @@ -161,6 +161,8 @@ POINT BrushOrigin = {0,0}; POINT SourcePoint; RECTL DestRect; + XLATEOBJ *XlateObj = NULL; + BOOL UsesSource = ROP3_USES_SOURCE(rop); DestRect.left = XDest; DestRect.top = YDest; @@ -183,13 +185,27 @@ SourcePoint.y += pSrc->rcDcRect.top + pSrc->rcVport.left; } + /* Create the XLATEOBJ */ + if (UsesSource) + { + XlateObj = IntCreateXlateForBlt(pDest, pSrc, pDest->pBitmap, pSrc->pBitmap); + + if (XlateObj == (XLATEOBJ*)-1) + { + DPRINT1("couldn't create XlateObj\n"); + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); + XlateObj = NULL; + return FALSE; + } + } + /* Perform the bitblt operation */ bRet = GrepBitBltEx( &pDest->pBitmap->SurfObj, pSrc ? &pSrc->pBitmap->SurfObj : NULL, NULL, NULL,//dc->rosdc.CombinedClip, - NULL,//XlateObj + XlateObj, &DestRect, &SourcePoint, NULL, @@ -197,6 +213,10 @@ &BrushOrigin, ROP3_TO_ROP4(rop), TRUE); + + /* Free XlateObj if it was created */ + if (UsesSource && XlateObj) + EngDeleteXlate(XlateObj); return bRet; } Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/xlateobj.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/xlateobj.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/xlateobj.h [iso-8859-1] Thu Jul 30 20:52:03 2009 @@ -29,4 +29,7 @@ VOID FASTCALL EngDeleteXlate(XLATEOBJ *XlateObj); +XLATEOBJ* FASTCALL +IntCreateXlateForBlt(PDC pDCDest, PDC pDCSrc, SURFACE* psurfDest, SURFACE* psurfSrc); + #endif

1 0

[dgorbachev] 42306: - Fix a bug in GPF handler, do not hang in it. - Initialize Esp field in TSS.
by dgorbachev＠svn.reactos.org 30 Jul '09

30 Jul '09

Author: dgorbachev Date: Thu Jul 30 19:54:21 2009 New Revision: 42306 URL: http://svn.reactos.org/svn/reactos?rev=42306&view=rev Log: - Fix a bug in GPF handler, do not hang in it. - Initialize Esp field in TSS. Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Thu Jul 30 19:54:21 2009 @@ -650,6 +650,7 @@ KiInitializeTSS(Tss); Tss->CR3 = __readcr3(); Tss->Esp0 = PtrToUlong(KiDoubleFaultStack); + Tss->Esp = PtrToUlong(KiDoubleFaultStack); Tss->Eip = PtrToUlong(KiTrap8); Tss->Cs = KGDT_R0_CODE; Tss->Fs = KGDT_R0_PCR; @@ -679,6 +680,7 @@ KiInitializeTSS(Tss); Tss->CR3 = __readcr3(); Tss->Esp0 = PtrToUlong(KiDoubleFaultStack); + Tss->Esp = PtrToUlong(KiDoubleFaultStack); Tss->Eip = PtrToUlong(KiTrap2); Tss->Cs = KGDT_R0_CODE; Tss->Fs = KGDT_R0_PCR; Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Thu Jul 30 19:54:21 2009 @@ -1338,7 +1338,6 @@ .globl _KiTrap8 .func KiTrap8 _KiTrap8: - /* Can't really do too much */ mov eax, 8 jmp _KiSystemFatalException @@ -1511,6 +1510,7 @@ cmp eax, offset CheckPrivilegedInstruction jbe KmodeGpf cmp eax, offset CheckPrivilegedInstruction2 + jae KmodeGpf /* FIXME: TODO */ UNHANDLED_PATH

1 0

[dgorbachev] 42305: Add a hack in KiSystemStartupReal function until Better Times.
by dgorbachev＠svn.reactos.org 30 Jul '09

30 Jul '09

Author: dgorbachev Date: Thu Jul 30 19:54:01 2009 New Revision: 42305 URL: http://svn.reactos.org/svn/reactos?rev=42305&view=rev Log: Add a hack in KiSystemStartupReal function until Better Times. Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Thu Jul 30 19:54:01 2009 @@ -712,18 +712,34 @@ Ke386SetDs(KGDT_R3_DATA | RPL_MASK); Ke386SetEs(KGDT_R3_DATA | RPL_MASK); - /* Save NMI and double fault traps */ - RtlCopyMemory(&NmiEntry, &Idt[2], sizeof(KIDTENTRY)); - RtlCopyMemory(&DoubleFaultEntry, &Idt[8], sizeof(KIDTENTRY)); - - /* Copy kernel's trap handlers */ - RtlCopyMemory(Idt, - (PVOID)KiIdtDescriptor.Base, - KiIdtDescriptor.Limit + 1); - - /* Restore NMI and double fault */ - RtlCopyMemory(&Idt[2], &NmiEntry, sizeof(KIDTENTRY)); - RtlCopyMemory(&Idt[8], &DoubleFaultEntry, sizeof(KIDTENTRY)); + /* HACK compensates for KiRosPrepareForSystemStartup hack */ + if ((ULONG)Idt == KiIdtDescriptor.Base) + { + USHORT FlippedSelector; + + FlippedSelector = KiIdt[2].Selector; + KiIdt[2].Selector = KiIdt[2].ExtendedOffset; + KiIdt[2].ExtendedOffset = FlippedSelector; + + FlippedSelector = KiIdt[8].Selector; + KiIdt[8].Selector = KiIdt[8].ExtendedOffset; + KiIdt[8].ExtendedOffset = FlippedSelector; + } + else + { + /* Save NMI and double fault traps */ + RtlCopyMemory(&NmiEntry, &Idt[2], sizeof(KIDTENTRY)); + RtlCopyMemory(&DoubleFaultEntry, &Idt[8], sizeof(KIDTENTRY)); + + /* Copy kernel's trap handlers */ + RtlCopyMemory(Idt, + (PVOID)KiIdtDescriptor.Base, + KiIdtDescriptor.Limit + 1); + + /* Restore NMI and double fault */ + RtlCopyMemory(&Idt[2], &NmiEntry, sizeof(KIDTENTRY)); + RtlCopyMemory(&Idt[8], &DoubleFaultEntry, sizeof(KIDTENTRY)); + } AppCpuInit: /* Loop until we can release the freeze lock */

1 0

[fireball] 42304: - Implement CURSORICON_Copy.
by fireball＠svn.reactos.org 30 Jul '09

30 Jul '09

Author: fireball Date: Thu Jul 30 19:38:48 2009 New Revision: 42304 URL: http://svn.reactos.org/svn/reactos?rev=42304&view=rev Log: - Implement CURSORICON_Copy. Modified: branches/arwinss/reactos/dll/win32/user32/cursoricon.c Modified: branches/arwinss/reactos/dll/win32/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/cursoricon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/cursoricon.c [iso-8859-1] Thu Jul 30 19:38:48 2009 @@ -1221,26 +1221,19 @@ */ static HICON CURSORICON_Copy( HINSTANCE16 hInst16, HICON hIcon ) { -#if 0 char *ptrOld, *ptrNew; int size; - HICON16 hOld = HICON_16(hIcon); - HICON16 hNew; - - if (!(ptrOld = GlobalLock16( hOld ))) return 0; - if (hInst16 && !(hInst16 = GetExePtr( hInst16 ))) return 0; - size = GlobalSize16( hOld ); - hNew = GlobalAlloc16( GMEM_MOVEABLE, size ); - FarSetOwner16( hNew, hInst16 ); - ptrNew = GlobalLock16( hNew ); + HICON hOld = hIcon; + HICON hNew; + + if (!(ptrOld = GlobalLock( hOld ))) return 0; + size = GlobalSize( hOld ); + hNew = GlobalAlloc( GMEM_MOVEABLE, size ); + ptrNew = GlobalLock( hNew ); memcpy( ptrNew, ptrOld, size ); - GlobalUnlock16( hOld ); - GlobalUnlock16( hNew ); - return HICON_32(hNew); -#else - ERR("CURSORICON_Copy unimplemented!\n"); - return 0; -#endif + GlobalUnlock( hOld ); + GlobalUnlock( hNew ); + return hNew; } /*************************************************************************

1 0

[janderwald] 42303: - Partly Implement KsCacheMedium - Implement KsHandleSizedListQuery - Remove KsGetChildCreateParameter, it is not exported in NT 5.1 KS
by janderwald＠svn.reactos.org 30 Jul '09

30 Jul '09

Author: janderwald Date: Thu Jul 30 18:51:03 2009 New Revision: 42303 URL: http://svn.reactos.org/svn/reactos?rev=42303&view=rev Log: - Partly Implement KsCacheMedium - Implement KsHandleSizedListQuery - Remove KsGetChildCreateParameter, it is not exported in NT 5.1 KS Modified: trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/connectivity.c trunk/reactos/drivers/ksfilter/ks/irp.c Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Thu Jul 30 18:51:03 2009 @@ -8,6 +8,9 @@ #include "priv.h" + +const GUID GUID_NULL = {0x00000000L, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}; +const GUID KSMEDIUMSETID_Standard = {0x4747B320L, 0x62CE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; /* @implemented @@ -1163,7 +1166,7 @@ } /* - @implemented + @unimplemented */ KSDDKAPI NTSTATUS @@ -1179,7 +1182,7 @@ /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS @@ -1189,8 +1192,83 @@ IN PKSPIN_MEDIUM Medium, IN ULONG PinDirection) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + HANDLE hKey; + UNICODE_STRING Path; + UNICODE_STRING BasePath = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\MediumCache\\"); + UNICODE_STRING GuidString; + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + BOOLEAN PathAdjusted = FALSE; + ULONG Value = 0; + + /* first check if the medium is standard */ + if (IsEqualGUIDAligned(&KSMEDIUMSETID_Standard, &Medium->Set) || + IsEqualGUIDAligned(&GUID_NULL, &Medium->Set)) + { + /* no need to cache that */ + return STATUS_SUCCESS; + } + + /* convert guid to string */ + Status = RtlStringFromGUID(&Medium->Set, &GuidString); + if (!NT_SUCCESS(Status)) + return Status; + + /* allocate path buffer */ + Path.Length = 0; + Path.MaximumLength = BasePath.MaximumLength + GuidString.MaximumLength + 10 * sizeof(WCHAR); + Path.Buffer = AllocateItem(PagedPool, Path.MaximumLength); + if (!Path.Buffer) + { + /* not enough resources */ + RtlFreeUnicodeString(&GuidString); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlAppendUnicodeStringToString(&Path, &BasePath); + RtlAppendUnicodeStringToString(&Path, &GuidString); + RtlAppendUnicodeToString(&Path, L"-"); + /* FIXME append real instance id */ + RtlAppendUnicodeToString(&Path, L"0"); + RtlAppendUnicodeToString(&Path, L"-"); + /* FIXME append real instance id */ + RtlAppendUnicodeToString(&Path, L"0"); + + /* free guid string */ + RtlFreeUnicodeString(&GuidString); + + /* initialize object attributes */ + InitializeObjectAttributes(&ObjectAttributes, &Path, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); + /* create the key */ + Status = ZwCreateKey(&hKey, GENERIC_WRITE, &ObjectAttributes, 0, NULL, 0, NULL); + + /* free path buffer */ + FreeItem(Path.Buffer); + + if (NT_SUCCESS(Status)) + { + /* store symbolic link */ + if (SymbolicLink->Buffer[1] == L'?' && SymbolicLink->Buffer[2] == L'?') + { + /* replace kernel path with user mode path */ + SymbolicLink->Buffer[1] = L'\\'; + PathAdjusted = TRUE; + } + + /* store the key */ + Status = ZwSetValueKey(hKey, SymbolicLink, 0, REG_DWORD, &Value, sizeof(ULONG)); + + if (PathAdjusted) + { + /* restore kernel path */ + SymbolicLink->Buffer[1] = L'?'; + } + + ZwClose(hKey); + } + + /* done */ + return Status; } /* Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Thu Jul 30 18:51:03 2009 @@ -402,34 +402,42 @@ ULONG Index; NTSTATUS Status; + /* get current irp stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); + /* calculate minimum data size */ Size = sizeof(KSP_PIN) + sizeof(KSMULTIPLE_ITEM) + sizeof(KSDATARANGE); if (IoStack->Parameters.DeviceIoControl.InputBufferLength < Size) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + /* buffer too small */ + Irp->IoStatus.Information = Size; + Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; return STATUS_BUFFER_TOO_SMALL; } - + /* is pin id out of bounds */ if (Pin->PinId >= DescriptorsCount) { + /* it is */ Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; Irp->IoStatus.Information = 0; return STATUS_INVALID_PARAMETER; } + /* get start item */ Item = (KSMULTIPLE_ITEM*)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + /* get first data range */ DataRange = (KSDATARANGE*)(Item + 1); - + /* iterate through all data ranges */ for(Index = 0; Index < Item->Count; Index++, DataRange++) { + /* call intersect handler */ Status = IntersectHandler(Irp, Pin, DataRange, Data); if (NT_SUCCESS(Status)) { - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KSDATARANGE)) - { - Irp->IoStatus.Information = sizeof(KSDATARANGE); + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < DataRange->FormatSize) + { + /* buffer is too small */ + Irp->IoStatus.Information = DataRange->FormatSize; Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; return STATUS_BUFFER_TOO_SMALL; } @@ -447,7 +455,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI @@ -459,5 +467,35 @@ IN ULONG DataItemSize, IN const VOID* DataItems) { + ULONG Size; + PIO_STACK_LOCATION IoStack; + PKSMULTIPLE_ITEM Item; + + /* get current irp stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + Size = DataItemSize * DataItemsCount + sizeof(KSMULTIPLE_ITEM); + + + if (IoStack->Parameters.DeviceIoControl.InputBufferLength < Size) + { + /* buffer too small */ + Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + Irp->IoStatus.Information = Size; + return STATUS_BUFFER_TOO_SMALL; + } + + /* get multiple item */ + Item = (PKSMULTIPLE_ITEM)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + + Item->Count = DataItemsCount; + Item->Size = DataItemSize; + /* copy items */ + RtlMoveMemory((PVOID)(Item + 1), DataItems, DataItemSize * DataItemsCount); + /* store result */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = Size; + /* done */ return STATUS_SUCCESS; } + Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Thu Jul 30 18:51:03 2009 @@ -1138,20 +1138,6 @@ Irp->IoStatus.Status = STATUS_CANCELLED; IoCompleteRequest(Irp, IO_NO_INCREMENT); } -} - -/* - @unimplemented -*/ -KSDDKAPI -NTSTATUS -NTAPI -KsGetChildCreateParameter( - IN PIRP Irp, - OUT PVOID* CreateParameter) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; } NTSTATUS

1 0

[janderwald] 42302: - Implement KsAcquireResetValue, KsCompletePendingRequest, KsAllocateExtraData
by janderwald＠svn.reactos.org 30 Jul '09

30 Jul '09

Author: janderwald Date: Thu Jul 30 16:20:13 2009 New Revision: 42302 URL: http://svn.reactos.org/svn/reactos?rev=42302&view=rev Log: - Implement KsAcquireResetValue, KsCompletePendingRequest, KsAllocateExtraData Modified: trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/device.c trunk/reactos/drivers/ksfilter/ks/filter.c trunk/reactos/drivers/ksfilter/ks/irp.c Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Thu Jul 30 16:20:13 2009 @@ -10,7 +10,7 @@ #include "priv.h" /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS @@ -19,8 +19,40 @@ IN PIRP Irp, OUT KSRESET* ResetValue) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + PIO_STACK_LOCATION IoStack; + KSRESET* Value; + NTSTATUS Status = STATUS_SUCCESS; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* check if there is reset value provided */ + if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KSRESET)) + return STATUS_INVALID_PARAMETER; + + if (Irp->RequestorMode == UserMode) + { + /* need to probe the buffer */ + _SEH2_TRY + { + ProbeForRead(IoStack->Parameters.DeviceIoControl.Type3InputBuffer, sizeof(KSRESET), sizeof(UCHAR)); + Value = (KSRESET*)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + *ResetValue = *Value; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Exception, get the error code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + else + { + Value = (KSRESET*)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + *ResetValue = *Value; + } + + return Status; } /* @@ -1551,10 +1583,8 @@ } } - - -/* - @unimplemented +/* + @implemented */ KSDDKAPI VOID @@ -1562,7 +1592,35 @@ KsCompletePendingRequest( IN PIRP Irp) { + PIO_STACK_LOCATION IoStack; + + /* get current irp stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* sanity check */ + ASSERT(Irp->IoStatus.Status != STATUS_PENDING); + + if (IoStack->MajorFunction != IRP_MJ_CLOSE) + { + /* can be completed immediately */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return; + } + + /* did close operation fail */ + if (!NT_SUCCESS(Irp->IoStatus.Status)) + { + /* closing failed, complete irp */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return; + } + + /* FIXME + * delete object / device header + * remove dead pin / filter instance + */ UNIMPLEMENTED + } /* Modified: trunk/reactos/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] Thu Jul 30 16:20:13 2009 @@ -597,32 +597,22 @@ /* increment create item reference count */ InterlockedIncrement(&CreateItemEntry->ReferenceCount); } - - /* acquire list lock */ - IKsDevice_fnReleaseDevice((IKsDevice*)&DeviceHeader->lpVtblIKsDevice); - - return Status; } /* acquire list lock */ IKsDevice_fnReleaseDevice((IKsDevice*)&DeviceHeader->lpVtblIKsDevice); - DPRINT1("No item found for Request %p\n", IoStack->FileObject->FileName.Buffer); - - Irp->IoStatus.Information = 0; - /* set return status */ - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; - - /* release lock */ - IKsDevice_fnRelease((IKsDevice*)&DeviceHeader->lpVtblIKsDevice); - - Irp->IoStatus.Information = 0; - /* set return status */ - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; + if (Status != STATUS_PENDING) + { + Irp->IoStatus.Information = 0; + /* set return status */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + return Status; + + } /* Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Thu Jul 30 16:20:13 2009 @@ -430,7 +430,7 @@ Status = This->Factory->FilterDescriptor->Dispatch->Close(&This->Filter, Irp); } - if (Status != STATUS_PENDING) + if (NT_SUCCESS(Status) && Status != STATUS_PENDING) { /* save the result */ Irp->IoStatus.Status = Status; @@ -439,9 +439,6 @@ /* remove our instance from the filter factory */ This->FilterFactory->lpVtbl->RemoveFilterInstance(This->FilterFactory, Filter); - - /* now release the acquired interface */ - Filter->lpVtbl->Release(Filter); /* free object header */ KsFreeObjectHeader(This->ObjectHeader); Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Thu Jul 30 16:20:13 2009 @@ -594,7 +594,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS @@ -604,8 +604,60 @@ IN ULONG ExtraSize, OUT PVOID* ExtraBuffer) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + PIO_STACK_LOCATION IoStack; + ULONG Count, Index; + PUCHAR Buffer, BufferOrg; + PKSSTREAM_HEADER Header; + NTSTATUS Status = STATUS_SUCCESS; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* sanity check */ + ASSERT(IoStack->Parameters.DeviceIoControl.InputBufferLength >= sizeof(KSSTREAM_HEADER)); + + /* get total length */ + Count = IoStack->Parameters.DeviceIoControl.InputBufferLength / sizeof(KSSTREAM_HEADER); + + /* allocate buffer */ + Buffer = BufferOrg = AllocateItem(NonPagedPool, Count * (sizeof(KSSTREAM_HEADER) + ExtraSize)); + if (!Buffer) + return STATUS_INSUFFICIENT_RESOURCES; + + _SEH2_TRY + { + /* get input buffer */ + Header = (PKSSTREAM_HEADER)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + for(Index = 0; Index < Count; Index++) + { + /* copy stream header */ + RtlMoveMemory(Buffer, Header, sizeof(KSSTREAM_HEADER)); + + /* move to next header */ + Header++; + /* increment output buffer offset */ + Buffer += sizeof(KSSTREAM_HEADER) + ExtraSize; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Exception, get the error code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + /* free buffer on exception */ + FreeItem(Buffer); + return Status; + } + + /* store result */ + *ExtraBuffer = BufferOrg; + + /* done */ + return STATUS_SUCCESS; } /*

1 0

[fireball] 42301: - Actually do set bitmap bits if RosGdiCreateBitmap was provided with bits. - Add helper GreSetBitmapBits function implementation.
by fireball＠svn.reactos.org 30 Jul '09

30 Jul '09

Author: fireball Date: Thu Jul 30 15:09:59 2009 New Revision: 42301 URL: http://svn.reactos.org/svn/reactos?rev=42301&view=rev Log: - Actually do set bitmap bits if RosGdiCreateBitmap was provided with bits. - Add helper GreSetBitmapBits function implementation. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c [iso-8859-1] Thu Jul 30 15:09:59 2009 @@ -51,6 +51,8 @@ HBITMAP hBitmap; SIZEL slSize; ULONG ulFormat; + ULONG ulFlags = 0; + PSURFACE pSurface; DPRINT("RosGdiCreateBitmap %dx%d %d bpp, bmBits %p\n", pBitmap->bmWidth, pBitmap->bmHeight, pBitmap->bmBitsPixel, bmBits); @@ -60,16 +62,33 @@ /* Convert format */ ulFormat = GrepBitmapFormat(pBitmap->bmBitsPixel, BI_RGB); + + /* Set flags */ + if (bmBits) ulFlags |= BMF_NOZEROINIT; + if (pBitmap->bmHeight < 0) ulFlags |= BMF_TOPDOWN; /* Call GRE to create the bitmap object */ hBitmap = GreCreateBitmap(slSize, pBitmap->bmWidthBytes, ulFormat, - (pBitmap->bmHeight < 0 ? BMF_TOPDOWN : 0), + ulFlags, NULL); /* Return failure if no bitmap was created */ if (!hBitmap) return FALSE; + + /* Set its bits if any */ + if (bmBits) + { + /* Get the object pointer */ + pSurface = GDI_GetObjPtr(hBitmap, (SHORT)GDI_OBJECT_TYPE_BITMAP); + + /* Copy bits */ + GreSetBitmapBits(pSurface, pSurface->SurfObj.cjBits, bmBits); + + /* Release the surface */ + GDI_ReleaseObj(hBitmap); + } /* Map handles */ GDI_AddHandleMapping(hBitmap, hUserBitmap); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c [iso-8859-1] Thu Jul 30 15:09:59 2009 @@ -235,4 +235,18 @@ return ulBytes; } - +LONG FASTCALL +GreSetBitmapBits(PSURFACE pSurf, ULONG ulBytes, PVOID pBits) +{ + /* Check ulBytes */ + if (!ulBytes) return 0; + + /* Don't copy more bytes than the surface has */ + ulBytes = min(ulBytes, pSurf->SurfObj.cjBits); + + /* Copy actual bits */ + RtlCopyMemory(pSurf->SurfObj.pvBits, pBits, ulBytes); + + /* Return amount copied */ + return ulBytes; +} Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h [iso-8859-1] Thu Jul 30 15:09:59 2009 @@ -25,6 +25,9 @@ LONG FASTCALL GreGetBitmapBits(PSURFACE pSurf, ULONG ulBytes, PVOID pBits); +LONG FASTCALL +GreSetBitmapBits(PSURFACE pSurf, ULONG ulBytes, PVOID pBits); + INT FASTCALL BITMAP_GetWidthBytes(INT bmWidth, INT bpp);

1 0

[fireball] 42300: - Uncomment access check for setting class info, but still leave the STATUS_ACCESS_DENIED case commented out with a mandatory debug print for debugging if it ever happens.
by fireball＠svn.reactos.org 30 Jul '09

30 Jul '09

Author: fireball Date: Thu Jul 30 15:08:50 2009 New Revision: 42300 URL: http://svn.reactos.org/svn/reactos?rev=42300&view=rev Log: - Uncomment access check for setting class info, but still leave the STATUS_ACCESS_DENIED case commented out with a mandatory debug print for debugging if it ever happens. Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/class.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/class.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/class.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/class.c [iso-8859-1] Thu Jul 30 15:08:50 2009 @@ -223,14 +223,12 @@ struct window_class *class = get_window_class( req->window ); if (!class) return; -DPRINT1("Fixme!\n"); -#if 0 if (req->flags && class->process != PsGetCurrentProcessWin32Process()) { - set_error( STATUS_ACCESS_DENIED ); - return; - } -#endif + //set_error( STATUS_ACCESS_DENIED ); + //return; + DPRINT1("Fixme, should deny access!\n"); + } if (req->extra_size > sizeof(req->extra_value) || req->extra_offset < -1 || req->extra_offset > class->nb_extra_bytes - (int)req->extra_size)

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