Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[cgutman] 40412: - Don't leave a bad handle or object pointer - Make sure we don't try to dereference a non-referenced handle
by cgutman＠svn.reactos.org 07 Apr '09

07 Apr '09

Author: cgutman Date: Tue Apr 7 09:07:09 2009 New Revision: 40412 URL: http://svn.reactos.org/svn/reactos?rev=40412&view=rev Log: - Don't leave a bad handle or object pointer - Make sure we don't try to dereference a non-referenced handle Modified: trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/afd/afd/tdi.c Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Tue Apr 7 09:07:09 2009 @@ -187,6 +187,9 @@ (PVOID*)&FileObjects[i].Handle, NULL ); } + + if( !NT_SUCCESS(Status) ) + FileObjects[i].Handle = 0; } if( !NT_SUCCESS(Status) ) { Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Tue Apr 7 09:07:09 2009 @@ -137,14 +137,17 @@ if (!NT_SUCCESS(Status)) { AFD_DbgPrint(MIN_TRACE, ("ObReferenceObjectByHandle() failed with status (0x%X).\n", Status)); ZwClose(*Handle); - *Handle = NULL; } else { AFD_DbgPrint(MAX_TRACE, ("Got handle (0x%X) Object (0x%X)\n", *Handle, *Object)); } } else { AFD_DbgPrint(MIN_TRACE, ("ZwCreateFile() failed with status (0x%X)\n", Status)); + } + + if (!NT_SUCCESS(Status)) { *Handle = NULL; + *Object = NULL; } return Status;

1 0

[cgutman] 40411: - Use ZwClose instead of NtClose
by cgutman＠svn.reactos.org 07 Apr '09

07 Apr '09

Author: cgutman Date: Tue Apr 7 08:22:39 2009 New Revision: 40411 URL: http://svn.reactos.org/svn/reactos?rev=40411&view=rev Log: - Use ZwClose instead of NtClose Modified: trunk/reactos/drivers/network/afd/afd/main.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Tue Apr 7 08:22:39 2009 @@ -222,12 +222,12 @@ FCB->RemoteAddress = NULL; } if( FCB->Connection.Object ) { - NtClose(FCB->Connection.Handle); + ZwClose(FCB->Connection.Handle); ObDereferenceObject(FCB->Connection.Object); FCB->Connection.Object = NULL; } if( FCB->AddressFile.Object ) { - NtClose(FCB->AddressFile.Handle); + ZwClose(FCB->AddressFile.Handle); ObDereferenceObject(FCB->AddressFile.Object); FCB->AddressFile.Object = NULL; }

1 0

[cgutman] 40410: - Set FCB->Recv.Window to NULL so it doesn't get freed again later
by cgutman＠svn.reactos.org 07 Apr '09

07 Apr '09

Author: cgutman Date: Tue Apr 7 08:12:57 2009 New Revision: 40410 URL: http://svn.reactos.org/svn/reactos?rev=40410&view=rev Log: - Set FCB->Recv.Window to NULL so it doesn't get freed again later Modified: trunk/reactos/drivers/network/afd/afd/connect.c Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Tue Apr 7 08:12:57 2009 @@ -50,7 +50,8 @@ ExAllocatePool( NonPagedPool, FCB->Send.Size ); if( !FCB->Send.Window ) { - ExFreePool( FCB->Recv.Window ); + ExFreePool( FCB->Recv.Window ); + FCB->Recv.Window = NULL; return STATUS_NO_MEMORY; }

1 0

[tkreuzer] 40409: Mouse pointer fix: - Remove useless Status from the GDIPOINTER struct - Remove MovePointer and use PDEVOBJ.pfnMovePointer instead, which is always set to a valid function. - Implement IntEngSetPointerShape, calling either the Eng or the Drv function if available, set pfnMovePointer according to the result. - Use IntEngSetPointerShape instead of doing the atuff in IntSetCursor. - Don't misuse gpsi->ptCursor in IntShow/HideMousePointer and EngMovePointer, use ppdev->ptlPointer in
by tkreuzer＠svn.reactos.org 07 Apr '09

07 Apr '09

Author: tkreuzer Date: Tue Apr 7 05:36:22 2009 New Revision: 40409 URL: http://svn.reactos.org/svn/reactos?rev=40409&view=rev Log: Mouse pointer fix: - Remove useless Status from the GDIPOINTER struct - Remove MovePointer and use PDEVOBJ.pfnMovePointer instead, which is always set to a valid function. - Implement IntEngSetPointerShape, calling either the Eng or the Drv function if available, set pfnMovePointer according to the result. - Use IntEngSetPointerShape instead of doing the atuff in IntSetCursor. - Don't misuse gpsi->ptCursor in IntShow/HideMousePointer and EngMovePointer, use ppdev->ptlPointer instead. - Dont Lock and unlock the surface evertime the pointer is drwn, instead keep a shared lock. - Implement IntEngCopyBits, that does the MouseSafety stuff and calls EngCopyBits. Fixes the broken mouse cursor with VBox display driver and improves mouse performance Modified: trunk/reactos/subsystems/win32/win32k/eng/copybits.c trunk/reactos/subsystems/win32/win32k/eng/mouse.c trunk/reactos/subsystems/win32/win32k/include/inteng.h trunk/reactos/subsystems/win32/win32k/include/pdevobj.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/objects/device.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/eng/copybits.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/copybits.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/copybits.c [iso-8859-1] Tue Apr 7 05:36:22 2009 @@ -54,17 +54,12 @@ psurfSource = CONTAINING_RECORD(psoSource, SURFACE, SurfObj); SURFACE_LockBitmapBits(psurfSource); - MouseSafetyOnDrawStart(psoSource, SourcePoint->x, SourcePoint->y, - (SourcePoint->x + abs(DestRect->right - DestRect->left)), - (SourcePoint->y + abs(DestRect->bottom - DestRect->top))); psurfDest = CONTAINING_RECORD(psoDest, SURFACE, SurfObj); if (psoDest != psoSource) { SURFACE_LockBitmapBits(psurfDest); } - - MouseSafetyOnDrawStart(psoDest, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); // FIXME: Don't punt to the driver's DrvCopyBits immediately. Instead, // mark the copy block function to be DrvCopyBits instead of the @@ -83,12 +78,10 @@ ret = GDIDEVFUNCS(psoDest).CopyBits( psoDest, psoSource, Clip, ColorTranslation, DestRect, SourcePoint); - MouseSafetyOnDrawEnd(psoDest); - if (psoDest != psoSource) - { - SURFACE_UnlockBitmapBits(psurfDest); - } - MouseSafetyOnDrawEnd(psoSource); + if (psoDest != psoSource) + { + SURFACE_UnlockBitmapBits(psurfDest); + } SURFACE_UnlockBitmapBits(psurfSource); return ret; @@ -104,12 +97,10 @@ ret = GDIDEVFUNCS(psoSource).CopyBits( psoDest, psoSource, Clip, ColorTranslation, DestRect, SourcePoint); - MouseSafetyOnDrawEnd(psoDest); - if (psoDest != psoSource) - { - SURFACE_UnlockBitmapBits(psurfDest); - } - MouseSafetyOnDrawEnd(psoSource); + if (psoDest != psoSource) + { + SURFACE_UnlockBitmapBits(psurfDest); + } SURFACE_UnlockBitmapBits(psurfSource); return ret; @@ -121,12 +112,10 @@ NULL, Clip, ColorTranslation, DestRect, SourcePoint, NULL, NULL, NULL, ROP3_TO_ROP4(SRCCOPY)); - MouseSafetyOnDrawEnd(psoDest); if (psoDest != psoSource) { SURFACE_UnlockBitmapBits(psurfDest); } - MouseSafetyOnDrawEnd(psoSource); SURFACE_UnlockBitmapBits(psurfSource); return ret; @@ -160,7 +149,6 @@ { SURFACE_UnlockBitmapBits(psurfDest); } - MouseSafetyOnDrawEnd(psoSource); SURFACE_UnlockBitmapBits(psurfSource); return(TRUE); @@ -174,12 +162,10 @@ DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_BitBltSrcCopy(&BltInfo); - MouseSafetyOnDrawEnd(psoDest); - if (psoDest != psoSource) - { - SURFACE_UnlockBitmapBits(psurfDest); - } - MouseSafetyOnDrawEnd(psoSource); + if (psoDest != psoSource) + { + SURFACE_UnlockBitmapBits(psurfDest); + } SURFACE_UnlockBitmapBits(psurfSource); return(TRUE); @@ -212,26 +198,48 @@ } while(EnumMore); - MouseSafetyOnDrawEnd(psoDest); if (psoDest != psoSource) { SURFACE_UnlockBitmapBits(psurfDest); } - MouseSafetyOnDrawEnd(psoSource); SURFACE_UnlockBitmapBits(psurfSource); return(TRUE); } - MouseSafetyOnDrawEnd(psoDest); if (psoDest != psoSource) { SURFACE_UnlockBitmapBits(psurfDest); } - MouseSafetyOnDrawEnd(psoSource); SURFACE_UnlockBitmapBits(psurfSource); return FALSE; } +BOOL APIENTRY +IntEngCopyBits( + SURFOBJ *psoDest, + SURFOBJ *psoSource, + CLIPOBJ *pco, + XLATEOBJ *pxlo, + RECTL *prclDest, + POINTL *ptlSource) +{ + BOOL bResult; + + MouseSafetyOnDrawStart(psoSource, ptlSource->x, ptlSource->y, + (ptlSource->x + abs(prclDest->right - prclDest->left)), + (ptlSource->y + abs(prclDest->bottom - prclDest->top))); + + MouseSafetyOnDrawStart(psoDest, prclDest->left, prclDest->top, prclDest->right, prclDest->bottom); + + bResult = EngCopyBits(psoDest, psoSource, pco, pxlo, prclDest, ptlSource); + + MouseSafetyOnDrawEnd(psoDest); + MouseSafetyOnDrawEnd(psoSource); + + return bResult; +} + + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Tue Apr 7 05:36:22 2009 @@ -3,6 +3,7 @@ * PURPOSE: Mouse pointer functions * FILE: subsystems/win32k/eng/mouse.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Timo Kreuzer (timo.kreuzer(a)reactos.org) * REVISION HISTORY: * 06-06-2001 CSH Created */ @@ -21,7 +22,7 @@ */ INT INTERNAL_CALL MouseSafetyOnDrawStart( - SURFOBJ *SurfObj, + SURFOBJ *pso, LONG HazardX1, LONG HazardY1, LONG HazardX2, @@ -31,20 +32,26 @@ PDEVOBJ *ppdev; GDIPOINTER *pgp; - ASSERT(SurfObj != NULL); - - ppdev = GDIDEV(SurfObj); + ASSERT(pso != NULL); + + ppdev = GDIDEV(pso); if (ppdev == NULL) { - return(FALSE); + return FALSE; } pgp = &ppdev->Pointer; - if (SPS_ACCEPT_NOEXCLUDE == pgp->Status || - pgp->Exclude.right == -1) - { - return(FALSE); + if (pgp->Exclude.right == -1) + { + return FALSE; + } + + ppdev->SafetyRemoveCount++; + + if (ppdev->SafetyRemoveLevel != 0) + { + return FALSE; } if (HazardX1 > HazardX2) @@ -59,14 +66,6 @@ HazardY2 = HazardY1; HazardY1 = tmp; } - - if (ppdev->SafetyRemoveLevel != 0) - { - ppdev->SafetyRemoveCount++; - return FALSE; - } - - ppdev->SafetyRemoveCount++; if (pgp->Exclude.right >= HazardX1 && pgp->Exclude.left <= HazardX2 @@ -74,10 +73,7 @@ && pgp->Exclude.top <= HazardY2) { ppdev->SafetyRemoveLevel = ppdev->SafetyRemoveCount; - if (pgp->MovePointer) - pgp->MovePointer(SurfObj, -1, -1, NULL); - else - EngMovePointer(SurfObj, -1, -1, NULL); + ppdev->pfnMovePointer(pso, -1, -1, NULL); } return(TRUE); @@ -88,14 +84,14 @@ */ INT INTERNAL_CALL MouseSafetyOnDrawEnd( - SURFOBJ *SurfObj) + SURFOBJ *pso) { PDEVOBJ *ppdev; GDIPOINTER *pgp; - ASSERT(SurfObj != NULL); - - ppdev = GDIDEV(SurfObj); + ASSERT(pso != NULL); + + ppdev = (PDEVOBJ*)pso->hdev; if (ppdev == NULL) { @@ -104,8 +100,7 @@ pgp = &ppdev->Pointer; - if (SPS_ACCEPT_NOEXCLUDE == pgp->Status || - pgp->Exclude.right == -1) + if (pgp->Exclude.right == -1) { return FALSE; } @@ -114,10 +109,8 @@ { return FALSE; } - if (pgp->MovePointer) - pgp->MovePointer(SurfObj, gpsi->ptCursor.x, gpsi->ptCursor.y, &pgp->Exclude); - else - EngMovePointer(SurfObj, gpsi->ptCursor.x, gpsi->ptCursor.y, &pgp->Exclude); + + ppdev->pfnMovePointer(pso, gpsi->ptCursor.x, gpsi->ptCursor.y, &pgp->Exclude); ppdev->SafetyRemoveLevel = 0; @@ -126,13 +119,16 @@ /* SOFTWARE MOUSE POINTER IMPLEMENTATION **************************************/ -VOID INTERNAL_CALL +VOID +INTERNAL_CALL IntHideMousePointer( PDEVOBJ *ppdev, SURFOBJ *psoDest) { GDIPOINTER *pgp; POINTL pt; + RECTL rclDest; + POINTL ptlSave; ASSERT(ppdev); ASSERT(psoDest); @@ -149,53 +145,48 @@ /* The mouse is hide from ShowCours and it is frist ?? */ if (pgp->ShowPointer < 0) { - return ; - } - - /* Hide the cours */ - pt.x = gpsi->ptCursor.x - pgp->HotSpot.x; - pt.y = gpsi->ptCursor.y - pgp->HotSpot.y; - - - if (pgp->SaveSurface != NULL) - { - RECTL DestRect; - POINTL SrcPoint; - SURFOBJ *SaveSurface; - SURFOBJ *MaskSurface; - - DestRect.left = max(pt.x, 0); - DestRect.top = max(pt.y, 0); - DestRect.right = min( - pt.x + pgp->Size.cx, - psoDest->sizlBitmap.cx); - DestRect.bottom = min( - pt.y + pgp->Size.cy, - psoDest->sizlBitmap.cy); - - SrcPoint.x = max(-pt.x, 0); - SrcPoint.y = max(-pt.y, 0); - - if ((SaveSurface = EngLockSurface(pgp->SaveSurface))) - { - if ((MaskSurface = EngLockSurface(pgp->MaskSurface))) - { - IntEngBitBltEx(psoDest, SaveSurface, MaskSurface, NULL, NULL, - &DestRect, &SrcPoint, &SrcPoint, NULL, NULL, - ROP3_TO_ROP4(SRCCOPY), FALSE); - EngUnlockSurface(MaskSurface); - } - EngUnlockSurface(SaveSurface); - } - } -} - -VOID INTERNAL_CALL + return; + } + + if (!pgp->psurfSave) + { + DPRINT1("No SaveSurface!\n"); + return; + } + + /* Calculate cursor coordinates */ + pt.x = ppdev->ptlPointer.x - pgp->HotSpot.x; + pt.y = ppdev->ptlPointer.y - pgp->HotSpot.y; + + rclDest.left = max(pt.x, 0); + rclDest.top = max(pt.y, 0); + rclDest.right = min(pt.x + pgp->Size.cx, psoDest->sizlBitmap.cx); + rclDest.bottom = min(pt.y + pgp->Size.cy, psoDest->sizlBitmap.cy); + + ptlSave.x = rclDest.left - pt.x; + ptlSave.y = rclDest.top - pt.y; + + IntEngBitBltEx(psoDest, + &pgp->psurfSave->SurfObj, + NULL, + NULL, + NULL, + &rclDest, + &ptlSave, + &ptlSave, + NULL, + NULL, + ROP3_TO_ROP4(SRCCOPY), + FALSE); +} + +VOID +INTERNAL_CALL IntShowMousePointer(PDEVOBJ *ppdev, SURFOBJ *psoDest) { GDIPOINTER *pgp; - SURFOBJ *SaveSurface; POINTL pt; + RECTL rclSurf, rclPointer; ASSERT(ppdev); ASSERT(psoDest); @@ -209,87 +200,87 @@ pgp->Enabled = TRUE; - /* Do not blt the mouse if it in hide */ + /* Do not blt the pointer, if it is hidden */ if (pgp->ShowPointer < 0) { return ; } - pt.x = gpsi->ptCursor.x - pgp->HotSpot.x; - pt.y = gpsi->ptCursor.y - pgp->HotSpot.y; + /* Calculate pointer coordinates */ + pt.x = ppdev->ptlPointer.x - pgp->HotSpot.x; + pt.y = ppdev->ptlPointer.y - pgp->HotSpot.y; + + /* Calculate the rect on the surface */ + rclSurf.left = max(pt.x, 0); + rclSurf.top = max(pt.y, 0); + rclSurf.right = min(pt.x + pgp->Size.cx, psoDest->sizlBitmap.cx); + rclSurf.bottom = min(pt.y + pgp->Size.cy, psoDest->sizlBitmap.cy); + + /* Calculate the rect in the pointer bitmap */ + rclPointer.left = rclSurf.left - pt.x; + rclPointer.top = rclSurf.top - pt.y; + rclPointer.right = min(pgp->Size.cx, psoDest->sizlBitmap.cx - pt.x); + rclPointer.bottom = min(pgp->Size.cy, psoDest->sizlBitmap.cy - pt.y); /* Copy the pixels under the cursor to temporary surface. */ - if (pgp->SaveSurface != NULL && - (SaveSurface = EngLockSurface(pgp->SaveSurface))) - { - RECTL DestRect; - POINTL SrcPoint; - - SrcPoint.x = max(pt.x, 0); - SrcPoint.y = max(pt.y, 0); - - DestRect.left = SrcPoint.x - pt.x; - DestRect.top = SrcPoint.y - pt.y; - DestRect.right = min( - pgp->Size.cx, - psoDest->sizlBitmap.cx - pt.x); - DestRect.bottom = min( - pgp->Size.cy, - psoDest->sizlBitmap.cy - pt.y); - - IntEngBitBltEx(SaveSurface, psoDest, NULL, NULL, NULL, - &DestRect, &SrcPoint, NULL, NULL, NULL, - ROP3_TO_ROP4(SRCCOPY), FALSE); - EngUnlockSurface(SaveSurface); - } - - - /* Blit the cursor on the screen. */ - { - RECTL DestRect; - POINTL SrcPoint; - SURFOBJ *psoColor; - SURFOBJ *psoMask = NULL; - - DestRect.left = max(pt.x, 0); - DestRect.top = max(pt.y, 0); - DestRect.right = min( - pt.x + pgp->Size.cx, - psoDest->sizlBitmap.cx); - DestRect.bottom = min( - pt.y + pgp->Size.cy, - psoDest->sizlBitmap.cy); - - SrcPoint.x = max(-pt.x, 0); - SrcPoint.y = max(-pt.y, 0); - - if (pgp->MaskSurface) - psoMask = EngLockSurface(pgp->MaskSurface); - - if (psoMask != NULL) - { - if (pgp->ColorSurface != NULL) - { - if ((psoColor = EngLockSurface(pgp->ColorSurface))) - { - IntEngBitBltEx(psoDest, psoColor, psoMask, NULL, - pgp->XlateObject, &DestRect, &SrcPoint, &SrcPoint, - NULL, NULL, R4_MASK, FALSE); - EngUnlockSurface(psoColor); - } - } - else - { - IntEngBitBltEx(psoDest, psoMask, NULL, NULL, pgp->XlateObject, - &DestRect, &SrcPoint, NULL, NULL, NULL, - ROP3_TO_ROP4(SRCAND), FALSE); - SrcPoint.y += pgp->Size.cy; - IntEngBitBltEx(psoDest, psoMask, NULL, NULL, pgp->XlateObject, - &DestRect, &SrcPoint, NULL, NULL, NULL, - ROP3_TO_ROP4(SRCINVERT), FALSE); - } - EngUnlockSurface(psoMask); - } + IntEngBitBltEx(&pgp->psurfSave->SurfObj, + psoDest, + NULL, + NULL, + NULL, + &rclPointer, + (POINTL*)&rclSurf, + NULL, + NULL, + NULL, + ROP3_TO_ROP4(SRCCOPY), + FALSE); + + /* Blt the pointer on the screen. */ + if (pgp->psurfColor) + { + IntEngBitBltEx(psoDest, + &pgp->psurfColor->SurfObj, + &pgp->psurfMask->SurfObj, + NULL, + pgp->XlateObject, + &rclSurf, + (POINTL*)&rclPointer, + (POINTL*)&rclPointer, + NULL, + NULL, + R4_MASK, + FALSE); + } + else + { + IntEngBitBltEx(psoDest, + &pgp->psurfMask->SurfObj, + NULL, + NULL, + pgp->XlateObject, + &rclSurf, + (POINTL*)&rclPointer, + NULL, + NULL, + NULL, + ROP3_TO_ROP4(SRCAND), + FALSE); + + rclPointer.top += pgp->Size.cy; + + IntEngBitBltEx(psoDest, + &pgp->psurfMask->SurfObj, + NULL, + NULL, + pgp->XlateObject, + &rclSurf, + (POINTL*)&rclPointer, + NULL, + NULL, + NULL, + ROP3_TO_ROP4(SRCINVERT), + FALSE); } } @@ -310,8 +301,11 @@ IN FLONG fl) { PDEVOBJ *ppdev; - SURFOBJ *psoTemp; GDIPOINTER *pgp; + PBYTE Bits; + SIZEL Size; + LONG lDelta; + HBITMAP hbmp; ASSERT(pso); @@ -320,38 +314,33 @@ IntHideMousePointer(ppdev, pso); - if (pgp->ColorSurface != NULL) - { - /* FIXME: Is this really needed? */ - if ((psoTemp = EngLockSurface(pgp->ColorSurface))) - { - EngFreeMem(psoTemp->pvBits); - psoTemp->pvBits = 0; - EngUnlockSurface(psoTemp); - } - - EngDeleteSurface(pgp->ColorSurface); - pgp->MaskSurface = NULL; - } - - if (pgp->MaskSurface != NULL) - { - /* FIXME: Is this really needed? */ - if ((psoTemp = EngLockSurface(pgp->MaskSurface))) - { - EngFreeMem(psoTemp->pvBits); - psoTemp->pvBits = 0; - EngUnlockSurface(psoTemp); - } - - EngDeleteSurface(pgp->MaskSurface); - pgp->MaskSurface = NULL; - } - - if (pgp->SaveSurface != NULL) - { - EngDeleteSurface(pgp->SaveSurface); - pgp->SaveSurface = NULL; + if (pgp->psurfColor) + { + /* FIXME: let GDI allocate/free memory */ + EngFreeMem(pgp->psurfColor->SurfObj.pvBits); + pgp->psurfColor->SurfObj.pvBits = 0; + + EngDeleteSurface(pgp->psurfColor->BaseObject.hHmgr); + SURFACE_ShareUnlockSurface(pgp->psurfColor); + pgp->psurfColor = NULL; + } + + if (pgp->psurfMask) + { + /* FIXME: let GDI allocate/free memory */ + EngFreeMem(pgp->psurfMask->SurfObj.pvBits); + pgp->psurfMask->SurfObj.pvBits = 0; + + EngDeleteSurface(pgp->psurfMask->BaseObject.hHmgr); + SURFACE_ShareUnlockSurface(pgp->psurfMask); + pgp->psurfMask = NULL; + } + + if (pgp->psurfSave != NULL) + { + EngDeleteSurface(pgp->psurfSave->BaseObject.hHmgr); + SURFACE_ShareUnlockSurface(pgp->psurfSave); + pgp->psurfSave = NULL; } if (pgp->XlateObject != NULL) @@ -369,12 +358,10 @@ pgp->HotSpot.x = xHot; pgp->HotSpot.y = yHot; - /* Actually this should be set by 'the other side', but it would be - * done right after this. It helps IntShowMousePointer. */ if (x != -1) { - gpsi->ptCursor.x = x; - gpsi->ptCursor.y = y; + ppdev->ptlPointer.x = x; + ppdev->ptlPointer.y = y; } pgp->Size.cx = abs(psoMask->lDelta) << 3; @@ -382,8 +369,7 @@ if (psoColor != NULL) { - PBYTE Bits; - + /* FIXME: let GDI allocate/free memory */ Bits = EngAllocMem(0, psoColor->cjBits, TAG_MOUSE); if (Bits == NULL) { @@ -392,33 +378,36 @@ memcpy(Bits, psoColor->pvBits, psoColor->cjBits); - pgp->ColorSurface = (HSURF)EngCreateBitmap(pgp->Size, - psoColor->lDelta, psoColor->iBitmapFormat, - psoColor->lDelta < 0 ? 0 : BMF_TOPDOWN, Bits); + hbmp = EngCreateBitmap(pgp->Size, + psoColor->lDelta, + psoColor->iBitmapFormat, + psoColor->lDelta < 0 ? 0 : BMF_TOPDOWN, + Bits); + + pgp->psurfColor = SURFACE_ShareLockSurface(hbmp); } else { - pgp->ColorSurface = NULL; - } - - { - SIZEL Size; - PBYTE Bits; - - Size.cx = pgp->Size.cx; - Size.cy = pgp->Size.cy << 1; - Bits = EngAllocMem(0, psoMask->cjBits, TAG_MOUSE); - if (Bits == NULL) - { - return SPS_ERROR; - } - - memcpy(Bits, psoMask->pvBits, psoMask->cjBits); - - pgp->MaskSurface = (HSURF)EngCreateBitmap(Size, - psoMask->lDelta, psoMask->iBitmapFormat, - psoMask->lDelta < 0 ? 0 : BMF_TOPDOWN, Bits); - } + pgp->psurfColor = NULL; + } + + Size.cx = pgp->Size.cx; + Size.cy = pgp->Size.cy << 1; + Bits = EngAllocMem(0, psoMask->cjBits, TAG_MOUSE); + if (Bits == NULL) + { + return SPS_ERROR; + } + + memcpy(Bits, psoMask->pvBits, psoMask->cjBits); + + hbmp = EngCreateBitmap(Size, + psoMask->lDelta, + psoMask->iBitmapFormat, + psoMask->lDelta < 0 ? 0 : BMF_TOPDOWN, + Bits); + + pgp->psurfMask = SURFACE_ShareLockSurface(hbmp); /* Create an XLATEOBJ that will be used for drawing masks. * FIXME: We should get this in pxlo parameter! */ @@ -441,39 +430,38 @@ } /* Create surface for saving the pixels under the cursor. */ - { - LONG lDelta; - - switch (pso->iBitmapFormat) - { - case BMF_1BPP: - lDelta = pgp->Size.cx >> 3; - break; - case BMF_4BPP: - lDelta = pgp->Size.cx >> 1; - break; - case BMF_8BPP: - lDelta = pgp->Size.cx; - break; - case BMF_16BPP: - lDelta = pgp->Size.cx << 1; - break; - case BMF_24BPP: - lDelta = pgp->Size.cx * 3; - break; - case BMF_32BPP: - lDelta = pgp->Size.cx << 2; - break; - default: - lDelta = 0; - break; - } - - pgp->SaveSurface = (HSURF)EngCreateBitmap(pgp->Size, - lDelta, - pso->iBitmapFormat, - BMF_TOPDOWN | BMF_NOZEROINIT, NULL); - } + switch (pso->iBitmapFormat) + { + case BMF_1BPP: + lDelta = pgp->Size.cx >> 3; + break; + case BMF_4BPP: + lDelta = pgp->Size.cx >> 1; + break; + case BMF_8BPP: + lDelta = pgp->Size.cx; + break; + case BMF_16BPP: + lDelta = pgp->Size.cx << 1; + break; + case BMF_24BPP: + lDelta = pgp->Size.cx * 3; + break; + case BMF_32BPP: + lDelta = pgp->Size.cx << 2; + break; + default: + lDelta = 0; + break; + } + + hbmp = EngCreateBitmap(pgp->Size, + lDelta, + pso->iBitmapFormat, + BMF_TOPDOWN | BMF_NOZEROINIT, + NULL); + + pgp->psurfSave = SURFACE_ShareLockSurface(hbmp); if (x != -1) { @@ -489,7 +477,7 @@ } else if (prcl != NULL) prcl->left = prcl->top = prcl->right = prcl->bottom = -1; - return SPS_ACCEPT_EXCLUDE; + return SPS_ACCEPT_NOEXCLUDE; } /* @@ -509,18 +497,17 @@ ASSERT(pso); ppdev = GDIDEV(pso); - ASSERT(ppdev); pgp = &ppdev->Pointer; IntHideMousePointer(ppdev, pso); + + ppdev->ptlPointer.x = x; + ppdev->ptlPointer.y = y; + if (x != -1) { - /* Actually this should be set by 'the other side', but it would be - * done right after this. It helps IntShowMousePointer. */ - gpsi->ptCursor.x = x; - gpsi->ptCursor.y = y; IntShowMousePointer(ppdev, pso); if (prcl != NULL) { @@ -531,7 +518,6 @@ } } else if (prcl != NULL) prcl->left = prcl->top = prcl->right = prcl->bottom = -1; - } VOID APIENTRY @@ -542,17 +528,74 @@ IN RECTL *prcl) { SURFACE *psurf = CONTAINING_RECORD(pso, SURFACE, SurfObj); + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; SURFACE_LockBitmapBits(psurf); - if (GDIDEV(pso)->Pointer.MovePointer) - { - GDIDEV(pso)->Pointer.MovePointer(pso, x, y, prcl); + ppdev->pfnMovePointer(pso, x, y, prcl); + SURFACE_UnlockBitmapBits(psurf); +} + +ULONG APIENTRY +IntEngSetPointerShape( + IN SURFOBJ *pso, + IN SURFOBJ *psoMask, + IN SURFOBJ *psoColor, + IN XLATEOBJ *pxlo, + IN LONG xHot, + IN LONG yHot, + IN LONG x, + IN LONG y, + IN RECTL *prcl, + IN FLONG fl) +{ + ULONG ulResult = SPS_DECLINE; + SURFACE *psurf = CONTAINING_RECORD(pso, SURFACE, SurfObj); + PFN_DrvSetPointerShape pfnSetPointerShape; + PPDEVOBJ ppdev = GDIDEV(pso); + + pfnSetPointerShape = GDIDEVFUNCS(pso).SetPointerShape; + + SURFACE_LockBitmapBits(psurf); + if (pfnSetPointerShape) + { + ulResult = pfnSetPointerShape(pso, + psoMask, + psoColor, + pxlo, + xHot, + yHot, + x, + y, + prcl, + fl); + } + + /* Check if the driver accepted it */ + if (ulResult == SPS_ACCEPT_NOEXCLUDE) + { + /* Set MovePointer to the driver function */ + ppdev->pfnMovePointer = GDIDEVFUNCS(pso).MovePointer; } else { - EngMovePointer(pso, x, y, prcl); - } + /* Set software pointer */ + ulResult = EngSetPointerShape(pso, + psoMask, + psoColor, + pxlo, + xHot, + yHot, + x, + y, + prcl, + fl); + /* Set MovePointer to the eng function */ + ppdev->pfnMovePointer = EngMovePointer; + } + SURFACE_UnlockBitmapBits(psurf); + + return ulResult; } /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/include/inteng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/inteng.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/inteng.h [iso-8859-1] Tue Apr 7 05:36:22 2009 @@ -156,6 +156,19 @@ IN LONG y, IN RECTL *prcl); +ULONG APIENTRY +IntEngSetPointerShape( + IN SURFOBJ *pso, + IN SURFOBJ *psoMask, + IN SURFOBJ *psoColor, + IN XLATEOBJ *pxlo, + IN LONG xHot, + IN LONG yHot, + IN LONG x, + IN LONG y, + IN RECTL *prcl, + IN FLONG fl); + BOOL APIENTRY IntEngAlphaBlend(IN SURFOBJ *Dest, IN SURFOBJ *Source, @@ -165,5 +178,12 @@ IN PRECTL SourceRect, IN BLENDOBJ *BlendObj); +BOOL APIENTRY +IntEngCopyBits(SURFOBJ *psoDest, + SURFOBJ *psoSource, + CLIPOBJ *pco, + XLATEOBJ *pxlo, + RECTL *prclDest, + POINTL *ptlSource); #endif /* _WIN32K_INTENG_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/pdevobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1] Tue Apr 7 05:36:22 2009 @@ -28,15 +28,13 @@ SIZEL Size; POINTL HotSpot; XLATEOBJ *XlateObject; - HSURF ColorSurface; - HSURF MaskSurface; - HSURF SaveSurface; + SURFACE *psurfColor; + SURFACE *psurfMask; + SURFACE *psurfSave; int ShowPointer; /* counter negtive do not show the mouse postive show the mouse */ /* public pointer information */ RECTL Exclude; /* required publicly for SPS_ACCEPT_EXCLUDE */ - PFN_DrvMovePointer MovePointer; - ULONG Status; } GDIPOINTER, *PGDIPOINTER; typedef struct _GRAPHICS_DEVICE @@ -59,7 +57,7 @@ // FLONG flAccelerated; PERESOURCE hsemDevLock; /* Device lock. */ // HSEMAPHORE hsemPointer; -// POINTL ptlPointer; + POINTL ptlPointer; // SIZEL szlPointer; // SPRITESTATE SpriteState; // HFONT hlfntDefault; @@ -80,7 +78,7 @@ // ULONG ulVertRes; // PFN_DrvSetPointerShape pfnDrvSetPointerShape; // PFN_DrvMovePointer pfnDrvMovePointer; -// PFN_DrvMovePointer pfnMovePointer; + PFN_DrvMovePointer pfnMovePointer; // PFN_DrvSynchronize pfnDrvSynchronize; // PFN_DrvSynchronizeSurface pfnDrvSynchronizeSurface; // PFN_DrvSetPalette pfnDrvSetPalette; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Tue Apr 7 05:36:22 2009 @@ -95,6 +95,7 @@ XLATEOBJ *XlateObj = NULL; HDC Screen; PDC dc; + ULONG Status; CurInfo = IntGetSysCursorInfo(WinSta); OldCursor = CurInfo->CurrentCursorObject; @@ -137,13 +138,11 @@ UserDereferenceObject(CurInfo->CurrentCursorObject); if (CurInfo->ShowingCursor) { - DPRINT1("Removing pointer!\n"); + DPRINT("Removing pointer!\n"); /* Remove the cursor if it was displayed */ IntEngMovePointer(pso, -1, -1, &GDIDEV(pso)->Pointer.Exclude); } } - - GDIDEV(pso)->Pointer.Status = SPS_ACCEPT_NOEXCLUDE; CurInfo->CurrentCursorObject = NewCursor; /* i.e. CurrentCursorObject = NULL */ CurInfo->ShowingCursor = 0; @@ -212,7 +211,7 @@ return (HCURSOR)0; } soMask = EngLockSurface((HSURF)hMask); - EngCopyBits(soMask, &MaskBmpObj->SurfObj, NULL, NULL, + IntEngCopyBits(soMask, &MaskBmpObj->SurfObj, NULL, NULL, &DestRect, &SourcePoint); SURFACE_UnlockSurface(MaskBmpObj); } @@ -234,40 +233,20 @@ UserDereferenceObject(OldCursor); } - if (GDIDEVFUNCS(pso).SetPointerShape) - { - GDIDEV(pso)->Pointer.Status = - GDIDEVFUNCS(pso).SetPointerShape( - pso, soMask, soColor, XlateObj, - NewCursor->IconInfo.xHotspot, - NewCursor->IconInfo.yHotspot, - gpsi->ptCursor.x, - gpsi->ptCursor.y, - &(GDIDEV(pso)->Pointer.Exclude), - SPS_CHANGE); - DPRINT("SetCursor: DrvSetPointerShape() returned %x\n", - GDIDEV(pso)->Pointer.Status); - } - else - { - GDIDEV(pso)->Pointer.Status = SPS_DECLINE; - } - - if(GDIDEV(pso)->Pointer.Status == SPS_DECLINE) - { - GDIDEV(pso)->Pointer.Status = EngSetPointerShape( - pso, soMask, soColor, XlateObj, - NewCursor->IconInfo.xHotspot, - NewCursor->IconInfo.yHotspot, - gpsi->ptCursor.x, - gpsi->ptCursor.y, - &(GDIDEV(pso)->Pointer.Exclude), - SPS_CHANGE); - GDIDEV(pso)->Pointer.MovePointer = NULL; - } - else - { - GDIDEV(pso)->Pointer.MovePointer = GDIDEVFUNCS(pso).MovePointer; + Status = IntEngSetPointerShape(pso, + soMask, + soColor, + XlateObj, + NewCursor->IconInfo.xHotspot, + NewCursor->IconInfo.yHotspot, + gpsi->ptCursor.x, + gpsi->ptCursor.y, + &(GDIDEV(pso)->Pointer.Exclude), + SPS_CHANGE); + + if (Status != SPS_ACCEPT_NOEXCLUDE) + { + DPRINT1("IntEngSetPointerShape returned %lx\n", Status); } SURFACE_UnlockSurface(psurf); @@ -280,9 +259,6 @@ { EngDeleteXlate(XlateObj); } - - if(GDIDEV(pso)->Pointer.Status == SPS_ERROR) - DPRINT1("SetCursor: DrvSetPointerShape() returned SPS_ERROR\n"); return Ret; } @@ -1804,7 +1780,7 @@ { //ppdev->SafetyRemoveCount = 1; //ppdev->SafetyRemoveLevel = 1; - EngMovePointer(SurfObj,-1,-1,NULL); + IntEngMovePointer(SurfObj,-1,-1,NULL); CurInfo->ShowingCursor = 0; } @@ -1819,7 +1795,7 @@ { //ppdev->SafetyRemoveCount = 0; //ppdev->SafetyRemoveLevel = 0; - EngMovePointer(SurfObj,-1,-1,NULL); + IntEngMovePointer(SurfObj,-1,-1,NULL); CurInfo->ShowingCursor = CURSOR_SHOWING; } } Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] Tue Apr 7 05:36:22 2009 @@ -553,6 +553,11 @@ gpsi->ptCursor.x = (SurfaceRect.right - SurfaceRect.left) / 2; gpsi->ptCursor.y = (SurfaceRect.bottom - SurfaceRect.top) / 2; + /* Give the PDEV a MovePointer function */ + PrimarySurface.pfnMovePointer = PrimarySurface.DriverFunctions.MovePointer; + if (!PrimarySurface.pfnMovePointer) + PrimarySurface.pfnMovePointer = EngMovePointer; + EngUnlockSurface(SurfObj); co_IntShowDesktop(IntGetActiveDesktop(), SurfSize.cx, SurfSize.cy); Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Tue Apr 7 05:36:22 2009 @@ -329,7 +329,7 @@ DestRect.right = SourceSize.cx; DestRect.bottom = DestRect.top + ScanLines; - copyBitsResult = EngCopyBits(DestSurf, SourceSurf, NULL, XlateObj, &DestRect, &ZeroPoint); + copyBitsResult = IntEngCopyBits(DestSurf, SourceSurf, NULL, XlateObj, &DestRect, &ZeroPoint); // If it succeeded, return number of scanlines copies if(copyBitsResult == TRUE) @@ -952,7 +952,7 @@ DestSurfObj = EngLockSurface((HSURF)hDestBitmap); - if (EngCopyBits( DestSurfObj, + if (IntEngCopyBits( DestSurfObj, &psurf->SurfObj, NULL, XlateObj,

1 0

[cgutman] 40408: - Return the correct status when we get a bad parameter
by cgutman＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: cgutman Date: Tue Apr 7 03:42:08 2009 New Revision: 40408 URL: http://svn.reactos.org/svn/reactos?rev=40408&view=rev Log: - Return the correct status when we get a bad parameter Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Tue Apr 7 03:42:08 2009 @@ -397,14 +397,14 @@ TranContext = IrpSp->FileObject->FsContext; if (!TranContext) { TI_DbgPrint(MID_TRACE, ("Bad transport context.\n")); - Status = STATUS_INVALID_CONNECTION; + Status = STATUS_INVALID_PARAMETER; goto done; } Connection = (PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext; if (!Connection) { TI_DbgPrint(MID_TRACE, ("No connection endpoint file object.\n")); - Status = STATUS_INVALID_CONNECTION; + Status = STATUS_INVALID_PARAMETER; goto done; } @@ -500,14 +500,14 @@ TranContext = IrpSp->FileObject->FsContext; if (!TranContext) { TI_DbgPrint(MID_TRACE, ("Bad transport context.\n")); - Status = STATUS_INVALID_CONNECTION; + Status = STATUS_INVALID_PARAMETER; goto done; } Connection = (PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext; if (!Connection) { TI_DbgPrint(MID_TRACE, ("No connection endpoint file object.\n")); - Status = STATUS_INVALID_CONNECTION; + Status = STATUS_INVALID_PARAMETER; goto done; } @@ -561,7 +561,7 @@ if (TranContext == NULL) { TI_DbgPrint(MID_TRACE, ("Bad transport context.\n")); - Status = STATUS_INVALID_CONNECTION; + Status = STATUS_INVALID_PARAMETER; goto done; } @@ -569,7 +569,7 @@ if (Connection == NULL) { TI_DbgPrint(MID_TRACE, ("No connection endpoint file object.\n")); - Status = STATUS_INVALID_CONNECTION; + Status = STATUS_INVALID_PARAMETER; goto done; } @@ -662,7 +662,7 @@ TranContext = IrpSp->FileObject->FsContext; if (!TranContext) { TI_DbgPrint(MID_TRACE, ("Bad transport context.\n")); - return STATUS_INVALID_CONNECTION; + return STATUS_INVALID_PARAMETER; } switch (Parameters->QueryType) @@ -793,14 +793,14 @@ if (TranContext == NULL) { TI_DbgPrint(MID_TRACE, ("Bad transport context.\n")); - Status = STATUS_INVALID_CONNECTION; + Status = STATUS_INVALID_PARAMETER; goto done; } if (TranContext->Handle.ConnectionContext == NULL) { TI_DbgPrint(MID_TRACE, ("No connection endpoint file object.\n")); - Status = STATUS_INVALID_CONNECTION; + Status = STATUS_INVALID_PARAMETER; goto done; } @@ -865,7 +865,7 @@ if (TranContext == NULL) { TI_DbgPrint(MID_TRACE, ("Bad transport context.\n")); - Status = STATUS_INVALID_CONNECTION; + Status = STATUS_INVALID_PARAMETER; goto done; } @@ -942,14 +942,14 @@ if (TranContext == NULL) { TI_DbgPrint(MID_TRACE, ("Bad transport context.\n")); - Status = STATUS_INVALID_CONNECTION; + Status = STATUS_INVALID_PARAMETER; goto done; } if (TranContext->Handle.ConnectionContext == NULL) { TI_DbgPrint(MID_TRACE, ("No connection endpoint file object.\n")); - Status = STATUS_INVALID_CONNECTION; + Status = STATUS_INVALID_PARAMETER; goto done; } @@ -1018,7 +1018,7 @@ if (TranContext == NULL) { TI_DbgPrint(MID_TRACE, ("Bad transport context.\n")); - Status = STATUS_INVALID_CONNECTION; + Status = STATUS_INVALID_PARAMETER; goto done; }

1 0

[cwittich] 40407: sync urlmon to wine 1.1.18
by cwittich＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: cwittich Date: Tue Apr 7 01:37:38 2009 New Revision: 40407 URL: http://svn.reactos.org/svn/reactos?rev=40407&view=rev Log: sync urlmon to wine 1.1.18 Modified: trunk/reactos/dll/win32/urlmon/umon.c trunk/reactos/dll/win32/urlmon/urlmon_main.c trunk/reactos/dll/win32/urlmon/urlmon_main.h Modified: trunk/reactos/dll/win32/urlmon/umon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/umon.c?re… ============================================================================== --- trunk/reactos/dll/win32/urlmon/umon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/umon.c [iso-8859-1] Tue Apr 7 01:37:38 2009 @@ -34,54 +34,50 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { - - const IMonikerVtbl* lpvtbl; /* VTable relative to the IMoniker interface.*/ - - LONG ref; /* reference counter for this object */ + const IMonikerVtbl *lpIMonikerVtbl; + + LONG ref; LPOLESTR URLName; /* URL string identified by this URLmoniker */ -} URLMonikerImpl; - -/******************************************************************************* - * URLMoniker_QueryInterface - *******************************************************************************/ -static HRESULT WINAPI URLMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) -{ - URLMonikerImpl *This = (URLMonikerImpl *)iface; - - TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppvObject); - - /* Perform a sanity check on the parameters.*/ - if ( (This==0) || (ppvObject==0) ) +} URLMoniker; + +#define MONIKER_THIS(iface) DEFINE_THIS(URLMoniker, IMoniker, iface) + +static HRESULT WINAPI URLMoniker_QueryInterface(IMoniker *iface, REFIID riid, void **ppv) +{ + URLMoniker *This = MONIKER_THIS(iface); + + if(!ppv) return E_INVALIDARG; - /* Initialize the return parameter */ - *ppvObject = 0; - - /* Compare the riid with the interface IDs implemented by this object.*/ - if (IsEqualIID(&IID_IUnknown, riid) || - IsEqualIID(&IID_IPersist, riid) || - IsEqualIID(&IID_IPersistStream,riid) || - IsEqualIID(&IID_IMoniker, riid) - ) - *ppvObject = iface; - - /* Check that we obtained an interface.*/ - if ((*ppvObject)==0) + if(IsEqualIID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = iface; + }else if(IsEqualIID(&IID_IPersist, riid)) { + TRACE("(%p)->(IID_IPersist %p)\n", This, ppv); + *ppv = iface; + }else if(IsEqualIID(&IID_IPersistStream,riid)) { + TRACE("(%p)->(IID_IPersistStream %p)\n", This, ppv); + *ppv = iface; + }else if(IsEqualIID(&IID_IMoniker, riid)) { + TRACE("(%p)->(IID_IMoniker %p)\n", This, ppv); + *ppv = iface; + }else if(IsEqualIID(&IID_IAsyncMoniker, riid)) { + TRACE("(%p)->(IID_IAsyncMoniker %p)\n", This, ppv); + *ppv = iface; + }else { + WARN("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; return E_NOINTERFACE; - - /* Query Interface always increases the reference count by one when it is successful */ - IMoniker_AddRef(iface); - - return S_OK; -} - -/****************************************************************************** - * URLMoniker_AddRef - ******************************************************************************/ -static ULONG WINAPI URLMonikerImpl_AddRef(IMoniker* iface) -{ - URLMonikerImpl *This = (URLMonikerImpl *)iface; + } + + IMoniker_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI URLMoniker_AddRef(IMoniker *iface) +{ + URLMoniker *This = MONIKER_THIS(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%u\n",This, refCount); @@ -89,17 +85,13 @@ return refCount; } -/****************************************************************************** - * URLMoniker_Release - ******************************************************************************/ -static ULONG WINAPI URLMonikerImpl_Release(IMoniker* iface) -{ - URLMonikerImpl *This = (URLMonikerImpl *)iface; +static ULONG WINAPI URLMoniker_Release(IMoniker *iface) +{ + URLMoniker *This = MONIKER_THIS(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%u\n",This, refCount); - /* destroy the object if there's no more reference on it */ if (!refCount) { heap_free(This->URLName); heap_free(This); @@ -110,58 +102,49 @@ return refCount; } - -/****************************************************************************** - * URLMoniker_GetClassID - ******************************************************************************/ -static HRESULT WINAPI URLMonikerImpl_GetClassID(IMoniker* iface, - CLSID *pClassID)/* Pointer to CLSID of object */ -{ - URLMonikerImpl *This = (URLMonikerImpl *)iface; - - TRACE("(%p,%p)\n",This,pClassID); - - if (pClassID==NULL) +static HRESULT WINAPI URLMoniker_GetClassID(IMoniker *iface, CLSID *pClassID) +{ + URLMoniker *This = MONIKER_THIS(iface); + + TRACE("(%p,%p)\n", This, pClassID); + + if(!pClassID) return E_POINTER; + /* Windows always returns CLSID_StdURLMoniker */ *pClassID = CLSID_StdURLMoniker; return S_OK; } -/****************************************************************************** - * URLMoniker_IsDirty - ******************************************************************************/ -static HRESULT WINAPI URLMonikerImpl_IsDirty(IMoniker* iface) -{ - URLMonikerImpl *This = (URLMonikerImpl *)iface; +static HRESULT WINAPI URLMoniker_IsDirty(IMoniker *iface) +{ + URLMoniker *This = MONIKER_THIS(iface); + + TRACE("(%p)\n",This); + /* Note that the OLE-provided implementations of the IPersistStream::IsDirty method in the OLE-provided moniker interfaces always return S_FALSE because their internal state never changes. */ - - TRACE("(%p)\n",This); - return S_FALSE; } -/****************************************************************************** - * URLMoniker_Load - * - * NOTE - * Writes a ULONG containing length of unicode string, followed - * by that many unicode characters - ******************************************************************************/ -static HRESULT WINAPI URLMonikerImpl_Load(IMoniker* iface,IStream* pStm) -{ - URLMonikerImpl *This = (URLMonikerImpl *)iface; - +static HRESULT WINAPI URLMoniker_Load(IMoniker* iface,IStream* pStm) +{ + URLMoniker *This = MONIKER_THIS(iface); HRESULT res; ULONG size; ULONG got; + TRACE("(%p,%p)\n",This,pStm); if(!pStm) return E_INVALIDARG; + /* + * NOTE + * Writes a ULONG containing length of unicode string, followed + * by that many unicode characters + */ res = IStream_Read(pStm, &size, sizeof(ULONG), &got); if(SUCCEEDED(res)) { if(got == sizeof(ULONG)) { @@ -177,21 +160,17 @@ else res = E_FAIL; } + return res; } -/****************************************************************************** - * URLMoniker_Save - ******************************************************************************/ -static HRESULT WINAPI URLMonikerImpl_Save(IMoniker* iface, - IStream* pStm,/* pointer to the stream where the object is to be saved */ - BOOL fClearDirty)/* Specifies whether to clear the dirty flag */ -{ - URLMonikerImpl *This = (URLMonikerImpl *)iface; - +static HRESULT WINAPI URLMoniker_Save(IMoniker *iface, IStream* pStm, BOOL fClearDirty) +{ + URLMoniker *This = MONIKER_THIS(iface); HRESULT res; ULONG size; - TRACE("(%p,%p,%d)\n",This,pStm,fClearDirty); + + TRACE("(%p,%p,%d)\n", This, pStm, fClearDirty); if(!pStm) return E_INVALIDARG; @@ -200,17 +179,14 @@ res=IStream_Write(pStm,&size,sizeof(ULONG),NULL); if(SUCCEEDED(res)) res=IStream_Write(pStm,This->URLName,size,NULL); + return res; } -/****************************************************************************** - * URLMoniker_GetSizeMax - ******************************************************************************/ -static HRESULT WINAPI URLMonikerImpl_GetSizeMax(IMoniker* iface, - ULARGE_INTEGER* pcbSize)/* Pointer to size of stream needed to save object */ -{ - URLMonikerImpl *This = (URLMonikerImpl *)iface; +static HRESULT WINAPI URLMoniker_GetSizeMax(IMoniker* iface, ULARGE_INTEGER *pcbSize) +{ + URLMoniker *This = MONIKER_THIS(iface); TRACE("(%p,%p)\n",This,pcbSize); @@ -221,16 +197,10 @@ return S_OK; } -/****************************************************************************** - * URLMoniker_BindToObject - ******************************************************************************/ -static HRESULT WINAPI URLMonikerImpl_BindToObject(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - REFIID riid, - VOID** ppv) -{ - URLMonikerImpl *This = (URLMonikerImpl *)iface; +static HRESULT WINAPI URLMoniker_BindToObject(IMoniker *iface, IBindCtx* pbc, IMoniker *pmkToLeft, + REFIID riid, void **ppv) +{ + URLMoniker *This = MONIKER_THIS(iface); IRunningObjectTable *obj_tbl; HRESULT hres; @@ -245,16 +215,10 @@ return bind_to_object(iface, This->URLName, pbc, riid, ppv); } -/****************************************************************************** - * URLMoniker_BindToStorage - ******************************************************************************/ -static HRESULT WINAPI URLMonikerImpl_BindToStorage(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - REFIID riid, - VOID** ppvObject) -{ - URLMonikerImpl *This = (URLMonikerImpl*)iface; +static HRESULT WINAPI URLMoniker_BindToStorage(IMoniker* iface, IBindCtx* pbc, + IMoniker* pmkToLeft, REFIID riid, void **ppvObject) +{ + URLMoniker *This = MONIKER_THIS(iface); TRACE("(%p)->(%p %p %s %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObject); @@ -264,48 +228,34 @@ return bind_to_storage(This->URLName, pbc, riid, ppvObject); } -/****************************************************************************** - * URLMoniker_Reduce - ******************************************************************************/ -static HRESULT WINAPI URLMonikerImpl_Reduce(IMoniker* iface, - IBindCtx* pbc, - DWORD dwReduceHowFar, - IMoniker** ppmkToLeft, - IMoniker** ppmkReduced) -{ - URLMonikerImpl *This = (URLMonikerImpl *)iface; +static HRESULT WINAPI URLMoniker_Reduce(IMoniker *iface, IBindCtx *pbc, + DWORD dwReduceHowFar, IMoniker **ppmkToLeft, IMoniker **ppmkReduced) +{ + URLMoniker *This = MONIKER_THIS(iface); - TRACE("(%p,%p,%d,%p,%p)\n",This,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced); + TRACE("(%p,%p,%d,%p,%p)\n", This, pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced); if(!ppmkReduced) return E_INVALIDARG; - URLMonikerImpl_AddRef(iface); + IMoniker_AddRef(iface); *ppmkReduced = iface; return MK_S_REDUCED_TO_SELF; } -/****************************************************************************** - * URLMoniker_ComposeWith - ******************************************************************************/ -static HRESULT WINAPI URLMonikerImpl_ComposeWith(IMoniker* iface, - IMoniker* pmkRight, - BOOL fOnlyIfNotGeneric, - IMoniker** ppmkComposite) -{ - URLMonikerImpl *This = (URLMonikerImpl *)iface; +static HRESULT WINAPI URLMoniker_ComposeWith(IMoniker *iface, IMoniker *pmkRight, + BOOL fOnlyIfNotGeneric, IMoniker **ppmkComposite) +{ + URLMoniker *This = MONIKER_THIS(iface); FIXME("(%p)->(%p,%d,%p): stub\n",This,pmkRight,fOnlyIfNotGeneric,ppmkComposite); - return E_NOTIMPL; } -/****************************************************************************** - * URLMoniker_Enum - ******************************************************************************/ -static HRESULT WINAPI URLMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker) -{ - URLMonikerImpl *This = (URLMonikerImpl *)iface; - TRACE("(%p,%d,%p)\n",This,fForward,ppenumMoniker); +static HRESULT WINAPI URLMoniker_Enum(IMoniker *iface, BOOL fForward, IEnumMoniker **ppenumMoniker) +{ + URLMoniker *This = MONIKER_THIS(iface); + + TRACE("(%p,%d,%p)\n", This, fForward, ppenumMoniker); if(!ppenumMoniker) return E_INVALIDARG; @@ -315,18 +265,15 @@ return S_OK; } -/****************************************************************************** - * URLMoniker_IsEqual - ******************************************************************************/ -static HRESULT WINAPI URLMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) -{ - URLMonikerImpl *This = (URLMonikerImpl *)iface; +static HRESULT WINAPI URLMoniker_IsEqual(IMoniker *iface, IMoniker *pmkOtherMoniker) +{ + URLMoniker *This = MONIKER_THIS(iface); CLSID clsid; LPOLESTR urlPath; IBindCtx* bind; HRESULT res; - TRACE("(%p,%p)\n",This,pmkOtherMoniker); + TRACE("(%p,%p)\n",This, pmkOtherMoniker); if(pmkOtherMoniker==NULL) return E_INVALIDARG; @@ -352,13 +299,9 @@ } -/****************************************************************************** - * URLMoniker_Hash - ******************************************************************************/ -static HRESULT WINAPI URLMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash) -{ - URLMonikerImpl *This = (URLMonikerImpl *)iface; - +static HRESULT WINAPI URLMoniker_Hash(IMoniker *iface, DWORD *pdwHash) +{ + URLMoniker *This = MONIKER_THIS(iface); int h = 0,i,skip,len; int off = 0; LPOLESTR val; @@ -375,8 +318,7 @@ for(i = len ; i > 0; i--) { h = (h * 37) + val[off++]; } - } - else { + }else { /* only sample some characters */ skip = len / 8; for(i = len; i > 0; i -= skip, off += skip) { @@ -387,84 +329,57 @@ return S_OK; } -/****************************************************************************** - * URLMoniker_IsRunning - ******************************************************************************/ -static HRESULT WINAPI URLMonikerImpl_IsRunning(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - IMoniker* pmkNewlyRunning) -{ - URLMonikerImpl *This = (URLMonikerImpl *)iface; +static HRESULT WINAPI URLMoniker_IsRunning(IMoniker* iface, IBindCtx* pbc, + IMoniker *pmkToLeft, IMoniker *pmkNewlyRunning) +{ + URLMoniker *This = MONIKER_THIS(iface); FIXME("(%p)->(%p,%p,%p): stub\n",This,pbc,pmkToLeft,pmkNewlyRunning); - return E_NOTIMPL; } -/****************************************************************************** - * URLMoniker_GetTimeOfLastChange - ******************************************************************************/ -static HRESULT WINAPI URLMonikerImpl_GetTimeOfLastChange(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - FILETIME* pFileTime) -{ - URLMonikerImpl *This = (URLMonikerImpl *)iface; - FIXME("(%p)->(%p,%p,%p): stub\n",This,pbc,pmkToLeft,pFileTime); - +static HRESULT WINAPI URLMoniker_GetTimeOfLastChange(IMoniker *iface, + IBindCtx *pbc, IMoniker *pmkToLeft, FILETIME *pFileTime) +{ + URLMoniker *This = MONIKER_THIS(iface); + FIXME("(%p)->(%p,%p,%p): stub\n", This, pbc, pmkToLeft, pFileTime); return E_NOTIMPL; } -/****************************************************************************** - * URLMoniker_Inverse - ******************************************************************************/ -static HRESULT WINAPI URLMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk) -{ - URLMonikerImpl *This = (URLMonikerImpl *)iface; +static HRESULT WINAPI URLMoniker_Inverse(IMoniker *iface, IMoniker **ppmk) +{ + URLMoniker *This = MONIKER_THIS(iface); TRACE("(%p,%p)\n",This,ppmk); - return MK_E_NOINVERSE; } -/****************************************************************************** - * URLMoniker_CommonPrefixWith - ******************************************************************************/ -static HRESULT WINAPI URLMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** ppmkPrefix) -{ - URLMonikerImpl *This = (URLMonikerImpl *)iface; +static HRESULT WINAPI URLMoniker_CommonPrefixWith(IMoniker *iface, IMoniker *pmkOther, IMoniker **ppmkPrefix) +{ + URLMoniker *This = MONIKER_THIS(iface); FIXME("(%p)->(%p,%p): stub\n",This,pmkOther,ppmkPrefix); - return E_NOTIMPL; } -/****************************************************************************** - * URLMoniker_RelativePathTo - ******************************************************************************/ -static HRESULT WINAPI URLMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppmkRelPath) -{ - URLMonikerImpl *This = (URLMonikerImpl *)iface; +static HRESULT WINAPI URLMoniker_RelativePathTo(IMoniker *iface, IMoniker *pmOther, IMoniker **ppmkRelPath) +{ + URLMoniker *This = MONIKER_THIS(iface); FIXME("(%p)->(%p,%p): stub\n",This,pmOther,ppmkRelPath); - return E_NOTIMPL; } -/****************************************************************************** - * URLMoniker_GetDisplayName - ******************************************************************************/ -static HRESULT WINAPI URLMonikerImpl_GetDisplayName(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - LPOLESTR *ppszDisplayName) -{ - URLMonikerImpl *This = (URLMonikerImpl *)iface; - +static HRESULT WINAPI URLMoniker_GetDisplayName(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, + LPOLESTR *ppszDisplayName) +{ + URLMoniker *This = MONIKER_THIS(iface); int len; - TRACE("(%p,%p,%p,%p)\n",This,pbc,pmkToLeft,ppszDisplayName); + TRACE("(%p,%p,%p,%p)\n", This, pbc, pmkToLeft, ppszDisplayName); if(!ppszDisplayName) return E_INVALIDARG; - + + if(!This->URLName) + return E_OUTOFMEMORY; + /* FIXME: If this is a partial URL, try and get a URL moniker from SZ_URLCONTEXT in the bind context, then look at pmkToLeft to try and complete the URL */ @@ -476,28 +391,18 @@ return S_OK; } -/****************************************************************************** - * URLMoniker_ParseDisplayName - ******************************************************************************/ -static HRESULT WINAPI URLMonikerImpl_ParseDisplayName(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - LPOLESTR pszDisplayName, - ULONG* pchEaten, - IMoniker** ppmkOut) -{ - URLMonikerImpl *This = (URLMonikerImpl *)iface; +static HRESULT WINAPI URLMoniker_ParseDisplayName(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, + LPOLESTR pszDisplayName, ULONG *pchEaten, IMoniker **ppmkOut) +{ + URLMoniker *This = MONIKER_THIS(iface); FIXME("(%p)->(%p,%p,%p,%p,%p): stub\n",This,pbc,pmkToLeft,pszDisplayName,pchEaten,ppmkOut); - return E_NOTIMPL; } -/****************************************************************************** - * URLMoniker_IsSystemMoniker - ******************************************************************************/ -static HRESULT WINAPI URLMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys) -{ - URLMonikerImpl *This = (URLMonikerImpl *)iface; +static HRESULT WINAPI URLMoniker_IsSystemMoniker(IMoniker *iface, DWORD *pwdMksys) +{ + URLMoniker *This = MONIKER_THIS(iface); + TRACE("(%p,%p)\n",This,pwdMksys); if(!pwdMksys) @@ -507,48 +412,54 @@ return S_OK; } -/********************************************************************************/ -/* Virtual function table for the URLMonikerImpl class which include IPersist,*/ -/* IPersistStream and IMoniker functions. */ -static const IMonikerVtbl VT_URLMonikerImpl = -{ - URLMonikerImpl_QueryInterface, - URLMonikerImpl_AddRef, - URLMonikerImpl_Release, - URLMonikerImpl_GetClassID, - URLMonikerImpl_IsDirty, - URLMonikerImpl_Load, - URLMonikerImpl_Save, - URLMonikerImpl_GetSizeMax, - URLMonikerImpl_BindToObject, - URLMonikerImpl_BindToStorage, - URLMonikerImpl_Reduce, - URLMonikerImpl_ComposeWith, - URLMonikerImpl_Enum, - URLMonikerImpl_IsEqual, - URLMonikerImpl_Hash, - URLMonikerImpl_IsRunning, - URLMonikerImpl_GetTimeOfLastChange, - URLMonikerImpl_Inverse, - URLMonikerImpl_CommonPrefixWith, - URLMonikerImpl_RelativePathTo, - URLMonikerImpl_GetDisplayName, - URLMonikerImpl_ParseDisplayName, - URLMonikerImpl_IsSystemMoniker +static const IMonikerVtbl URLMonikerVtbl = +{ + URLMoniker_QueryInterface, + URLMoniker_AddRef, + URLMoniker_Release, + URLMoniker_GetClassID, + URLMoniker_IsDirty, + URLMoniker_Load, + URLMoniker_Save, + URLMoniker_GetSizeMax, + URLMoniker_BindToObject, + URLMoniker_BindToStorage, + URLMoniker_Reduce, + URLMoniker_ComposeWith, + URLMoniker_Enum, + URLMoniker_IsEqual, + URLMoniker_Hash, + URLMoniker_IsRunning, + URLMoniker_GetTimeOfLastChange, + URLMoniker_Inverse, + URLMoniker_CommonPrefixWith, + URLMoniker_RelativePathTo, + URLMoniker_GetDisplayName, + URLMoniker_ParseDisplayName, + URLMoniker_IsSystemMoniker }; -/****************************************************************************** - * URLMoniker_Construct (local function) - *******************************************************************************/ -static HRESULT URLMonikerImpl_Construct(URLMonikerImpl* This, LPCOLESTR lpszLeftURLName, LPCOLESTR lpszURLName) +static URLMoniker *alloc_moniker(void) +{ + URLMoniker *ret; + + ret = heap_alloc(sizeof(URLMoniker)); + if(!ret) + return NULL; + + ret->lpIMonikerVtbl = &URLMonikerVtbl; + ret->ref = 1; + ret->URLName = NULL; + + return ret; +} + +static HRESULT URLMoniker_Init(URLMoniker *This, LPCOLESTR lpszLeftURLName, LPCOLESTR lpszURLName) { HRESULT hres; DWORD sizeStr = 0; TRACE("(%p,%s,%s)\n",This,debugstr_w(lpszLeftURLName),debugstr_w(lpszURLName)); - - This->lpvtbl = &VT_URLMonikerImpl; - This->ref = 0; This->URLName = heap_alloc(INTERNET_MAX_URL_LENGTH*sizeof(WCHAR)); @@ -574,6 +485,14 @@ return S_OK; } +HRESULT StdURLMoniker_Construct(IUnknown *outer, void **ppv) +{ + TRACE("(%p %p)\n", outer, ppv); + + *ppv = alloc_moniker(); + return *ppv ? S_OK : E_OUTOFMEMORY; +} + /*********************************************************************** * CreateURLMonikerEx (URLMON.@) * @@ -592,7 +511,7 @@ */ HRESULT WINAPI CreateURLMonikerEx(IMoniker *pmkContext, LPCWSTR szURL, IMoniker **ppmk, DWORD dwFlags) { - URLMonikerImpl *obj; + URLMoniker *obj; HRESULT hres; LPOLESTR lefturl = NULL; @@ -600,7 +519,7 @@ if (dwFlags & URL_MK_UNIFORM) FIXME("ignoring flag URL_MK_UNIFORM\n"); - if(!(obj = heap_alloc(sizeof(*obj)))) + if(!(obj = alloc_moniker())) return E_OUTOFMEMORY; if(pmkContext) { @@ -614,12 +533,11 @@ } } - hres = URLMonikerImpl_Construct(obj, lefturl, szURL); + hres = URLMoniker_Init(obj, lefturl, szURL); CoTaskMemFree(lefturl); if(SUCCEEDED(hres)) - hres = URLMonikerImpl_QueryInterface((IMoniker*)obj, &IID_IMoniker, (void**)ppmk); - else - heap_free(obj); + hres = URLMoniker_QueryInterface((IMoniker*)obj, &IID_IMoniker, (void**)ppmk); + IMoniker_Release((IMoniker*)obj); return hres; } Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ma… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon_main.c [iso-8859-1] Tue Apr 7 01:37:38 2009 @@ -185,6 +185,8 @@ { &ClassFactoryVtbl, SecManagerImpl_Construct}; static const ClassFactory ZoneManagerCF = { &ClassFactoryVtbl, ZoneMgrImpl_Construct}; +static const ClassFactory StdURLMonikerCF = + { &ClassFactoryVtbl, StdURLMoniker_Construct}; struct object_creation_info { @@ -209,7 +211,8 @@ { &CLSID_HttpSProtocol, CLASSFACTORY(&HttpSProtocolCF), wszHttps }, { &CLSID_MkProtocol, CLASSFACTORY(&MkProtocolCF), wszMk }, { &CLSID_InternetSecurityManager, CLASSFACTORY(&SecurityManagerCF), NULL }, - { &CLSID_InternetZoneManager, CLASSFACTORY(&ZoneManagerCF), NULL } + { &CLSID_InternetZoneManager, CLASSFACTORY(&ZoneManagerCF), NULL }, + { &CLSID_StdURLMoniker, CLASSFACTORY(&StdURLMonikerCF), NULL } }; static void init_session(BOOL init) Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ma… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon_main.h [iso-8859-1] Tue Apr 7 01:37:38 2009 @@ -38,6 +38,7 @@ extern HINSTANCE URLMON_hInstance; extern HRESULT SecManagerImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT ZoneMgrImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); +extern HRESULT StdURLMoniker_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT FileProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT HttpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT HttpSProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj);

1 0

[cwittich] 40406: sync crypt32 to wine 1.1.18
by cwittich＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: cwittich Date: Tue Apr 7 01:34:28 2009 New Revision: 40406 URL: http://svn.reactos.org/svn/reactos?rev=40406&view=rev Log: sync crypt32 to wine 1.1.18 Modified: trunk/reactos/dll/win32/crypt32/crypt32_De.rc Modified: trunk/reactos/dll/win32/crypt32/crypt32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_De.rc [iso-8859-1] Tue Apr 7 01:34:28 2009 @@ -2,6 +2,7 @@ * crypt32 dll resources * * Copyright (C) 2006 Henning Gerhardt + * Copyright (C) 2008,2009 Michael Stefaniuc * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,41 +21,43 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +#pragma code_page(65001) + STRINGTABLE DISCARDABLE { - IDS_AUTHORITY_KEY_ID "Autoritätsschlüsselkennung" - IDS_KEY_ATTRIBUTES "Schlüsselattribute" - IDS_KEY_USAGE_RESTRICTION "Schlüsselbenutzungseinschränkung" + IDS_AUTHORITY_KEY_ID "AutoritÃ¤tsschlÃ¼sselkennung" + IDS_KEY_ATTRIBUTES "SchlÃ¼sselattribute" + IDS_KEY_USAGE_RESTRICTION "SchlÃ¼sselbenutzungseinschrÃ¤nkung" IDS_SUBJECT_ALT_NAME "Alternativer Name des Antragsstellers" IDS_ISSUER_ALT_NAME "Alternativer Name des Ausgebers" - IDS_BASIC_CONSTRAINTS "Grundsätzliche Einschränkungen" - IDS_KEY_USAGE "Schlüsselbenutzung" + IDS_BASIC_CONSTRAINTS "GrundsÃ¤tzliche EinschrÃ¤nkungen" + IDS_KEY_USAGE "SchlÃ¼sselbenutzung" IDS_CERT_POLICIES "Zertifikatsrichtlinien" - IDS_SUBJECT_KEY_IDENTIFIER "Schlüsselkennung des Antragsstellers" + IDS_SUBJECT_KEY_IDENTIFIER "SchlÃ¼sselkennung des Antragsstellers" IDS_CRL_REASON_CODE "CRL Grundcode" IDS_CRL_DIST_POINTS "CRL Verteilungspunkte" - IDS_ENHANCED_KEY_USAGE "Erweiterte Schlüsselbenutzung" - IDS_AUTHORITY_INFO_ACCESS "Autoritätsinformationszugriff" + IDS_ENHANCED_KEY_USAGE "Erweiterte SchlÃ¼sselbenutzung" + IDS_AUTHORITY_INFO_ACCESS "AutoritÃ¤tsinformationszugriff" IDS_CERT_EXTENSIONS "Zertifikatserweiterung" IDS_NEXT_UPDATE_LOCATION "Next Update Location" IDS_YES_OR_NO_TRUST "Vertrauen oder nicht vertrauen" IDS_EMAIL_ADDRESS "E-Mail-Adresse" IDS_UNSTRUCTURED_NAME "Unstrukturierter Name" IDS_CONTENT_TYPE "Inhaltstyp" - IDS_MESSAGE_DIGEST "Nachrichtenübersicht" + IDS_MESSAGE_DIGEST "NachrichtenÃ¼bersicht" IDS_SIGNING_TIME "Signierungszeit" IDS_COUNTER_SIGN "Gegensignatur" - IDS_CHALLENGE_PASSWORD "Challenge Password" + IDS_CHALLENGE_PASSWORD "Anfragekennwort" IDS_UNSTRUCTURED_ADDRESS "Unstrukturierte Adresse" - IDS_SMIME_CAPABILITIES "SMIME Möglichkeiten" + IDS_SMIME_CAPABILITIES "SMIME MÃ¶glichkeiten" IDS_PREFER_SIGNED_DATA "Signierte Daten bevorzugen" IDS_CPS "CPS" IDS_USER_NOTICE "Benutzerbenachrichtung" IDS_OCSP "Online Zertifikationsstatusprotokoll" - IDS_CA_ISSUER "Ausgeber des Zertifikationsautorität" + IDS_CA_ISSUER "Ausgeber des ZertifikationsautoritÃ¤t" IDS_CERT_TEMPLATE_NAME "Zertifkationsvorlagenname" IDS_CERT_TYPE "Zertifikationstyp" - IDS_CERT_MANIFOLD "Zertifikationsvervielfältigung" + IDS_CERT_MANIFOLD "ZertifikationsvervielfÃ¤ltigung" IDS_NETSCAPE_CERT_TYPE "Netscape Zertifikationstyp" IDS_NETSCAPE_BASE_URL "Netscape Basis-URL" IDS_NETSCAPE_REVOCATION_URL "Netscape Sperrungs-URL" @@ -76,28 +79,28 @@ IDS_GIVEN_NAME "Vorname" IDS_INITIALS "Initialen" IDS_SUR_NAME "Nachname" - IDS_DOMAIN_COMPONENT "Domänkomponente" - IDS_STREET_ADDRESS "Straße" + IDS_DOMAIN_COMPONENT "DomÃ¤nenkomponente" + IDS_STREET_ADDRESS "StraÃe" IDS_SERIAL_NUMBER "Seriennummer" IDS_CA_VERSION "CA Version" IDS_CROSS_CA_VERSION "Kreuz CA Version" IDS_SERIALIZED_SIG_SERIAL_NUMBER "Serialisierte Signaturseriennummer" IDS_PRINCIPAL_NAME "Prinzipalname" IDS_WINDOWS_PRODUCT_UPDATE "Windows Produkt Aktualisierung" - IDS_ENROLLMENT_NAME_VALUE_PAIR "Wertepaar für Eintragungsname" + IDS_ENROLLMENT_NAME_VALUE_PAIR "Wertepaar fÃ¼r Eintragungsname" IDS_OS_VERSION "Betriebssystemversion" IDS_ENROLLMENT_CSP "Eintragungs-CSP" IDS_CRL_NUMBER "CRL Nummer" IDS_DELTA_CRL_INDICATOR "Delta CRL Indikator" IDS_ISSUING_DIST_POINT "Ausgeber des Verteilungspunktes" IDS_FRESHEST_CRL "Aktuelle CRL" - IDS_NAME_CONSTRAINTS "Namenseinschränkungen" + IDS_NAME_CONSTRAINTS "NamenseinschrÃ¤nkungen" IDS_POLICY_MAPPINGS "Richtlinienzuordnungen" - IDS_POLICY_CONSTRAINTS "Richtlinieneinschränkungen" - IDS_CROSS_CERT_DIST_POINTS "Verteilungspunkte für Kreuzzertifikate" + IDS_POLICY_CONSTRAINTS "RichtlinieneinschrÃ¤nkungen" + IDS_CROSS_CERT_DIST_POINTS "Verteilungspunkte fÃ¼r Kreuzzertifikate" IDS_APPLICATION_POLICIES "Anwendungsrichtlinien" IDS_APPLICATION_POLICY_MAPPINGS "Anwendungsrichtlinienzuordnungen" - IDS_APPLICATION_POLICY_CONSTRAINTS "Anwendungsungsrichtlinieneinschränkungen" + IDS_APPLICATION_POLICY_CONSTRAINTS "AnwendungsungsrichtlinieneinschrÃ¤nkungen" IDS_CMC_DATA "CMC Daten" IDS_CMC_RESPONSE "CMC Antwort" IDS_UNSIGNED_CMC_REQUEST "Unsignierte CMC Antwort" @@ -106,32 +109,32 @@ IDS_CMC_ATTRIBUTES "CMC Attribute" IDS_PKCS_7_DATA "PKCS 7 Daten" IDS_PKCS_7_SIGNED "PKCS 7 signiert" - IDS_PKCS_7_ENVELOPED "PKCS 7 umhüllt" - IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 signiert und umhüllt" + IDS_PKCS_7_ENVELOPED "PKCS 7 umhÃ¼llt" + IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 signiert und umhÃ¼llt" IDS_PKCS_7_DIGESTED "PKCS 7 Digested" - IDS_PKCS_7_ENCRYPTED "PKCS 7 verschlüsselt" + IDS_PKCS_7_ENCRYPTED "PKCS 7 verschlÃ¼sselt" IDS_PREVIOUS_CA_CERT_HASH "Vorheriger CA Zertifikatshash" IDS_CRL_VIRTUAL_BASE "Virtuelle Basis-CRL-Nummer" - IDS_CRL_NEXT_PUBLISH "Nächste CRL Veröffentlichung" - IDS_CA_EXCHANGE "CA Verschlüsselungszertifikat" - IDS_KEY_RECOVERY_AGENT "Agent zur Schlüsselwiederherstellung" + IDS_CRL_NEXT_PUBLISH "NÃ¤chste CRL VerÃ¶ffentlichung" + IDS_CA_EXCHANGE "CA VerschlÃ¼sselungszertifikat" + IDS_KEY_RECOVERY_AGENT "Agent zur SchlÃ¼sselwiederherstellung" IDS_CERTIFICATE_TEMPLATE "Zertifikatsvorlageninformation" IDS_ENTERPRISE_ROOT_OID "Unternehmensstamm-OID" IDS_RDN_DUMMY_SIGNER "Attrapenunterzeichner" - IDS_ARCHIVED_KEY_ATTR "Verschlüsselter, privater Schlüssel" - IDS_CRL_SELF_CDP "Veröffentlichte CRL Standorte" + IDS_ARCHIVED_KEY_ATTR "VerschlÃ¼sselter, privater SchlÃ¼ssel" + IDS_CRL_SELF_CDP "VerÃ¶ffentlichte CRL Standorte" IDS_REQUIRE_CERT_CHAIN_POLICY "Erzwinge Zertifikatskettenrichtlinie" IDS_TRANSACTION_ID "Transaktions-ID" IDS_SENDER_NONCE "Sender einstweilen" - IDS_RECIPIENT_NONCE "Empfänger einstweilen" + IDS_RECIPIENT_NONCE "EmpfÃ¤nger einstweilen" IDS_REG_INFO "Registrierungsinformationen" IDS_GET_CERTIFICATE "Bekomme Zertifikat" IDS_GET_CRL "Bekomme CRL" IDS_REVOKE_REQUEST "Anfrageablehnen" IDS_QUERY_PENDING "Wartende Abfrage" IDS_SORTED_CTL "Zertifikatsvertrauensliste" - IDS_ARCHIVED_KEY_CERT_HASH "Archivierter Schlüsselzertifikatshash" - IDS_PRIVATE_KEY_USAGE_PERIOD "Private Schlüsselbenutzungsdauer" + IDS_ARCHIVED_KEY_CERT_HASH "Archivierter SchlÃ¼sselzertifikatshash" + IDS_PRIVATE_KEY_USAGE_PERIOD "Private SchlÃ¼sselbenutzungsdauer" IDS_CLIENT_INFORMATION "Client Information" IDS_SERVER_AUTHENTICATION "Server Authentifizierung" IDS_CLIENT_AUTHENTICATION "Client Authentifizierung" @@ -143,32 +146,98 @@ IDS_IPSEC_END_SYSTEM "IP Sicherheitsendsystem" IDS_IPSEC_TUNNEL "IP Sicherheitstunnelabschluss" IDS_IPSEC_USER "IP Sicherheitsbenutzer" - IDS_EFS "Verschlüsseltes Dateisystem" + IDS_EFS "VerschlÃ¼sseltes Dateisystem" IDS_WHQL_CRYPTO "Windows Hardware Treiber Verifizierung" IDS_NT5_CRYPTO "Windows System Komponenten Verifizierung" IDS_OEM_WHQL_CRYPTO "OEM Windows System Komponenten Verifizierung" IDS_EMBEDDED_NT_CRYPTO "Embedded Windows System Komponenten Verifizierung" - IDS_KEY_PACK_LICENSES "Schlüsselpaketlizenzen" + IDS_KEY_PACK_LICENSES "SchlÃ¼sselpaketlizenzen" IDS_LICENSE_SERVER "Lizenzserver Verifizierung" IDS_SMART_CARD_LOGON "Smartcard Login" IDS_DIGITAL_RIGHTS "Digitale Rechte" IDS_QUALIFIED_SUBORDINATION "Qualifizierte Unterordnung" - IDS_KEY_RECOVERY "Schlüsselwiederherstellung" + IDS_KEY_RECOVERY "SchlÃ¼sselwiederherstellung" IDS_DOCUMENT_SIGNING "Dokumentensignatur" IDS_IPSEC_IKE_INTERMEDIATE "dazwischenliegende IP Sicherheits-IKE" IDS_FILE_RECOVERY "Dateiwiederherstellung" IDS_ROOT_LIST_SIGNER "Stammlistengeber" IDS_ANY_APPLICATION_POLICIES "Alle Anwendungsrichtlinien" - IDS_DS_EMAIL_REPLICATION "Verzeichnisdienst für E-Mail Replikation" - IDS_ENROLLMENT_AGENT "Agent für Zertifikationsanforderung" + IDS_DS_EMAIL_REPLICATION "Verzeichnisdienst fÃ¼r E-Mail Replikation" + IDS_ENROLLMENT_AGENT "Agent fÃ¼r Zertifikationsanforderung" IDS_LIFETIME_SIGNING "Lebensdauersignatur" IDS_ANY_CERT_POLICY "Alle ausgegebenen Richtlinien" } STRINGTABLE DISCARDABLE { - IDS_LOCALIZEDNAME_ROOT "Vertrauenswürdige Stammzertifizierungsstellen" - IDS_LOCALIZEDNAME_MY "Persönlich" + IDS_LOCALIZEDNAME_ROOT "VertrauenswÃ¼rdige Stammzertifizierungsstellen" + IDS_LOCALIZEDNAME_MY "PersÃ¶nlich" IDS_LOCALIZEDNAME_CA "Zwischenzertifizierungsstellen" IDS_LOCALIZEDNAME_ADDRESSBOOK "Andere Personen" + IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "VertrauenswÃ¼rdige Herausgeber" } + +STRINGTABLE DISCARDABLE +{ + IDS_KEY_ID "SchlÃ¼sselkennung=" + IDS_CERT_ISSUER "Ausgeber des Zertifikats" + IDS_CERT_SERIAL_NUMBER "Serienummer des Zertifikats=" + IDS_ALT_NAME_OTHER_NAME "Anderer Name=" + IDS_ALT_NAME_RFC822_NAME "E-Mail Adresse=" + IDS_ALT_NAME_DNS_NAME "DNS Name=" + IDS_ALT_NAME_DIRECTORY_NAME "Verzeichnis-Adresse" + IDS_ALT_NAME_URL "URL=" + IDS_ALT_NAME_IP_ADDRESS "IP Adresse=" + IDS_ALT_NAME_MASK "Maske=" + IDS_ALT_NAME_REGISTERED_ID "Registrierte Kennung=" + IDS_USAGE_UNKNOWN "Unbekannte Verwendung des SchlÃ¼ssels" + IDS_SUBJECT_TYPE "Subject Typ=" + IDS_SUBJECT_TYPE_CA "ZertifikationsautoritÃ¤t" + IDS_SUBJECT_TYPE_END_CERT "Endeinheit" + IDS_PATH_LENGTH "EinschrÃ¤nkung der PfadlÃ¤nge=" + IDS_PATH_LENGTH_NONE "Keine" + IDS_INFO_NOT_AVAILABLE "Information nicht verfÃ¼gbar" + IDS_AIA "AutoritÃ¤tsinformationszugriff" + IDS_ACCESS_METHOD "Zugriffsmethode=" + IDS_ACCESS_METHOD_OCSP "OCSP" + IDS_ACCESS_METHOD_CA_ISSUERS "Ausgeber des ZertifikationsautoritÃ¤t" + IDS_ACCESS_METHOD_UNKNOWN "Unbekannte Zugriffsmethode" + IDS_ACCESS_LOCATION "Alternativer Name" + IDS_CRL_DIST_POINT "CRL Verteilungspunkt" + IDS_CRL_DIST_POINT_NAME "Name des Verteilungspunkt" + IDS_CRL_DIST_POINT_FULL_NAME "VollstÃ¤ndiger Name" + IDS_CRL_DIST_POINT_RDN_NAME "RDN Name" + IDS_CRL_DIST_POINT_REASON "CRL BegrÃ¼ndung=" + IDS_CRL_DIST_POINT_ISSUER "CRL Ausgeber" + IDS_REASON_KEY_COMPROMISE "Kompromittierung des SchlÃ¼ssels" + IDS_REASON_CA_COMPROMISE "Kompromittierung der ZertifikationsautoritÃ¤t" + IDS_REASON_AFFILIATION_CHANGED "ZugehÃ¶rigkeit verÃ¤ndert" + IDS_REASON_SUPERSEDED "ErsÃ¤tzt" + IDS_REASON_CESSATION_OF_OPERATION "Betrieb eingestellt" + IDS_REASON_CERTIFICATE_HOLD "Zertifikat blockiert" + IDS_FINANCIAL_CRITERIA "Finanzinformationen=" + IDS_FINANCIAL_CRITERIA_AVAILABLE "Vorhanden" + IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE "Nicht vorhanden" + IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "Kriterien erfÃ¼llt=" + IDS_YES "Ja" + IDS_NO "Nein" + IDS_DIGITAL_SIGNATURE "Digitale Signatur" + IDS_NON_REPUDIATION "Unleugbarkeit" + IDS_KEY_ENCIPHERMENT "SchlÃ¼sselverschlÃ¼sselung" + IDS_DATA_ENCIPHERMENT "DatenverschlÃ¼sselung" + IDS_KEY_AGREEMENT "SchlÃ¼sselvereinbarung" + IDS_CERT_SIGN "Signieren des Zertifikats" + IDS_OFFLINE_CRL_SIGN "Offline Signieren der CRL" + IDS_CRL_SIGN "Signieren der CRL" + IDS_ENCIPHER_ONLY "Nur VerschlÃ¼sseln" + IDS_DECIPHER_ONLY "Nur EntschlÃ¼sseln" + IDS_NETSCAPE_SSL_CLIENT "SSL Client-Authentifizierung" + IDS_NETSCAPE_SSL_SERVER "SSL Server-Authentifizierung" + IDS_NETSCAPE_SMIME "S/MIME" + IDS_NETSCAPE_SIGN "Signatur" + IDS_NETSCAPE_SSL_CA "SSL ZertifikationsautoritÃ¤t" + IDS_NETSCAPE_SMIME_CA "S/MIME ZertifikationsautoritÃ¤t" + IDS_NETSCAPE_SIGN_CA "ZertifikationsautoritÃ¤t der Signatur" +} + +#pragma code_page(default)

1 0

[tkreuzer] 40405: Go back to old logic in GdiSelectPalette. Should fix the gdi32_winetest gdiobj regression introduced in r40381.
by tkreuzer＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: tkreuzer Date: Mon Apr 6 23:43:25 2009 New Revision: 40405 URL: http://svn.reactos.org/svn/reactos?rev=40405&view=rev Log: Go back to old logic in GdiSelectPalette. Should fix the gdi32_winetest gdiobj regression introduced in r40381. 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] Mon Apr 6 23:43:25 2009 @@ -264,9 +264,10 @@ return NULL; } + // FIXME: This looks wrong /* Is this a valid palette for this depth? */ if ((pdc->rosdc.bitsPerPixel <= 8 && ppal->Mode == PAL_INDEXED) || - (pdc->rosdc.bitsPerPixel > 8 && ppal->Mode != PAL_INDEXED)) + (pdc->rosdc.bitsPerPixel > 8)) { /* Get old palette, set new one */ oldPal = pdc->dclevel.hpal;

1 0

[gschneider] 40404: - path.c: Correct purpose header entry - gradient.c: Use proper debug prints, terminate them with a newline character. Remove duplicate clipRegion.
by gschneider＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: gschneider Date: Mon Apr 6 22:00:48 2009 New Revision: 40404 URL: http://svn.reactos.org/svn/reactos?rev=40404&view=rev Log: - path.c: Correct purpose header entry - gradient.c: Use proper debug prints, terminate them with a newline character. Remove duplicate clipRegion. Modified: trunk/reactos/subsystems/win32/win32k/eng/gradient.c trunk/reactos/subsystems/win32/win32k/objects/path.c Modified: trunk/reactos/subsystems/win32/win32k/eng/gradient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/gradient.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/gradient.c [iso-8859-1] Mon Apr 6 22:00:48 2009 @@ -347,9 +347,9 @@ } } - DbgPrint("Triangle: (%i,%i) (%i,%i) (%i,%i)\n", v1->x, v1->y, v2->x, v2->y, v3->x, v3->y); + DPRINT1("Triangle: (%i,%i) (%i,%i) (%i,%i)\n", v1->x, v1->y, v2->x, v2->y, v3->x, v3->y); /* FIXME: commented out because of an endless loop - fix triangles first */ - DbgPrint("FIXME: IntEngGradientFillTriangle is broken"); + DPRINT1("FIXME: IntEngGradientFillTriangle is broken\n"); if(!IntEngEnter(&EnterLeave, psoDest, &FillRect, FALSE, &Translate, &psoOutput)) { @@ -476,12 +476,11 @@ IN ULONG ulMode) { ULONG i; - CLIPOBJ *pcoPriv = NULL; BOOL ret = FALSE; if (!pco) { - pco = pcoPriv = IntEngCreateClipRegion(0, 0, prclExtents); + pco = IntEngCreateClipRegion(0, 0, prclExtents); if (!pco) { return FALSE; @@ -526,11 +525,6 @@ } } - if (pcoPriv) - { - IntEngDeleteClipRegion(pcoPriv); - } - return ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Mon Apr 6 22:00:48 2009 @@ -28,7 +28,7 @@ * PROJECT: ReactOS win32 kernel mode subsystem * LICENSE: GPL - See COPYING in the top level directory * FILE: subsystems/win32/win32k/objects/path.c - * PURPOSE: Freetype library support + * PURPOSE: Path support * PROGRAMMER: */

1 0

[dchapyshev] 40403: - Sync some headers with Wine - Fix ddstream.idl
by dchapyshev＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: dchapyshev Date: Mon Apr 6 20:55:54 2009 New Revision: 40403 URL: http://svn.reactos.org/svn/reactos?rev=40403&view=rev Log: - Sync some headers with Wine - Fix ddstream.idl Added: trunk/reactos/include/psdk/perhist.idl (with props) Modified: trunk/reactos/include/dxsdk/amstream.idl trunk/reactos/include/dxsdk/ddstream.idl trunk/reactos/include/psdk/mscoree.idl trunk/reactos/include/psdk/msctf.idl trunk/reactos/include/psdk/psdk.rbuild Modified: trunk/reactos/include/dxsdk/amstream.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/amstream.idl… ============================================================================== --- trunk/reactos/include/dxsdk/amstream.idl [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/amstream.idl [iso-8859-1] Mon Apr 6 20:55:54 2009 @@ -317,3 +317,4 @@ cpp_quote("DEFINE_GUID(CLSID_AMAudioStream, 0x8496e040, 0xaf4c, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45);") cpp_quote("DEFINE_GUID(CLSID_AMAudioData, 0xf2468580, 0xaf8a, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45);") cpp_quote("DEFINE_GUID(CLSID_AMMediaTypeStream, 0xcf0f2f7c, 0xf7bf, 0x11d0, 0x90, 0x0d, 0x00, 0xc0, 0x4f, 0xd9, 0x18, 0x9d);") +cpp_quote("DEFINE_GUID(CLSID_MediaStreamFilter, 0x49c47ce0, 0x9ba4, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45);") Modified: trunk/reactos/include/dxsdk/ddstream.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ddstream.idl… ============================================================================== --- trunk/reactos/include/dxsdk/ddstream.idl [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/ddstream.idl [iso-8859-1] Mon Apr 6 20:55:54 2009 @@ -19,7 +19,7 @@ import "unknwn.idl"; import "mmstream.idl"; -cpp_quote("#ifndef __WINE_DDRAW_H") +cpp_quote("#ifndef __DDRAW_INCLUDED__") typedef void * LPDDSURFACEDESC; typedef struct tDDSURFACEDESC DDSURFACEDESC; interface IDirectDraw; Modified: trunk/reactos/include/psdk/mscoree.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mscoree.idl?r… ============================================================================== --- trunk/reactos/include/psdk/mscoree.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mscoree.idl [iso-8859-1] Mon Apr 6 20:55:54 2009 @@ -27,6 +27,8 @@ cpp_quote("HRESULT WINAPI GetCORVersion(LPWSTR,DWORD,DWORD*);") cpp_quote("HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,DWORD,LPWSTR,DWORD,DWORD*,LPWSTR,DWORD,DWORD*);") cpp_quote("HRESULT WINAPI LoadLibraryShim(LPCWSTR,LPCWSTR,LPVOID,HMODULE*);") +cpp_quote("typedef HRESULT (__stdcall *FLockClrVersionCallback)();") +cpp_quote("HRESULT WINAPI LockClrVersion(FLockClrVersionCallback,FLockClrVersionCallback*,FLockClrVersionCallback*);") typedef void* HDOMAINENUM; Modified: trunk/reactos/include/psdk/msctf.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msctf.idl?rev… ============================================================================== --- trunk/reactos/include/psdk/msctf.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msctf.idl [iso-8859-1] Mon Apr 6 20:55:54 2009 @@ -476,3 +476,42 @@ HRESULT Skip( [in] ULONG ulCount); }; + +[ + object, + local, + uuid(aa80e7f7-2021-11d2-93e0-0060b067b86e), + pointer_default(unique) +] +interface ITfTextInputProcessor : IUnknown +{ + HRESULT Activate( + [in] ITfThreadMgr *ptim, + [in] TfClientId tid); + + HRESULT Deactivate(); +}; + +[ + object, + uuid(aa80e80e-2021-11d2-93e0-0060b067b86e), + pointer_default(unique) +] +interface ITfThreadMgrEventSink : IUnknown +{ + HRESULT OnInitDocumentMgr( + [in] ITfDocumentMgr *pdim); + + HRESULT OnUninitDocumentMgr( + [in] ITfDocumentMgr *pdim); + + HRESULT OnSetFocus( + [in] ITfDocumentMgr *pdimFocus, + [in] ITfDocumentMgr *pdimPrevFocus); + + HRESULT OnPushContext( + [in] ITfContext *pic); + + HRESULT OnPopContext( + [in] ITfContext *pic); +}; Added: trunk/reactos/include/psdk/perhist.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/perhist.idl?r… ============================================================================== --- trunk/reactos/include/psdk/perhist.idl (added) +++ trunk/reactos/include/psdk/perhist.idl [iso-8859-1] Mon Apr 6 20:55:54 2009 @@ -1,0 +1,38 @@ +/* + * Copyright 2009 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "objidl.idl"; +import "oleidl.idl"; + +[ + object, + uuid(91A565C1-E38F-11d0-94BF-00A0C9055CBF), + pointer_default(unique) +] +interface IPersistHistory : IPersist +{ + typedef [unique] IPersistHistory *LPPERSISTHISTORY; + + HRESULT LoadHistory([in] IStream *pStream, [in] IBindCtx *pbc); + + HRESULT SaveHistory([in] IStream *pStream); + + HRESULT SetPositionCookie([in] DWORD dwPositioncookie); + + HRESULT GetPositionCookie([out] DWORD *pdwPositioncookie); +} Propchange: trunk/reactos/include/psdk/perhist.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psdk.rbuild?r… ============================================================================== --- trunk/reactos/include/psdk/psdk.rbuild [iso-8859-1] (original) +++ trunk/reactos/include/psdk/psdk.rbuild [iso-8859-1] Mon Apr 6 20:55:54 2009 @@ -35,6 +35,7 @@ <file>oledb.idl</file> <file>oleidl.idl</file> <file>optary.idl</file> + <file>perhist.idl</file> <file>propidl.idl</file> <file>pstore.idl</file> <file>richole.idl</file>

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2009