Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[tkreuzer] 42394: Patch by Amine Khaldi: Get rid of XlatePatternToDest in BLTINFO and in the DIB code.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Aug 5 00:19:24 2009 New Revision: 42394 URL: http://svn.reactos.org/svn/reactos?rev=42394&view=rev Log: Patch by Amine Khaldi: Get rid of XlatePatternToDest in BLTINFO and in the DIB code. Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c trunk/reactos/subsystems/win32/win32k/dib/dib.h trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c trunk/reactos/subsystems/win32/win32k/dib/stretchblt.c trunk/reactos/subsystems/win32/win32k/eng/bitblt.c trunk/reactos/subsystems/win32/win32k/eng/copybits.c trunk/reactos/subsystems/win32/win32k/eng/stretchblt.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib.c [iso-8859-1] Wed Aug 5 00:19:24 2009 @@ -218,7 +218,7 @@ POINTL* MaskOrigin, BRUSHOBJ* Brush, POINTL* BrushOrign, XLATEOBJ *ColorTranslation, - XLATEOBJ *XlatePatternToDest, ROP4 Rop) + ROP4 Rop) { return FALSE; } Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib.h [iso-8859-1] Wed Aug 5 00:19:24 2009 @@ -28,7 +28,6 @@ SURFOBJ *SourceSurface; SURFOBJ *PatternSurface; XLATEOBJ *XlateSourceToDest; - XLATEOBJ *XlatePatternToDest; RECTL DestRect; POINTL SourcePoint; BRUSHOBJ *Brush; @@ -41,7 +40,7 @@ typedef VOID (*PFN_DIB_HLine)(SURFOBJ*,LONG,LONG,LONG,ULONG); typedef VOID (*PFN_DIB_VLine)(SURFOBJ*,LONG,LONG,LONG,ULONG); typedef BOOLEAN (*PFN_DIB_BitBlt)(PBLTINFO); -typedef BOOLEAN (*PFN_DIB_StretchBlt)(SURFOBJ*,SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); +typedef BOOLEAN (*PFN_DIB_StretchBlt)(SURFOBJ*,SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,ROP4); typedef BOOLEAN (*PFN_DIB_TransparentBlt)(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,XLATEOBJ*,ULONG); typedef BOOLEAN (*PFN_DIB_ColorFill)(SURFOBJ*, RECTL*, ULONG); typedef BOOLEAN (*PFN_DIB_AlphaBlend)(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -67,7 +66,7 @@ VOID Dummy_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG); VOID Dummy_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN Dummy_BitBlt(PBLTINFO); -BOOLEAN Dummy_StretchBlt(SURFOBJ*,SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); +BOOLEAN Dummy_StretchBlt(SURFOBJ*,SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,ROP4); BOOLEAN Dummy_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,XLATEOBJ*,ULONG); BOOLEAN Dummy_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN Dummy_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -132,7 +131,7 @@ BOOLEAN DIB_32BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN DIB_32BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); -BOOLEAN DIB_XXBPP_StretchBlt(SURFOBJ*,SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); +BOOLEAN DIB_XXBPP_StretchBlt(SURFOBJ*,SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,ROP4); BOOLEAN DIB_XXBPP_FloodFillSolid(SURFOBJ*, BRUSHOBJ*, RECTL*, POINTL*, ULONG, UINT); extern unsigned char notmask[2]; Modified: trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] Wed Aug 5 00:19:24 2009 @@ -380,7 +380,7 @@ { Pattern = 0; for (k = 31 - NoBits; k >= 0; k++) - Pattern |= (DIB_GetSource(PatternObj, (X + BrushOrigin.x + k) % PatternWidth, PatternY, BltInfo->XlatePatternToDest) << (31 - k)); + Pattern |= (DIB_GetSourceIndex(PatternObj, (X + BrushOrigin.x + k) % PatternWidth, PatternY) << (31 - k)); } Dest = DIB_DoRop(Rop4, Dest, Source, Pattern); @@ -415,10 +415,10 @@ Pattern = 0; for (Index = 0; Index < 8; Index++) { - Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + Index) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << (7 - Index); - Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + Index + 8) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << (8 + (7 - Index)); - Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + Index + 16) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << (16 + (7 - Index)); - Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + Index + 24) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << (24 + (7 - Index)); + Pattern |= DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + Index) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY) << (7 - Index); + Pattern |= DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + Index + 8) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY) << (8 + (7 - Index)); + Pattern |= DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + Index + 16) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY) << (16 + (7 - Index)); + Pattern |= DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + Index + 24) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY) << (24 + (7 - Index)); } } @@ -438,7 +438,7 @@ if (BltInfo->PatternSurface) { - Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest); + Pattern = DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY); } DIB_1BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xF); Modified: trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c [iso-8859-1] Wed Aug 5 00:19:24 2009 @@ -274,7 +274,7 @@ if (BltInfo->PatternSurface) { - Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX - BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest); + Pattern = DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX - BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY); } Dest = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xFFFFFF; Modified: trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c [iso-8859-1] Wed Aug 5 00:19:24 2009 @@ -289,7 +289,7 @@ if (BltInfo->PatternSurface) { - Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest); + Pattern = DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY); } DIB_4BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xF); @@ -316,14 +316,14 @@ } if (BltInfo->PatternSurface) { - Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 1) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest); - Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 0) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 4; - Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 3) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 8; - Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 2) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 12; - Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 5) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 16; - Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 4) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 20; - Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 7) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 24; - Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 6) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 28; + Pattern = DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 1) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY); + Pattern |= DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 0) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY) << 4; + Pattern |= DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 3) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY) << 8; + Pattern |= DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 2) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY) << 12; + Pattern |= DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 5) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY) << 16; + Pattern |= DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 4) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY) << 20; + Pattern |= DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 7) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY) << 24; + Pattern |= DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 6) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY) << 28; } *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern); } @@ -338,7 +338,7 @@ } if (BltInfo->PatternSurface) { - Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest); + Pattern = DIB_GetSourceIndex(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY); } DIB_4BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xF); } Modified: trunk/reactos/subsystems/win32/win32k/dib/stretchblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/stretchblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/stretchblt.c [iso-8859-1] Wed Aug 5 00:19:24 2009 @@ -18,7 +18,7 @@ RECTL *DestRect, RECTL *SourceRect, POINTL *MaskOrigin, BRUSHOBJ *Brush, POINTL *BrushOrigin, XLATEOBJ *ColorTranslation, - XLATEOBJ *XlatePatternToDest, ROP4 ROP) + ROP4 ROP) { LONG sx = 0; LONG sy = 0; @@ -148,7 +148,7 @@ { if (PatternSurface) { - Pattern = XLATEOBJ_iXlate(XlatePatternToDest, fnPattern_GetPixel(PatternSurface, PatternX, PatternY)); + Pattern = fnPattern_GetPixel(PatternSurface, PatternX, PatternY); PatternX++; PatternX %= PatternSurface->sizlBitmap.cx; } Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Wed Aug 5 00:19:24 2009 @@ -188,7 +188,6 @@ if (ROP3_TO_ROP4(SRCCOPY) == Rop4) return DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_BitBltSrcCopy(&BltInfo); - BltInfo.XlatePatternToDest = NULL; BltInfo.Brush = pbo; BltInfo.BrushOrigin = *BrushOrigin; BltInfo.Rop4 = Rop4; 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] Wed Aug 5 00:19:24 2009 @@ -133,7 +133,6 @@ BltInfo.SourceSurface = psoSource; BltInfo.PatternSurface = NULL; BltInfo.XlateSourceToDest = ColorTranslation; - BltInfo.XlatePatternToDest = NULL; BltInfo.Rop4 = SRCCOPY; switch(clippingType) Modified: trunk/reactos/subsystems/win32/win32k/eng/stretchblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/stretchblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/stretchblt.c [iso-8859-1] Wed Aug 5 00:19:24 2009 @@ -73,7 +73,7 @@ bResult = DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_StretchBlt( psoDest, psoSource, Mask, PatternSurface, OutputRect, InputRect, MaskOrigin, pbo, &RealBrushOrigin, - ColorTranslation, NULL, Rop4); + ColorTranslation, Rop4); /* Pattern brush */ if (psurfPattern)

15 years, 1 month

[tkreuzer] 42393: Set pulXlate to aulXlate when freeing the allocated buffer to prevent double frees.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Aug 4 23:31:34 2009 New Revision: 42393 URL: http://svn.reactos.org/svn/reactos?rev=42393&view=rev Log: Set pulXlate to aulXlate when freeing the allocated buffer to prevent double frees. Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Tue Aug 4 23:31:34 2009 @@ -478,7 +478,10 @@ if (pexlo->xlo.flXlate & XO_TRIVIAL) { if (pexlo->xlo.pulXlate != pexlo->aulXlate) + { EngFreeMem(pexlo->xlo.pulXlate); + pexlo->xlo.pulXlate = pexlo->aulXlate; + } pexlo->pfnXlate = EXLATEOBJ_iXlateTrivial; pexlo->xlo.flXlate = XO_TRIVIAL; return; @@ -760,7 +763,7 @@ { EngFreeMem(pexlo->xlo.pulXlate); } - pexlo->xlo.pulXlate = NULL; + pexlo->xlo.pulXlate = pexlo->aulXlate; } VOID

15 years, 1 month

[fireball] 42392: - Add preliminary support for pattern pens. - Create null brushes when a DC is created.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Aug 4 22:39:20 2009 New Revision: 42392 URL: http://svn.reactos.org/svn/reactos?rev=42392&view=rev Log: - Add preliminary support for pattern pens. - Create null brushes when a DC is created. Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engblt.c branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c branches/arwinss/reactos/subsystems/win32/win32k/include/brushobj.h Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/engblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engblt.c [iso-8859-1] Tue Aug 4 22:39:20 2009 @@ -71,7 +71,7 @@ { pebo = CONTAINING_RECORD(pbo, BRUSHGDI, BrushObj); - psurfPattern = pebo->pPattern; + psurfPattern = SURFACE_Lock(pebo->hbmPattern); if (psurfPattern != NULL) { psoPattern = &psurfPattern->SurfObj; @@ -208,7 +208,7 @@ if (ROP4_USES_PATTERN(Rop4) && pbo && pbo->iSolidColor == 0xFFFFFFFF) { GdiBrush = CONTAINING_RECORD(pbo, BRUSHGDI, BrushObj); - if ((psurfPattern = GdiBrush->pPattern)) + if ((psurfPattern = SURFACE_Lock(GdiBrush->hbmPattern))) { BltInfo.PatternSurface = &psurfPattern->SurfObj; } @@ -226,10 +226,8 @@ Result = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_BitBlt(&BltInfo); /* Pattern brush */ - if (psurfPattern != NULL) - { + if (psurfPattern) SURFACE_Unlock(psurfPattern); - } return Result; } @@ -265,7 +263,7 @@ if (ROP4_USES_PATTERN(Rop4) && pbo && pbo->iSolidColor == 0xFFFFFFFF) { GdiBrush = CONTAINING_RECORD(pbo, BRUSHGDI, BrushObj); - psurfPattern = GdiBrush->pPattern; + psurfPattern = SURFACE_Lock(GdiBrush->hbmPattern); if (psurfPattern) { PatternSurface = &psurfPattern->SurfObj; Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Tue Aug 4 22:39:20 2009 @@ -113,6 +113,10 @@ DPRINT("Creating a compatible with %x DC!\n", *pdev); } + /* Create default NULL brushes */ + pNewDC->pLineBrush = GreCreateNullBrush(); + pNewDC->pFillBrush = GreCreateNullBrush(); + if (dc->dwType == OBJ_MEMDC) { DPRINT("Creating a memory DC %x\n", hNewDC); @@ -229,7 +233,6 @@ { PDC pDC; HGDIOBJ hBmpKern; - PSURFACE pSurface; /* Get a pointer to the DC */ pDC = DC_Lock(physDev); @@ -270,8 +273,7 @@ DPRINT1("Trying to select an unknown bitmap %x to the DC %x!\n", pLogBrush->lbHatch, physDev); break; } - pSurface = SURFACE_Lock(hBmpKern); - pDC->pFillBrush = GreCreatePatternBrush(pSurface); + pDC->pFillBrush = GreCreatePatternBrush(hBmpKern); break; case BS_DIBPATTERN: @@ -293,34 +295,47 @@ { PDC pDC; + /* Check parameters */ + if (!pLogPen && !pExtLogPen) return; + /* Get a pointer to the DC */ pDC = DC_Lock(physDev); DPRINT("RosGdiSelectPen(): dc %x, pen style %x, pen color %x\n", physDev, pLogPen->lopnStyle, pLogPen->lopnColor); - - if (pExtLogPen) - { - DPRINT1("Ext pens aren't supported yet!"); - /* Release the object */ - DC_Unlock(pDC); - return; - } /* Free previous brush */ if (pDC->pLineBrush) GreFreeBrush(pDC->pLineBrush); /* Create the pen */ - pDC->pLineBrush = - GreCreatePen(pLogPen->lopnStyle, - pLogPen->lopnWidth.x, - BS_SOLID, - pLogPen->lopnColor, - 0, - 0, - 0, - NULL, - 0, - TRUE); + if (pLogPen) + { + pDC->pLineBrush = + GreCreatePen(pLogPen->lopnStyle, + pLogPen->lopnWidth.x, + BS_SOLID, + pLogPen->lopnColor, + 0, + 0, + 0, + NULL, + 0, + TRUE); + } + else + { + /* Extended pen information */ + pDC->pLineBrush = + GreCreatePen(pExtLogPen->elpPenStyle, + pExtLogPen->elpWidth, + pExtLogPen->elpBrushStyle, + pExtLogPen->elpColor, + 0, + pExtLogPen->elpHatch, + pExtLogPen->elpNumEntries, + pExtLogPen->elpStyleEntry, + 0, + FALSE); + } /* Release the object */ DC_Unlock(pDC); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c [iso-8859-1] Tue Aug 4 22:39:20 2009 @@ -28,14 +28,16 @@ IN ULONG cjDIB, IN BOOL bOldStylePen) { - /*static const BYTE PatternAlternate[] = {0x55, 0x55, 0x55}; + static const BYTE PatternAlternate[] = {0x55, 0x55, 0x55}; static const BYTE PatternDash[] = {0xFF, 0xFF, 0xC0}; static const BYTE PatternDot[] = {0xE3, 0x8E, 0x38}; static const BYTE PatternDashDot[] = {0xFF, 0x81, 0xC0}; - static const BYTE PatternDashDotDot[] = {0xFF, 0x8E, 0x38};*/ + static const BYTE PatternDashDotDot[] = {0xFF, 0x8E, 0x38}; PBRUSHGDI pBrush; XLATEOBJ *pXlate; HPALETTE hPalette; + SIZEL szPatSize; + PSURFACE pPattern; /* Allocate memory for the object */ pBrush = EngAllocMem(FL_ZERO_MEMORY, sizeof(BRUSHGDI), TAG_BRUSHOBJ); @@ -68,6 +70,9 @@ pBrush->flAttrs = bOldStylePen? GDIBRUSH_IS_OLDSTYLEPEN : GDIBRUSH_IS_PEN; + /* Initialize default pattern bitmap size */ + szPatSize.cx = 1; szPatSize.cy = 1; + // If dwPenStyle is PS_COSMETIC, the width must be set to 1. if ( !(bOldStylePen) && ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) && ( dwWidth != 1) ) { @@ -94,32 +99,42 @@ case PS_ALTERNATE: pBrush->flAttrs |= GDIBRUSH_IS_BITMAP; - UNIMPLEMENTED; - //pBrush->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternAlternate); + pBrush->hbmPattern = GreCreateBitmap(szPatSize, 1, BMF_24BPP, BMF_NOZEROINIT, NULL); + pPattern = SURFACE_Lock(pBrush->hbmPattern); + GreSetBitmapBits(pPattern, sizeof(PatternDashDotDot), (PVOID)PatternAlternate); + SURFACE_Unlock(pPattern); break; case PS_DOT: pBrush->flAttrs |= GDIBRUSH_IS_BITMAP; - UNIMPLEMENTED; - //pBrush->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDot); + pBrush->hbmPattern = GreCreateBitmap(szPatSize, 1, BMF_24BPP, BMF_NOZEROINIT, NULL); + pPattern = SURFACE_Lock(pBrush->hbmPattern); + GreSetBitmapBits(pPattern, sizeof(PatternDashDotDot), (PVOID)PatternDot); + SURFACE_Unlock(pPattern); break; case PS_DASH: pBrush->flAttrs |= GDIBRUSH_IS_BITMAP; - UNIMPLEMENTED; - //pBrush->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDash); + pBrush->hbmPattern = GreCreateBitmap(szPatSize, 1, BMF_24BPP, BMF_NOZEROINIT, NULL); + pPattern = SURFACE_Lock(pBrush->hbmPattern); + GreSetBitmapBits(pPattern, sizeof(PatternDashDotDot), (PVOID)PatternDash); + SURFACE_Unlock(pPattern); break; case PS_DASHDOT: pBrush->flAttrs |= GDIBRUSH_IS_BITMAP; - UNIMPLEMENTED; - //pBrush->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDashDot); + pBrush->hbmPattern = GreCreateBitmap(szPatSize, 1, BMF_24BPP, BMF_NOZEROINIT, NULL); + pPattern = SURFACE_Lock(pBrush->hbmPattern); + GreSetBitmapBits(pPattern, sizeof(PatternDashDotDot), (PVOID)PatternDashDot); + SURFACE_Unlock(pPattern); break; case PS_DASHDOTDOT: pBrush->flAttrs |= GDIBRUSH_IS_BITMAP; - UNIMPLEMENTED; - //pBrush->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDashDotDot); + pBrush->hbmPattern = GreCreateBitmap(szPatSize, 1, BMF_24BPP, BMF_NOZEROINIT, NULL); + pPattern = SURFACE_Lock(pBrush->hbmPattern); + GreSetBitmapBits(pPattern, sizeof(PatternDashDotDot), (PVOID)PatternDashDotDot); + SURFACE_Unlock(pPattern); break; case PS_INSIDEFRAME: @@ -183,7 +198,7 @@ PBRUSHGDI NTAPI -GreCreatePatternBrush(PSURFACE pSurface) +GreCreatePatternBrush(HBITMAP hbmPattern) { PBRUSHGDI pBrush; @@ -195,7 +210,7 @@ pBrush->flAttrs |= GDIBRUSH_IS_BITMAP; /* Set bitmap */ - pBrush->pPattern = pSurface; + pBrush->hbmPattern = hbmPattern; /* Set color to the reserved value */ pBrush->BrushObj.iSolidColor = 0xFFFFFFFF; Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/brushobj.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/brushobj.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/brushobj.h [iso-8859-1] Tue Aug 4 22:39:20 2009 @@ -32,7 +32,7 @@ ULONG ulPenStyle; DWORD *pStyle; ULONG dwStyleCount; - PSURFACE pPattern; + HBITMAP hbmPattern; XLATEOBJ *XlateObject; } BRUSHGDI, *PBRUSHGDI; @@ -53,7 +53,7 @@ GreCreateSolidBrush(COLORREF crColor); PBRUSHGDI NTAPI -GreCreatePatternBrush(PSURFACE pSurface); +GreCreatePatternBrush(HBITMAP hbmPattern); PBRUSHGDI NTAPI GreCreateNullBrush();

15 years, 1 month

[tkreuzer] 42391: XLATEOBJ rewrite. The new XLATEOBJ is not allocated from paged pool anymore, but instead allocated on the stack and Initialized. Only when we habe more than a color table with more than 6 entries, we need to allocate an additional buffer. The new interface: EXLATEOBJ_vInitialize is the main init function. It takes a source and destination palette and back and fore colors for monochome surfaces. EXLATEOBJ_vInitXlateFromDCs takes the source and dest DC and is for color translatio

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Aug 4 22:37:10 2009 New Revision: 42391 URL: http://svn.reactos.org/svn/reactos?rev=42391&view=rev Log: XLATEOBJ rewrite. The new XLATEOBJ is not allocated from paged pool anymore, but instead allocated on the stack and Initialized. Only when we habe more than a color table with more than 6 entries, we need to allocate an additional buffer. The new interface: EXLATEOBJ_vInitialize is the main init function. It takes a source and destination palette and back and fore colors for monochome surfaces. EXLATEOBJ_vInitXlateFromDCs takes the source and dest DC and is for color translation between 2 surfaces represented by 2 DCs. EXLATEOBJ_vInitBrushXlate initializes an XLATEOBJ for a pattern brush. Finally EXLATEOBJ_vCleanup needs to be called when the XLATEOBJ is not needed anymore. Implement individual iXlate functions for certain cases and store a function pointer in the EXLATEOBJ structure for quick access. Change the usage of the PALETTE.Mode member to be a flag instead of an enum, add usage of PAL_MONOCHOME, PAL_RGB16_555 and PAL_RGB16_565. Add gpalMono, which *should* be used as palette for 1bpp DDBs. Currently there's a hack in the XLATEOBJ init code, to hack around the fact that this is missing. Fix the Hatch brush patterns, as they were inverted. Implement PALETTE_ulGetNearestBitFieldsIndex and PALETTE_ulGetNearestIndex. Get rid of the XLATEOBJ for the mouse pointer instead realize the pointer before usage. Get rid of logicalToSystem PALETTE member. NtGdiGetDIBitsInternal: Don't create a DIBBrush from the BITMAPINFO, when pvBits is NULL, as the function might be uninitualized. This fixes a crash of gdi_regtest. The whole function is quite ugly and needs to be rewritten (like probably the rest of the DIB code). This fixes the problem of artifacts in the selected desktop icons and some color problems. Added: trunk/reactos/subsystems/win32/win32k/include/xlateobj.h (with props) Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s trunk/reactos/subsystems/win32/win32k/eng/engbrush.c trunk/reactos/subsystems/win32/win32k/eng/mouse.c trunk/reactos/subsystems/win32/win32k/eng/xlate.c trunk/reactos/subsystems/win32/win32k/include/brush.h trunk/reactos/subsystems/win32/win32k/include/engobjects.h trunk/reactos/subsystems/win32/win32k/include/palette.h trunk/reactos/subsystems/win32/win32k/include/win32k.h trunk/reactos/subsystems/win32/win32k/misc/file.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/brush.c trunk/reactos/subsystems/win32/win32k/objects/dclife.c trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/objects/palette.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/include/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/engobjects.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/win32k.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Added: trunk/reactos/subsystems/win32/win32k/include/xlateobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/misc/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…

15 years, 1 month

[sginsberg] 42390: - Make kernel build again after __STDC__ change in 42369

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Aug 4 21:05:29 2009 New Revision: 42390 URL: http://svn.reactos.org/svn/reactos?rev=42390&view=rev Log: - Make kernel build again after __STDC__ change in 42369 Modified: trunk/reactos/ntoskrnl/cc/copy.c Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=423… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Tue Aug 4 21:05:29 2009 @@ -24,6 +24,7 @@ /* void * alloca(size_t size); */ #elif defined(_MSC_VER) void* _alloca(size_t size); +#define alloca _alloca #else #error Unknown compiler for alloca intrinsic stack allocation "function" #endif

15 years, 1 month

[cgutman] 42389: - Hardcode the return value of OID_GEN_HARDWARE_STATUS again due to media detection issues on certain pcnet adapters (such as vmware's emulated pcnet adapter)

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Aug 4 21:04:08 2009 New Revision: 42389 URL: http://svn.reactos.org/svn/reactos?rev=42389&view=rev Log: - Hardcode the return value of OID_GEN_HARDWARE_STATUS again due to media detection issues on certain pcnet adapters (such as vmware's emulated pcnet adapter) Modified: trunk/reactos/drivers/network/dd/pcnet/requests.c Modified: trunk/reactos/drivers/network/dd/pcnet/requests.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/r… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/requests.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/requests.c [iso-8859-1] Tue Aug 4 21:04:08 2009 @@ -139,7 +139,8 @@ case OID_GEN_HARDWARE_STATUS: { - GenericULONG = (ULONG)((Adapter->MediaState == NdisMediaStateConnected) ? NdisHardwareStatusReady : NdisHardwareStatusNotReady); + GenericULONG = (ULONG)NdisHardwareStatusReady; + /* ((Adapter->MediaState == NdisMediaStateConnected) ? NdisHardwareStatusReady : NdisHardwareStatusNotReady); */ break; }

15 years, 1 month

[dchapyshev] 42388: - Add "ReactOS Application Manager". This program is replacement "Download !" and appwiz.cpl.

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Aug 4 21:02:56 2009 New Revision: 42388 URL: http://svn.reactos.org/svn/reactos?rev=42388&view=rev Log: - Add "ReactOS Application Manager". This program is replacement "Download !" and appwiz.cpl. Added: trunk/reactos/base/applications/rapps/ (with props) trunk/reactos/base/applications/rapps/CreateCabFile.bat (with props) trunk/reactos/base/applications/rapps/README.RUS (with props) trunk/reactos/base/applications/rapps/aboutdlg.c (with props) trunk/reactos/base/applications/rapps/available.c (with props) trunk/reactos/base/applications/rapps/installdlg.c (with props) trunk/reactos/base/applications/rapps/installed.c (with props) trunk/reactos/base/applications/rapps/lang/ (with props) trunk/reactos/base/applications/rapps/lang/en-US.rc (with props) trunk/reactos/base/applications/rapps/listview.c (with props) trunk/reactos/base/applications/rapps/loaddlg.c (with props) trunk/reactos/base/applications/rapps/manifest.xml (with props) trunk/reactos/base/applications/rapps/misc.c (with props) trunk/reactos/base/applications/rapps/parser.c (with props) trunk/reactos/base/applications/rapps/rapps/ (with props) trunk/reactos/base/applications/rapps/rapps.h (with props) trunk/reactos/base/applications/rapps/rapps.rbuild (with props) trunk/reactos/base/applications/rapps/rapps.rc (with props) trunk/reactos/base/applications/rapps/rapps/abiword.txt (with props) trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt (with props) trunk/reactos/base/applications/rapps/rapps/audiograbber.txt (with props) trunk/reactos/base/applications/rapps/rapps/diablo2.txt (with props) trunk/reactos/base/applications/rapps/rapps/dosbox.txt (with props) trunk/reactos/base/applications/rapps/rapps/firefox2.txt (with props) trunk/reactos/base/applications/rapps/rapps/firefox3.txt (with props) trunk/reactos/base/applications/rapps/rapps/freebasic.txt (with props) trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt (with props) trunk/reactos/base/applications/rapps/rapps/irfanview.txt (with props) trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt (with props) trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt (with props) trunk/reactos/base/applications/rapps/rapps/lgeneral.txt (with props) trunk/reactos/base/applications/rapps/rapps/lmarbles.txt (with props) trunk/reactos/base/applications/rapps/rapps/mfc40.txt (with props) trunk/reactos/base/applications/rapps/rapps/mingw.txt (with props) trunk/reactos/base/applications/rapps/rapps/mirandaim.txt (with props) trunk/reactos/base/applications/rapps/rapps/mirc.txt (with props) trunk/reactos/base/applications/rapps/rapps/msxml3.txt (with props) trunk/reactos/base/applications/rapps/rapps/offbyone.txt (with props) trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt (with props) trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt (with props) trunk/reactos/base/applications/rapps/rapps/openttd.txt (with props) trunk/reactos/base/applications/rapps/rapps/opera.txt (with props) trunk/reactos/base/applications/rapps/rapps/putty.txt (with props) trunk/reactos/base/applications/rapps/rapps/rosbe.txt (with props) trunk/reactos/base/applications/rapps/rapps/sambatng.txt (with props) trunk/reactos/base/applications/rapps/rapps/scummvm.txt (with props) trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt (with props) trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt (with props) trunk/reactos/base/applications/rapps/rapps/seamonkey.txt (with props) trunk/reactos/base/applications/rapps/rapps/smplayer.txt (with props) trunk/reactos/base/applications/rapps/rapps/thunderbird.txt (with props) trunk/reactos/base/applications/rapps/rapps/tileworld.txt (with props) trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt (with props) trunk/reactos/base/applications/rapps/rapps/utorrent.txt (with props) trunk/reactos/base/applications/rapps/rapps/vb5run.txt (with props) trunk/reactos/base/applications/rapps/rapps/vb6run.txt (with props) trunk/reactos/base/applications/rapps/rapps/vc2005run.txt (with props) trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt (with props) trunk/reactos/base/applications/rapps/rapps/vc2008run.txt (with props) trunk/reactos/base/applications/rapps/rapps/vc6run.txt (with props) trunk/reactos/base/applications/rapps/rapps/winboard.txt (with props) trunk/reactos/base/applications/rapps/res/ (with props) trunk/reactos/base/applications/rapps/res/apps.ico (with props) trunk/reactos/base/applications/rapps/res/appupd.ico (with props) trunk/reactos/base/applications/rapps/res/cat.ico (with props) trunk/reactos/base/applications/rapps/res/cats/ (with props) trunk/reactos/base/applications/rapps/res/cats/audio.ico (with props) trunk/reactos/base/applications/rapps/res/cats/devel.ico (with props) trunk/reactos/base/applications/rapps/res/cats/drivers.ico (with props) trunk/reactos/base/applications/rapps/res/cats/edu.ico (with props) trunk/reactos/base/applications/rapps/res/cats/engineer.ico (with props) trunk/reactos/base/applications/rapps/res/cats/finance.ico (with props) trunk/reactos/base/applications/rapps/res/cats/games.ico (with props) trunk/reactos/base/applications/rapps/res/cats/graphics.ico (with props) trunk/reactos/base/applications/rapps/res/cats/internet.ico (with props) trunk/reactos/base/applications/rapps/res/cats/libs.ico (with props) trunk/reactos/base/applications/rapps/res/cats/office.ico (with props) trunk/reactos/base/applications/rapps/res/cats/other.ico (with props) trunk/reactos/base/applications/rapps/res/cats/science.ico (with props) trunk/reactos/base/applications/rapps/res/cats/tools.ico (with props) trunk/reactos/base/applications/rapps/res/cats/video.ico (with props) trunk/reactos/base/applications/rapps/res/exit.ico (with props) trunk/reactos/base/applications/rapps/res/install.ico (with props) trunk/reactos/base/applications/rapps/res/main.ico (with props) trunk/reactos/base/applications/rapps/res/modify.ico (with props) trunk/reactos/base/applications/rapps/res/refresh.ico (with props) trunk/reactos/base/applications/rapps/res/settings.ico (with props) trunk/reactos/base/applications/rapps/res/uninstall.ico (with props) trunk/reactos/base/applications/rapps/resource.h (with props) trunk/reactos/base/applications/rapps/richedit.c (with props) trunk/reactos/base/applications/rapps/rsrc.rc (with props) trunk/reactos/base/applications/rapps/settingsdlg.c (with props) trunk/reactos/base/applications/rapps/splitter.c (with props) trunk/reactos/base/applications/rapps/statusbar.c (with props) trunk/reactos/base/applications/rapps/toolbar.c (with props) trunk/reactos/base/applications/rapps/treeview.c (with props) trunk/reactos/base/applications/rapps/winmain.c (with props) Modified: trunk/reactos/base/applications/applications.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… Added: trunk/reactos/base/applications/rapps/CreateCabFile.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/Cr… Added: trunk/reactos/base/applications/rapps/README.RUS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/RE… Added: trunk/reactos/base/applications/rapps/aboutdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ab… Added: trunk/reactos/base/applications/rapps/available.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/av… Added: trunk/reactos/base/applications/rapps/installdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/in… Added: trunk/reactos/base/applications/rapps/installed.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/in… Added: trunk/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Added: trunk/reactos/base/applications/rapps/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/li… Added: trunk/reactos/base/applications/rapps/loaddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo… Added: trunk/reactos/base/applications/rapps/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ma… Added: trunk/reactos/base/applications/rapps/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/mi… Added: trunk/reactos/base/applications/rapps/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/pa… Added: trunk/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/abiword.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/audiograbber.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/diablo2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/dosbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/firefox2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/lgeneral.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/lmarbles.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/mfc40.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/mingw.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/msxml3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/offbyone.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/sambatng.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/tileworld.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/vb5run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/vb6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/vc2005run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/vc2008run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/vc6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/res/apps.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/appupd.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cat.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/audio.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/devel.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/drivers.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/edu.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/engineer.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/finance.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/games.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/graphics.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/internet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/libs.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/office.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/other.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/science.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/tools.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/video.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/exit.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/install.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/main.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/modify.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/refresh.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/settings.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/uninstall.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/richedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ri… Added: trunk/reactos/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rs… Added: trunk/reactos/base/applications/rapps/settingsdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/se… Added: trunk/reactos/base/applications/rapps/splitter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/sp… Added: trunk/reactos/base/applications/rapps/statusbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/st… Added: trunk/reactos/base/applications/rapps/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/to… Added: trunk/reactos/base/applications/rapps/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/tr… Added: trunk/reactos/base/applications/rapps/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi…

15 years, 1 month

[cgutman] 42387: - Finally get IRP_MJ_CLOSE working properly - Remove handling of IRP_MJ_CLEANUP and move the code to the DispatchClose routine - Remove the hack (holding an extra reference and not closing the handle) which hid these bugs - Fixes some memory and handle leaks too

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Aug 4 20:56:56 2009 New Revision: 42387 URL: http://svn.reactos.org/svn/reactos?rev=42387&view=rev Log: - Finally get IRP_MJ_CLOSE working properly - Remove handling of IRP_MJ_CLEANUP and move the code to the DispatchClose routine - Remove the hack (holding an extra reference and not closing the handle) which hid these bugs - Fixes some memory and handle leaks too Modified: trunk/reactos/drivers/network/afd/afd/bind.c trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/tdi.c trunk/reactos/drivers/network/tcpip/include/fileobjs.h trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c trunk/reactos/drivers/network/tcpip/tcpip/main.c Modified: trunk/reactos/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/bi… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] Tue Aug 4 20:56:56 2009 @@ -32,11 +32,6 @@ FCB->LocalAddress, &FCB->AddressFile.Handle, &FCB->AddressFile.Object ); - - if (NT_SUCCESS(Status)) - { - ObReferenceObject(FCB->AddressFile.Object); - } AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); 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 Aug 4 20:56:56 2009 @@ -29,11 +29,6 @@ FCB->Connection.Object ); } - if (NT_SUCCESS(Status)) - { - ObReferenceObject(FCB->Connection.Object); - } - return Status; } 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 Aug 4 20:56:56 2009 @@ -96,6 +96,8 @@ FCB->DeviceExt = DeviceExt; FCB->Recv.Size = DEFAULT_RECEIVE_WINDOW_SIZE; FCB->Send.Size = DEFAULT_SEND_WINDOW_SIZE; + FCB->AddressFile.Handle = INVALID_HANDLE_VALUE; + FCB->Connection.Handle = INVALID_HANDLE_VALUE; KeInitializeSpinLock( &FCB->SpinLock ); ExInitializeFastMutex( &FCB->Mutex ); @@ -167,13 +169,19 @@ return Status; } -VOID CleanupSocket( PAFD_FCB FCB ) { +static NTSTATUS NTAPI +AfdCloseSocket(PDEVICE_OBJECT DeviceObject, PIRP Irp, + PIO_STACK_LOCATION IrpSp) +{ + PFILE_OBJECT FileObject = IrpSp->FileObject; + PAFD_FCB FCB = FileObject->FsContext; UINT i; PAFD_IN_FLIGHT_REQUEST InFlightRequest[IN_FLIGHT_REQUESTS]; - AFD_DbgPrint(MIN_TRACE,("Called (%x)\n", FCB)); - - if( !SocketAcquireStateLock( FCB ) ) return; + AFD_DbgPrint(MID_TRACE, + ("AfdClose(DeviceObject %p Irp %p)\n", DeviceObject, Irp)); + + if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; FCB->State = SOCKET_STATE_CLOSED; @@ -191,104 +199,53 @@ } } - FCB->State = SOCKET_STATE_CREATED; - - if( FCB->EventSelect ) { + KillSelectsForFCB( FCB->DeviceExt, FileObject, FALSE ); + + SocketStateUnlock( FCB ); + + if( FCB->EventSelect ) ObDereferenceObject( FCB->EventSelect ); - FCB->EventSelect = NULL; - } - if( FCB->Context ) { + + if( FCB->Context ) ExFreePool( FCB->Context ); - FCB->Context = NULL; - } - if( FCB->Recv.Window ) { + + if( FCB->Recv.Window ) ExFreePool( FCB->Recv.Window ); - FCB->Recv.Window = NULL; - } - if( FCB->Send.Window ) { + + if( FCB->Send.Window ) ExFreePool( FCB->Send.Window ); - FCB->Send.Window = NULL; - } - if( FCB->AddressFrom ) { + + if( FCB->AddressFrom ) ExFreePool( FCB->AddressFrom ); - FCB->AddressFrom = NULL; - } - if( FCB->LocalAddress ) { + + if( FCB->LocalAddress ) ExFreePool( FCB->LocalAddress ); - FCB->LocalAddress = NULL; - } - if( FCB->RemoteAddress ) { + + if( FCB->RemoteAddress ) ExFreePool( FCB->RemoteAddress ); - FCB->RemoteAddress = NULL; - } - if( FCB->Connection.Object ) { - ZwClose(FCB->Connection.Handle); + + if( FCB->Connection.Object ) ObDereferenceObject(FCB->Connection.Object); - FCB->Connection.Object = NULL; - } - if( FCB->AddressFile.Object ) { - ZwClose(FCB->AddressFile.Handle); + + if( FCB->AddressFile.Object ) ObDereferenceObject(FCB->AddressFile.Object); - FCB->AddressFile.Object = NULL; - } - - SocketStateUnlock( FCB ); -} - -VOID DestroySocket( PAFD_FCB FCB ) { + + if( FCB->AddressFile.Handle != INVALID_HANDLE_VALUE ) + ZwClose(FCB->AddressFile.Handle); + + if( FCB->Connection.Handle != INVALID_HANDLE_VALUE ) + ZwClose(FCB->Connection.Handle); + if( FCB->TdiDeviceName.Buffer ) ExFreePool(FCB->TdiDeviceName.Buffer); ExFreePool(FCB); - AFD_DbgPrint(MIN_TRACE,("Deleted (%x)\n", FCB)); -} - -static NTSTATUS NTAPI -AfdCloseSocket(PDEVICE_OBJECT DeviceObject, PIRP Irp, - PIO_STACK_LOCATION IrpSp) -{ - PFILE_OBJECT FileObject = IrpSp->FileObject; - PAFD_FCB FCB = FileObject->FsContext; - - AFD_DbgPrint(MID_TRACE, - ("AfdClose(DeviceObject %p Irp %p)\n", DeviceObject, Irp)); - - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - - AFD_DbgPrint(MID_TRACE,("FCB %x\n", FCB)); - - FileObject->FsContext = NULL; - SocketStateUnlock( FCB ); - - DestroySocket( FCB ); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); AFD_DbgPrint(MID_TRACE, ("Returning success.\n")); - - return STATUS_SUCCESS; -} - -static NTSTATUS NTAPI -AfdCleanupSocket(PDEVICE_OBJECT DeviceObject, PIRP Irp, - PIO_STACK_LOCATION IrpSp) -{ - PFILE_OBJECT FileObject = IrpSp->FileObject; - PAFD_FCB FCB = FileObject->FsContext; - - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - - CleanupSocket( FCB ); - - KillSelectsForFCB( FCB->DeviceExt, FileObject, FALSE ); - - SocketStateUnlock( FCB ); - - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); return STATUS_SUCCESS; } @@ -373,9 +330,6 @@ /* Ditto the borrowing */ return AfdCloseSocket(DeviceObject, Irp, IrpSp); - case IRP_MJ_CLEANUP: - return AfdCleanupSocket(DeviceObject, Irp, IrpSp); - /* write data */ case IRP_MJ_WRITE: return AfdConnectedSocketWriteData( DeviceObject, Irp, IrpSp, TRUE ); @@ -550,7 +504,6 @@ /* register driver routines */ DriverObject->MajorFunction[IRP_MJ_CLOSE] = AfdDispatch; DriverObject->MajorFunction[IRP_MJ_CREATE] = AfdDispatch; - DriverObject->MajorFunction[IRP_MJ_CLEANUP] = AfdDispatch; DriverObject->MajorFunction[IRP_MJ_WRITE] = AfdDispatch; DriverObject->MajorFunction[IRP_MJ_READ] = AfdDispatch; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = AfdDispatch; 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 Aug 4 20:56:56 2009 @@ -146,13 +146,12 @@ } if (!NT_SUCCESS(Status)) { - *Handle = NULL; + *Handle = INVALID_HANDLE_VALUE; *Object = NULL; } return Status; } - NTSTATUS TdiOpenAddressFile( PUNICODE_STRING DeviceName, Modified: trunk/reactos/drivers/network/tcpip/include/fileobjs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/fileobjs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/fileobjs.h [iso-8859-1] Tue Aug 4 20:56:56 2009 @@ -23,9 +23,6 @@ NTSTATUS FileCloseAddress( PTDI_REQUEST Request); -NTSTATUS FileFreeAddress( - PTDI_REQUEST Request); - NTSTATUS FileOpenConnection( PTDI_REQUEST Request, PVOID ClientContext); @@ -35,13 +32,10 @@ NTSTATUS FileCloseConnection( PTDI_REQUEST Request); -NTSTATUS FileFreeConnection( - PTDI_REQUEST Request); - NTSTATUS FileOpenControlChannel( PTDI_REQUEST Request); -NTSTATUS FileFreeControlChannel( +NTSTATUS FileCloseControlChannel( PTDI_REQUEST Request); #endif /* __FILEOBJS_H */ Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Tue Aug 4 20:56:56 2009 @@ -284,17 +284,21 @@ NTSTATUS FileCloseAddress( PTDI_REQUEST Request) { - KIRQL OldIrql; PADDRESS_FILE AddrFile; NTSTATUS Status = STATUS_SUCCESS; + KIRQL OldIrql; + PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; PDATAGRAM_SEND_REQUEST SendRequest; - PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; - PLIST_ENTRY CurrentEntry; - PLIST_ENTRY NextEntry; + PLIST_ENTRY CurrentEntry, NextEntry; + + AddrFile = Request->Handle.AddressHandle; TI_DbgPrint(MID_TRACE, ("Called.\n")); - AddrFile = Request->Handle.AddressHandle; + /* Remove address file from the global list */ + TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); + RemoveEntryList(&AddrFile->ListEntry); + TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); @@ -311,7 +315,7 @@ ReceiveRequest = CONTAINING_RECORD(CurrentEntry, DATAGRAM_RECEIVE_REQUEST, ListEntry); /* Abort the request and free its resources */ TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); - (*ReceiveRequest->Complete)(ReceiveRequest->Context, STATUS_ADDRESS_CLOSED, 0); + (*ReceiveRequest->Complete)(ReceiveRequest->Context, STATUS_CANCELLED, 0); TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); CurrentEntry = NextEntry; } @@ -326,42 +330,13 @@ DATAGRAM_SEND_REQUEST, ListEntry); /* Abort the request and free its resources */ TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); - (*SendRequest->Complete)(SendRequest->Context, STATUS_ADDRESS_CLOSED, 0); + (*SendRequest->Complete)(SendRequest->Context, STATUS_CANCELLED, 0); exFreePool(SendRequest); TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); CurrentEntry = NextEntry; } TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); - - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - - return Status; -} - - -/* - * FUNCTION: Closes an address file object - * ARGUMENTS: - * Request = Pointer to TDI request structure for this request - * RETURNS: - * Status of operation - */ -NTSTATUS FileFreeAddress( - PTDI_REQUEST Request) -{ - PADDRESS_FILE AddrFile; - NTSTATUS Status = STATUS_SUCCESS; - KIRQL OldIrql; - - AddrFile = Request->Handle.AddressHandle; - - TI_DbgPrint(MID_TRACE, ("Called.\n")); - - /* Remove address file from the global list */ - TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); - RemoveEntryList(&AddrFile->ListEntry); - TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); /* Protocol specific handling */ switch (AddrFile->Protocol) { @@ -474,42 +449,20 @@ PTDI_REQUEST Request) { PCONNECTION_ENDPOINT Connection; + KIRQL OldIrql; TI_DbgPrint(MID_TRACE, ("Called.\n")); Connection = Request->Handle.ConnectionContext; + + TcpipAcquireSpinLock(&ConnectionEndpointListLock, &OldIrql); + RemoveEntryList(&Connection->ListEntry); + TcpipReleaseSpinLock(&ConnectionEndpointListLock, OldIrql); TcpipRecursiveMutexEnter( &TCPLock, TRUE ); TCPClose( Connection ); TcpipRecursiveMutexLeave( &TCPLock ); - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - - return STATUS_SUCCESS; -} - - -/* - * FUNCTION: Frees an connection file object - * ARGUMENTS: - * Request = Pointer to TDI request structure for this request - * RETURNS: - * Status of operation - */ -NTSTATUS FileFreeConnection( - PTDI_REQUEST Request) -{ - KIRQL OldIrql; - PCONNECTION_ENDPOINT Connection; - - TI_DbgPrint(MID_TRACE, ("Called.\n")); - - Connection = Request->Handle.ConnectionContext; - - TcpipAcquireSpinLock(&ConnectionEndpointListLock, &OldIrql); - RemoveEntryList(&Connection->ListEntry); - TcpipReleaseSpinLock(&ConnectionEndpointListLock, OldIrql); - TCPFreeConnectionEndpoint(Connection); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); @@ -565,7 +518,7 @@ * RETURNS: * Status of operation */ -NTSTATUS FileFreeControlChannel( +NTSTATUS FileCloseControlChannel( PTDI_REQUEST Request) { PCONTROL_CHANNEL ControlChannel = Request->Handle.ControlChannel; Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Tue Aug 4 20:56:56 2009 @@ -252,74 +252,6 @@ return Status; } -/* - * FUNCTION: Prepares a file object for close - * ARGUMENTS: - * DeviceObject = Pointer to a device object for this driver - * Irp = Pointer to a I/O request packet - * RETURNS: - * Status of the operation - * NOTES: - * This function does not pend - */ -NTSTATUS TiCleanupFileObject( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - PIO_STACK_LOCATION IrpSp; - PTRANSPORT_CONTEXT Context; - TDI_REQUEST Request; - NTSTATUS Status; - KIRQL OldIrql; - - IrpSp = IoGetCurrentIrpStackLocation(Irp); - Context = IrpSp->FileObject->FsContext; - if (!Context) { - TI_DbgPrint(MIN_TRACE, ("Parameters are invalid.\n")); - return STATUS_INVALID_PARAMETER; - } - - IoAcquireCancelSpinLock(&OldIrql); - - Context->CancelIrps = TRUE; - - IoReleaseCancelSpinLock(OldIrql); - - switch ((ULONG_PTR)IrpSp->FileObject->FsContext2) { - case TDI_TRANSPORT_ADDRESS_FILE: - Request.Handle.AddressHandle = Context->Handle.AddressHandle; - Status = FileCloseAddress(&Request); - break; - - case TDI_CONNECTION_FILE: - Request.Handle.ConnectionContext = Context->Handle.ConnectionContext; - Status = FileCloseConnection(&Request); - break; - - case TDI_CONTROL_CHANNEL_FILE: - Request.Handle.ControlChannel = Context->Handle.ControlChannel; - /* Nothing to do to close */ - Status = STATUS_SUCCESS; - break; - - default: - /* This should never happen */ - - TI_DbgPrint(MIN_TRACE, ("Unknown transport context.\n")); - - IoAcquireCancelSpinLock(&OldIrql); - Context->CancelIrps = FALSE; - IoReleaseCancelSpinLock(OldIrql); - - Status = STATUS_INVALID_PARAMETER; - - } - - Irp->IoStatus.Status = Status; - - return Irp->IoStatus.Status; -} - /* * FUNCTION: Releases resources used by a file object @@ -339,7 +271,6 @@ PTRANSPORT_CONTEXT Context; TDI_REQUEST Request; NTSTATUS Status; - KIRQL OldIrql; IrpSp = IoGetCurrentIrpStackLocation(Irp); Context = IrpSp->FileObject->FsContext; @@ -348,39 +279,26 @@ return STATUS_INVALID_PARAMETER; } - IoAcquireCancelSpinLock(&OldIrql); - - Context->CancelIrps = TRUE; - - IoReleaseCancelSpinLock(OldIrql); - switch ((ULONG_PTR)IrpSp->FileObject->FsContext2) { case TDI_TRANSPORT_ADDRESS_FILE: Request.Handle.AddressHandle = Context->Handle.AddressHandle; - Status = FileFreeAddress(&Request); + Status = FileCloseAddress(&Request); break; case TDI_CONNECTION_FILE: Request.Handle.ConnectionContext = Context->Handle.ConnectionContext; - Status = FileFreeConnection(&Request); + Status = FileCloseConnection(&Request); break; case TDI_CONTROL_CHANNEL_FILE: Request.Handle.ControlChannel = Context->Handle.ControlChannel; - Status = FileFreeControlChannel(&Request); + Status = FileCloseControlChannel(&Request); break; default: - /* This should never happen */ - - TI_DbgPrint(MIN_TRACE, ("Unknown transport context.\n")); - - IoAcquireCancelSpinLock(&OldIrql); - Context->CancelIrps = FALSE; - IoReleaseCancelSpinLock(OldIrql); - + DbgPrint("Unknown type %d\n", (ULONG_PTR)IrpSp->FileObject->FsContext2); Status = STATUS_INVALID_PARAMETER; - + break; } Irp->IoStatus.Status = Status; @@ -422,12 +340,6 @@ case IRP_MJ_CLOSE: Context = (PTRANSPORT_CONTEXT)IrpSp->FileObject->FsContext; Status = TiCloseFileObject(DeviceObject, Irp); - break; - - /* Release resources bound to an address file, connection endpoint, - or control connection */ - case IRP_MJ_CLEANUP: - Status = TiCleanupFileObject(DeviceObject, Irp); break; default: @@ -912,7 +824,6 @@ /* Initialize the driver object with this driver's entry points */ DriverObject->MajorFunction[IRP_MJ_CREATE] = TiDispatchOpenClose; DriverObject->MajorFunction[IRP_MJ_CLOSE] = TiDispatchOpenClose; - DriverObject->MajorFunction[IRP_MJ_CLEANUP] = TiDispatchOpenClose; DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = TiDispatchInternal; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = TiDispatch;

15 years, 1 month

[sginsberg] 42386: - Follow up to 41644: Get rid of the Wine headers using include_next as the definitions are now in the PSDK, wrapped under _WINE. Also define _WINE for the modules using those types. - Move MCI_OPEN_DRIVER and MCI_CLOSE_DRIVER to mmddk.h as this is where they belong. Also move them out of the _WINE guard as those defines are present in the official headers. - Add GetDriverFlags to mmsystem.h (missed this one in 41644). - Most Wine code now compiles fine in MSVC. - Wrap include

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Aug 4 20:34:06 2009 New Revision: 42386 URL: http://svn.reactos.org/svn/reactos?rev=42386&view=rev Log: - Follow up to 41644: Get rid of the Wine headers using include_next as the definitions are now in the PSDK, wrapped under _WINE. Also define _WINE for the modules using those types. - Move MCI_OPEN_DRIVER and MCI_CLOSE_DRIVER to mmddk.h as this is where they belong. Also move them out of the _WINE guard as those defines are present in the official headers. - Add GetDriverFlags to mmsystem.h (missed this one in 41644). - Most Wine code now compiles fine in MSVC. - Wrap include_next in crt/float.h under a __GNUC__ guard -- not quite correct as the included float.h defines some stuff that should be in the "real" float.h. - winnt.h: Remove duplicated LANG* defines that are already defined there and present in the official headers. Remove the _WINE guard from the rest as we may want to provide translations for those languages too. Removed: trunk/reactos/include/reactos/wine/dlgs.h trunk/reactos/include/reactos/wine/mmddk.h trunk/reactos/include/reactos/wine/mmsystem.h trunk/reactos/include/reactos/wine/prsht.h trunk/reactos/include/reactos/wine/sys/ trunk/reactos/include/reactos/wine/winbase.h trunk/reactos/include/reactos/wine/windef.h trunk/reactos/include/reactos/wine/winnetwk.h trunk/reactos/include/reactos/wine/winnls.h trunk/reactos/include/reactos/wine/winnt.h trunk/reactos/include/reactos/wine/winspool.h trunk/reactos/include/reactos/wine/winuser.h Modified: trunk/reactos/dll/directx/dsound/dsound.rbuild trunk/reactos/dll/win32/comctl32/comctl32.rbuild trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild trunk/reactos/dll/win32/cryptui/cryptui.rbuild trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild trunk/reactos/dll/win32/mciwave/mciwave.rbuild trunk/reactos/dll/win32/mpr/mpr.rbuild trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild trunk/reactos/dll/win32/msxml3/msxml3.rbuild trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/wininet/wininet.rbuild trunk/reactos/dll/win32/winmm/winmm.rbuild trunk/reactos/include/crt/float.h trunk/reactos/include/psdk/mmddk.h trunk/reactos/include/psdk/mmsystem.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/reactos/wine/config.h trunk/reactos/include/reactos/wine/port.h trunk/reactos/include/reactos/wine/winbase16.h Modified: trunk/reactos/dll/directx/dsound/dsound.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound.… ============================================================================== --- trunk/reactos/dll/directx/dsound/dsound.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound/dsound.rbuild [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -5,6 +5,7 @@ <importlibrary definition="dsound.spec" /> <include base="dsound">.</include> <include base="ReactOS">include/reactos/wine</include> + <define name="_WINE" /> <library>wine</library> <library>uuid</library> <library>ntdll</library> Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.rbuild [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -7,6 +7,7 @@ <include base="comctl32">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="_WINE" /> <file>animate.c</file> <file>comboex.c</file> <file>comctl32undoc.c</file> Modified: trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/comdlg3… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -6,6 +6,7 @@ <include base="comdlg32">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="_WINE" /> <file>cdlg32.c</file> <file>colordlg.c</file> <file>filedlg.c</file> Modified: trunk/reactos/dll/win32/cryptui/cryptui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui.rbuild [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -7,6 +7,7 @@ <include base="cryptui">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="_WINE" /> <file>main.c</file> <file>cryptui.rc</file> <file>cryptui_De.rc</file> Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -6,6 +6,7 @@ <include base="dbghelp">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="_WINE" /> <define name="HAVE_REGEX_H" /> <file>coff.c</file> <file>dbghelp.c</file> Modified: trunk/reactos/dll/win32/mciwave/mciwave.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciwave/mciwave.… ============================================================================== --- trunk/reactos/dll/win32/mciwave/mciwave.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciwave/mciwave.rbuild [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -3,6 +3,7 @@ <include base="mciwave">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="_WINE" /> <file>mciwave.c</file> <library>wine</library> <library>winmm</library> Modified: trunk/reactos/dll/win32/mpr/mpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr.rbuild [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -6,6 +6,7 @@ <include base="mpr">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="_WINE" /> <file>auth.c</file> <file>mpr_main.c</file> <file>multinet.c</file> Modified: trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32.… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -6,6 +6,7 @@ <include base="msvfw32">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="_WINE" /> <file>mciwnd.c</file> <file>msvideo_main.c</file> <file>drawdib.c</file> Modified: trunk/reactos/dll/win32/msxml3/msxml3.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3.rb… ============================================================================== --- trunk/reactos/dll/win32/msxml3/msxml3.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/msxml3.rbuild [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -7,6 +7,7 @@ <include base="msxml3" root="intermediate">.</include> <dependency>msxml3_v1</dependency> <define name="__WINESRC__" /> + <define name="_WINE" /> <redefine name="_WIN32_WINNT">0x601</redefine> <define name="LIBXML_STATIC" /> <library>libxml2</library> Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -7,6 +7,7 @@ <include base="ReactOS">include/reactos/wine</include> <define name="_SHELL32_" /> <define name="COM_NO_WINDOWS_H" /> + <define name="_WINE" /> <redefine name="_WIN32_WINNT">0x600</redefine> <library>wine</library> <library>uuid</library> Modified: trunk/reactos/dll/win32/wininet/wininet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet.rbuild [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -7,6 +7,7 @@ <include base="wininet">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="_WINE" /> <library>wine</library> <library>mpr</library> <library>shlwapi</library> Modified: trunk/reactos/dll/win32/winmm/winmm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm.rbui… ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winmm.rbuild [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -8,6 +8,7 @@ <importlibrary definition="winmm.spec" /> <include base="winmm">.</include> <include base="ReactOS">include/reactos/wine</include> + <define name="_WINE" /> <library>wine</library> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/float.h?rev=42… ============================================================================== --- trunk/reactos/include/crt/float.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/float.h [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -16,7 +16,9 @@ * */ +#ifdef __GNUC__ #include_next<float.h> +#endif #ifndef _MINGW_FLOAT_H_ #define _MINGW_FLOAT_H_ Modified: trunk/reactos/include/psdk/mmddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmddk.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/mmddk.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mmddk.h [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -91,7 +91,7 @@ #define DRV_QUERYSTRINGID (DRV_RESERVED + 14) #define DRV_QUERYSTRINGIDSIZE (DRV_RESERVED + 15) #define DRV_QUERYIDFROMSTRINGID (DRV_RESERVED + 16) -#ifdef __WINESRC__ +#ifdef _WINE #define DRV_QUERYDSOUNDIFACE (DRV_RESERVED + 20) #define DRV_QUERYDSOUNDDESC (DRV_RESERVED + 21) #define DRV_QUERYDSOUNDGUID (DRV_RESERVED + 22) @@ -330,6 +330,9 @@ #define MCI_MAX_DEVICE_TYPE_LENGTH 80 +#define MCI_OPEN_DRIVER 0x0801 +#define MCI_CLOSE_DRIVER 0x0802 + #define MCI_FALSE (MCI_STRING_OFFSET + 19) #define MCI_TRUE (MCI_STRING_OFFSET + 20) Modified: trunk/reactos/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmsystem.h?re… ============================================================================== --- trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -911,8 +911,6 @@ #define MCI_OVLY_WHERE_FRAME 0x80000 #define MCI_OVLY_WHERE_VIDEO 0x100000 #ifdef _WINE -#define MCI_OPEN_DRIVER 0x0801 -#define MCI_CLOSE_DRIVER 0x0802 #define MCI_SOUND 0x0812 #define MCI_SOUND_NAME 0x00000100L #endif @@ -1883,6 +1881,10 @@ BOOL WINAPI mciSetYieldProc(MCIDEVICEID,YIELDPROC,DWORD); HTASK WINAPI mciGetCreatorTask(MCIDEVICEID); YIELDPROC WINAPI mciGetYieldProc(MCIDEVICEID,PDWORD); + +#ifdef _WINE +DWORD WINAPI GetDriverFlags(HDRVR hDriver); +#endif typedef struct tagMCI_SEQ_SET_PARMS { DWORD dwCallback; Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -884,25 +884,17 @@ #define LANG_YORUBA 0x6a #define LANG_ZULU 0x35 -#ifdef _WINE +/* FIXME: non-standard */ #define LANG_ESPERANTO 0x8f #define LANG_WALON 0x90 #define LANG_CORNISH 0x91 +/* FIXME: not present in the official headers */ #define LANG_GAELIC 0x94 -#define LANG_MALTESE 0x3a -#define LANG_ROMANSH 0x17 #define LANG_SAAMI 0x3b -#define LANG_LOWER_SORBIAN 0x2e -#define LANG_UPPER_SORBIAN 0x2e #define LANG_SUTU 0x30 -#define LANG_TAJIK 0x28 #define LANG_TSONGA 0x31 -#define LANG_TSWANA 0x32 #define LANG_VENDA 0x33 -#define LANG_XHOSA 0x34 -#define LANG_ZULU 0x35 -#endif #define SUBLANG_CUSTOM_UNSPECIFIED 0x04 #define SUBLANG_CUSTOM_DEFAULT 0x03 Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… ============================================================================== --- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -443,9 +443,7 @@ #define HAVE_PCLOSE 1 /* Define to 1 if the system has the type `pid_t'. */ -#if !defined(_MSC_VER) #define HAVE_PID_T 1 -#endif /* Define to 1 if you have the <poll.h> header file. */ /* #undef HAVE_POLL_H */ Removed: trunk/reactos/include/reactos/wine/dlgs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/dlgs.… ============================================================================== --- trunk/reactos/include/reactos/wine/dlgs.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/dlgs.h (removed) @@ -1,20 +1,0 @@ -/* - * Compatibility header - * - * This header is wrapper to allow compilation of Wine DLLs under ReactOS - * build system. It contains definitions commonly refered to as Wineisms - * and definitions that are missing in w32api. - */ - -#ifndef __WINE_DLGS_H -#define __WINE_DLGS_H - -#define OFN_DONTADDTORECENT 0x02000000 -#define OFN_ENABLEINCLUDENOTIFY 0x00400000 -#define NEWFILEOPENORD 1547 - -#if !defined (_MSC_VER) -#include_next <dlgs.h> -#endif - -#endif /* __WINE_DLGS_H */ Removed: trunk/reactos/include/reactos/wine/mmddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/mmddk… ============================================================================== --- trunk/reactos/include/reactos/wine/mmddk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/mmddk.h (removed) @@ -1,18 +1,0 @@ -/* $Id $ - * - * Compatibility header - * - * This header is wrapper to allow compilation of Wine DLLs under ReactOS - * build system. It contains definitions commonly refered to as Wineisms - * and definitions that are missing in w32api. - */ - -#include_next <mmddk.h> - -#ifndef __WINE_MMDDK_H -#define __WINE_MMDDK_H - -#define DRV_QUERYDSOUNDIFACE (DRV_RESERVED + 20) -#define DRV_QUERYDSOUNDDESC (DRV_RESERVED + 21) - -#endif /* __WINE_MMDDK_H */ Removed: trunk/reactos/include/reactos/wine/mmsystem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/mmsys… ============================================================================== --- trunk/reactos/include/reactos/wine/mmsystem.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/mmsystem.h (removed) @@ -1,64 +1,0 @@ -/* - * MMSYSTEM - Multimedia Wine Extension ... :-) - * - * Copyright (C) the Wine project - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __WINE_MMSYSTEM_H -#define __WINE_MMSYSTEM_H - -#include_next <mmsystem.h> - -#define DRV_SUCCESS 0x0001 -#define DRV_FAILURE 0x0000 -#define DRV_EXITAPPLICATION 0x000C - -#define MAXWAVEDRIVERS 10 -#define MAXMIDIDRIVERS 10 -#define MAXAUXDRIVERS 10 -#define MAXMCIDRIVERS 32 -#define MAXMIXERDRIVERS 10 - -#define MCI_OPEN_DRIVER 0x0801 -#define MCI_CLOSE_DRIVER 0x0802 -#define MCI_SOUND 0x0812 - -#define MCI_SOUND_NAME 0x00000100L - -typedef LPCSTR HPCSTR; /* a huge version of LPCSTR */ - -typedef struct tagMCI_SOUND_PARMSA { - DWORD_PTR dwCallback; - LPCSTR lpstrSoundName; -} MCI_SOUND_PARMSA, *LPMCI_SOUND_PARMSA; - -typedef struct tagMCI_SOUND_PARMSW { - DWORD_PTR dwCallback; - LPCWSTR lpstrSoundName; -} MCI_SOUND_PARMSW, *LPMCI_SOUND_PARMSW; - -#ifdef UNICODE -typedef MCI_SOUND_PARMSW MCI_SOUND_PARMS; -#else -typedef MCI_SOUND_PARMSA MCI_SOUND_PARMS; -#endif - -typedef struct midievent_tag *LPMIDIEVENT; - -DWORD WINAPI GetDriverFlags(HDRVR hDriver); - -#endif /* __WINE_WINNT_H */ Modified: trunk/reactos/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/port.… ============================================================================== --- trunk/reactos/include/reactos/wine/port.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/port.h [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -242,10 +242,6 @@ size_t getpagesize(void); #endif /* HAVE_GETPAGESIZE */ -#ifndef HAVE_GETTID -pid_t gettid(void); -#endif /* HAVE_GETTID */ - #ifndef HAVE_LSTAT int lstat(const char *file_name, struct stat *buf); #endif /* HAVE_LSTAT */ Removed: trunk/reactos/include/reactos/wine/prsht.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/prsht… ============================================================================== --- trunk/reactos/include/reactos/wine/prsht.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/prsht.h (removed) @@ -1,27 +1,0 @@ -/* - * Copyright (C) the Wine project - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include_next <prsht.h> - -#ifndef __WINE_PRSHT_H -#define __WINE_PRSHT_H - -#define PSH_WIZARD97_OLD 0x00002000 /* for IE < 5 */ -#define PSH_WIZARD97_NEW 0x01000000 /* for IE >= 5 */ - -#endif /* __WINE_PRSHT_H */ Removed: trunk/reactos/include/reactos/wine/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winba… ============================================================================== --- trunk/reactos/include/reactos/wine/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winbase.h (removed) @@ -1,15 +1,0 @@ -#ifndef __WINE_WINBASE_H -#define __WINE_WINBASE_H - -#include_next <winbase.h> - -/* undocumented functions */ - -typedef struct tagSYSLEVEL -{ - CRITICAL_SECTION crst; - INT level; -} SYSLEVEL; - - -#endif /* __WINE_WINBASE_H */ Modified: trunk/reactos/include/reactos/wine/winbase16.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winba… ============================================================================== --- trunk/reactos/include/reactos/wine/winbase16.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winbase16.h [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -316,6 +316,13 @@ #define __AHSHIFT 3 /* don't change! */ #define __AHINCR (1 << __AHSHIFT) + + +typedef struct tagSYSLEVEL +{ + CRITICAL_SECTION crst; + INT level; +} SYSLEVEL; /* undocumented functions */ WORD WINAPI AllocCStoDSAlias16(WORD); Removed: trunk/reactos/include/reactos/wine/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winde… ============================================================================== --- trunk/reactos/include/reactos/wine/windef.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/windef.h (removed) @@ -1,1 +1,0 @@ -#include "../../psdk/windef.h" Removed: trunk/reactos/include/reactos/wine/winnetwk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winne… ============================================================================== --- trunk/reactos/include/reactos/wine/winnetwk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winnetwk.h (removed) @@ -1,31 +1,0 @@ -/* $Id: winnetwk.h 20909 2006-01-15 22:25:16Z gvg $ - * - * Compatibility header - * - * This header is wrapper to allow compilation of Wine DLLs under ReactOS - * build system. It contains definitions commonly refered to as Wineisms - * and definitions that are missing in w32api. - */ - -#include_next <winnetwk.h> - -#ifndef __WINE_WINNETWK_H -#define __WINE_WINNETWK_H - -/* WNetEnumCachedPasswords */ -typedef struct tagPASSWORD_CACHE_ENTRY -{ - WORD cbEntry; - WORD cbResource; - WORD cbPassword; - BYTE iEntry; - BYTE nType; - BYTE abResource[1]; -} PASSWORD_CACHE_ENTRY; - -typedef BOOL (CALLBACK *ENUMPASSWORDPROC)(PASSWORD_CACHE_ENTRY *, DWORD); -DWORD WINAPI WNetCachePassword( LPSTR, WORD, LPSTR, WORD, BYTE, WORD ); -UINT WINAPI WNetEnumCachedPasswords( LPSTR, WORD, BYTE, ENUMPASSWORDPROC, DWORD); -DWORD WINAPI WNetGetCachedPassword( LPSTR, WORD, LPSTR, LPWORD, BYTE ); - -#endif /* __WINE_WINNETWK_H */ Removed: trunk/reactos/include/reactos/wine/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winnl… ============================================================================== --- trunk/reactos/include/reactos/wine/winnls.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winnls.h (removed) @@ -1,27 +1,0 @@ -/* - * Copyright (C) the Wine project - * - * 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 - */ - -#ifndef __WINE_WINNLS_H -#define __WINE_WINNLS_H - -#include_next <winnls.h> - -#define CP_UNIXCP CP_ACP - - -#endif /* __WINE_WINNLS_H */ Removed: trunk/reactos/include/reactos/wine/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winnt… ============================================================================== --- trunk/reactos/include/reactos/wine/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winnt.h (removed) @@ -1,54 +1,0 @@ -/* - * Win32 definitions for Windows NT - * - * Copyright 1996 Alexandre Julliard - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __WINE_WINNT_H -#define __WINE_WINNT_H - -#include_next <winnt.h> - -#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) -#define __WINE_ALLOC_SIZE(x) __attribute__((__alloc_size__(x))) -#else -#define __WINE_ALLOC_SIZE(x) -#endif - -/* non standard; keep the number high enough (but < 0xff) */ -#define LANG_ESPERANTO 0x8f -#define LANG_WALON 0x90 -#define LANG_CORNISH 0x91 - -/* FIXME: these are not in the Windows header */ -#define LANG_GAELIC 0x94 -#define LANG_MALTESE 0x3a -#define LANG_ROMANSH 0x17 -#define LANG_SAAMI 0x3b -#define LANG_LOWER_SORBIAN 0x2e -#define LANG_UPPER_SORBIAN 0x2e -#define LANG_SUTU 0x30 -#define LANG_TAJIK 0x28 -#define LANG_TSONGA 0x31 -#define LANG_TSWANA 0x32 -#define LANG_VENDA 0x33 -#define LANG_XHOSA 0x34 -#define LANG_ZULU 0x35 - -#define WINE_UNUSED __attribute__((unused)) - -#endif /* __WINE_WINNT_H */ Removed: trunk/reactos/include/reactos/wine/winspool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winsp… ============================================================================== --- trunk/reactos/include/reactos/wine/winspool.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winspool.h (removed) @@ -1,48 +1,0 @@ -/* Definitions for printing - * - * Copyright 1998 Huw Davies, Andreas Mohr - * - * Portions Copyright (c) 1999 Corel Corporation - * (Paul Quinn, Albert Den Haan) - * - * 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 - */ -#ifndef __WINE_WINSPOOL_H -#define __WINE_WINSPOOL_H - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * Compatibility header - */ - -#if !defined(_MSC_VER) -#include_next "winspool.h" -#endif - - -/* DECLARATIONS */ - -LPSTR WINAPI StartDocDlgA(HANDLE hPrinter, DOCINFOA *doc); -LPWSTR WINAPI StartDocDlgW(HANDLE hPrinter, DOCINFOW *doc); -#define StartDocDlg WINELIB_NAME_AW(StartDocDlg) - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __WINE_WINSPOOL_H */ Removed: trunk/reactos/include/reactos/wine/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winus… ============================================================================== --- trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winuser.h (removed) @@ -1,15 +1,0 @@ -#ifndef __WINE_WINUSER_H -#define __WINE_WINUSER_H - -/* - * Compatibility header - */ - -#if !defined(_MSC_VER) -#include_next "winuser.h" -#endif - -#define DCX_USESTYLE 0x00010000 -#define LB_CARETOFF 0x01a4 - -#endif /* __WINE_WINUSER_H */

15 years, 1 month

[dchapyshev] 42385: - Sync FreeLibrary with Wine. Fixes an exception at installation Firefox 3.5.x

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Aug 4 18:43:37 2009 New Revision: 42385 URL: http://svn.reactos.org/svn/reactos?rev=42385&view=rev Log: - Sync FreeLibrary with Wine. Fixes an exception at installation Firefox 3.5.x Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ld… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] Tue Aug 4 18:43:37 2009 @@ -340,28 +340,25 @@ /* * @implemented */ -BOOL -WINAPI -FreeLibrary( HMODULE hLibModule ) -{ - PVOID Module = (PVOID)((ULONG_PTR)hLibModule & ~1); +BOOL WINAPI FreeLibrary(HINSTANCE hLibModule) +{ NTSTATUS Status; + if (!hLibModule) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if ((ULONG_PTR)hLibModule & 1) { - if (!RtlImageNtHeader(Module)) - { - SetLastErrorByStatus(STATUS_INVALID_IMAGE_FORMAT); - return FALSE; - } - - Status = NtUnmapViewOfSection(NtCurrentProcess(), Module); - } - else - { - Status = LdrUnloadDll(hLibModule); - } - + /* this is a LOAD_LIBRARY_AS_DATAFILE module */ + char *ptr = (char *)hLibModule - 1; + UnmapViewOfFile(ptr); + return TRUE; + } + + Status = LdrUnloadDll(hLibModule); if (!NT_SUCCESS(Status)) { SetLastErrorByStatus(Status);

15 years, 1 month

← Newer
1
...
56
57
58
59
60
61
62
...
66
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2009