Ros-diffs February 2010

ros-diffs@reactos.org

22 participants
365 discussions

[fireball] 45601: - Implement SetDIBColorTable.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Feb 16 20:56:35 2010 New Revision: 45601 URL: http://svn.reactos.org/svn/reactos?rev=45601&view=rev Log: - Implement SetDIBColorTable. Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.… [View More]c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Tue Feb 16 20:56:35 2010 @@ -717,8 +717,7 @@ UINT CDECL RosDrv_SetDIBColorTable( NTDRV_PDEVICE *physDev, UINT start, UINT count, const RGBQUAD *colors ) { - UNIMPLEMENTED; - return 0; + return RosGdiSetDIBColorTable(physDev->hKernelDC, start, count, colors); } INT CDECL RosDrv_SetDIBits( NTDRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c [iso-8859-1] Tue Feb 16 20:56:35 2010 @@ -351,10 +351,20 @@ return 0; } -UINT APIENTRY RosGdiSetDIBColorTable( HDC physDev, UINT start, UINT count, const RGBQUAD *colors ) -{ - UNIMPLEMENTED; - return 0; +UINT APIENTRY RosGdiSetDIBColorTable( HDC physDev, UINT StartIndex, UINT Entries, const RGBQUAD *Colors ) +{ + PDC pDC; + + /* Get a pointer to the DCs */ + pDC = DC_Lock(physDev); + + Entries = GreSetDIBColorTable(pDC, StartIndex, Entries, Colors); + + /* Release DC objects */ + DC_Unlock(pDC); + + /* Return amount of lines set */ + return Entries; } INT APIENTRY RosGdiSetDIBits(HDC physDev, HBITMAP hUserBitmap, UINT StartScan, Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] Tue Feb 16 20:56:35 2010 @@ -1227,4 +1227,53 @@ return ret; } +UINT +NTAPI +GreSetDIBColorTable( + PDC dc, + UINT StartIndex, + UINT Entries, + CONST RGBQUAD *Colors) +{ + PSURFACE psurf; + PPALETTE PalGDI; + UINT Index; + ULONG biBitCount; + + psurf = dc->pBitmap; + if (psurf == NULL) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return 0; + } + + biBitCount = BitsPerFormat(psurf->SurfObj.iBitmapFormat); + if (biBitCount <= 8 && StartIndex < (1 << biBitCount)) + { + if (StartIndex + Entries > (1 << biBitCount)) + Entries = (1 << biBitCount) - StartIndex; + + PalGDI = PALETTE_LockPalette(psurf->hDIBPalette); + if (PalGDI == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + for (Index = StartIndex; + Index < StartIndex + Entries && Index < PalGDI->NumColors; + Index++) + { + PalGDI->IndexedColors[Index].peRed = Colors[Index - StartIndex].rgbRed; + PalGDI->IndexedColors[Index].peGreen = Colors[Index - StartIndex].rgbGreen; + PalGDI->IndexedColors[Index].peBlue = Colors[Index - StartIndex].rgbBlue; + } + PALETTE_UnlockPalette(PalGDI); + } + else + Entries = 0; + + return Entries; +} + /* EOF */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] Tue Feb 16 20:56:35 2010 @@ -109,6 +109,14 @@ CONST BITMAPINFO *bmi, UINT ColorUse); +UINT +NTAPI +GreSetDIBColorTable( + PDC pDC, + UINT StartIndex, + UINT Entries, + CONST RGBQUAD *Colors); + INT FASTCALL BitsPerFormat(ULONG Format); [View Less]

15 years, 4 months

[fireball] 45600: - Implement kernelmode part of SetDIBitsToDevice (heavily based on win32k from r41760).

by fireball＠svn.reactos.org

Author: fireball Date: Tue Feb 16 19:45:49 2010 New Revision: 45600 URL: http://svn.reactos.org/svn/reactos?rev=45600&view=rev Log: - Implement kernelmode part of SetDIBitsToDevice (heavily based on win32k from r41760). Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/… [View More]bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c [iso-8859-1] Tue Feb 16 19:45:49 2010 @@ -388,11 +388,33 @@ INT APIENTRY RosGdiSetDIBitsToDevice( HDC physDev, INT xDest, INT yDest, DWORD cx, DWORD cy, INT xSrc, INT ySrc, - UINT startscan, UINT lines, LPCVOID bits, - const BITMAPINFO *info, UINT coloruse ) -{ - UNIMPLEMENTED; - return 0; + UINT StartScan, UINT ScanLines, LPCVOID Bits, + const BITMAPINFO *bmi, UINT ColorUse ) +{ + PDC pDC; + + /* Get a pointer to the DCs */ + pDC = DC_Lock(physDev); + + /* Set the bits */ + ScanLines = GreSetDIBitsToDevice(pDC, + xDest, + yDest, + cx, + cy, + xSrc, + ySrc, + StartScan, + ScanLines, + Bits, + bmi, + ColorUse); + + /* Release DC objects */ + DC_Unlock(pDC); + + /* Return amount of lines set */ + return ScanLines; } BOOL APIENTRY RosGdiStretchBlt( HDC physDevDst, INT xDst, INT yDst, Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] Tue Feb 16 19:45:49 2010 @@ -1093,4 +1093,138 @@ return Result; } +INT +NTAPI +GreSetDIBitsToDevice( + PDC pDC, + INT XDest, + INT YDest, + DWORD Width, + DWORD Height, + INT XSrc, + INT YSrc, + UINT StartScan, + UINT ScanLines, + CONST VOID *Bits, + CONST BITMAPINFO *bmi, + UINT ColorUse) +{ + INT ret = 0; + NTSTATUS Status = STATUS_SUCCESS; + HBITMAP hSourceBitmap = NULL; + SURFOBJ *pDestSurf, *pSourceSurf = NULL; + SURFACE *pSurf; + RECTL rcDest; + POINTL ptSource; + INT DIBWidth; + SIZEL SourceSize; + XLATEOBJ *XlateObj = NULL; + PPALETTE pDCPalette; + HPALETTE DDBPalette, DIBPalette = NULL; + ULONG DDBPaletteType, DIBPaletteType; + + if (!Bits) return 0; + + /* Use destination palette obtained from the DC by default */ + DDBPalette = pDC->pPDevice->DevInfo.hpalDefault; + + /* Try to use hDIBPalette if it exists */ + pSurf = pDC->pBitmap; + if (pSurf && pSurf->hDIBPalette) + { + DDBPalette = pSurf->hDIBPalette; + } + + pDestSurf = pSurf ? &pSurf->SurfObj : NULL; + + rcDest.left = XDest; + rcDest.top = YDest; + rcDest.left += pDC->rcVport.left + pDC->rcDcRect.left; + rcDest.top += pDC->rcVport.top + pDC->rcDcRect.top; + + rcDest.right = rcDest.left + Width; + rcDest.bottom = rcDest.top + Height; + ptSource.x = XSrc; + ptSource.y = YSrc; + + SourceSize.cx = bmi->bmiHeader.biWidth; + SourceSize.cy = ScanLines; // this one --> abs(bmi->bmiHeader.biHeight) - StartScan + DIBWidth = DIB_GetDIBWidthBytes(SourceSize.cx, bmi->bmiHeader.biBitCount); + + hSourceBitmap = EngCreateBitmap(SourceSize, + DIBWidth, + GrepBitmapFormat(bmi->bmiHeader.biBitCount, bmi->bmiHeader.biCompression), + bmi->bmiHeader.biHeight < 0 ? BMF_TOPDOWN : 0, + (PVOID) Bits); + if (!hSourceBitmap) + { + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); + Status = STATUS_NO_MEMORY; + goto Exit; + } + + pSourceSurf = EngLockSurface((HSURF)hSourceBitmap); + if (!pSourceSurf) + { + Status = STATUS_UNSUCCESSFUL; + goto Exit; + } + + /* Obtain destination palette */ + pDCPalette = PALETTE_LockPalette(DDBPalette); + if (!pDCPalette) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + Status = STATUS_UNSUCCESSFUL; + goto Exit; + } + + DDBPaletteType = pDCPalette->Mode; + PALETTE_UnlockPalette(pDCPalette); + + DIBPalette = BuildDIBPalette(bmi, (PINT)&DIBPaletteType); + if (!DIBPalette) + { + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); + Status = STATUS_NO_MEMORY; + goto Exit; + } + + /* Determine XlateObj */ + XlateObj = IntEngCreateXlate(DDBPaletteType, DIBPaletteType, DDBPalette, DIBPalette); + if (!XlateObj) + { + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); + Status = STATUS_NO_MEMORY; + goto Exit; + } + + /* Copy the bits */ + Status = GrepBitBltEx(pDestSurf, + pSourceSurf, + NULL, + pDC->CombinedClip, + XlateObj, + &rcDest, + &ptSource, + NULL, + NULL, + NULL, + ROP3_TO_ROP4(SRCCOPY), + TRUE); +Exit: + if (NT_SUCCESS(Status)) + { + /* FIXME: Should probably be only the number of lines actually copied */ + ret = ScanLines; // this one --> abs(Info->bmiHeader.biHeight) - StartScan; + } + + if (pSourceSurf) EngUnlockSurface(pSourceSurf); + if (hSourceBitmap) EngDeleteSurface((HSURF)hSourceBitmap); + if (XlateObj) EngDeleteXlate(XlateObj); + if (DIBPalette) PALETTE_FreePaletteByHandle(DIBPalette); + + return ret; +} + /* EOF */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] Tue Feb 16 19:45:49 2010 @@ -93,6 +93,22 @@ BITMAPINFO *bmi, UINT ColorUse); +INT +NTAPI +GreSetDIBitsToDevice( + PDC DC, + INT xDest, + INT yDest, + DWORD cx, + DWORD cy, + INT xSrc, + INT ySrc, + UINT StartScan, + UINT ScanLines, + CONST VOID *Bits, + CONST BITMAPINFO *bmi, + UINT ColorUse); + INT FASTCALL BitsPerFormat(ULONG Format); @@ -362,4 +378,7 @@ INT FASTCALL MouseSafetyOnDrawEnd(SURFOBJ *pso); +/* Test functions */ +VOID NTAPI GrePerformTests(); + #endif [View Less]

15 years, 4 months

[fireball] 45599: - Implement usermode part of SetDIBitsToDevice.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Feb 16 19:43:21 2010 New Revision: 45599 URL: http://svn.reactos.org/svn/reactos?rev=45599&view=rev Log: - Implement usermode part of SetDIBitsToDevice. Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/dll/win32/winent.drv/winent.h Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… =====================================… [View More]========================================= --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Tue Feb 16 19:43:21 2010 @@ -732,8 +732,59 @@ UINT startscan, UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse ) { - UNIMPLEMENTED; - return 0; + BOOL top_down; + LONG height, width; + WORD infoBpp, compression; + POINT pt; + + pt.x = xDest; pt.y = yDest; + LPtoDP(physDev->hUserDC, &pt, 1); + + /* Perform extensive parameter checking */ + if (DIB_GetBitmapInfo( &info->bmiHeader, &width, &height, + &infoBpp, &compression ) == -1) + return 0; + + top_down = (height < 0); + if (top_down) height = -height; + + if (!lines || (startscan >= height)) return 0; + if (!top_down && startscan + lines > height) lines = height - startscan; + + /* make xSrc,ySrc point to the upper-left corner, not the lower-left one, + * and clamp all values to fit inside [startscan,startscan+lines] + */ + if (ySrc + cy <= startscan + lines) + { + UINT y = startscan + lines - (ySrc + cy); + if (ySrc < startscan) cy -= (startscan - ySrc); + if (!top_down) + { + /* avoid getting unnecessary lines */ + ySrc = 0; + if (y >= lines) return 0; + lines -= y; + } + else + { + if (y >= lines) return lines; + ySrc = y; /* need to get all lines in top down mode */ + } + } + else + { + if (ySrc >= startscan + lines) return lines; + pt.y += ySrc + cy - (startscan + lines); + cy = startscan + lines - ySrc; + ySrc = 0; + if (cy > lines) cy = lines; + } + if (xSrc >= width) return lines; + if (xSrc + cx >= width) cx = width - xSrc; + if (!cx || !cy) return lines; + + return RosGdiSetDIBitsToDevice(physDev->hKernelDC, pt.x, pt.y, cx, cy, + xSrc, ySrc, startscan, lines, bits, info, coloruse); } void CDECL RosDrv_SetDeviceClipping( NTDRV_PDEVICE *physDev, HRGN vis_rgn, HRGN clip_rgn ) @@ -850,4 +901,54 @@ return FALSE; } +/*********************************************************************** + * DIB_GetBitmapInfoEx + * + * Get the info from a bitmap header. + * Return 1 for INFOHEADER, 0 for COREHEADER, -1 for error. + */ +int DIB_GetBitmapInfoEx( const BITMAPINFOHEADER *header, LONG *width, + LONG *height, WORD *planes, WORD *bpp, + WORD *compr, DWORD *size ) +{ + if (header->biSize == sizeof(BITMAPCOREHEADER)) + { + const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)header; + *width = core->bcWidth; + *height = core->bcHeight; + *planes = core->bcPlanes; + *bpp = core->bcBitCount; + *compr = 0; + *size = 0; + return 0; + } + if (header->biSize >= sizeof(BITMAPINFOHEADER)) + { + *width = header->biWidth; + *height = header->biHeight; + *planes = header->biPlanes; + *bpp = header->biBitCount; + *compr = header->biCompression; + *size = header->biSizeImage; + return 1; + } + ERR("(%d): unknown/wrong size for header\n", header->biSize ); + return -1; +} + +/*********************************************************************** + * DIB_GetBitmapInfo + * + * Get the info from a bitmap header. + * Return 1 for INFOHEADER, 0 for COREHEADER, -1 for error. + */ +int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, + LONG *height, WORD *bpp, WORD *compr ) +{ + WORD planes; + DWORD size; + + return DIB_GetBitmapInfoEx( header, width, height, &planes, bpp, compr, &size); +} + /* EOF */ Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] Tue Feb 16 19:43:21 2010 @@ -37,6 +37,15 @@ RECT client_rect; /* client area relative to parent */ }; +/* gdidrv.c */ +int DIB_GetBitmapInfoEx( const BITMAPINFOHEADER *header, LONG *width, + LONG *height, WORD *planes, WORD *bpp, + WORD *compr, DWORD *size ); + +int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, + LONG *height, WORD *bpp, WORD *compr ); + + /* font.c */ VOID FeSelectFont(NTDRV_PDEVICE *physDev, HFONT hFont); [View Less]

15 years, 4 months

[tkreuzer] 45598: [NTOS] Allocate the trap frame on the stack by decreasing esp before modifying any members. While doing it after is a tiny optimization (no need to wait for esp to be ready) and would work with all real traps (which clear cli), it doesn't work with Zw calls that directly call KiSystemService with interrupts enabled. This caused random trap frame corruption when an interrupt fired after members of the trap frame have been set but before esp was adjusted. Should hopefully fix mos

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 15 21:16:15 2010 New Revision: 45598 URL: http://svn.reactos.org/svn/reactos?rev=45598&view=rev Log: [NTOS] Allocate the trap frame on the stack by decreasing esp before modifying any members. While doing it after is a tiny optimization (no need to wait for esp to be ready) and would work with all real traps (which clear cli), it doesn't work with Zw calls that directly call KiSystemService with interrupts enabled. This caused random trap frame corruption … [View More]when an interrupt fired after members of the trap frame have been set but before esp was adjusted. Should hopefully fix most random failures on real hardware and qemu. Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Mon Feb 15 21:16:15 2010 @@ -115,38 +115,41 @@ endif + /* Make space for this frame */ + sub esp, FrameSize + /* Save nonvolatile registers */ - mov [esp - FrameSize + KTRAP_FRAME_EBP], ebp - mov [esp - FrameSize + KTRAP_FRAME_EBX], ebx - mov [esp - FrameSize + KTRAP_FRAME_ESI], esi - mov [esp - FrameSize + KTRAP_FRAME_EDI], edi + mov [esp + KTRAP_FRAME_EBP], ebp + mov [esp + KTRAP_FRAME_EBX], ebx + mov [esp + KTRAP_FRAME_ESI], esi + mov [esp + KTRAP_FRAME_EDI], edi /* Save eax for system calls, for use by the C handler */ - mov [esp - FrameSize + KTRAP_FRAME_EAX], eax + mov [esp + KTRAP_FRAME_EAX], eax /* Does the caller want nonvolatiles only? */ if ((Flags AND KI_NONVOLATILES_ONLY) == 0) /* Otherwise, save the volatiles as well */ - mov [esp - FrameSize + KTRAP_FRAME_ECX], ecx - mov [esp - FrameSize + KTRAP_FRAME_EDX], edx + mov [esp + KTRAP_FRAME_ECX], ecx + mov [esp + KTRAP_FRAME_EDX], edx endif /* Save segment registers? */ if ((Flags AND KI_DONT_SAVE_SEGS) == 0) /* Check for V86 mode */ - test byte ptr [esp - FrameSize + KTRAP_FRAME_EFLAGS + 2], (EFLAGS_V86_MASK >> 16) + test byte ptr [esp + KTRAP_FRAME_EFLAGS + 2], (EFLAGS_V86_MASK >> 16) jz not_v86_trap /* Restore V8086 segments into Protected Mode segments */ - mov eax, [esp - FrameSize + KTRAP_FRAME_V86_DS] - mov ecx, [esp - FrameSize + KTRAP_FRAME_V86_ES] - mov [esp - FrameSize + KTRAP_FRAME_DS], eax - mov [esp - FrameSize + KTRAP_FRAME_ES], ecx - mov eax, [esp - FrameSize + KTRAP_FRAME_V86_FS] - mov ecx, [esp - FrameSize + KTRAP_FRAME_V86_GS] - mov [esp - FrameSize + KTRAP_FRAME_FS], eax - mov [esp - FrameSize + KTRAP_FRAME_GS], ecx + mov eax, [esp + KTRAP_FRAME_V86_DS] + mov ecx, [esp + KTRAP_FRAME_V86_ES] + mov [esp + KTRAP_FRAME_DS], eax + mov [esp + KTRAP_FRAME_ES], ecx + mov eax, [esp + KTRAP_FRAME_V86_FS] + mov ecx, [esp + KTRAP_FRAME_V86_GS] + mov [esp + KTRAP_FRAME_FS], eax + mov [esp + KTRAP_FRAME_GS], ecx jmp set_sane_segs not_v86_trap: @@ -154,12 +157,12 @@ /* Save segment selectors */ mov eax, ds mov ecx, es - mov [esp - FrameSize + KTRAP_FRAME_DS], eax - mov [esp - FrameSize + KTRAP_FRAME_ES], ecx + mov [esp + KTRAP_FRAME_DS], eax + mov [esp + KTRAP_FRAME_ES], ecx mov eax, fs mov ecx, gs - mov [esp - FrameSize + KTRAP_FRAME_FS], eax - mov [esp - FrameSize + KTRAP_FRAME_GS], ecx + mov [esp + KTRAP_FRAME_FS], eax + mov [esp + KTRAP_FRAME_GS], ecx endif @@ -176,14 +179,11 @@ mov fs, ax endif - /* Make space for this frame */ - sub esp, FrameSize + /* Set parameter 1 (ECX) to point to the frame */ + mov ecx, esp /* Clear direction flag */ cld - - /* Set parameter 1 (ECX) to point to the frame */ - mov ecx, esp ENDM [View Less]

15 years, 4 months

[sserapion] 45597: forgot this file

by sserapion＠svn.reactos.org

Author: sserapion Date: Mon Feb 15 17:23:55 2010 New Revision: 45597 URL: http://svn.reactos.org/svn/reactos?rev=45597&view=rev Log: forgot this file Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== ---… [View More] branches/ros-amd64-bringup/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp [iso-8859-1] Mon Feb 15 17:23:55 2010 @@ -461,8 +461,8 @@ vcdir = DEF_SSEP + _get_vc_dir(); } - fprintf ( OUT, "\t\t<Configuration\r\n" ); - fprintf ( OUT, "\t\t\tName=\"%s|Win32\"\r\n", cfg.name.c_str() ); + fprintf ( OUT, "\t\t<Configuration\r\n" ); + fprintf ( OUT, "\t\t\tName=\"%s|Win32\"\r\n", cfg.name.c_str() ); if ( configuration.UseConfigurationInPath ) { @@ -527,24 +527,18 @@ const std::string& include = includes[i]; if ( strcmp ( include.c_str(), "." ) ) { - const std::string& include = includes[i]; - if ( strcmp ( include.c_str(), "." ) ) - { - if ( multiple_includes ) - fprintf ( OUT, ";" ); - fprintf ( OUT, "%s", include.c_str() ); - include_string += " /I " + include; - multiple_includes = true; - } - } - if ( include_idl ) - { if ( multiple_includes ) fprintf ( OUT, ";" ); fprintf ( OUT, "%s", include.c_str() ); multiple_includes = true; } - if ( cfg.headers == ReactOSHeaders ) + } + if ( include_idl ) + { + if ( multiple_includes ) + fprintf ( OUT, ";" ); + + if ( configuration.UseConfigurationInPath ) { fprintf ( OUT, "$(int)\\include\\reactos\\idl%s\\$(ConfigurationName)\r\n", vcdir.c_str ()); } @@ -556,17 +550,17 @@ fprintf ( OUT, "\"\r\n" ); - StringSet defines = common_defines; + StringSet defines = common_defines; if ( binaryType == Lib || binaryType == Exe ) - { - defines.insert ( "_LIB" ); - } - else - { - defines.insert ( "_WINDOWS" ); - defines.insert ( "_USRDLL" ); - } + { + defines.insert ( "_LIB" ); + } + else + { + defines.insert ( "_WINDOWS" ); + defines.insert ( "_USRDLL" ); + } fprintf ( OUT, "\t\t\t\tPreprocessorDefinitions=\"" ); for ( StringSet::iterator it1=defines.begin(); it1!=defines.end(); it1++ ) @@ -601,8 +595,8 @@ fprintf ( OUT, "\t\t\t/>\r\n"); - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCCustomBuildTool\"/>\r\n" ); + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCCustomBuildTool\"/>\r\n" ); if ( binaryType != Lib ) { @@ -613,164 +607,136 @@ if (configuration.VSProjectVersion == "9.00") { - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCLibrarianTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s.lib\"/>\r\n", module.name.c_str() ); - } - else - { - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCLinkerTool\"\r\n" ); - if (module.GetEntryPoint() == "0" && binaryType != Sys ) - fprintf ( OUT, "AdditionalOptions=\"/noentry\"" ); - - if (configuration.VSProjectVersion == "9.00") - { - fprintf ( OUT, "\t\t\t\tRandomizedBaseAddress=\"0\"\r\n" ); - fprintf ( OUT, "\t\t\t\tDataExecutionPrevention=\"0\"\r\n" ); - } - - if (module.importLibrary != NULL) - fprintf ( OUT, "\t\t\t\tModuleDefinitionFile=\"%s\"\r\n", importLib.c_str()); - - fprintf ( OUT, "\t\t\t\tAdditionalDependencies=\"" ); - bool use_msvcrt_lib = false; - for ( i = 0; i < libraries.size(); i++ ) - { - if ( i > 0 ) - fprintf ( OUT, " " ); - string libpath = libraries[i].c_str(); - libpath = libpath.erase (0, libpath.find_last_of ("\\") + 1 ); - if ( libpath == "msvcrt.lib" ) - { - use_msvcrt_lib = true; - } - fprintf ( OUT, "%s", libpath.c_str() ); - } - fprintf ( OUT, "\"\r\n" ); - - fprintf ( OUT, "\t\t\t\tAdditionalLibraryDirectories=\"" ); - - // Add conventional libraries dirs - for (i = 0; i < libraries.size (); i++) - { - if ( i > 0 ) - fprintf ( OUT, ";" ); + fprintf ( OUT, "\t\t\t\tRandomizedBaseAddress=\"0\"\r\n" ); + fprintf ( OUT, "\t\t\t\tDataExecutionPrevention=\"0\"\r\n" ); + } + + if (module.importLibrary != NULL) + fprintf ( OUT, "\t\t\t\tModuleDefinitionFile=\"%s\"\r\n", importLib.c_str()); + + fprintf ( OUT, "\t\t\t\tAdditionalDependencies=\"" ); + bool use_msvcrt_lib = false; + for ( i = 0; i < libraries.size(); i++ ) + { + if ( i > 0 ) + fprintf ( OUT, " " ); + string libpath = libraries[i].c_str(); + libpath = libpath.erase (0, libpath.find_last_of ("\\") + 1 ); + if ( libpath == "msvcrt.lib" ) + { + use_msvcrt_lib = true; + } + fprintf ( OUT, "%s", libpath.c_str() ); + } + fprintf ( OUT, "\"\r\n" ); + + fprintf ( OUT, "\t\t\t\tAdditionalLibraryDirectories=\"" ); + + // Add conventional libraries dirs + for (i = 0; i < libraries.size (); i++) + { + if ( i > 0 ) + fprintf ( OUT, ";" ); string libpath = libraries[i].c_str(); libpath = libpath.substr (0, libpath.find_last_of ("\\") ); fprintf ( OUT, "%s", libpath.c_str() ); } - fprintf ( OUT, "\"\r\n" ); + fprintf ( OUT, "\"\r\n" ); fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s%s\"\r\n", module.name.c_str(), module_type.c_str() ); if ( binaryType == Sys ) - { + { if (module.GetEntryPoint() == "0") - fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /noentry /ALIGN:0x20 /SECTION:INIT,D /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" ); - else - fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /ALIGN:0x20 /SECTION:INIT,D /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" ); + fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /noentry /ALIGN:0x20 /SECTION:INIT,D /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" ); + else + fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /ALIGN:0x20 /SECTION:INIT,D /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" ); + fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 3 ); + fprintf ( OUT, "\t\t\t\tDriver=\"%d\"\r\n", 1 ); + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.GetEntryPoint() == "" ? "DriverEntry" : module.GetEntryPoint().c_str ()); + fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x10000" : baseaddr.c_str ()); + } + else if ( binaryType == Exe ) + { + if ( module.type == Kernel ) + { + fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SECTION:INIT,D /ALIGN:0x80\"\r\n" ); fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" ); fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 3 ); fprintf ( OUT, "\t\t\t\tDriver=\"%d\"\r\n", 1 ); - fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.GetEntryPoint() == "" ? "DriverEntry" : module.GetEntryPoint().c_str ()); - fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x10000" : baseaddr.c_str ()); - } - else if ( binaryType == Exe ) - { - if ( module.type == Kernel ) - { - fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SECTION:INIT,D /ALIGN:0x80\"\r\n" ); - fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); - fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" ); - fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 3 ); - fprintf ( OUT, "\t\t\t\tDriver=\"%d\"\r\n", 1 ); - fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"KiSystemStartup\"\r\n" ); - fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr.c_str ()); - } - else if ( module.type == NativeCUI ) - { - fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /ALIGN:0x20\"\r\n" ); - fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 1 ); - fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" ); - fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); - fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"NtProcessStartup\"\r\n" ); - fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr.c_str ()); - } - else if ( module.type == Win32CUI || module.type == Win32GUI || module.type == Win32SCR) - { - if ( use_msvcrt_lib ) - { - fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); - } - fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 2 ); - } - } - else if ( binaryType == Dll ) - { - if (module.GetEntryPoint() == "0") - fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"\"\r\n" ); - else - { - // get rid of DllMain@12 because MSVC needs to link to _DllMainCRTStartup@12 - // when using CRT - if (module.GetEntryPoint() == "DllMain@12") - fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"\"\r\n" ); - else - fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.GetEntryPoint().c_str ()); - } - fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x40000" : baseaddr.c_str ()); + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"KiSystemStartup\"\r\n" ); + fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr.c_str ()); + } + else if ( module.type == NativeCUI ) + { + fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /ALIGN:0x20\"\r\n" ); + fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 1 ); + fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"NtProcessStartup\"\r\n" ); + fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr.c_str ()); + } + else if ( module.type == Win32CUI || module.type == Win32GUI || module.type == Win32SCR) + { if ( use_msvcrt_lib ) { fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); } - } - fprintf ( OUT, "\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 ); + fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 2 ); + } + } + else if ( binaryType == Dll ) + { + if (module.GetEntryPoint() == "0") + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"\"\r\n" ); + else + { + // get rid of DllMain@12 because MSVC needs to link to _DllMainCRTStartup@12 + // when using CRT + if (module.GetEntryPoint() == "DllMain@12") + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"\"\r\n" ); + else + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.GetEntryPoint().c_str ()); + } + fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x40000" : baseaddr.c_str ()); + if ( use_msvcrt_lib ) + { + fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); + } } fprintf ( OUT, "\t\t\t/>\r\n" ); } + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCResourceCompilerTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\tAdditionalIncludeDirectories=\"" ); + multiple_includes = false; + fprintf ( OUT, "./;" ); + for ( i = 0; i < includes.size(); i++ ) + { + const std::string& include = includes[i]; + if ( strcmp ( include.c_str(), "." ) ) + { + if ( multiple_includes ) + fprintf ( OUT, ";" ); + fprintf ( OUT, "%s", include.c_str() ); + multiple_includes = true; + } + } + + fprintf ( OUT, "\"/>\r\n " ); + + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCMIDLTool\"/>\r\n" ); + if (configuration.VSProjectVersion == "8.00") + { fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCResourceCompilerTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\tAdditionalIncludeDirectories=\"" ); - multiple_includes = false; - fprintf ( OUT, "./;" ); - for ( i = 0; i < includes.size(); i++ ) - { - const std::string& include = includes[i]; - if ( strcmp ( include.c_str(), "." ) ) - { - if ( multiple_includes ) - fprintf ( OUT, ";" ); - fprintf ( OUT, "%s", include.c_str() ); - multiple_includes = true; - } - } - } - - fprintf ( OUT, "\"/>\r\n " ); - - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCMIDLTool\"/>\r\n" ); - if (configuration.VSProjectVersion == "8.00") - { - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCManifestTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\tEmbedManifest=\"false\"/>\r\n" ); - } - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCPostBuildEventTool\"/>\r\n" ); - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCPreBuildEventTool\"/>\r\n" ); - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCPreLinkEventTool\"/>\r\n" ); - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCWebServiceProxyGeneratorTool\"/>\r\n" ); - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCWebDeploymentTool\"/>\r\n" ); - fprintf ( OUT, "\t\t</Configuration>\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCManifestTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\tEmbedManifest=\"false\"/>\r\n" ); } fprintf ( OUT, "\t\t</Configuration>\r\n" ); } @@ -790,7 +756,7 @@ if ( intenv == "obj-i386" ) intdir = path_basedir + "obj-i386"; /* append relative dir from project dir */ - else + else intdir = intenv; if ( outenv == "output-i386" ) @@ -799,23 +765,23 @@ outdir = outenv; if ( configuration.UseVSVersionInPath ) - { + { vcdir = DEF_SSEP + _get_vc_dir(); - } + } fprintf ( OUT, "\t\t<Configuration\r\n" ); fprintf ( OUT, "\t\t\tName=\"%s|Win32\"\r\n", cfg.name.c_str() ); if ( configuration.UseConfigurationInPath ) - { + { fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\\%s\\%s\"\r\n", outdir.c_str (), module.output->relative_path.c_str (), cfg.name.c_str() ); fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\\%s\\%s\"\r\n", intdir.c_str (), module.output->relative_path.c_str (), cfg.name.c_str() ); - } - else - { + } + else + { fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\\%s\"\r\n", outdir.c_str (), module.output->relative_path.c_str () ); fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\\%s\"\r\n", intdir.c_str (), module.output->relative_path.c_str () ); - } + } fprintf ( OUT, "\t\t\tConfigurationType=\"0\"\r\n"); fprintf ( OUT, "\t\t\t>\r\n" ); @@ -834,6 +800,6 @@ fprintf ( OUT, "\t\t\t\tForcedUsingAssemblies=\"\"\r\n"); fprintf ( OUT, "\t\t\t\tCompileAsManaged=\"\"\r\n"); - fprintf ( OUT, "\t\t\t/>\r\n" ); - fprintf ( OUT, "\t\t</Configuration>\r\n" ); - } + fprintf ( OUT, "\t\t\t/>\r\n" ); + fprintf ( OUT, "\t\t</Configuration>\r\n" ); +} [View Less]

15 years, 4 months

[sserapion] 45596: Reduce diferences with trunk.

by sserapion＠svn.reactos.org

Author: sserapion Date: Mon Feb 15 07:14:17 2010 New Revision: 45596 URL: http://svn.reactos.org/svn/reactos?rev=45596&view=rev Log: Reduce diferences with trunk. Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/linkers/ld.mak branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/… [View More]linkers/ld.mak URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/linkers/ld.mak [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/linkers/ld.mak [iso-8859-1] Mon Feb 15 07:14:17 2010 @@ -87,4 +87,4 @@ #~ #(module, def, deps, ldflags, libs, entry, base) #~ RBUILD_LINK_RULE=${call RBUILD_LINK,$(1),$(value $(1)_OBJS),$(3),$(4),$(value $(1)_TARGET),$(2),$(5) $(value $(1)_LIBS) $(5),$(6),$(7)} #(module, def, deps, ldflags, libs, entry, base, extralibs) -RBUILD_LINK_RULE=${call RBUILD_LINK,$(1),$(value $(1)_OBJS),$(3),$(4),$(value $(1)_TARGET),$(2),$(value $(1)_LIBS),$(6),$(7),$(5)} +RBUILD_LINK_RULE=${call RBUILD_LINK,$(1),$(value $(1)_OBJS),$(3),$(4),$(value $(1)_TARGET),$(2),$(value $(1)_LIBS),$(6),$(7),$(5)} Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Mon Feb 15 07:14:17 2010 @@ -487,8 +487,11 @@ fputs ( "BUILTIN_CXXINCLUDES+= $(TARGET_CPPFLAGS)\n", fMakefile ); fprintf ( fMakefile, "PROJECT_CCLIBS := \"$(shell ${TARGET_CC} -print-libgcc-file-name)\"\n" ); + fprintf ( fMakefile, "PROJECT_CXXLIBS := \"$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)\" \"$(shell ${TARGET_CPP} -print-libgcc-file-name)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)\" " ); + /* hack to get libgcc_eh.a, should check mingw version or something */ if (Environment::GetArch() == "amd64") + fprintf ( fMakefile, " \"$(shell ${TARGET_CPP} -print-file-name=libgcc_eh.a)\"" ); /* hack to get _get_output_format, needed by libmingwex */ else if (Environment::GetArch() == "i386") fprintf ( fMakefile, "\"$(shell ${TARGET_CPP} -print-file-name=ofmt_stub.a)\""); @@ -977,7 +980,7 @@ { int digit = binutilsVersion.find_last_of("."); if(digit == -1) - { + { printf("Unable to detect binutils version!\n"); return false; } Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Mon Feb 15 07:14:17 2010 @@ -1471,11 +1471,11 @@ module.name.c_str(), definitionFilename.c_str(), module.xmlbuildFile.c_str(), - linkerScriptArgument.c_str (), + linkerScriptArgument.c_str(), extraLibraries.c_str(), module.GetEntryPoint().c_str(), module.baseaddress.c_str() ); - } +} void MingwModuleHandler::GenerateObjectFileTargets ( const IfableData& data ) @@ -1782,12 +1782,6 @@ &module.linkerFlags, used_defs ); - /* LD automatically exports all symbols by default if -shared is specified. Prevent it from doing - this by adding the option -exclude-all-symbols (available since Binutils 20091017). */ - // FIXME: Should only be applied for -shared modules, when there's a smart way to check for them. - if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse && !module.importLibrary ) - fprintf ( fMakefile, "%s_LDFLAGS+=$(LDFLAG_EXCLUDE_ALL_SYMBOLS)\n", module.name.c_str() ); - fprintf ( fMakefile, "\n\n" ); } @@ -1822,7 +1816,7 @@ const FileLocation* ar_target = GenerateArchiveTarget (); if ( ar_target ) - delete ar_target; + delete ar_target; } @@ -2195,9 +2189,9 @@ void MingwKernelModuleHandler::GenerateKernelModuleTarget () { - GenerateRules (); + GenerateRules (); GenerateLinkerCommand (); - } +} MingwKernelModeDLLModuleHandler::MingwKernelModeDLLModuleHandler ( @@ -2224,9 +2218,9 @@ void MingwKernelModeDLLModuleHandler::GenerateKernelModeDLLModuleTarget () { - GenerateRules (); + GenerateRules (); GenerateLinkerCommand (); - } +} MingwNativeDLLModuleHandler::MingwNativeDLLModuleHandler ( @@ -2252,9 +2246,9 @@ void MingwNativeDLLModuleHandler::GenerateNativeDLLModuleTarget () { - GenerateRules (); + GenerateRules (); GenerateLinkerCommand (); - } +} MingwNativeCUIModuleHandler::MingwNativeCUIModuleHandler ( @@ -2280,9 +2274,9 @@ void MingwNativeCUIModuleHandler::GenerateNativeCUIModuleTarget () { - GenerateRules (); + GenerateRules (); GenerateLinkerCommand (); - } +} MingwWin32DLLModuleHandler::MingwWin32DLLModuleHandler ( @@ -2349,9 +2343,9 @@ void MingwWin32DLLModuleHandler::GenerateWin32DLLModuleTarget () { - GenerateRules (); + GenerateRules (); GenerateLinkerCommand (); - } +} void @@ -2369,9 +2363,9 @@ void MingwWin32OCXModuleHandler::GenerateWin32OCXModuleTarget () { - GenerateRules (); + GenerateRules (); GenerateLinkerCommand (); - } +} MingwWin32CUIModuleHandler::MingwWin32CUIModuleHandler ( @@ -2396,9 +2390,9 @@ void MingwWin32CUIModuleHandler::GenerateWin32CUIModuleTarget () { - GenerateRules (); + GenerateRules (); GenerateLinkerCommand (); - } +} MingwWin32GUIModuleHandler::MingwWin32GUIModuleHandler ( @@ -2423,9 +2417,9 @@ void MingwWin32GUIModuleHandler::GenerateWin32GUIModuleTarget () { - GenerateRules (); + GenerateRules (); GenerateLinkerCommand (); - } +} MingwBootLoaderModuleHandler::MingwBootLoaderModuleHandler ( @@ -3024,9 +3018,9 @@ void MingwTestModuleHandler::GenerateTestModuleTarget () { - GenerateRules (); + GenerateRules (); GenerateLinkerCommand (); - } +} MingwAliasModuleHandler::MingwAliasModuleHandler ( @@ -3107,4 +3101,4 @@ delete target_file; fprintf ( fMakefile, "#/ELF EXECUTABLE TARGET\n" ); -} +} [View Less]

15 years, 4 months

[sserapion] 45595: Sync tools to 45592

by sserapion＠svn.reactos.org

Author: sserapion Date: Mon Feb 15 07:02:48 2010 New Revision: 45595 URL: http://svn.reactos.org/svn/reactos?rev=45595&view=rev Log: Sync tools to 45592 Added: branches/ros-amd64-bringup/reactos/tools/log2lines/cmd.c - copied unchanged from r45594, trunk/reactos/tools/log2lines/cmd.c branches/ros-amd64-bringup/reactos/tools/log2lines/cmd.h - copied unchanged from r45594, trunk/reactos/tools/log2lines/cmd.h branches/ros-amd64-bringup/reactos/tools/rbuild/backend/… [View More]

15 years, 4 months

[fireball] 45594: - Calculate correct bounding rectangle and pass it to GrePolygon. Fixes non-filled polygon bug (because GrepFillPolygon relies on a correct bounding rect), issue #31 in the Arwinss wiki. - Pass bounding rect to GrepFillPolygon by pointer instead of by value. - Update line brush in GrePolyline.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Feb 14 21:45:31 2010 New Revision: 45594 URL: http://svn.reactos.org/svn/reactos?rev=45594&view=rev Log: - Calculate correct bounding rectangle and pass it to GrePolygon. Fixes non-filled polygon bug (because GrepFillPolygon relies on a correct bounding rect), issue #31 in the Arwinss wiki. - Pass bounding rect to GrepFillPolygon by pointer instead of by value. - Update line brush in GrePolyline. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/… [View More]misc.c branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c branches/arwinss/reactos/subsystems/win32/win32k/gre/polyfill.c branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] Sun Feb 14 21:45:31 2010 @@ -151,6 +151,7 @@ NTSTATUS Status = STATUS_SUCCESS; POINT pStackBuf[16]; POINT *pPoints = pStackBuf; + RECTL rcBound; ULONG i; /* Get a pointer to the DC */ @@ -186,15 +187,28 @@ return FALSE; } - /* Offset points data */ - for (i=0; i<count; i++) + /* Calculate bounding rect and offset points data */ + pPoints[0].x += pDC->rcDcRect.left + pDC->rcVport.left; + pPoints[0].y += pDC->rcDcRect.top + pDC->rcVport.top; + + rcBound.left = pPoints[0].x; + rcBound.right = pPoints[0].x; + rcBound.top = pPoints[0].y; + rcBound.bottom = pPoints[0].y; + + for (i=1; i<count; i++) { pPoints[i].x += pDC->rcDcRect.left + pDC->rcVport.left; pPoints[i].y += pDC->rcDcRect.top + pDC->rcVport.top; + + rcBound.left = min(rcBound.left, pPoints[i].x); + rcBound.right = max(rcBound.right, pPoints[i].x); + rcBound.top = min(rcBound.top, pPoints[i].y); + rcBound.bottom = max(rcBound.bottom, pPoints[i].y); } /* Draw the polygon */ - GrePolygon(pDC, pPoints, count); + GrePolygon(pDC, pPoints, count, &rcBound); /* Release the object */ DC_Unlock(pDC); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c [iso-8859-1] Sun Feb 14 21:45:31 2010 @@ -112,6 +112,7 @@ /* Draw pen-based polygon */ if (!(pDC->pLineBrush->flAttrs & GDIBRUSH_IS_NULL)) { + GreUpdateBrush(pDC->pLineBrush, pDC); Mix = ROP2_TO_MIX(R2_COPYPEN);/*pdcattr->jROP2*/ for (i=0; i<count-1; i++) { Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/polyfill.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/polyfill.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/polyfill.c [iso-8859-1] Sun Feb 14 21:45:31 2010 @@ -605,7 +605,7 @@ BRUSHOBJ *BrushObj, CONST POINT *Points, int Count, - RECTL DestRect, + CONST PRECTL DestRect, POINTL *BrushOrigin) { FILL_EDGE_LIST *list = 0; @@ -622,7 +622,7 @@ return FALSE; /* For each Scanline from DestRect.top to DestRect.bottom, determine line segments to draw */ - for ( ScanLine = DestRect.top; ScanLine < DestRect.bottom; ++ScanLine ) + for ( ScanLine = DestRect->top; ScanLine < DestRect->bottom; ++ScanLine ) { POLYGONFILL_BuildActiveList(ScanLine, list, &ActiveHead); //DEBUG_PRINT_ACTIVE_EDGELIST(ActiveHead); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] Sun Feb 14 21:45:31 2010 @@ -98,19 +98,13 @@ NTAPI GrePolygon(PDC pDC, const POINT *ptPoints, - INT count) + INT count, + PRECTL DestRect) { BOOLEAN bRet; - RECTL DestRect; MIX Mix; INT i; POINT BrushOrigin; - - // HACK - DestRect.left = 0; - DestRect.top = 0; - DestRect.bottom = PrimarySurface.GDIInfo.ulVertRes; - DestRect.right = PrimarySurface.GDIInfo.ulHorzRes; BrushOrigin.x = pDC->ptBrushOrg.x + pDC->rcDcRect.left; BrushOrigin.y = pDC->ptBrushOrg.y + pDC->rcDcRect.top; @@ -145,7 +139,7 @@ ptPoints[i].y, ptPoints[i+1].x, ptPoints[i+1].y, - &DestRect, // Bounding rectangle + DestRect, Mix); } } Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] Sun Feb 14 21:45:31 2010 @@ -189,7 +189,7 @@ BRUSHOBJ *BrushObj, CONST POINT *Points, int Count, - RECTL DestRect, + PRECTL DestRect, POINTL *BrushOrigin); /* rect.c */ @@ -203,7 +203,8 @@ VOID NTAPI GrePolygon(PDC pDC, const POINT *ptPoints, - INT count); + INT count, + PRECTL pDestRect); VOID NTAPI GrePolyline(PDC pDC, [View Less]

15 years, 4 months

[fireball] 45593: - Calculate a real bounding rect instead of hacking it to be always display surface sized.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Feb 14 12:57:56 2010 New Revision: 45593 URL: http://svn.reactos.org/svn/reactos?rev=45593&view=rev Log: - Calculate a real bounding rect instead of hacking it to be always display surface sized. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… =======================================… [View More]======================================= --- branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c [iso-8859-1] Sun Feb 14 12:57:56 2010 @@ -104,30 +104,35 @@ INT count) { BOOLEAN bRet; + POINT ptLine[2]; RECTL DestRect; MIX Mix; INT i; - // HACK - DestRect.left = 0; - DestRect.top = 0; - DestRect.bottom = PrimarySurface.GDIInfo.ulVertRes; - DestRect.right = PrimarySurface.GDIInfo.ulHorzRes; - /* Draw pen-based polygon */ if (!(pDC->pLineBrush->flAttrs & GDIBRUSH_IS_NULL)) { Mix = ROP2_TO_MIX(R2_COPYPEN);/*pdcattr->jROP2*/ for (i=0; i<count-1; i++) { + ptLine[0].x = ptPoints[i].x + pDC->rcDcRect.left + pDC->rcVport.left; + ptLine[0].y = ptPoints[i].y + pDC->rcDcRect.top + pDC->rcVport.top; + ptLine[1].x = ptPoints[i+1].x + pDC->rcDcRect.left + pDC->rcVport.left; + ptLine[1].y = ptPoints[i+1].y + pDC->rcDcRect.top + pDC->rcVport.top; + + DestRect.left = min(ptLine[0].x, ptLine[1].x); + DestRect.top = min(ptLine[0].y, ptLine[1].y); + DestRect.right = max(ptLine[0].x, ptLine[1].x); + DestRect.bottom = max(ptLine[0].y, ptLine[1].y); + bRet = GreLineTo(&pDC->pBitmap->SurfObj, pDC->CombinedClip, &pDC->pLineBrush->BrushObj, - ptPoints[i].x + pDC->rcDcRect.left + pDC->rcVport.left, - ptPoints[i].y + pDC->rcDcRect.top + pDC->rcVport.top, - ptPoints[i+1].x + pDC->rcDcRect.left + pDC->rcVport.left, - ptPoints[i+1].y + pDC->rcDcRect.top + pDC->rcVport.top, - &DestRect, // Bounding rectangle + ptLine[0].x, + ptLine[0].y, + ptLine[1].x, + ptLine[1].y, + &DestRect, Mix); } } [View Less]

15 years, 4 months

[jcatena] 45592: [branch] merge trunk head

by jcatena＠svn.reactos.org

Author: jcatena Date: Sat Feb 13 13:28:12 2010 New Revision: 45592 URL: http://svn.reactos.org/svn/reactos?rev=45592&view=rev Log: [branch] merge trunk head Added: branches/jcatena-branch/base/applications/cmdutils/doskey/lang/de-DE.rc - copied unchanged from r45591, trunk/reactos/base/applications/cmdutils/doskey/lang/de-DE.rc branches/jcatena-branch/base/applications/cmdutils/xcopy/It.rc - copied unchanged from r45591, trunk/reactos/base/applications/cmdutils/xcopy/… [View More]

15 years, 4 months

← Newer
1
...
11
12
13
14
15
16
17
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2010