Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 33332: DC: use dc.DcLevel.hPal for the palette instead of using dc.PalIndexed and dc.w.hPalette NtUserSelectPalette: make code more readable
by tkreuzer＠svn.reactos.org 06 May '08

06 May '08

Author: tkreuzer Date: Tue May 6 15:44:25 2008 New Revision: 33332 URL: http://svn.reactos.org/svn/reactos?rev=33332&view=rev Log: DC: use dc.DcLevel.hPal for the palette instead of using dc.PalIndexed and dc.w.hPalette NtUserSelectPalette: make code more readable Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h 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/color.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] Tue May 6 15:44:25 2008 @@ -344,8 +344,6 @@ HBITMAP hFirstBitmap; /* Bitmap selected at creation of the DC */ /* #if 0 */ - HPALETTE hPalette; - GdiPath path; /* #endif */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Tue May 6 15:44:25 2008 @@ -1078,46 +1078,42 @@ HPALETTE hpal, BOOL ForceBackground) { - PDC dc; - HPALETTE oldPal = NULL; - PPALGDI PalGDI; - - // FIXME: mark the palette as a [fore\back]ground pal - dc = DC_LockDc(hDC); - if (NULL != dc) + PDC dc; + HPALETTE oldPal = NULL; + PPALGDI PalGDI; + + // FIXME: mark the palette as a [fore\back]ground pal + dc = DC_LockDc(hDC); + if (!dc) { - /* Check if this is a valid palette handle */ - PalGDI = PALETTE_LockPalette(hpal); - if (NULL != PalGDI) - { - /* Is this a valid palette for this depth? */ - if ((dc->w.bitsPerPixel <= 8 && PAL_INDEXED == PalGDI->Mode) - || (8 < dc->w.bitsPerPixel && PAL_INDEXED != PalGDI->Mode)) - { - PALETTE_UnlockPalette(PalGDI); - oldPal = dc->w.hPalette; - dc->w.hPalette = hpal; - } - else if (8 < dc->w.bitsPerPixel && PAL_INDEXED == PalGDI->Mode) - { - PALETTE_UnlockPalette(PalGDI); - oldPal = dc->PalIndexed; - dc->PalIndexed = hpal; - } - else - { - PALETTE_UnlockPalette(PalGDI); - oldPal = NULL; - } - } - else - { - oldPal = NULL; - } - DC_UnlockDc(dc); + return NULL; } - return oldPal; + /* Check if this is a valid palette handle */ + PalGDI = PALETTE_LockPalette(hpal); + if (!PalGDI) + { + DC_UnlockDc(dc); + return NULL; + } + + /* Is this a valid palette for this depth? */ + if ((dc->w.bitsPerPixel <= 8 && PalGDI->Mode == PAL_INDEXED) || + (dc->w.bitsPerPixel > 8 && PalGDI->Mode != PAL_INDEXED)) + { + oldPal = dc->DcLevel.hpal; + dc->DcLevel.hpal = hpal; + } + else if (8 < dc->w.bitsPerPixel && PAL_INDEXED == PalGDI->Mode) + { + oldPal = dc->DcLevel.hpal; + dc->DcLevel.hpal = hpal; + } + + PALETTE_UnlockPalette(PalGDI); + DC_UnlockDc(dc); + + return oldPal; } Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Tue May 6 15:44:25 2008 @@ -115,10 +115,10 @@ BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); /* Create the XLATEOBJ. */ - if (DCDest->w.hPalette != 0) - DestPalette = DCDest->w.hPalette; - if (DCSrc->w.hPalette != 0) - SourcePalette = DCSrc->w.hPalette; + if (DCDest->DcLevel.hpal != 0) + DestPalette = DCDest->DcLevel.hpal; + if (DCSrc->DcLevel.hpal != 0) + SourcePalette = DCSrc->DcLevel.hpal; /* KB41464 details how to convert between mono and color */ if (DCDest->w.bitsPerPixel == 1 && DCSrc->w.bitsPerPixel == 1) @@ -311,11 +311,11 @@ /* Create the XLATEOBJ. */ if (UsesSource) { - if (DCDest->w.hPalette != 0) - DestPalette = DCDest->w.hPalette; - - if (DCSrc->w.hPalette != 0) - SourcePalette = DCSrc->w.hPalette; + if (DCDest->DcLevel.hpal != 0) + DestPalette = DCDest->DcLevel.hpal; + + if (DCSrc->DcLevel.hpal != 0) + SourcePalette = DCSrc->DcLevel.hpal; /* KB41464 details how to convert between mono and color */ if (DCDest->w.bitsPerPixel == 1 && DCSrc->w.bitsPerPixel == 1) @@ -459,11 +459,11 @@ xSrc += DCSrc->w.DCOrgX; ySrc += DCSrc->w.DCOrgY; - if(DCDest->w.hPalette) - DestPalette = DCDest->w.hPalette; - - if(DCSrc->w.hPalette) - SourcePalette = DCSrc->w.hPalette; + if(DCDest->DcLevel.hpal) + DestPalette = DCDest->DcLevel.hpal; + + if(DCSrc->DcLevel.hpal) + SourcePalette = DCSrc->DcLevel.hpal; if(!(PalSourceGDI = PALETTE_LockPalette(SourcePalette))) { @@ -962,11 +962,11 @@ /* Create the XLATEOBJ. */ if (UsesSource) { - if (DCDest->w.hPalette != 0) - DestPalette = DCDest->w.hPalette; - - if (DCSrc->w.hPalette != 0) - SourcePalette = DCSrc->w.hPalette; + if (DCDest->DcLevel.hpal != 0) + DestPalette = DCDest->DcLevel.hpal; + + if (DCSrc->DcLevel.hpal != 0) + SourcePalette = DCSrc->DcLevel.hpal; /* FIXME: Use the same logic for create XLATEOBJ as in NtGdiBitBlt. */ XlateObj = (XLATEOBJ*)IntEngCreateXlate(0, 0, DestPalette, SourcePalette); Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Tue May 6 15:44:25 2008 @@ -271,8 +271,8 @@ SurfaceObject = &BitmapObject->SurfObj; if ( BitmapObject ) { - if ( dc->w.hPalette != 0 ) - Pal = dc->w.hPalette; + if ( dc->DcLevel.hpal != 0 ) + Pal = dc->DcLevel.hpal; /* FIXME: Verify if it shouldn't be PAL_BGR! */ XlateObj = (XLATEOBJ*)IntEngCreateXlate ( PAL_RGB, 0, NULL, Pal ); if ( XlateObj ) Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Tue May 6 15:44:25 2008 @@ -127,7 +127,7 @@ } else if (BrushObj->flAttrs & GDIBRUSH_IS_SOLID) { - Result = IntEngCreateXlate(0, PAL_RGB, Dc->w.hPalette, NULL); + Result = IntEngCreateXlate(0, PAL_RGB, Dc->DcLevel.hpal, NULL); *Failed = FALSE; } else @@ -143,11 +143,11 @@ if (!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; if (Dc->w.bitsPerPixel != 1) - Result = IntEngCreateSrcMonoXlate(Dc->w.hPalette, Dc_Attr->crForegroundClr, Dc_Attr->crBackgroundClr); + Result = IntEngCreateSrcMonoXlate(Dc->DcLevel.hpal, Dc_Attr->crForegroundClr, Dc_Attr->crBackgroundClr); } else if (BrushObj->flAttrs & GDIBRUSH_IS_DIB) { - Result = IntEngCreateXlate(0, 0, Dc->w.hPalette, Pattern->hDIBPalette); + Result = IntEngCreateXlate(0, 0, Dc->DcLevel.hpal, Pattern->hDIBPalette); } BITMAPOBJ_UnlockBitmap(Pattern); Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/color.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/color.c [iso-8859-1] Tue May 6 15:44:25 2008 @@ -122,7 +122,7 @@ dc = DC_LockDc(hDC); if (NULL != dc) { - if (dc->w.hPalette == hPal) + if (dc->DcLevel.hpal == hPal) { DC_UnlockDc(dc); IntGdiRealizePalette(hDC); @@ -301,7 +301,7 @@ dc = DC_LockDc(hDC); if (NULL != dc) { - HPALETTE hpal = dc->w.hPalette; + HPALETTE hpal = dc->DcLevel.hpal; palGDI = (PPALGDI) PALETTE_LockPalette(hpal); if (!palGDI) { @@ -431,7 +431,7 @@ return 0; } - palGDI = PALETTE_LockPalette(dc->w.hPalette); + palGDI = PALETTE_LockPalette(dc->DcLevel.hpal); if (palGDI != NULL) { if (pe != NULL) @@ -505,7 +505,7 @@ return 0; systemPalette = NtGdiGetStockObject((INT)DEFAULT_PALETTE); - palGDI = PALETTE_LockPalette(dc->w.hPalette); + palGDI = PALETTE_LockPalette(dc->DcLevel.hpal); palPtr = (PALOBJ*) palGDI; if (palGDI == NULL) @@ -536,8 +536,8 @@ // Step 1: Create mapping of system palette\DC palette #ifndef NO_MAPPING realized = PALETTE_SetMapping(palPtr, 0, palGDI->NumColors, - (dc->w.hPalette != hPrimaryPalette) || - (dc->w.hPalette == NtGdiGetStockObject(DEFAULT_PALETTE))); + (dc->DcLevel.hpal != hPrimaryPalette) || + (dc->DcLevel.hpal == NtGdiGetStockObject(DEFAULT_PALETTE))); #else realized = 0; #endif @@ -574,7 +574,7 @@ if(dc->DC_Type != DC_TYPE_MEMORY) { // Device managed DC - palGDI->logicalToSystem = IntEngCreateXlate(sysMode, palMode, systemPalette, dc->w.hPalette); + palGDI->logicalToSystem = IntEngCreateXlate(sysMode, palMode, systemPalette, dc->DcLevel.hpal); } DC_UnlockDc(dc); Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Tue May 6 15:44:25 2008 @@ -135,8 +135,7 @@ NewDC->w.hFirstBitmap = hBitmap; NewDC->pPDev = OrigDC->pPDev; - NewDC->PalIndexed = OrigDC->PalIndexed; - NewDC->w.hPalette = OrigDC->w.hPalette; + NewDC->DcLevel.hpal = OrigDC->DcLevel.hpal; nDc_Attr->lTextAlign = oDc_Attr->lTextAlign; nDc_Attr->ulForegroundClr = oDc_Attr->ulForegroundClr; nDc_Attr->ulBackgroundClr = oDc_Attr->ulBackgroundClr; @@ -829,8 +828,7 @@ if (!CreateAsIC) { - NewDC->PalIndexed = NtGdiGetStockObject(DEFAULT_PALETTE); - NewDC->w.hPalette = PrimarySurface.DevInfo.hpalDefault; + NewDC->DcLevel.hpal = PrimarySurface.DevInfo.hpalDefault; nDc_Attr->jROP2 = R2_COPYPEN; NewDC->erclWindow.top = NewDC->erclWindow.left = 0; @@ -1130,7 +1128,7 @@ SelObject = Dc_Attr->hbrush; break; case GDI_OBJECT_TYPE_PALETTE: - SelObject = dc->w.hPalette; + SelObject = dc->DcLevel.hpal; break; case GDI_OBJECT_TYPE_FONT: SelObject = Dc_Attr->hlfntNew; @@ -1140,6 +1138,7 @@ break; case GDI_OBJECT_TYPE_COLORSPACE: DPRINT1("FIXME: NtGdiGetCurrentObject() ObjectType OBJ_COLORSPACE not supported yet!\n"); + // SelObject = dc->DcLevel.pColorSpace.BaseObject.hHmgr; ? SelObject = NULL; break; default: @@ -1196,18 +1195,18 @@ *ppt = pDc->ptlDCOrig; return TRUE; } - + BOOL STDCALL GdiGetDCOrgEx(HDC hDC, PPOINTL ppt, PRECTL prc) { PDC pdc; - + pdc = DC_LockDc(hDC); if (!pdc) return FALSE; - + *prc = pdc->erclWindow; *ppt = pdc->ptlDCOrig; - + DC_UnlockDc(pdc); return TRUE; } @@ -1217,7 +1216,7 @@ LPSIZE AspectRatio) { PDC_ATTR pDc_Attr; - + pDc_Attr = pDC->pDc_Attr; if ( !pDc_Attr ) pDc_Attr = &pDC->Dc_Attr; @@ -1337,8 +1336,7 @@ nDc_Attr->hlfntNew = Dc_Attr->hlfntNew; newdc->w.hBitmap = dc->w.hBitmap; newdc->w.hFirstBitmap = dc->w.hFirstBitmap; - newdc->PalIndexed = dc->PalIndexed; - newdc->w.hPalette = dc->w.hPalette; + newdc->DcLevel.hpal = dc->DcLevel.hpal; newdc->w.totalExtent = dc->w.totalExtent; newdc->w.bitsPerPixel = dc->w.bitsPerPixel; nDc_Attr->jROP2 = Dc_Attr->jROP2; @@ -1444,7 +1442,6 @@ Dc_Attr->szlWindowExt = sDc_Attr->szlWindowExt; Dc_Attr->ptlViewportOrg = sDc_Attr->ptlViewportOrg; Dc_Attr->szlViewportExt = sDc_Attr->szlViewportExt; - dc->PalIndexed = dcs->PalIndexed; if (dc->DC_Type != DC_TYPE_MEMORY) { @@ -1488,10 +1485,10 @@ IntGdiSetBkColor( hDC, sDc_Attr->crBackgroundClr); IntGdiSetTextColor( hDC, sDc_Attr->crForegroundClr); - NtUserSelectPalette( hDC, dcs->w.hPalette, FALSE ); + NtUserSelectPalette( hDC, dcs->DcLevel.hpal, FALSE ); #if 0 - GDISelectPalette16( hDC, dcs->w.hPalette, FALSE ); + GDISelectPalette16( hDC, dcs->DcLevel.hpal, FALSE ); #endif } @@ -1960,12 +1957,12 @@ if(pBmp->dib) { pDC->w.bitsPerPixel = pBmp->dib->dsBmih.biBitCount; - pDC->w.hPalette = pBmp->hDIBPalette; + pDC->DcLevel.hpal = pBmp->hDIBPalette; } else { pDC->w.bitsPerPixel = BitsPerFormat(pBmp->SurfObj.iBitmapFormat); - pDC->w.hPalette = ((GDIDEVICE *)pDC->pPDev)->DevInfo.hpalDefault; + pDC->DcLevel.hpal = ((GDIDEVICE *)pDC->pPDev)->DevInfo.hpalDefault; } /* Regenerate the XLATEOBJs. */ @@ -2333,7 +2330,7 @@ break; } SafeResult = Dc_Attr->flFontMapper; - Dc_Attr->flFontMapper = dwIn; + Dc_Attr->flFontMapper = dwIn; break; case GdiGetSetMapMode: SafeResult = IntGdiSetMapMode( dc, dwIn); @@ -2479,7 +2476,7 @@ Dc_Attr->hlfntNew = NtGdiGetStockObject(SYSTEM_FONT); TextIntRealizeFont(Dc_Attr->hlfntNew); - NewDC->w.hPalette = NtGdiGetStockObject(DEFAULT_PALETTE); + NewDC->DcLevel.hpal = NtGdiGetStockObject(DEFAULT_PALETTE); DC_UnlockDc(NewDC); @@ -2757,7 +2754,7 @@ } VOID FASTCALL -IntGdiUnreferencePdev(PGDIDEVICE pPDev, DWORD CleanUpType) +IntGdiUnreferencePdev(PGDIDEVICE pPDev, DWORD CleanUpType) { IntGdiAcquireSemaphore(hsemDriverMgmt); pPDev->cPdevRefs--; Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Tue May 6 15:44:25 2008 @@ -1,4 +1,5 @@ /* + * $Id$ * * ReactOS W32 Subsystem * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team @@ -382,7 +383,7 @@ SourceSize.cx = bmi->bmiHeader.biWidth; SourceSize.cy = ScanLines; DIBWidth = DIB_GetDIBWidthBytes(SourceSize.cx, bmi->bmiHeader.biBitCount); - + ProbeForRead(Bits, DIBWidth * abs(bmi->bmiHeader.biHeight), 1); hSourceBitmap = EngCreateBitmap(SourceSize, DIBWidth, @@ -403,7 +404,7 @@ _SEH_LEAVE; } - + /* Obtain destination palette from the DC */ pDCPalette = PALETTE_LockPalette(((GDIDEVICE *)pDC->pPDev)->DevInfo.hpalDefault); if (!pDCPalette) @@ -415,7 +416,7 @@ DDBPaletteType = pDCPalette->Mode; DDBPalette = ((GDIDEVICE *)pDC->pPDev)->DevInfo.hpalDefault; PALETTE_UnlockPalette(pDCPalette); - + DIBPalette = BuildDIBPalette(bmi, (PINT)&DIBPaletteType); if (!DIBPalette) { @@ -504,7 +505,7 @@ return 0; } /* Source palette obtained from the windows hdc */ - hSourcePalette = Dc->w.hPalette; + hSourcePalette = Dc->DcLevel.hpal; DC_UnlockDc(Dc); /* don't do anything if we fail this */ @@ -909,7 +910,7 @@ 1, NULL); } - + if (height < 0) height = -height; @@ -1258,7 +1259,7 @@ USHORT *lpIndex; PPALGDI palGDI; - palGDI = PALETTE_LockPalette(dc->w.hPalette); + palGDI = PALETTE_LockPalette(dc->DcLevel.hpal); if (NULL == palGDI) { @@ -1269,11 +1270,7 @@ if (palGDI->Mode != PAL_INDEXED) { PALETTE_UnlockPalette(palGDI); - palGDI = PALETTE_LockPalette(dc->PalIndexed); - if (palGDI->Mode != PAL_INDEXED) - { - return NULL; - } + return NULL; } nNumColors = 1 << lpbmi->bmiHeader.biBitCount; Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Tue May 6 15:44:25 2008 @@ -64,7 +64,7 @@ Dc_Attr = dc->pDc_Attr; if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - + BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); /* FIXME - BitmapObj can be NULL!!!! don't assert but handle this case gracefully! */ ASSERT(BitmapObj); @@ -1033,7 +1033,7 @@ RECTL DestRect; MIX Mix; PDC_ATTR Dc_Attr; - + ASSERT ( dc ); // caller's responsibility to set this up /* FIXME - BitmapObj can be NULL!!! Don't assert but handle this case gracefully! */ ASSERT ( BitmapObj ); @@ -1550,13 +1550,13 @@ /* FIXME - BitmapObj can be NULL!!! Don't assert but handle this case gracefully! */ ASSERT(BitmapObj); - PalDestGDI = PALETTE_LockPalette(dc->w.hPalette); + PalDestGDI = PALETTE_LockPalette(dc->DcLevel.hpal); /* FIXME - PalDestGDI can be NULL!!! Don't assert but handle this case gracefully! */ ASSERT(PalDestGDI); Mode = PalDestGDI->Mode; PALETTE_UnlockPalette(PalDestGDI); - XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, dc->w.hPalette, NULL); + XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, dc->DcLevel.hpal, NULL); ASSERT(XlateObj); Ret = IntEngGradientFill(&BitmapObj->SurfObj, Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Tue May 6 15:44:25 2008 @@ -1629,7 +1629,7 @@ YStart = Start.y + dc->w.DCOrgY; /* Create the brushes */ - PalDestGDI = PALETTE_LockPalette(dc->w.hPalette); + PalDestGDI = PALETTE_LockPalette(dc->DcLevel.hpal); if ( !PalDestGDI ) Mode = PAL_RGB; else @@ -1637,7 +1637,7 @@ Mode = PalDestGDI->Mode; PALETTE_UnlockPalette(PalDestGDI); } - XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, dc->w.hPalette, NULL); + XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, dc->DcLevel.hpal, NULL); if ( !XlateObj ) { goto fail; @@ -1667,7 +1667,7 @@ } IntGdiInitBrushInstance(&BrushBgInst, BrushBg, NULL); } - XlateObj2 = (XLATEOBJ*)IntEngCreateXlate(PAL_RGB, Mode, NULL, dc->w.hPalette); + XlateObj2 = (XLATEOBJ*)IntEngCreateXlate(PAL_RGB, Mode, NULL, dc->DcLevel.hpal); if ( !XlateObj2 ) { goto fail;

1 0

[janderwald] 33331: - remove unused files :)
by janderwald＠svn.reactos.org 06 May '08

06 May '08

Author: janderwald Date: Tue May 6 15:36:06 2008 New Revision: 33331 URL: http://svn.reactos.org/svn/reactos?rev=33331&view=rev Log: - remove unused files :) Removed: trunk/rosapps/fraginator/COPYING trunk/rosapps/fraginator/Fraginator.dsp trunk/rosapps/fraginator/Fraginator.dsw trunk/rosapps/fraginator/Fraginator.sln trunk/rosapps/fraginator/Fraginator.vcproj trunk/rosapps/fraginator/default1.bin trunk/rosapps/fraginator/unfrag.dsp trunk/rosapps/fraginator/unfrag.vcproj Removed: trunk/rosapps/fraginator/COPYING URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/COPYING?rev=333… ============================================================================== --- trunk/rosapps/fraginator/COPYING [iso-8859-1] (original) +++ trunk/rosapps/fraginator/COPYING (removed) @@ -1,340 +1,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. Removed: trunk/rosapps/fraginator/Fraginator.dsp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/Fraginator.dsp?… ============================================================================== --- trunk/rosapps/fraginator/Fraginator.dsp [iso-8859-1] (original) +++ trunk/rosapps/fraginator/Fraginator.dsp (removed) @@ -1,186 +1,0 @@ -# Microsoft Developer Studio Project File - Name="Fraginator" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=Fraginator - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Fraginator.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Fraginator.mak" CFG="Fraginator - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Fraginator - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "Fraginator - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=xicl6.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Fraginator - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /G6 /Gr /MT /W3 /GX /Ox /Ot /Og /Oi /Ob2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=xilink6.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /profile /machine:I386 -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copying to Program Files ... -PostBuild_Cmds=copy Release\Fraginator.exe "c:\Program Files\Fraginator\Fraginator.exe" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "Fraginator - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=xilink6.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /profile /debug /machine:I386 - -!ENDIF - -# Begin Target - -# Name "Fraginator - Win32 Release" -# Name "Fraginator - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Defragment.cpp -# End Source File -# Begin Source File - -SOURCE=.\DriveVolume.cpp -# End Source File -# Begin Source File - -SOURCE=.\Fraginator.cpp -# End Source File -# Begin Source File - -SOURCE=.\MainDialog.cpp -# End Source File -# Begin Source File - -SOURCE=.\ReportDialog.cpp -# End Source File -# Begin Source File - -SOURCE=.\Unfrag.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Defragment.h -# End Source File -# Begin Source File - -SOURCE=.\DriveVolume.h -# End Source File -# Begin Source File - -SOURCE=.\Fraginator.h -# End Source File -# Begin Source File - -SOURCE=.\MainDialog.h -# End Source File -# Begin Source File - -SOURCE=.\Mutex.h -# End Source File -# Begin Source File - -SOURCE=.\ReportDialog.h -# End Source File -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# Begin Source File - -SOURCE=.\Unfrag.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\default1.bin -# End Source File -# Begin Source File - -SOURCE=".\Fraginator Help - Fraginator Icon.bmp" -# End Source File -# Begin Source File - -SOURCE=".\Fraginator Motif Icon.bmp" -# End Source File -# Begin Source File - -SOURCE=.\Fraginator.rc -# End Source File -# Begin Source File - -SOURCE=.\icon1.ico -# End Source File -# End Group -# End Target -# End Project Removed: trunk/rosapps/fraginator/Fraginator.dsw URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/Fraginator.dsw?… ============================================================================== --- trunk/rosapps/fraginator/Fraginator.dsw [iso-8859-1] (original) +++ trunk/rosapps/fraginator/Fraginator.dsw (removed) @@ -1,41 +1,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "Fraginator"=.\Fraginator.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "unfrag"=.\unfrag.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - Removed: trunk/rosapps/fraginator/Fraginator.sln URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/Fraginator.sln?… ============================================================================== --- trunk/rosapps/fraginator/Fraginator.sln [iso-8859-1] (original) +++ trunk/rosapps/fraginator/Fraginator.sln (removed) @@ -1,25 +1,0 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual C++ Express 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Fraginator", "Fraginator.vcproj", "{7CB0DB3F-D4AB-4A99-807F-C56CC9F0B19C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unfrag", "unfrag.vcproj", "{8E7E76C1-739B-46E5-99C2-A0504558164B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7CB0DB3F-D4AB-4A99-807F-C56CC9F0B19C}.Debug|Win32.ActiveCfg = Debug|Win32 - {7CB0DB3F-D4AB-4A99-807F-C56CC9F0B19C}.Debug|Win32.Build.0 = Debug|Win32 - {7CB0DB3F-D4AB-4A99-807F-C56CC9F0B19C}.Release|Win32.ActiveCfg = Release|Win32 - {7CB0DB3F-D4AB-4A99-807F-C56CC9F0B19C}.Release|Win32.Build.0 = Release|Win32 - {8E7E76C1-739B-46E5-99C2-A0504558164B}.Debug|Win32.ActiveCfg = Debug|Win32 - {8E7E76C1-739B-46E5-99C2-A0504558164B}.Debug|Win32.Build.0 = Debug|Win32 - {8E7E76C1-739B-46E5-99C2-A0504558164B}.Release|Win32.ActiveCfg = Release|Win32 - {8E7E76C1-739B-46E5-99C2-A0504558164B}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal Removed: trunk/rosapps/fraginator/Fraginator.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/Fraginator.vcpr… ============================================================================== --- trunk/rosapps/fraginator/Fraginator.vcproj [iso-8859-1] (original) +++ trunk/rosapps/fraginator/Fraginator.vcproj (removed) @@ -1,295 +1,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="Fraginator" - ProjectGUID="{7CB0DB3F-D4AB-4A99-807F-C56CC9F0B19C}" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="1" - ManagedExtensions="0" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="NDEBUG" - MkTypLibCompatible="true" - SuppressStartupBanner="true" - TargetEnvironment="1" - TypeLibraryName=".\Release/Fraginator.tlb" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="3" - InlineFunctionExpansion="2" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" - PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS" - ExceptionHandling="1" - RuntimeLibrary="0" - StructMemberAlignment="5" - BufferSecurityCheck="false" - PrecompiledHeaderFile=".\Release/Fraginator.pch" - WarningLevel="3" - SuppressStartupBanner="true" - CallingConvention="1" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="user32.lib advapi32.lib shell32.lib comctl32.lib" - LinkIncremental="1" - SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - SubSystem="2" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - Description="Copying to Program Files ..." - CommandLine="copy Release\Fraginator.exe "c:\Program Files\Fraginator\Fraginator.exe"" - /> - </Configuration> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" - MkTypLibCompatible="true" - SuppressStartupBanner="true" - TargetEnvironment="1" - TypeLibraryName=".\Debug/Fraginator.tlb" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - SuppressStartupBanner="true" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="user32.lib advapi32.lib shell32.lib comctl32.lib" - LinkIncremental="2" - SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - SubSystem="2" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - > - <File - RelativePath=".\Defragment.cpp" - > - </File> - <File - RelativePath=".\DriveVolume.cpp" - > - </File> - <File - RelativePath=".\Fraginator.cpp" - > - </File> - <File - RelativePath=".\MainDialog.cpp" - > - </File> - <File - RelativePath=".\ReportDialog.cpp" - > - </File> - <File - RelativePath="Unfrag.cpp" - > - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl" - > - <File - RelativePath=".\Defragment.h" - > - </File> - <File - RelativePath=".\DriveVolume.h" - > - </File> - <File - RelativePath=".\Fraginator.h" - > - </File> - <File - RelativePath=".\MainDialog.h" - > - </File> - <File - RelativePath=".\Mutex.h" - > - </File> - <File - RelativePath=".\ReportDialog.h" - > - </File> - <File - RelativePath=".\resource.h" - > - </File> - <File - RelativePath=".\Unfrag.h" - > - </File> - </Filter> - <Filter - Name="Resource Files" - Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - > - <File - RelativePath=".\default1.bin" - > - </File> - <File - RelativePath=".\Fraginator Help - Fraginator Icon.bmp" - > - </File> - <File - RelativePath=".\Fraginator Motif Icon.bmp" - > - </File> - <File - RelativePath=".\Fraginator.rc" - > - </File> - <File - RelativePath=".\icon1.ico" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> Removed: trunk/rosapps/fraginator/default1.bin URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/default1.bin?re… ============================================================================== --- trunk/rosapps/fraginator/default1.bin [iso-8859-1] (original) +++ trunk/rosapps/fraginator/default1.bin (removed) @@ -1,22 +1,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - processorArchitecture="x86" - version="5.1.0.0" - type="win32" - name="Fraginator.exe"/> - <description>Fraginator</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - publicKeyToken="6595b64144ccf1df" - language="*" - processorArchitecture="x86"/> - </dependentAssembly> - </dependency> -</assembly> Removed: trunk/rosapps/fraginator/unfrag.dsp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/unfrag.dsp?rev=… ============================================================================== --- trunk/rosapps/fraginator/unfrag.dsp [iso-8859-1] (original) +++ trunk/rosapps/fraginator/unfrag.dsp (removed) @@ -1,133 +1,0 @@ -# Microsoft Developer Studio Project File - Name="unfrag" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=unfrag - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "unfrag.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "unfrag.mak" CFG="unfrag - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "unfrag - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "unfrag - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=xicl6.exe -RSC=rc.exe - -!IF "$(CFG)" == "unfrag - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /G6 /Gr /MD /W3 /GX /Ox /Ot /Og /Oi /Ob2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=xilink6.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copying to Program Files ... -PostBuild_Cmds=copy Release\unfrag.exe "c:\Program Files\Fraginator\unfrag.exe" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "unfrag - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "unfrag___Win32_Debug" -# PROP BASE Intermediate_Dir "unfrag___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "unfrag___Win32_Debug" -# PROP Intermediate_Dir "unfrag___Win32_Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=xilink6.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "unfrag - Win32 Release" -# Name "unfrag - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\Defragment.cpp -# End Source File -# Begin Source File - -SOURCE=.\DriveVolume.cpp -# End Source File -# Begin Source File - -SOURCE=.\Unfrag.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\Defragment.h -# End Source File -# Begin Source File - -SOURCE=.\DriveVolume.h -# End Source File -# Begin Source File - -SOURCE=.\Mutex.h -# End Source File -# Begin Source File - -SOURCE=.\Unfrag.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project Removed: trunk/rosapps/fraginator/unfrag.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/unfrag.vcproj?r… ============================================================================== --- trunk/rosapps/fraginator/unfrag.vcproj [iso-8859-1] (original) +++ trunk/rosapps/fraginator/unfrag.vcproj (removed) @@ -1,235 +1,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="unfrag" - ProjectGUID="{8E7E76C1-739B-46E5-99C2-A0504558164B}" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\Release/unfrag.tlb" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="3" - InlineFunctionExpansion="2" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" - PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" - RuntimeLibrary="0" - StructMemberAlignment="5" - BufferSecurityCheck="false" - PrecompiledHeaderFile=".\Release/unfrag.pch" - WarningLevel="3" - SuppressStartupBanner="true" - CallingConvention="1" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - LinkIncremental="1" - SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - SubSystem="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - Description="Copying to Program Files ..." - CommandLine="copy Release\unfrag.exe "c:\Program Files\Fraginator\unfrag.exe"" - /> - </Configuration> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\unfrag___Win32_Debug/unfrag.tlb" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - WarningLevel="3" - SuppressStartupBanner="true" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - LinkIncremental="2" - SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - SubSystem="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" - > - <File - RelativePath=".\Defragment.cpp" - > - </File> - <File - RelativePath=".\DriveVolume.cpp" - > - </File> - <File - RelativePath=".\Unfrag.cpp" - > - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl" - > - <File - RelativePath=".\Defragment.h" - > - </File> - <File - RelativePath=".\DriveVolume.h" - > - </File> - <File - RelativePath=".\Mutex.h" - > - </File> - <File - RelativePath=".\Unfrag.h" - > - </File> - </Filter> - <Filter - Name="Resource Files" - Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - > - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject>

1 0

[greatlrd] 33330: started cleanup object/dc.c 1. remove the static global value edd_directdraw_global I intrudues for dx. it is now for each driver.
by greatlrd＠svn.reactos.org 06 May '08

06 May '08

Author: greatlrd Date: Tue May 6 15:20:56 2008 New Revision: 33330 URL: http://svn.reactos.org/svn/reactos?rev=33330&view=rev Log: started cleanup object/dc.c 1. remove the static global value edd_directdraw_global I intrudues for dx. it is now for each driver. Modified: trunk/reactos/subsystems/win32/win32k/include/tags.h trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/include/tags.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] Tue May 6 15:20:56 2008 @@ -91,8 +91,9 @@ /* Dx internal tags rember I do not known if it right namees */ #define TAG_DXPVMLIST TAG('D', 'X', 'P', 'L') /* pmvlist for the driver */ #define TAG_DXFOURCC TAG('D', 'X', 'F', 'O') /* pdwFourCC for the driver */ -#define TAG_DDRAW TAG('D', 'h', ' ', '1') +#define TAG_DDRAW TAG('D', 'h', ' ', '1') #define TAG_DDSURF TAG('D', 'h', ' ', '2') +#define TAG_EDDGBL TAG('E', 'D', 'D', 'G') /* ? edd_directdraw_global ??*/ #endif /* _WIN32K_TAGS_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Tue May 6 15:20:56 2008 @@ -432,10 +432,6 @@ DWORD *puNumFourCC, DWORD *puFourCC) { -#if DXDBG - BOOL status = FALSE; -#endif - PGD_DXDDQUERYDIRECTDRAWOBJECT pfnDdQueryDirectDrawObject = (PGD_DXDDQUERYDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdQueryDirectDrawObject].pfn; if (pfnDdQueryDirectDrawObject == NULL) @@ -446,20 +442,9 @@ DPRINT1("Calling dxg.sys pfnDdQueryDirectDrawObject\n"); -#if DXDBG - status = pfnDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, - puD3dBufferCallbacks, puD3dTextureFormats, puNumHeaps, puvmList, puNumFourCC, puFourCC); - - - dump_edd_directdraw_global(&edd_DdirectDraw_Global); - dump_edd_directdraw_local(edd_DdirectDraw_Global.peDirectDrawLocalList); - - return status; -#else + return pfnDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, puNumHeaps, puvmList, puNumFourCC, puFourCC); - -#endif } Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Tue May 6 15:20:56 2008 @@ -32,7 +32,7 @@ static KEVENT VideoDriverNeedsPreparation; static KEVENT VideoDriverPrepared; static PDC defaultDCstate = NULL; -EDD_DIRECTDRAW_GLOBAL edd_DdirectDraw_Global; + NTSTATUS FASTCALL InitDcImpl(VOID) @@ -554,8 +554,11 @@ PrimarySurface.ppdevNext = NULL; // Fixme! We need to support more than display drvs. PrimarySurface.ppdevParent = NULL; // Always NULL if primary. PrimarySurface.pGraphicsDev = NULL; // Fixme! - PrimarySurface.pEDDgpl = (EDD_DIRECTDRAW_GLOBAL *)&edd_DdirectDraw_Global; // FIXME! We need to support more than display drvs. - RtlZeroMemory( &edd_DdirectDraw_Global ,sizeof(EDD_DIRECTDRAW_GLOBAL)); + PrimarySurface.pEDDgpl = ExAllocatePoolWithTag(PagedPool, sizeof(EDD_DIRECTDRAW_GLOBAL), TAG_EDDGBL); + if (PrimarySurface.pEDDgpl) + { + RtlZeroMemory( PrimarySurface.pEDDgpl ,sizeof(EDD_DIRECTDRAW_GLOBAL)); + } ret = TRUE; goto cleanup; } @@ -625,6 +628,7 @@ return NT_SUCCESS(Status); } + BOOL FASTCALL IntCreatePrimarySurface()

1 0

[tkreuzer] 33329: rename 2nd parameter of NtUserGetClipboardData from Unknown1 to pBuffer. Use SEH to copy data.
by tkreuzer＠svn.reactos.org 06 May '08

06 May '08

Author: tkreuzer Date: Tue May 6 15:09:34 2008 New Revision: 33329 URL: http://svn.reactos.org/svn/reactos?rev=33329&view=rev Log: rename 2nd parameter of NtUserGetClipboardData from Unknown1 to pBuffer. Use SEH to copy data. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue May 6 15:09:34 2008 @@ -1169,7 +1169,7 @@ NTAPI NtUserGetClipboardData( UINT uFormat, - DWORD Unknown1); + PVOID pBuffer); INT NTAPI @@ -1614,7 +1614,7 @@ #define NUMC_SENDMESSAGE 0x02B0 // Kernel has option to use TO or normal msg send, based on type of msg. -#define NUMC_SENDMESSAGEWTOOPTION 0x02B1 +#define NUMC_SENDMESSAGEWTOOPTION 0x02B1 #define NUMC_SENDMESSAGETIMEOUT 0x02B2 #define NUMC_BROADCASTSYSTEMMESSAGE 0x02B4 #define NUMC_SENDNOTIFYMESSAGE 0x02B7 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Tue May 6 15:09:34 2008 @@ -598,17 +598,16 @@ } HANDLE STDCALL -NtUserGetClipboardData(UINT uFormat, DWORD Unknown1) +NtUserGetClipboardData(UINT uFormat, PVOID pBuffer) { HANDLE ret = NULL; - PCHAR buffer; UserEnterShared(); if (intIsClipboardOpenByMe()) { /* when Unknown1 is zero, we returns to user32 the data size */ - if (Unknown1 == 0) + if (!pBuffer) { PCLIPBOARDELEMENT data = intIsFormatAvailable(uFormat); @@ -624,7 +623,7 @@ co_IntSendMessage(ClipboardOwnerWindow->hSelf, WM_RENDERFORMAT, (WPARAM)uFormat, 0); data = intIsFormatAvailable(uFormat); ASSERT(data->size); - ret = (HANDLE)data->size; + ret = (HANDLE)(ULONG_PTR)data->size; } } else @@ -635,7 +634,7 @@ } } - ret = (HANDLE)data->size; + ret = (HANDLE)(ULONG_PTR)data->size; } else { @@ -668,20 +667,36 @@ } else { - buffer = (PCHAR)Unknown1; - memcpy(buffer, (PCHAR)synthesizedData, synthesizedDataSize); + ret = (HANDLE)pBuffer; + + _SEH_TRY + { + ProbeForWrite(pBuffer, synthesizedDataSize, 1); + memcpy(pBuffer, (PCHAR)synthesizedData, synthesizedDataSize); + } + _SEH_HANDLE + { + ret = NULL; + } + _SEH_END freeSynthesizedData(); - - ret = (HANDLE)Unknown1; } } else { - buffer = (PCHAR)Unknown1; - memcpy(buffer, (PCHAR)data->hData, data->size); - - ret = (HANDLE)Unknown1; + ret = (HANDLE)pBuffer; + + _SEH_TRY + { + ProbeForWrite(pBuffer, data->size, 1); + memcpy(pBuffer, (PCHAR)data->hData, data->size); + } + _SEH_HANDLE + { + ret = NULL; + } + _SEH_END } }

1 0

[fireball] 33328: - Fix a bug resulting in a write to an uninitialized address (coincidently located somewhere in the middle of another heap allocation) and later heapfreeing it. WaitNamedPipeA() was the affected function (results were visible when e.g. starting Office 2003 installer).
by fireball＠svn.reactos.org 06 May '08

06 May '08

Author: fireball Date: Tue May 6 13:11:41 2008 New Revision: 33328 URL: http://svn.reactos.org/svn/reactos?rev=33328&view=rev Log: - Fix a bug resulting in a write to an uninitialized address (coincidently located somewhere in the middle of another heap allocation) and later heapfreeing it. WaitNamedPipeA() was the affected function (results were visible when e.g. starting Office 2003 installer). Modified: trunk/reactos/dll/win32/kernel32/file/npipe.c Modified: trunk/reactos/dll/win32/kernel32/file/npipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/np… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/npipe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/npipe.c [iso-8859-1] Tue May 6 13:11:41 2008 @@ -250,7 +250,7 @@ UNICODE_STRING NameU; /* Convert the name to Unicode */ - Basep8BitStringToLiveUnicodeString(&NameU, lpNamedPipeName); + Basep8BitStringToHeapUnicodeString(&NameU, lpNamedPipeName); /* Call the Unicode API */ r = WaitNamedPipeW(NameU.Buffer, nTimeOut);

1 0

[dreimer] 33327: Netherland translation for calc by Wouter Thierens. Congrats for the first one. May follow many more!
by dreimer＠svn.reactos.org 06 May '08

06 May '08

Author: dreimer Date: Tue May 6 12:54:08 2008 New Revision: 33327 URL: http://svn.reactos.org/svn/reactos?rev=33327&view=rev Log: Netherland translation for calc by Wouter Thierens. Congrats for the first one. May follow many more! Added: trunk/reactos/base/applications/calc/lang/nl-NL.rc (with props) Modified: trunk/reactos/base/applications/calc/resource.rc Added: trunk/reactos/base/applications/calc/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/nl-NL.rc (added) +++ trunk/reactos/base/applications/calc/lang/nl-NL.rc [iso-8859-1] Tue May 6 12:54:08 2008 @@ -1,0 +1,366 @@ + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +// Dialog + +IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Rekenmachine" +MENU IDR_MENU_SCIENTIFIC_1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "",IDC_STATIC,4,16,132,21 + CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, + 10 + CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29, + 10 + CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27, + 10 + CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24, + 26,10 + GROUPBOX "",IDC_STATIC,4,36,76,21 + CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,8,44,26,10 + CONTROL "Hyp",IDC_CHECK_HYP,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,40,44,29,10 + CTEXT "",IDC_TEXT_PARENT,84,40,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CTEXT "",IDC_TEXT_MEMORY,112,40,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "Sta",IDC_BUTTON_STA,4,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Ave",IDC_BUTTON_AVE,4,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sum",IDC_BUTTON_SUM,4,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "s",IDC_BUTTON_S,4,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Dat",IDC_BUTTON_DAT,4,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F-E",IDC_BUTTON_FE,38,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "dms",IDC_BUTTON_DMS,38,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "sin",IDC_BUTTON_SIN,38,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "cos",IDC_BUTTON_COS,38,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "tan",IDC_BUTTON_TAN,38,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "(",IDC_BUTTON_LEFTPAR,64,64,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Exp",IDC_BUTTON_EXP,64,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^y",IDC_BUTTON_XeY,64,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^2",IDC_BUTTON_Xe2,64,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^3",IDC_BUTTON_Xe3,64,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ")",IDC_BUTTON_RIGHTPAR,90,64,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "ln",IDC_BUTTON_LN,90,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "log",IDC_BUTTON_LOG,90,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "n!",IDC_BUTTON_NF,90,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,90,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MC",IDC_BUTTON_MC,124,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,124,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,124,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,124,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "pi",IDC_BUTTON_PI,124,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "7",IDC_BUTTON_7,158,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,158,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,158,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,158,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "A",IDC_BUTTON_A,158,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,184,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,184,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,184,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,184,121,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "B",IDC_BUTTON_B,184,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,210,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,210,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,210,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,210,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "C",IDC_BUTTON_C,210,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,236,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,236,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,236,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,236,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "D",IDC_BUTTON_D,236,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Mod",IDC_BUTTON_MOD,262,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Or",IDC_BUTTON_OR,262,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Lsh",IDC_BUTTON_LSH,262,102,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,262,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "E",IDC_BUTTON_E,262,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "And",IDC_BUTTON_AND,288,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Xor",IDC_BUTTON_XOR,288,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Not",IDC_BUTTON_NOT,288,102,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Int",IDC_BUTTON_INT,288,121,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F",IDC_BUTTON_F,288,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + GROUPBOX "",IDC_STATIC,140,16,172,21 + CONTROL "Qword",IDC_RADIO_QWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,148,24,37,10 + CONTROL "Dword",IDC_RADIO_DWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,188,24,37,10 + CONTROL "Word",IDC_RADIO_WORD,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,232,24,33,10 + CONTROL "Byte",IDC_RADIO_BYTE,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,272,24,30,10 + CONTROL "Graden",IDC_RADIO_DEG,"Button",BS_AUTORADIOBUTTON,148,24, + 42,10 + CONTROL "Radialen",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192, + 24,42,10 + CONTROL "Gradiënten",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON, + 236,24,44,10 + PUSHBUTTON "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,228,40,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "BACKSPACE",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,4,4,308,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Rekenmachine" +MENU IDR_MENU_STANDARD +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + PUSHBUTTON "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,84,24,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "BACKSPACE",IDC_BUTTON_BACK,40,24,40,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,4,4,164,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "7",IDC_BUTTON_7,40,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,40,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,40,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,40,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,66,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,66,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,66,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,66,105,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,92,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,92,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,92,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,92,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,118,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,118,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,118,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,118,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sqrt",IDC_BUTTON_SQRT,144,48,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "%",IDC_BUTTON_PERCENT,144,67,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,144,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,144,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + CTEXT "",IDC_TEXT_MEMORY,4,24,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "MC",IDC_BUTTON_MC,4,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,4,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,4,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,4,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Over ReactOS Rekenmachine" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,105,148,52,16 + CONTROL 106,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | + SS_REALSIZEIMAGE | WS_BORDER,4,4,104,48 + LTEXT "ReactOS Rekenmachine",IDC_STATIC,120,12,132,8, + SS_CENTERIMAGE + LTEXT "Versie",IDC_TEXT_VERSION,120,20,132,8,SS_CENTERIMAGE + LTEXT "Geschreven door: Carlo Bramini",IDC_STATIC,120,32,132,8, + SS_CENTERIMAGE + GROUPBOX "",IDC_STATIC,112,0,148,52 + GROUPBOX "",IDC_STATIC,4,56,256,88 + EDITTEXT IDC_EDIT_LICENSE,12,68,240,68,ES_MULTILINE | ES_READONLY | + WS_VSCROLL +END + +IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 +STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Statistiek-venster" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | + WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "RET",IDC_BUTTON_RET,4,48,36,16 + PUSHBUTTON "Laden",IDC_BUTTON_LOAD,44,48,36,16 + PUSHBUTTON "CD",IDC_BUTTON_CD,84,48,36,16 + PUSHBUTTON "CAD",IDC_BUTTON_CAD,124,48,36,16 + CTEXT "n=0",IDC_TEXT_NITEMS,4,68,156,12,SS_CENTERIMAGE | + SS_SUNKEN +END + + +// Menus + +IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE +BEGIN + POPUP "Bewerken" + BEGIN + MENUITEM "Kopiëren\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Plakken\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "Beeld" + BEGIN + MENUITEM "Standaard", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Converteren", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "Decimaal\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "Achttallig\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "Binair\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "Graden\tF2", IDM_VIEW_DEG, CHECKED + MENUITEM "Radialen\tF3", IDM_VIEW_RAD, CHECKED + MENUITEM "Gradiënten\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM SEPARATOR + MENUITEM "Cijfergroepering", IDM_VIEW_GROUP, CHECKED + END + POPUP "Help" + BEGIN + MENUITEM "Help-onderwerpen", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Info", IDM_HELP_ABOUT + END +END + +IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE +BEGIN + POPUP "Edit" + BEGIN + MENUITEM "Kopiëren\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Plakken\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "Beeld" + BEGIN + MENUITEM "Standaard", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Omzetten", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "Decimaal\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "Achttallig\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "Binair\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "Qword\tF12", IDM_VIEW_QWORD, CHECKED + MENUITEM "Dword\tF2", IDM_VIEW_DWORD, CHECKED + MENUITEM "Word\tF3", IDM_VIEW_WORD, CHECKED + MENUITEM "Byte\tF4", IDM_VIEW_BYTE, CHECKED + MENUITEM SEPARATOR + MENUITEM "Cijfergroepering", IDM_VIEW_GROUP, CHECKED + END + POPUP "Help" + BEGIN + MENUITEM "Help-onderpwerpen", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Info", IDM_HELP_ABOUT + END +END + +IDR_MENU_STANDARD MENU DISCARDABLE +BEGIN + POPUP "Edit" + BEGIN + MENUITEM "Kopiëren\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Plakken\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "View" + BEGIN + MENUITEM "Standaard", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Omzetten", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Cijfergroeperingen", IDM_VIEW_GROUP, CHECKED + END + POPUP "Help" + BEGIN + MENUITEM "Help-onderwerpen", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Info", IDM_HELP_ABOUT + END +END + +// String Tables + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STRING_LICENSE "De ReactOS Rekenmachine is free software gepubliceerd onder de GNU GPL licentie.\r\n\r\nU kan een kopie van GNU GPL licentie hier bezichtigen:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nU kan ook een vertaling van de GNU GPL licentie vier bezichtigen:\r\nhttp://www.gnu.org/licenses/translations.html" + IDS_MATH_ERROR "Fout" + IDS_QUICKHELP "Snelle hulp" +END + Propchange: trunk/reactos/base/applications/calc/lang/nl-NL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== --- trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] Tue May 6 12:54:08 2008 @@ -45,6 +45,7 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/it-IT.rc" +#include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc"

1 0

[mpiulachs] 33325: -fix build
by mpiulachs＠svn.reactos.org 06 May '08

06 May '08

Author: mpiulachs Date: Tue May 6 10:27:34 2008 New Revision: 33325 URL: http://svn.reactos.org/svn/reactos?rev=33325&view=rev Log: -fix build Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Tue May 6 10:27:34 2008 @@ -3837,13 +3837,13 @@ GenerateRules (); const FileLocation *target_file = GetTargetFilename ( module, NULL ); - fprintf ( fMakefile, "%s: | %s\n", + fprintf ( fMakefile, "%s: $(CABMAN_TARGET) | %s\n", targetMacro.c_str (), backend->GetFullPath ( *target_file ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_CABMAN)\n" ); fprintf ( fMakefile, - "\t$(Q)$(cabman_TARGET) -M raw -S %s $(%s_SOURCES)\n", // Escape the asterisk for Make + "\t$(Q)$(CABMAN_TARGET) -M raw -S %s $(%s_SOURCES)\n", // Escape the asterisk for Make targetMacro.c_str (), module.name.c_str()); }

1 0

[mpiulachs] 33324: -fix build
by mpiulachs＠svn.reactos.org 06 May '08

06 May '08

Author: mpiulachs Date: Tue May 6 09:52:46 2008 New Revision: 33324 URL: http://svn.reactos.org/svn/reactos?rev=33324&view=rev Log: -fix build Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Tue May 6 09:52:46 2008 @@ -3843,7 +3843,7 @@ fprintf ( fMakefile, "\t$(ECHO_CABMAN)\n" ); fprintf ( fMakefile, - "\t$(Q)$(CABMAN_TARGET) -M raw -S %s $(%s_SOURCES)\n", // Escape the asterisk for Make + "\t$(Q)$(cabman_TARGET) -M raw -S %s $(%s_SOURCES)\n", // Escape the asterisk for Make targetMacro.c_str (), module.name.c_str()); }

1 0

[mpiulachs] 33323: -Fix unnecessary msi builds (part 2/2)
by mpiulachs＠svn.reactos.org 06 May '08

06 May '08

Author: mpiulachs Date: Tue May 6 09:43:24 2008 New Revision: 33323 URL: http://svn.reactos.org/svn/reactos?rev=33323&view=rev Log: -Fix unnecessary msi builds (part 2/2) Modified: trunk/reactos/dll/win32/msi/msi.rbuild Modified: trunk/reactos/dll/win32/msi/msi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.rbuild [iso-8859-1] Tue May 6 09:43:24 2008 @@ -70,10 +70,10 @@ <library>odbccp32</library> <library>uuid</library> <library>ntdll</library> - <dependency>msi_msiserver_typelib</dependency> + <dependency>msiserver</dependency> <dependency>msiheader</dependency> </module> -<module name="msi_msiserver_typelib" type="embeddedtypelib" allowwarnings="true"> +<module name="msiserver" type="embeddedtypelib" allowwarnings="true"> <file>msiserver.idl</file> </module> <module name="msiheader" type="idlheader">

1 0

[mpiulachs] 33322: -Fix unnecessary msi builds, this time for real! msi module was referencing the module 'msi_msiserver_typelib' expecting (OUTPUT)msi_msiserver_typelib.tlb to be build inset of (INTERMEDIATE)msiserver.tlb (the actual generated file). As a result the file was never created and make was trying to recreate it on every build. mystery solved :) (part 1/2)
by mpiulachs＠svn.reactos.org 06 May '08

06 May '08

Author: mpiulachs Date: Tue May 6 09:42:49 2008 New Revision: 33322 URL: http://svn.reactos.org/svn/reactos?rev=33322&view=rev Log: -Fix unnecessary msi builds, this time for real! msi module was referencing the module 'msi_msiserver_typelib' expecting (OUTPUT)msi_msiserver_typelib.tlb to be build inset of (INTERMEDIATE)msiserver.tlb (the actual generated file). As a result the file was never created and make was trying to recreate it on every build. mystery solved :) (part 1/2) Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Tue May 6 09:42:49 2008 @@ -1340,7 +1340,7 @@ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule widlTlbRule ( "$(source): ${$(module_name)_precondition}\n" - "$(OUTPUT)$(SEP)$(source_dir)$(SEP)$(module_name).tlb: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(module_name).tlb: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -T $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).tlb $(source)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Tue May 6 09:42:49 2008 @@ -970,10 +970,10 @@ case LiveIso: case IsoRegTest: case LiveIsoRegTest: - case EmbeddedTypeLib: case ElfExecutable: case Cabinet: return OutputDirectory; + case EmbeddedTypeLib: case StaticLibrary: case HostStaticLibrary: case ObjectLibrary:

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs