Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 57141: [FREELDR] Improve readability of sector calculation
by tkreuzer＠svn.reactos.org 23 Aug '12

23 Aug '12

Author: tkreuzer Date: Thu Aug 23 12:02:30 2012 New Revision: 57141 URL: http://svn.reactos.org/svn/reactos?rev=57141&view=rev Log: [FREELDR] Improve readability of sector calculation Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Thu Aug 23 12:02:30 2012 @@ -1338,8 +1338,7 @@ // // Seek to right position // - Position.HighPart = SectorNumber >> 23; - Position.LowPart = SectorNumber << 9; + Position.QuadPart = (ULONGLONG)SectorNumber * 512; ret = ArcSeek(Volume->DeviceId, &Position, SeekAbsolute); if (ret != ESUCCESS) {

1 0

[jgardou] 57140: [CMAKE] - Get rid of __ROS_CMAKE__ definition
by jgardou＠svn.reactos.org 23 Aug '12

23 Aug '12

Author: jgardou Date: Thu Aug 23 11:30:26 2012 New Revision: 57140 URL: http://svn.reactos.org/svn/reactos?rev=57140&view=rev Log: [CMAKE] - Get rid of __ROS_CMAKE__ definition Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=57140&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Thu Aug 23 11:30:26 2012 @@ -43,7 +43,7 @@ # Compiler flags handling include(cmake/compilerflags.cmake) -add_definitions(-D__REACTOS__ -D__ROS_CMAKE__) +add_definitions(-D__REACTOS__) if(NOT CMAKE_CROSSCOMPILING)

1 0

[jgardou] 57139: [MESA] - Add a small "how to upgrade" guide
by jgardou＠svn.reactos.org 22 Aug '12

22 Aug '12

Author: jgardou Date: Wed Aug 22 20:55:42 2012 New Revision: 57139 URL: http://svn.reactos.org/svn/reactos?rev=57139&view=rev Log: [MESA] - Add a small "how to upgrade" guide Added: trunk/reactos/dll/opengl/Mesa_for_ReactOS.txt (with props) Added: trunk/reactos/dll/opengl/Mesa_for_ReactOS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/Mesa_for_ReactO… ============================================================================== --- trunk/reactos/dll/opengl/Mesa_for_ReactOS.txt (added) +++ trunk/reactos/dll/opengl/Mesa_for_ReactOS.txt [iso-8859-1] Wed Aug 22 20:55:42 2012 @@ -1,0 +1,42 @@ +Here is a brief explanation on how to sync Mesa in trunk base. + +Current version is 8.0.4 + +- SOURCE FILES : +________________ + +All unnecessary files and directories where removed from the tree, as it's already a huge piece of code. + + - build tools (bin, configs, scons, src/gallium/tools) were removed, as we don't use it. + - documentation (docs, src/gallium/docs, doxygen) were removed. If you want to contribute to libMesa, you'd better use their build system, not our adapted one + - tests and testing tools were removed (test, src/gallium/tests, src/gallium/tools) + - egl functionality (src/egl) is useless to us and were removed. + - gbm functionality (src/gbm) is useless to us and were removed. + - getopt implementation (src/getopt, for MSVC compatibility) is useless to us, we already have one + - glx (src/glx) functionality is useless to us and were removed. + - src/gallium + - All gallium drivers (src/gallium/driver) where deleted, except for the softpipe one. + - All gallium state trackers (src/gallium/state_trackers) were removed, except for the wgl one + - All gallium targets (src/gallium/targets) were removed, except for the libgl-gdi one. + - All gallium window system backends (src/gallium/winsys) were removed, except for the gdi one (sw/gdi) + - src/mapi + - only mapi and glapi directories were relevant and kept + - src/mesa + - All MESA drivers where deleted (src/mesa/drivers), except for the "common" part and osmesa (off-screen mesa) library. + - Architecture specifics were removed. x86 and x86_64 might be restored in future + - src/glu where kept and will be used for the glu32 dll implementation + + +- GENERATED FILES: +__________________ + +libMesa build system generates source files (using scons). +They were taken from an out-of-source build an put in the "generated" directory, using the same +directory structure for the sake of ease of maintainability. + + +- CMAKELISTS FILES: +___________________ + +Those files were written using the Sconscript and source list files as reference. I think that diff-ing them between two +versions would permit to easily update the cmake configuration files. Propchange: trunk/reactos/dll/opengl/Mesa_for_ReactOS.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[jgardou] 57138: [WIN32K] - Use DC_vPrepareDCsForBlit in DIB transfer functions, as per Timo's remarks.
by jgardou＠svn.reactos.org 22 Aug '12

22 Aug '12

Author: jgardou Date: Wed Aug 22 20:11:41 2012 New Revision: 57138 URL: http://svn.reactos.org/svn/reactos?rev=57138&view=rev Log: [WIN32K] - Use DC_vPrepareDCsForBlit in DIB transfer functions, as per Timo's remarks. Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Wed Aug 22 20:11:41 2012 @@ -445,26 +445,8 @@ if (pDC->dctype == DC_TYPE_INFO) { DC_UnlockDc(pDC); - goto Exit2; - } - - /* - * Select the right surface. - * NOTE: we don't call DC_vPrepareDCsForBlit, because we don't - * care about mouse, visible region or brushes in this API. - */ - if(pDC->dctype == DCTYPE_DIRECT) - pSurf = pDC->ppdev->pSurface; - else - pSurf = pDC->dclevel.pSurface; - if (!pSurf) - { - DC_UnlockDc(pDC); - ret = ScanLines; - goto Exit2; - } - - pDestSurf = &pSurf->SurfObj; + goto Exit; + } rcDest.left = XDest; rcDest.top = YDest; @@ -483,7 +465,7 @@ SourceSize.cx = bmi->bmiHeader.biWidth; SourceSize.cy = ScanLines; - + //DIBWidth = WIDTH_BYTES_ALIGN32(SourceSize.cx, bmi->bmiHeader.biBitCount); hSourceBitmap = GreCreateBitmapEx(bmi->bmiHeader.biWidth, @@ -510,8 +492,6 @@ goto Exit; } - ASSERT(pSurf->ppal); - /* Create a palette for the DIB */ ppalDIB = CreateDIBPalette(bmi, pDC, ColorUse); if (!ppalDIB) @@ -520,6 +500,18 @@ Status = STATUS_NO_MEMORY; goto Exit; } + + /* This is actually a blit */ + DC_vPrepareDCsForBlit(pDC, rcDest, NULL, rcDest); + pSurf = pDC->dclevel.pSurface; + if (!pSurf) + { + DC_vFinishBlit(pDC, NULL); + ret = ScanLines; + goto Exit; + } + + ASSERT(pSurf->ppal); /* Initialize EXLATEOBJ */ EXLATEOBJ_vInitialize(&exlo, @@ -528,6 +520,8 @@ RGB(0xff, 0xff, 0xff), pDC->pdcattr->crBackgroundClr, pDC->pdcattr->crForegroundClr); + + pDestSurf = &pSurf->SurfObj; /* Copy the bits */ DPRINT("BitsToDev with dstsurf=(%d|%d) (%d|%d), src=(%d|%d) w=%d h=%d\n", @@ -547,6 +541,9 @@ /* Cleanup EXLATEOBJ */ EXLATEOBJ_vCleanup(&exlo); + + /* We're done */ + DC_vFinishBlit(pDC, NULL); Exit: if (NT_SUCCESS(Status)) @@ -1121,22 +1118,6 @@ goto cleanup; } - /* - * Select the right surface. - * NOTE: we don't call DC_vPrepareDCsForBlit, because we don't - * care about mouse, visible region or brushes in this API. - */ - if(pdc->dctype == DCTYPE_DIRECT) - psurfDst = pdc->ppdev->pSurface; - else - psurfDst = pdc->dclevel.pSurface; - if (!psurfDst) - { - // CHECKME - bResult = TRUE; - goto cleanup; - } - /* Calculate source and destination rect */ rcSrc.left = xSrc; rcSrc.top = ySrc; @@ -1148,7 +1129,7 @@ rcDst.bottom = rcDst.top + cyDst; IntLPtoDP(pdc, (POINTL*)&rcDst, 2); RECTL_vOffsetRect(&rcDst, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y); - + hbmTmp = GreCreateBitmapEx(pbmi->bmiHeader.biWidth, pbmi->bmiHeader.biHeight, 0, @@ -1180,6 +1161,18 @@ goto cleanup; } + /* Prepare DC for blit */ + DC_vPrepareDCsForBlit(pdc, rcDst, NULL, rcSrc); + + psurfDst = pdc->dclevel.pSurface; + if (!psurfDst) + { + DC_vFinishBlit(pdc, NULL); + // CHECKME + bResult = TRUE; + goto cleanup; + } + /* Initialize XLATEOBJ */ EXLATEOBJ_vInitialize(&exlo, ppalDIB, @@ -1187,9 +1180,6 @@ RGB(0xff, 0xff, 0xff), pdc->pdcattr->crBackgroundClr, pdc->pdcattr->crForegroundClr); - - /* Prepare DC for blit */ - DC_vPrepareDCsForBlit(pdc, rcDst, NULL, rcSrc); /* Perform the stretch operation */ bResult = IntEngStretchBlt(&psurfDst->SurfObj,

1 0

[jgardou] 57137: [OPENGL32_WINETEST] - Fix crash with gallium3d ICD. Already sent to wine
by jgardou＠svn.reactos.org 22 Aug '12

22 Aug '12

Author: jgardou Date: Wed Aug 22 18:45:25 2012 New Revision: 57137 URL: http://svn.reactos.org/svn/reactos?rev=57137&view=rev Log: [OPENGL32_WINETEST] - Fix crash with gallium3d ICD. Already sent to wine Modified: trunk/rostests/winetests/opengl32/opengl.c Modified: trunk/rostests/winetests/opengl32/opengl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/opengl32/opengl… ============================================================================== --- trunk/rostests/winetests/opengl32/opengl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/opengl32/opengl.c [iso-8859-1] Wed Aug 22 18:45:25 2012 @@ -159,7 +159,8 @@ if(iPixelFormat != 0) { HDC pbuffer_hdc; - HPBUFFERARB pbuffer = pwglCreatePbufferARB(hdc, iPixelFormat, 640 /* width */, 480 /* height */, NULL); + int attrib = 0; + HPBUFFERARB pbuffer = pwglCreatePbufferARB(hdc, iPixelFormat, 640 /* width */, 480 /* height */, &attrib); if(!pbuffer) skip("Pbuffer creation failed!\n");

1 0

[jgardou] 57136: [INCLUDE/C++] - Add fake iostream headers to fix MSVC compilation - hack numerical_limits<float>::infinity() implementation until we have a real C++ library Oddly, empty headers se...
by jgardou＠svn.reactos.org 22 Aug '12

22 Aug '12

Author: jgardou Date: Wed Aug 22 18:42:57 2012 New Revision: 57136 URL: http://svn.reactos.org/svn/reactos?rev=57136&view=rev Log: [INCLUDE/C++] - Add fake iostream headers to fix MSVC compilation - hack numerical_limits<float>::infinity() implementation until we have a real C++ library Oddly, empty headers seem to be enough for now Added: trunk/reactos/include/c++/fstream (with props) trunk/reactos/include/c++/ios (with props) trunk/reactos/include/c++/iostream (with props) trunk/reactos/include/c++/istream (with props) trunk/reactos/include/c++/sstream (with props) Modified: trunk/reactos/include/c++/limits Added: trunk/reactos/include/c++/fstream URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/fstream?re… ============================================================================== (empty) Propchange: trunk/reactos/include/c++/fstream ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/c++/ios URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/ios?rev=57… ============================================================================== (empty) Propchange: trunk/reactos/include/c++/ios ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/c++/iostream URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/iostream?r… ============================================================================== (empty) Propchange: trunk/reactos/include/c++/iostream ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/c++/istream URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/istream?re… ============================================================================== (empty) Propchange: trunk/reactos/include/c++/istream ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/c++/limits URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/limits?rev… ============================================================================== --- trunk/reactos/include/c++/limits [iso-8859-1] (original) +++ trunk/reactos/include/c++/limits [iso-8859-1] Wed Aug 22 18:42:57 2012 @@ -938,7 +938,11 @@ // infinity static const bool has_infinity = true; static float infinity( ) throw( ) - {return _FInf._Float;} + //{return _FInf._Float;} + { + static const unsigned __inf_bytes = 0x7f800000; + return *(float*)&__inf_bytes; + } // Denormalization static const float_denorm_style has_denorm = denorm_present; Added: trunk/reactos/include/c++/sstream URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/sstream?re… ============================================================================== (empty) Propchange: trunk/reactos/include/c++/sstream ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[jgardou] 57135: [OPENGL] - Remove old libmesa code base
by jgardou＠svn.reactos.org 22 Aug '12

22 Aug '12

Author: jgardou Date: Wed Aug 22 18:39:07 2012 New Revision: 57135 URL: http://svn.reactos.org/svn/reactos?rev=57135&view=rev Log: [OPENGL] - Remove old libmesa code base Removed: trunk/reactos/dll/3rdparty/mesa32/

1 0

[jgardou] 57134: [HIVESFT] - Use right driver version for new mesa driver
by jgardou＠svn.reactos.org 22 Aug '12

22 Aug '12

Author: jgardou Date: Wed Aug 22 18:38:02 2012 New Revision: 57134 URL: http://svn.reactos.org/svn/reactos?rev=57134&view=rev Log: [HIVESFT] - Use right driver version for new mesa driver Modified: trunk/reactos/boot/bootdata/hivesft_amd64.inf trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf Modified: trunk/reactos/boot/bootdata/hivesft_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_amd64.inf [iso-8859-1] Wed Aug 22 18:38:02 2012 @@ -187,7 +187,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers","DefaultDriver",0x00000000,"Mesa" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\Mesa","Version",0x00010001,0x00000002 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\Mesa","Dll",0x00000000,"mesa32" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\Mesa","DriverVersion",0x00010001,0x00000010 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\Mesa","DriverVersion",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\Mesa","Flags",0x00010001,0x00000001 ; User Profile List Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Wed Aug 22 18:38:02 2012 @@ -113,7 +113,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers","DefaultDriver",0x00000000,"Mesa" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\Mesa","Version",0x00010001,0x00000002 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\Mesa","Dll",0x00000000,"mesa32" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\Mesa","DriverVersion",0x00010001,0x00000010 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\Mesa","DriverVersion",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\Mesa","Flags",0x00010001,0x00000001 ; User Profile List Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… ============================================================================== Binary files - no diff available.

1 0

[jgardou] 57133: [[MESA] - Fix compilation for case sensitive systems
by jgardou＠svn.reactos.org 22 Aug '12

22 Aug '12

Author: jgardou Date: Wed Aug 22 18:36:12 2012 New Revision: 57133 URL: http://svn.reactos.org/svn/reactos?rev=57133&view=rev Log: [[MESA] - Fix compilation for case sensitive systems Added: trunk/reactos/dll/opengl/mesa/src/gallium/winsys/sw/gdi/CMakeLists.txt - copied unchanged from r57130, trunk/reactos/dll/opengl/mesa/src/gallium/winsys/sw/gdi/CmakeLists.txt Removed: trunk/reactos/dll/opengl/mesa/src/gallium/winsys/sw/gdi/CmakeLists.txt Modified: trunk/reactos/dll/opengl/mesa/src/gallium/CMakeLists.txt Modified: trunk/reactos/dll/opengl/mesa/src/gallium/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/galliu… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/gallium/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/gallium/CMakeLists.txt [iso-8859-1] Wed Aug 22 18:36:12 2012 @@ -2,5 +2,5 @@ add_subdirectory(auxiliary) add_subdirectory(drivers/softpipe) add_subdirectory(state_trackers/wgl) -add_subdirectory(winsys/sw/gdi) -add_subdirectory(targets/libgl-gdi) +add_subdirectory(targets/libgl-gdi) +add_subdirectory(winsys/sw/gdi) Removed: trunk/reactos/dll/opengl/mesa/src/gallium/winsys/sw/gdi/CmakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/galliu… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/gallium/winsys/sw/gdi/CmakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/gallium/winsys/sw/gdi/CmakeLists.txt (removed) @@ -1,2 +1,0 @@ - -add_library(gallium_ws_gdi STATIC EXCLUDE_FROM_ALL gdi_sw_winsys.c)

1 0

[jgardou] 57132: [MESA] - Try to fix weird buildbot failure
by jgardou＠svn.reactos.org 22 Aug '12

22 Aug '12

Author: jgardou Date: Wed Aug 22 18:28:22 2012 New Revision: 57132 URL: http://svn.reactos.org/svn/reactos?rev=57132&view=rev Log: [MESA] - Try to fix weird buildbot failure Modified: trunk/reactos/dll/opengl/mesa/src/gallium/CMakeLists.txt Modified: trunk/reactos/dll/opengl/mesa/src/gallium/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/galliu… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/gallium/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/gallium/CMakeLists.txt [iso-8859-1] Wed Aug 22 18:28:22 2012 @@ -2,5 +2,5 @@ add_subdirectory(auxiliary) add_subdirectory(drivers/softpipe) add_subdirectory(state_trackers/wgl) -add_subdirectory(targets/libgl-gdi) -add_subdirectory(winsys/sw/gdi) +add_subdirectory(winsys/sw/gdi) +add_subdirectory(targets/libgl-gdi)

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