Ros-diffs June 2017

ros-diffs@reactos.org

20 participants
526 discussions

[akhaldi] 75061: [D3D8][D3D9][DDRAW][WINED3D] Sync with Wine Staging 2.9. This work couldn't have been committed without Sebastian Gasiorek's work on CORE-11331 so thanks again! Dedicated to Daniel...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jun 16 18:50:42 2017 New Revision: 75061 URL: http://svn.reactos.org/svn/reactos?rev=75061&view=rev Log: [D3D8][D3D9][DDRAW][WINED3D] Sync with Wine Staging 2.9. This work couldn't have been committed without Sebastian Gasiorek's work on CORE-11331 so thanks again! Dedicated to Daniel. CORE-13362 Removed: trunk/reactos/dll/directx/wine/wined3d/volume.c Modified: trunk/reactos/dll/directx/wine/d3d8/buffer.c trunk/reactos/dll/directx/wine/d3d8/d3d8.spec trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/directx.c trunk/reactos/dll/directx/wine/d3d8/shader.c trunk/reactos/dll/directx/wine/d3d8/surface.c trunk/reactos/dll/directx/wine/d3d8/swapchain.c trunk/reactos/dll/directx/wine/d3d8/texture.c trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d8/volume.c trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d9/buffer.c trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/d3d9/query.c trunk/reactos/dll/directx/wine/d3d9/shader.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/swapchain.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d9/volume.c trunk/reactos/dll/directx/wine/ddraw/ddraw.c trunk/reactos/dll/directx/wine/ddraw/ddraw.spec trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h trunk/reactos/dll/directx/wine/ddraw/device.c trunk/reactos/dll/directx/wine/ddraw/executebuffer.c trunk/reactos/dll/directx/wine/ddraw/main.c trunk/reactos/dll/directx/wine/ddraw/palette.c trunk/reactos/dll/directx/wine/ddraw/surface.c trunk/reactos/dll/directx/wine/ddraw/utils.c trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c trunk/reactos/dll/directx/wine/ddraw/viewport.c trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/cs.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c trunk/reactos/dll/directx/wine/wined3d/palette.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/sampler.c trunk/reactos/dll/directx/wine/wined3d/shader.c trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c trunk/reactos/dll/directx/wine/wined3d/view.c trunk/reactos/dll/directx/wine/wined3d/wined3d.spec trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/include/reactos/wine/wgl.h trunk/reactos/sdk/include/reactos/wine/wgl_driver.h trunk/reactos/sdk/include/reactos/wine/wined3d.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/buff… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/dire… Modified: trunk/reactos/dll/directx/wine/d3d8/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/shad… Modified: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surf… Modified: trunk/reactos/dll/directx/wine/d3d8/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/swap… Modified: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/text… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/CMak… Modified: trunk/reactos/dll/directx/wine/d3d9/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/buff… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… Modified: trunk/reactos/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/quer… Modified: trunk/reactos/dll/directx/wine/d3d9/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/shad… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dev… Modified: trunk/reactos/dll/directx/wine/ddraw/executebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/exe… Modified: trunk/reactos/dll/directx/wine/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mai… Modified: trunk/reactos/dll/directx/wine/ddraw/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/pal… Modified: trunk/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… Modified: trunk/reactos/dll/directx/wine/ddraw/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/uti… Modified: trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ver… Modified: trunk/reactos/dll/directx/wine/ddraw/viewport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/vie… Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/C… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/cs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n… Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/sampler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Removed: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… Modified: trunk/reactos/sdk/include/reactos/wine/wgl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/wine/w… Modified: trunk/reactos/sdk/include/reactos/wine/wgl_driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/wine/w… Modified: trunk/reactos/sdk/include/reactos/wine/wined3d.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/wine/w…

7 years, 6 months

[akhaldi] 75060: [PSDK] Update D3DCOLOR_ARGB and D3DQUERYTYPE. [DXSDK] Add missing D3DDEVICEDESC1, D3DDEVICEDESC2, D3DFINDDEVICERESULT1 and D3DFINDDEVICERESULT2.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jun 16 18:40:31 2017 New Revision: 75060 URL: http://svn.reactos.org/svn/reactos?rev=75060&view=rev Log: [PSDK] Update D3DCOLOR_ARGB and D3DQUERYTYPE. [DXSDK] Add missing D3DDEVICEDESC1, D3DDEVICEDESC2, D3DFINDDEVICERESULT1 and D3DFINDDEVICERESULT2. Modified: trunk/reactos/sdk/include/dxsdk/d3dcaps.h trunk/reactos/sdk/include/psdk/d3d9types.h Modified: trunk/reactos/sdk/include/dxsdk/d3dcaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/dxsdk/d3dcaps.… ============================================================================== --- trunk/reactos/sdk/include/dxsdk/d3dcaps.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/dxsdk/d3dcaps.h [iso-8859-1] Fri Jun 16 18:40:31 2017 @@ -277,6 +277,42 @@ DWORD dwStippleHeight; } D3DPRIMCAPS, *LPD3DPRIMCAPS; +typedef struct _D3DDeviceDesc1 { + DWORD dwSize; + DWORD dwFlags; + D3DCOLORMODEL dcmColorModel; + DWORD dwDevCaps; + D3DTRANSFORMCAPS dtcTransformCaps; + BOOL bClipping; + D3DLIGHTINGCAPS dlcLightingCaps; + D3DPRIMCAPS dpcLineCaps; + D3DPRIMCAPS dpcTriCaps; + DWORD dwDeviceRenderBitDepth; + DWORD dwDeviceZBufferBitDepth; + DWORD dwMaxBufferSize; + DWORD dwMaxVertexCount; +} D3DDEVICEDESC1, *LPD3DDEVICEDESC1; + +typedef struct _D3DDeviceDesc2 { + DWORD dwSize; + DWORD dwFlags; + D3DCOLORMODEL dcmColorModel; + DWORD dwDevCaps; + D3DTRANSFORMCAPS dtcTransformCaps; + BOOL bClipping; + D3DLIGHTINGCAPS dlcLightingCaps; + D3DPRIMCAPS dpcLineCaps; + D3DPRIMCAPS dpcTriCaps; + DWORD dwDeviceRenderBitDepth; + DWORD dwDeviceZBufferBitDepth; + DWORD dwMaxBufferSize; + DWORD dwMaxVertexCount; + DWORD dwMinTextureWidth, dwMinTextureHeight; + DWORD dwMaxTextureWidth, dwMaxTextureHeight; + DWORD dwMinStippleWidth, dwMaxStippleWidth; + DWORD dwMinStippleHeight, dwMaxStippleHeight; +} D3DDEVICEDESC2, *LPD3DDEVICEDESC2; + typedef struct _D3DDeviceDesc { DWORD dwSize; @@ -365,6 +401,20 @@ D3DPRIMCAPS dpcPrimCaps; } D3DFINDDEVICESEARCH, *LPD3DFINDDEVICESEARCH; +typedef struct _D3DFINDDEVICERESULT1 { + DWORD dwSize; + GUID guid; + D3DDEVICEDESC1 ddHwDesc; + D3DDEVICEDESC1 ddSwDesc; +} D3DFINDDEVICERESULT1, *LPD3DFINDDEVICERESULT1; + +typedef struct _D3DFINDDEVICERESULT2 { + DWORD dwSize; + GUID guid; + D3DDEVICEDESC2 ddHwDesc; + D3DDEVICEDESC2 ddSwDesc; +} D3DFINDDEVICERESULT2, *LPD3DFINDDEVICERESULT2; + typedef struct _D3DFINDDEVICERESULT { DWORD dwSize; Modified: trunk/reactos/sdk/include/psdk/d3d9types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/d3d9types… ============================================================================== --- trunk/reactos/sdk/include/psdk/d3d9types.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/d3d9types.h [iso-8859-1] Fri Jun 16 18:40:31 2017 @@ -39,7 +39,7 @@ #define D3DCLIPPLANE4 (1 << 4) #define D3DCLIPPLANE5 (1 << 5) -#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff))) +#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xffu)<<24)|(((r)&0xffu)<<16)|(((g)&0xffu)<<8)|((b)&0xffu))) #define D3DCOLOR_COLORVALUE(r,g,b,a) D3DCOLOR_RGBA((DWORD)((r)*255.f),(DWORD)((g)*255.f),(DWORD)((b)*255.f),(DWORD)((a)*255.f)) #define D3DCOLOR_RGBA(r,g,b,a) D3DCOLOR_ARGB(a,r,g,b) #define D3DCOLOR_XRGB(r,g,b) D3DCOLOR_ARGB(0xff,r,g,b) @@ -299,7 +299,8 @@ D3DQUERYTYPE_VERTEXTIMINGS = 15, D3DQUERYTYPE_PIXELTIMINGS = 16, D3DQUERYTYPE_BANDWIDTHTIMINGS = 17, - D3DQUERYTYPE_CACHEUTILIZATION = 18 + D3DQUERYTYPE_CACHEUTILIZATION = 18, + D3DQUERYTYPE_MEMORYPRESSURE = 19, } D3DQUERYTYPE; #define D3DISSUE_BEGIN (1 << 1)

7 years, 6 months

[akhaldi] 75059: [WIN32SS] Implement D3DKMT{Create, Destroy}DCFromMemory. Brought to you by Sebastian Gasiorek. CORE-11331 CORE-13362

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jun 16 18:38:08 2017 New Revision: 75059 URL: http://svn.reactos.org/svn/reactos?rev=75059&view=rev Log: [WIN32SS] Implement D3DKMT{Create,Destroy}DCFromMemory. Brought to you by Sebastian Gasiorek. CORE-11331 CORE-13362 Added: trunk/reactos/sdk/include/ddk/d3dkmthk.h (with props) trunk/reactos/sdk/include/psdk/d3dukmdt.h (with props) trunk/reactos/win32ss/reactx/ntddraw/d3dkmt.c (with props) Modified: trunk/reactos/sdk/include/psdk/d3dnthal.h trunk/reactos/sdk/include/psdk/ntgdi.h trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/gdi/gdi32/gdi32.spec trunk/reactos/win32ss/gdi/gdi32/include/precomp.h trunk/reactos/win32ss/gdi/gdi32/objects/dc.c trunk/reactos/win32ss/reactx/ntddraw/intddraw.h trunk/reactos/win32ss/w32ksvc.db trunk/reactos/win32ss/w32ksvc.h Added: trunk/reactos/sdk/include/ddk/d3dkmthk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/d3dkmthk.h… ============================================================================== --- trunk/reactos/sdk/include/ddk/d3dkmthk.h (added) +++ trunk/reactos/sdk/include/ddk/d3dkmthk.h [iso-8859-1] Fri Jun 16 18:38:08 2017 @@ -0,0 +1,55 @@ +/* + * Copyright 2016 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_D3DKMTHK_H +#define __WINE_D3DKMTHK_H + +#include <d3dukmdt.h> + +typedef struct _D3DKMT_CREATEDCFROMMEMORY +{ + void *pMemory; + D3DDDIFORMAT Format; + UINT Width; + UINT Height; + UINT Pitch; + HDC hDeviceDc; + PALETTEENTRY *pColorTable; + HDC hDc; + HANDLE hBitmap; +} D3DKMT_CREATEDCFROMMEMORY; + +typedef struct _D3DKMT_DESTROYDCFROMMEMORY +{ + HDC hDc; + HANDLE hBitmap; +} D3DKMT_DESTROYDCFROMMEMORY; + +#ifdef __cplusplus +extern "C" +{ +#endif /* __cplusplus */ + +DWORD APIENTRY D3DKMTCreateDCFromMemory(_Inout_ D3DKMT_CREATEDCFROMMEMORY*); +DWORD APIENTRY D3DKMTDestroyDCFromMemory(_In_ CONST D3DKMT_DESTROYDCFROMMEMORY*); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __WINE_D3DKMTHK_H */ Propchange: trunk/reactos/sdk/include/ddk/d3dkmthk.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/sdk/include/psdk/d3dnthal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/d3dnthal.… ============================================================================== --- trunk/reactos/sdk/include/psdk/d3dnthal.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/d3dnthal.h [iso-8859-1] Fri Jun 16 18:38:08 2017 @@ -24,6 +24,7 @@ #include <ddrawint.h> #include <d3dtypes.h> #include <d3dcaps.h> +#include <d3dkmthk.h> #ifdef __cplusplus extern "C" { Added: trunk/reactos/sdk/include/psdk/d3dukmdt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/d3dukmdt.… ============================================================================== --- trunk/reactos/sdk/include/psdk/d3dukmdt.h (added) +++ trunk/reactos/sdk/include/psdk/d3dukmdt.h [iso-8859-1] Fri Jun 16 18:38:08 2017 @@ -0,0 +1,139 @@ +/* + * Copyright 2016 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_D3DUKMDT_H +#define __WINE_D3DUKMDT_H + +#ifndef MAKEFOURCC +#define MAKEFOURCC(ch0, ch1, ch2, ch3) \ + ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ + ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) +#endif /* MAKEFOURCC */ + +typedef enum _D3DDDIFORMAT +{ + D3DDDIFMT_UNKNOWN = 0, + D3DDDIFMT_R8G8B8 = 0x14, + D3DDDIFMT_A8R8G8B8 = 0x15, + D3DDDIFMT_X8R8G8B8 = 0x16, + D3DDDIFMT_R5G6B5 = 0x17, + D3DDDIFMT_X1R5G5B5 = 0x18, + D3DDDIFMT_A1R5G5B5 = 0x19, + D3DDDIFMT_A4R4G4B4 = 0x1a, + D3DDDIFMT_R3G3B2 = 0x1b, + D3DDDIFMT_A8 = 0x1c, + D3DDDIFMT_A8R3G3B2 = 0x1d, + D3DDDIFMT_X4R4G4B4 = 0x1e, + D3DDDIFMT_A2B10G10R10 = 0x1f, + D3DDDIFMT_A8B8G8R8 = 0x20, + D3DDDIFMT_X8B8G8R8 = 0x21, + D3DDDIFMT_G16R16 = 0x22, + D3DDDIFMT_A2R10G10B10 = 0x23, + D3DDDIFMT_A16B16G16R16 = 0x24, + D3DDDIFMT_A8P8 = 0x28, + D3DDDIFMT_P8 = 0x29, + D3DDDIFMT_L8 = 0x32, + D3DDDIFMT_A8L8 = 0x33, + D3DDDIFMT_A4L4 = 0x34, + D3DDDIFMT_V8U8 = 0x3c, + D3DDDIFMT_L6V5U5 = 0x3d, + D3DDDIFMT_X8L8V8U8 = 0x3e, + D3DDDIFMT_Q8W8V8U8 = 0x3f, + D3DDDIFMT_V16U16 = 0x40, + D3DDDIFMT_W11V11U10 = 0x41, + D3DDDIFMT_A2W10V10U10 = 0x43, + D3DDDIFMT_D16_LOCKABLE = 0x46, + D3DDDIFMT_D32 = 0x47, + D3DDDIFMT_S1D15 = 0x48, + D3DDDIFMT_D15S1 = 0x49, + D3DDDIFMT_S8D24 = 0x4a, + D3DDDIFMT_D24S8 = 0x4b, + D3DDDIFMT_X8D24 = 0x4c, + D3DDDIFMT_D24X8 = 0x4d, + D3DDDIFMT_X4S4D24 = 0x4e, + D3DDDIFMT_D24X4S4 = 0x4f, + D3DDDIFMT_D16 = 0x50, + D3DDDIFMT_L16 = 0x51, + D3DDDIFMT_D32F_LOCKABLE = 0x52, + D3DDDIFMT_D24FS8 = 0x53, + D3DDDIFMT_D32_LOCKABLE = 0x54, + D3DDDIFMT_S8_LOCKABLE = 0x55, + D3DDDIFMT_G8R8 = 0x5b, + D3DDDIFMT_R8 = 0x5c, + D3DDDIFMT_VERTEXDATA = 0x64, + D3DDDIFMT_INDEX16 = 0x65, + D3DDDIFMT_INDEX32 = 0x66, + D3DDDIFMT_Q16W16V16U16 = 0x6e, + D3DDDIFMT_R16F = 0x6f, + D3DDDIFMT_G16R16F = 0x70, + D3DDDIFMT_A16B16G16R16F = 0x71, + D3DDDIFMT_R32F = 0x72, + D3DDDIFMT_G32R32F = 0x73, + D3DDDIFMT_A32B32G32R32F = 0x74, + D3DDDIFMT_CxV8U8 = 0x75, + D3DDDIFMT_A1 = 0x76, + D3DDDIFMT_A2B10G10R10_XR_BIAS = 0x77, + D3DDDIFMT_DXVACOMPBUFFER_BASE = 0x96, + D3DDDIFMT_PICTUREPARAMSDATA = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0, + D3DDDIFMT_MACROBLOCKDATA = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x01, + D3DDDIFMT_RESIDUALDIFFERENCEDATA = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x02, + D3DDDIFMT_DEBLOCKINGDATA = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x03, + D3DDDIFMT_INVERSEQUANTIZATIONDATA = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x04, + D3DDDIFMT_SLICECONTROLDATA = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x05, + D3DDDIFMT_BITSTREAMDATA = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x06, + D3DDDIFMT_MOTIONVECTORBUFFER = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x07, + D3DDDIFMT_FILMGRAINBUFFER = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x08, + D3DDDIFMT_DXVA_RESERVED9 = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x09, + D3DDDIFMT_DXVA_RESERVED10 = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x0a, + D3DDDIFMT_DXVA_RESERVED11 = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x0b, + D3DDDIFMT_DXVA_RESERVED12 = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x0c, + D3DDDIFMT_DXVA_RESERVED13 = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x0d, + D3DDDIFMT_DXVA_RESERVED14 = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x0e, + D3DDDIFMT_DXVA_RESERVED15 = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x0f, + D3DDDIFMT_DXVA_RESERVED16 = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x10, + D3DDDIFMT_DXVA_RESERVED17 = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x11, + D3DDDIFMT_DXVA_RESERVED18 = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x12, + D3DDDIFMT_DXVA_RESERVED19 = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x13, + D3DDDIFMT_DXVA_RESERVED20 = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x14, + D3DDDIFMT_DXVA_RESERVED21 = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x15, + D3DDDIFMT_DXVA_RESERVED22 = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x16, + D3DDDIFMT_DXVA_RESERVED23 = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x17, + D3DDDIFMT_DXVA_RESERVED24 = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x18, + D3DDDIFMT_DXVA_RESERVED25 = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x19, + D3DDDIFMT_DXVA_RESERVED26 = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x1a, + D3DDDIFMT_DXVA_RESERVED27 = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x1b, + D3DDDIFMT_DXVA_RESERVED28 = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x1c, + D3DDDIFMT_DXVA_RESERVED29 = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x1d, + D3DDDIFMT_DXVA_RESERVED30 = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x1e, + D3DDDIFMT_DXVA_RESERVED31 = D3DDDIFMT_DXVACOMPBUFFER_BASE + 0x1f, + D3DDDIFMT_DXVACOMPBUFFER_MAX = D3DDDIFMT_DXVA_RESERVED31, + D3DDDIFMT_BINARYBUFFER = 0xc7, + D3DDDIFMT_DXT1 = MAKEFOURCC('D', 'X', 'T', '1'), + D3DDDIFMT_DXT2 = MAKEFOURCC('D', 'X', 'T', '2'), + D3DDDIFMT_DXT3 = MAKEFOURCC('D', 'X', 'T', '3'), + D3DDDIFMT_DXT4 = MAKEFOURCC('D', 'X', 'T', '4'), + D3DDDIFMT_DXT5 = MAKEFOURCC('D', 'X', 'T', '5'), + D3DDDIFMT_G8R8_G8B8 = MAKEFOURCC('G', 'R', 'G', 'B'), + D3DDDIFMT_MULTI2_ARGB8 = MAKEFOURCC('M', 'E', 'T', '1'), + D3DDDIFMT_R8G8_B8G8 = MAKEFOURCC('R', 'G', 'B', 'G'), + D3DDDIFMT_UYVY = MAKEFOURCC('U', 'Y', 'V', 'Y'), + D3DDDIFMT_YUY2 = MAKEFOURCC('Y', 'U', 'Y', '2'), + D3DDDIFMT_FORCE_UINT = 0x7fffffff, +} D3DDDIFORMAT; + +#endif /* __WINE_D3DUKMDT_H */ Propchange: trunk/reactos/sdk/include/psdk/d3dukmdt.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/sdk/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/ntgdi.h?r… ============================================================================== --- trunk/reactos/sdk/include/psdk/ntgdi.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/ntgdi.h [iso-8859-1] Fri Jun 16 18:38:08 2017 @@ -920,6 +920,20 @@ W32KAPI DWORD APIENTRY +NtGdiDdDDICreateDCFromMemory( + _Inout_ D3DKMT_CREATEDCFROMMEMORY *desc); + +__kernel_entry +W32KAPI +DWORD +APIENTRY +NtGdiDdDDIDestroyDCFromMemory( + _In_ CONST D3DKMT_DESTROYDCFROMMEMORY *desc); + +__kernel_entry +W32KAPI +DWORD +APIENTRY NtGdiDvpCanCreateVideoPort( _In_ HANDLE hDirectDraw, _Inout_ PDD_CANCREATEVPORTDATA puCanCreateVPortData); Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Fri Jun 16 18:38:08 2017 @@ -96,6 +96,7 @@ reactx/ntddraw/dd.c reactx/ntddraw/ddsurf.c reactx/ntddraw/d3d.c + reactx/ntddraw/d3dkmt.c reactx/ntddraw/dvp.c reactx/ntddraw/mocomp.c reactx/ntddraw/eng.c Modified: trunk/reactos/win32ss/gdi/gdi32/gdi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/gdi32.sp… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/gdi32.spec [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/gdi32.spec [iso-8859-1] Fri Jun 16 18:38:08 2017 @@ -608,3 +608,6 @@ 608 stdcall bMakePathNameW(wstr wstr wstr long) 609 stdcall cGetTTFFromFOT(long long long long long long long) 610 stdcall gdiPlaySpoolStream(long long long long long long) +; FIXME: Wine DX Dlls need these +@ stdcall D3DKMTCreateDCFromMemory(ptr) +@ stdcall D3DKMTDestroyDCFromMemory(ptr) Modified: trunk/reactos/win32ss/gdi/gdi32/include/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/include/precomp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/include/precomp.h [iso-8859-1] Fri Jun 16 18:38:08 2017 @@ -44,6 +44,7 @@ #include <ddrawi.h> #include <ddrawgdi.h> +#include <d3dkmthk.h> /* Public Win32K Headers */ #include <ntgdityp.h> Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] Fri Jun 16 18:38:08 2017 @@ -1538,3 +1538,15 @@ return NULL; } +/*********************************************************************** + * D3DKMTCreateDCFromMemory (GDI32.@) + */ +DWORD WINAPI D3DKMTCreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ) +{ + return NtGdiDdDDICreateDCFromMemory( desc ); +} + +DWORD WINAPI D3DKMTDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY *desc ) +{ + return NtGdiDdDDIDestroyDCFromMemory( desc ); +} Added: trunk/reactos/win32ss/reactx/ntddraw/d3dkmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/ntddraw/d3d… ============================================================================== --- trunk/reactos/win32ss/reactx/ntddraw/d3dkmt.c (added) +++ trunk/reactos/win32ss/reactx/ntddraw/d3dkmt.c [iso-8859-1] Fri Jun 16 18:38:08 2017 @@ -0,0 +1,112 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Native DirectDraw implementation + * FILE: win32ss/reactx/ntddraw/d3dkmt.c + * PROGRAMER: Sebastian Gasiorek (sebastian.gasiorek(a)reactos.com) + */ + +#include <win32k.h> +#include <debug.h> + +DWORD +APIENTRY +NtGdiDdDDICreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc) +{ + PSURFACE psurf; + HDC hDC; + + const struct d3dddi_format_info + { + D3DDDIFORMAT format; + unsigned int bit_count; + DWORD compression; + unsigned int palette_size; + DWORD mask_r, mask_g, mask_b; + } *format = NULL; + unsigned int i; + + static const struct d3dddi_format_info format_info[] = + { + { D3DDDIFMT_R8G8B8, 24, BI_RGB, 0, 0x00000000, 0x00000000, 0x00000000 }, + { D3DDDIFMT_A8R8G8B8, 32, BI_RGB, 0, 0x00000000, 0x00000000, 0x00000000 }, + { D3DDDIFMT_X8R8G8B8, 32, BI_RGB, 0, 0x00000000, 0x00000000, 0x00000000 }, + { D3DDDIFMT_R5G6B5, 16, BI_BITFIELDS, 0, 0x0000f800, 0x000007e0, 0x0000001f }, + { D3DDDIFMT_X1R5G5B5, 16, BI_BITFIELDS, 0, 0x00007c00, 0x000003e0, 0x0000001f }, + { D3DDDIFMT_A1R5G5B5, 16, BI_BITFIELDS, 0, 0x00007c00, 0x000003e0, 0x0000001f }, + { D3DDDIFMT_A4R4G4B4, 16, BI_BITFIELDS, 0, 0x00000f00, 0x000000f0, 0x0000000f }, + { D3DDDIFMT_X4R4G4B4, 16, BI_BITFIELDS, 0, 0x00000f00, 0x000000f0, 0x0000000f }, + { D3DDDIFMT_P8, 8, BI_RGB, 256, 0x00000000, 0x00000000, 0x00000000 }, + }; + + if (!desc) + return STATUS_INVALID_PARAMETER; + + if (!desc->pMemory) + return STATUS_INVALID_PARAMETER; + + for (i = 0; i < sizeof(format_info) / sizeof(*format_info); ++i) + { + if (format_info[i].format == desc->Format) + { + format = &format_info[i]; + break; + } + } + + if (!format) + return STATUS_INVALID_PARAMETER; + + if (desc->Width > (UINT_MAX & ~3) / (format->bit_count / 8) || + !desc->Pitch || desc->Pitch < (((desc->Width * format->bit_count + 31) >> 3) & ~3) || + !desc->Height || desc->Height > UINT_MAX / desc->Pitch) + { + return STATUS_INVALID_PARAMETER; + } + + if (!desc->hDeviceDc || !(hDC = NtGdiCreateCompatibleDC(desc->hDeviceDc))) + { + return STATUS_INVALID_PARAMETER; + } + + /* Allocate a surface */ + psurf = SURFACE_AllocSurface(STYPE_BITMAP, + desc->Width, + desc->Height, + BitmapFormat(format->bit_count, format->compression), + BMF_TOPDOWN | BMF_NOZEROINIT, + desc->Pitch, + 0, + desc->pMemory); + + /* Mark as API bitmap */ + psurf->flags |= (DDB_SURFACE | API_BITMAP); + + desc->hDc = hDC; + /* Get the handle for the bitmap */ + desc->hBitmap = (HBITMAP)psurf->SurfObj.hsurf; + + /* Unlock the surface and return */ + SURFACE_UnlockSurface(psurf); + + NtGdiSelectBitmap(desc->hDc, desc->hBitmap); + + return STATUS_SUCCESS; +} + +DWORD +APIENTRY +NtGdiDdDDIDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc) +{ + if (!desc) + return STATUS_INVALID_PARAMETER; + + if (GDI_HANDLE_GET_TYPE(desc->hDc) != GDI_OBJECT_TYPE_DC || + GDI_HANDLE_GET_TYPE(desc->hBitmap) != GDI_OBJECT_TYPE_BITMAP) + return STATUS_INVALID_PARAMETER; + + NtGdiDeleteObjectApp(desc->hBitmap); + NtGdiDeleteObjectApp(desc->hDc); + + return STATUS_SUCCESS; +} Propchange: trunk/reactos/win32ss/reactx/ntddraw/d3dkmt.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/win32ss/reactx/ntddraw/intddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/ntddraw/int… ============================================================================== --- trunk/reactos/win32ss/reactx/ntddraw/intddraw.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/ntddraw/intddraw.h [iso-8859-1] Fri Jun 16 18:38:08 2017 @@ -1,6 +1,7 @@ #pragma once #include <ddrawint.h> +#include <d3dkmthk.h> #include <ddkernel.h> #include <reactos/drivers/directx/directxint.h> #include <reactos/drivers/directx/dxg.h> Modified: trunk/reactos/win32ss/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/w32ksvc.db?rev=750… ============================================================================== --- trunk/reactos/win32ss/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/win32ss/w32ksvc.db [iso-8859-1] Fri Jun 16 18:38:08 2017 @@ -690,3 +690,8 @@ NtUserMonitorFromWindow 2 NtUserSetScrollBarInfo 3 # + +# Vista+ Syscall add on for Wine DX +NtGdiDdDDICreateDCFromMemory 1 +NtGdiDdDDIDestroyDCFromMemory 1 +# Modified: trunk/reactos/win32ss/w32ksvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/w32ksvc.h?rev=7505… ============================================================================== --- trunk/reactos/win32ss/w32ksvc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/w32ksvc.h [iso-8859-1] Fri Jun 16 18:38:08 2017 @@ -688,3 +688,6 @@ SVC_(UserMonitorFromRect, 2) SVC_(UserMonitorFromWindow, 2) SVC_(UserSetScrollBarInfo, 3) +// For Wine DX + SVC_(GdiDdDDICreateDCFromMemory, 1) + SVC_(GdiDdDDIDestroyDCFromMemory, 1)

7 years, 6 months

[gadamopoulos] 75058: [SHELL32] -CMenuBand: When the flat menus style is enabled, shell menu bars should not look like toolbars.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Jun 16 17:53:50 2017 New Revision: 75058 URL: http://svn.reactos.org/svn/reactos?rev=75058&view=rev Log: [SHELL32] -CMenuBand: When the flat menus style is enabled, shell menu bars should not look like toolbars. Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp [iso-8859-1] Fri Jun 16 17:53:50 2017 @@ -160,7 +160,10 @@ isHot = m_hotBar == this && (int) cdraw->nmcd.dwItemSpec == m_hotItem; isPopup = m_popupBar == this && (int) cdraw->nmcd.dwItemSpec == m_popupItem; - if ((m_initFlags & SMINIT_VERTICAL)) + if (m_hotItem < 0 && isPopup) + isHot = TRUE; + + if ((m_useFlatMenus && isHot) || (m_initFlags & SMINIT_VERTICAL)) { COLORREF clrText; HBRUSH bgBrush; @@ -171,7 +174,7 @@ cdraw->nmcd.uItemState &= ~(CDIS_HOT | CDIS_CHECKED); // Decide on the colors - if (isHot || (m_hotItem < 0 && isPopup)) + if (isHot) { cdraw->nmcd.uItemState |= CDIS_HOT; @@ -203,7 +206,7 @@ cdraw->nmcd.uItemState &= ~CDIS_HOT; // Decide on the colors - if (isHot || (m_hotItem < 0 && isPopup)) + if (isHot) { cdraw->nmcd.uItemState |= CDIS_HOT; }

7 years, 6 months

[tfaber] 75057: [KMTESTS:MM] - In the MmMapLockedPagesSpecifyCache test, try to allocate & free memory or unmap a section view in the mapped buffer space CORE-13444

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Jun 16 11:06:33 2017 New Revision: 75057 URL: http://svn.reactos.org/svn/reactos?rev=75057&view=rev Log: [KMTESTS:MM] - In the MmMapLockedPagesSpecifyCache test, try to allocate & free memory or unmap a section view in the mapped buffer space CORE-13444 Modified: trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_user.c Modified: trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmMapLock… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_user.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_user.c [iso-8859-1] Fri Jun 16 11:06:33 2017 @@ -38,6 +38,39 @@ } \ } +#define CHECK_ALLOC(MappedBuffer, BufferLength) \ +{ \ + NTSTATUS Status; \ + PVOID BaseAddress; \ + SIZE_T Size; \ + BaseAddress = MappedBuffer; \ + Size = BufferLength; \ + Status = NtAllocateVirtualMemory(NtCurrentProcess(), \ + &BaseAddress, \ + 0, \ + &Size, \ + MEM_RESERVE, \ + PAGE_READWRITE); \ + ok_eq_hex(Status, STATUS_CONFLICTING_ADDRESSES); \ + BaseAddress = MappedBuffer; \ + Size = 0; \ + Status = NtFreeVirtualMemory(NtCurrentProcess(), \ + &BaseAddress, \ + &Size, \ + MEM_DECOMMIT); \ + ok_eq_hex(Status, STATUS_UNABLE_TO_DELETE_SECTION); \ + BaseAddress = MappedBuffer; \ + Size = 0; \ + Status = NtFreeVirtualMemory(NtCurrentProcess(), \ + &BaseAddress, \ + &Size, \ + MEM_RELEASE); \ + ok_eq_hex(Status, STATUS_UNABLE_TO_DELETE_SECTION); \ + Status = NtUnmapViewOfSection(NtCurrentProcess(), \ + MappedBuffer); \ + ok_eq_hex(Status, STATUS_NOT_MAPPED_VIEW); \ +} + START_TEST(MmMapLockedPagesSpecifyCache) { QUERY_BUFFER QueryBuffer; @@ -56,16 +89,18 @@ ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); ok_eq_int(QueryBuffer.Length, BufferLength); ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); - - Length = 0; - FILL_READ_BUFFER(QueryBuffer, ReadBuffer); - ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - - Length = sizeof(QUERY_BUFFER); - FILL_QUERY_BUFFER(QueryBuffer, BufferLength, TRUE); - ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - ok_eq_int(QueryBuffer.Length, BufferLength); - ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + CHECK_ALLOC(QueryBuffer.Buffer, BufferLength); + + Length = 0; + FILL_READ_BUFFER(QueryBuffer, ReadBuffer); + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + Length = sizeof(QUERY_BUFFER); + FILL_QUERY_BUFFER(QueryBuffer, BufferLength, TRUE); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + CHECK_ALLOC(QueryBuffer.Buffer, BufferLength); Length = 0; FILL_READ_BUFFER(QueryBuffer, ReadBuffer); @@ -78,16 +113,18 @@ ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); ok_eq_int(QueryBuffer.Length, BufferLength); ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); - - Length = 0; - FILL_READ_BUFFER(QueryBuffer, ReadBuffer); - ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - - Length = sizeof(QUERY_BUFFER); - FILL_QUERY_BUFFER(QueryBuffer, BufferLength, TRUE); - ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - ok_eq_int(QueryBuffer.Length, BufferLength); - ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + CHECK_ALLOC(QueryBuffer.Buffer, BufferLength); + + Length = 0; + FILL_READ_BUFFER(QueryBuffer, ReadBuffer); + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + Length = sizeof(QUERY_BUFFER); + FILL_QUERY_BUFFER(QueryBuffer, BufferLength, TRUE); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + CHECK_ALLOC(QueryBuffer.Buffer, BufferLength); Length = 0; FILL_READ_BUFFER(QueryBuffer, ReadBuffer); @@ -100,16 +137,18 @@ ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); ok_eq_int(QueryBuffer.Length, BufferLength); ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); - - Length = 0; - FILL_READ_BUFFER(QueryBuffer, ReadBuffer); - ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - - Length = sizeof(QUERY_BUFFER); - FILL_QUERY_BUFFER(QueryBuffer, BufferLength, TRUE); - ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - ok_eq_int(QueryBuffer.Length, BufferLength); - ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + CHECK_ALLOC(QueryBuffer.Buffer, BufferLength); + + Length = 0; + FILL_READ_BUFFER(QueryBuffer, ReadBuffer); + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + Length = sizeof(QUERY_BUFFER); + FILL_QUERY_BUFFER(QueryBuffer, BufferLength, TRUE); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + CHECK_ALLOC(QueryBuffer.Buffer, BufferLength); Length = 0; FILL_READ_BUFFER(QueryBuffer, ReadBuffer); @@ -122,16 +161,18 @@ ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); ok_eq_int(QueryBuffer.Length, BufferLength); ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); - - Length = 0; - FILL_READ_BUFFER(QueryBuffer, ReadBuffer); - ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - - Length = sizeof(QUERY_BUFFER); - FILL_QUERY_BUFFER(QueryBuffer, BufferLength, TRUE); - ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - ok_eq_int(QueryBuffer.Length, BufferLength); - ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + CHECK_ALLOC(QueryBuffer.Buffer, BufferLength); + + Length = 0; + FILL_READ_BUFFER(QueryBuffer, ReadBuffer); + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + Length = sizeof(QUERY_BUFFER); + FILL_QUERY_BUFFER(QueryBuffer, BufferLength, TRUE); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + CHECK_ALLOC(QueryBuffer.Buffer, BufferLength); Length = 0; FILL_READ_BUFFER(QueryBuffer, ReadBuffer); @@ -146,6 +187,7 @@ ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); ok_eq_int(QueryBuffer.Length, BufferLength); ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + CHECK_ALLOC(QueryBuffer.Buffer, BufferLength); Length = 0; FILL_READ_BUFFER(QueryBuffer, ReadBuffer); @@ -158,6 +200,7 @@ ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); ok_eq_int(QueryBuffer.Length, BufferLength); ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + CHECK_ALLOC(QueryBuffer.Buffer, BufferLength); Length = 0; FILL_READ_BUFFER(QueryBuffer, ReadBuffer);

7 years, 6 months

[tthompson] 75056: [NTFS] - Add support for expanding the master file table. Fix a bug with BrowseIndexEntries(). Improve diagnostic output. -AddNewMftEntry() - Increase size of MFT as needed. Fix ...

by tthompson＠svn.reactos.org

Author: tthompson Date: Fri Jun 16 06:00:09 2017 New Revision: 75056 URL: http://svn.reactos.org/svn/reactos?rev=75056&view=rev Log: [NTFS] - Add support for expanding the master file table. Fix a bug with BrowseIndexEntries(). Improve diagnostic output. -AddNewMftEntry() - Increase size of MFT as needed. Fix math for bitmap length. Don't assign file records to MFT indices 0x10 - 0x17; In Windows, these records aren't used unless they have to be, even though they are marked as unused in the bitmap. +IncreaseMftSize() - Adds room for additional file records in the master file table. -BrowseIndexEntries() - allow for the rare situation when a non-system file has an MFT index of 0x10. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] Fri Jun 16 06:00:09 2017 @@ -649,6 +649,8 @@ ULONGLONG ParentMftIndex; ULONGLONG FileMftIndex; + DPRINT1("NtfsCreateFileRecord(%p, %p)\n", DeviceExt, FileObject); + // allocate memory for file record FileRecord = ExAllocatePoolWithTag(NonPagedPool, DeviceExt->NtfsInfo.BytesPerFileRecord, Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Fri Jun 16 06:00:09 2017 @@ -186,6 +186,161 @@ return AttrRecord->Resident.ValueLength; } +/** +* @name IncreaseMftSize +* @implemented +* +* Increases the size of the master file table on a volume, increasing the space available for file records. +* +* @param Vcb +* Pointer to the VCB (DEVICE_EXTENSION) of the target volume. +* +* @return +* STATUS_SUCCESS on success. +* STATUS_INSUFFICIENT_RESOURCES if an allocation fails. +* STATUS_INVALID_PARAMETER if there was an error reading the Mft's bitmap. +* +* @remarks +* Increases the size of the Master File Table by 8 records. Bitmap entries for the new records are cleared, +* and the bitmap is also enlarged if needed. Mimicking Windows' behavior when enlarging the mft is still TODO. +* This function will wait for exlusive access to the volume fcb. +*/ +NTSTATUS +IncreaseMftSize(PDEVICE_EXTENSION Vcb) +{ + PNTFS_ATTR_CONTEXT BitmapContext; + LARGE_INTEGER BitmapSize; + LARGE_INTEGER DataSize; + LONGLONG BitmapSizeDifference; + ULONG DataSizeDifference = Vcb->NtfsInfo.BytesPerFileRecord * 8; + ULONG BitmapOffset; + PUCHAR BitmapBuffer; + ULONGLONG BitmapBytes; + ULONGLONG NewBitmapSize; + ULONG BytesRead; + ULONG LengthWritten; + NTSTATUS Status; + + DPRINT1("IncreaseMftSize(%p)\n", Vcb); + + // We need exclusive access to the mft while we change its size + if (!ExAcquireResourceExclusiveLite(&(Vcb->DirResource), TRUE)) + { + return STATUS_CANT_WAIT; + } + + // Find the bitmap attribute of master file table + Status = FindAttribute(Vcb, Vcb->MasterFileTable, AttributeBitmap, L"", 0, &BitmapContext, &BitmapOffset); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Couldn't find $BITMAP attribute of Mft!\n"); + ExReleaseResourceLite(&(Vcb->DirResource)); + return Status; + } + + // Get size of Bitmap Attribute + BitmapSize.QuadPart = AttributeDataLength(&BitmapContext->Record); + + // Calculate the new mft size + DataSize.QuadPart = AttributeDataLength(&(Vcb->MFTContext->Record)) + DataSizeDifference; + + // Determine how many bytes will make up the bitmap + BitmapBytes = DataSize.QuadPart / Vcb->NtfsInfo.BytesPerFileRecord / 8; + + // Determine how much we need to adjust the bitmap size (it's possible we don't) + BitmapSizeDifference = BitmapBytes - BitmapSize.QuadPart; + NewBitmapSize = max(BitmapSize.QuadPart + BitmapSizeDifference, BitmapSize.QuadPart); + + // Allocate memory for the bitmap + BitmapBuffer = ExAllocatePoolWithTag(NonPagedPool, NewBitmapSize, TAG_NTFS); + if (!BitmapBuffer) + { + DPRINT1("ERROR: Unable to allocate memory for bitmap attribute!\n"); + ExReleaseResourceLite(&(Vcb->DirResource)); + ReleaseAttributeContext(BitmapContext); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // Zero the bytes we'll be adding + RtlZeroMemory((PUCHAR)((ULONG_PTR)BitmapBuffer), NewBitmapSize); + + // Read the bitmap attribute + BytesRead = ReadAttribute(Vcb, + BitmapContext, + 0, + (PCHAR)BitmapBuffer, + BitmapSize.LowPart); + if (BytesRead != BitmapSize.LowPart) + { + DPRINT1("ERROR: Bytes read != Bitmap size!\n"); + ExReleaseResourceLite(&(Vcb->DirResource)); + ExFreePoolWithTag(BitmapBuffer, TAG_NTFS); + ReleaseAttributeContext(BitmapContext); + return STATUS_INVALID_PARAMETER; + } + + // Increase the mft size + Status = SetNonResidentAttributeDataLength(Vcb, Vcb->MFTContext, Vcb->MftDataOffset, Vcb->MasterFileTable, &DataSize); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Failed to set size of $MFT data attribute!\n"); + ExReleaseResourceLite(&(Vcb->DirResource)); + ExFreePoolWithTag(BitmapBuffer, TAG_NTFS); + ReleaseAttributeContext(BitmapContext); + return Status; + } + + // If the bitmap grew + if (BitmapSizeDifference > 0) + { + // Set the new bitmap size + BitmapSize.QuadPart += BitmapSizeDifference; + if (BitmapContext->Record.IsNonResident) + Status = SetNonResidentAttributeDataLength(Vcb, BitmapContext, BitmapOffset, Vcb->MasterFileTable, &BitmapSize); + else + Status = SetResidentAttributeDataLength(Vcb, BitmapContext, BitmapOffset, Vcb->MasterFileTable, &BitmapSize); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Failed to set size of bitmap attribute!\n"); + ExReleaseResourceLite(&(Vcb->DirResource)); + ExFreePoolWithTag(BitmapBuffer, TAG_NTFS); + ReleaseAttributeContext(BitmapContext); + return Status; + } + } + + //NtfsDumpFileAttributes(Vcb, FileRecord); + + // Update the file record with the new attribute sizes + Status = UpdateFileRecord(Vcb, Vcb->VolumeFcb->MFTIndex, Vcb->MasterFileTable); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Failed to update $MFT file record!\n"); + ExReleaseResourceLite(&(Vcb->DirResource)); + ExFreePoolWithTag(BitmapBuffer, TAG_NTFS); + ReleaseAttributeContext(BitmapContext); + return Status; + } + + // Write out the new bitmap + Status = WriteAttribute(Vcb, BitmapContext, BitmapOffset, BitmapBuffer, BitmapSize.LowPart, &LengthWritten); + if (!NT_SUCCESS(Status)) + { + ExReleaseResourceLite(&(Vcb->DirResource)); + ExFreePoolWithTag(BitmapBuffer, TAG_NTFS); + ReleaseAttributeContext(BitmapContext); + DPRINT1("ERROR: Couldn't write to bitmap attribute of $MFT!\n"); + } + + // Cleanup + ExReleaseResourceLite(&(Vcb->DirResource)); + ExFreePoolWithTag(BitmapBuffer, TAG_NTFS); + ReleaseAttributeContext(BitmapContext); + + return STATUS_SUCCESS; +} + VOID InternalSetResidentAttributeLength(PNTFS_ATTR_CONTEXT AttrContext, PFILE_RECORD_HEADER FileRecord, @@ -351,7 +506,7 @@ * STATUS_INVALID_PARAMETER if we can't find the last cluster in the data run. * * @remarks -* Called by SetAttributeDataLength(). Use SetAttributeDataLength() unless you have a good +* Called by SetAttributeDataLength() and IncreaseMftSize(). Use SetAttributeDataLength() unless you have a good * reason to use this. Doesn't update the file record on disk. Doesn't inform the cache controller of changes with * any associated files. Synchronization is the callers responsibility. */ @@ -485,7 +640,7 @@ * last attribute listed in the file record. * * @remarks -* Called by SetAttributeDataLength(). Use SetAttributeDataLength() unless you have a good +* Called by SetAttributeDataLength() and IncreaseMftSize(). Use SetAttributeDataLength() unless you have a good * reason to use this. Doesn't update the file record on disk. Doesn't inform the cache controller of changes with * any associated files. Synchronization is the callers responsibility. */ @@ -1488,7 +1643,6 @@ * STATUS_OBJECT_NAME_NOT_FOUND if we can't find the MFT's $Bitmap or if we weren't able * to read the attribute. * STATUS_INSUFFICIENT_RESOURCES if we can't allocate enough memory for a copy of $Bitmap. -* STATUS_NOT_IMPLEMENTED if we need to increase the size of the MFT. * */ NTSTATUS @@ -1503,9 +1657,13 @@ ULONGLONG AttrBytesRead; PVOID BitmapData; ULONG LengthWritten; + PNTFS_ATTR_CONTEXT BitmapContext; + LARGE_INTEGER BitmapBits; + UCHAR SystemReservedBits; + + DPRINT1("AddNewMftEntry(%p, %p, %p)\n", FileRecord, DeviceExt, DestinationIndex); // First, we have to read the mft's $Bitmap attribute - PNTFS_ATTR_CONTEXT BitmapContext; Status = FindAttribute(DeviceExt, DeviceExt->MasterFileTable, AttributeBitmap, L"", 0, &BitmapContext, NULL); if (!NT_SUCCESS(Status)) { @@ -1533,20 +1691,40 @@ return STATUS_OBJECT_NAME_NOT_FOUND; } + // we need to backup the bits for records 0x10 - 0x17 and leave them unassigned if they aren't assigned + RtlCopyMemory(&SystemReservedBits, (PVOID)((ULONG_PTR)BitmapData + 2), 1); + RtlFillMemory((PVOID)((ULONG_PTR)BitmapData + 2), 1, (UCHAR)0xFF); + + // Calculate bit count + BitmapBits.QuadPart = AttributeDataLength(&(DeviceExt->MFTContext->Record)) / + DeviceExt->NtfsInfo.BytesPerFileRecord; + if (BitmapBits.HighPart != 0) + { + DPRINT1("\tFIXME: bitmap sizes beyond 32bits are not yet supported!\n"); + BitmapBits.LowPart = 0xFFFFFFFF; + } + // convert buffer into bitmap - RtlInitializeBitMap(&Bitmap, (PULONG)BitmapData, BitmapDataSize * 8); + RtlInitializeBitMap(&Bitmap, (PULONG)BitmapData, BitmapBits.LowPart); // set next available bit, preferrably after 23rd bit MftIndex = RtlFindClearBitsAndSet(&Bitmap, 1, 24); if ((LONG)MftIndex == -1) { - DPRINT1("ERROR: Couldn't find free space in MFT for file record!\n"); + DPRINT1("Couldn't find free space in MFT for file record, increasing MFT size.\n"); ExFreePoolWithTag(BitmapData, TAG_NTFS); ReleaseAttributeContext(BitmapContext); - // TODO: increase mft size - return STATUS_NOT_IMPLEMENTED; + // Couldn't find a free record in the MFT, add some blank records and try again + Status = IncreaseMftSize(DeviceExt); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Couldn't find space in MFT for file or increase MFT size!\n"); + return Status; + } + + return AddNewMftEntry(FileRecord, DeviceExt, DestinationIndex); } DPRINT1("Creating file record at MFT index: %I64u\n", MftIndex); @@ -1555,6 +1733,9 @@ FileRecord->MFTRecordNumber = MftIndex; // [BitmapData should have been updated via RtlFindClearBitsAndSet()] + + // Restore the system reserved bits + RtlCopyMemory((PVOID)((ULONG_PTR)BitmapData + 2), &SystemReservedBits, 1); // write the bitmap back to the MFT's $Bitmap attribute Status = WriteAttribute(DeviceExt, BitmapContext, 0, BitmapData, BitmapDataSize, &LengthWritten); @@ -1723,7 +1904,7 @@ while (IndexEntry < LastEntry && !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) { - if ((IndexEntry->Data.Directory.IndexedFile & NTFS_MFT_MASK) > 0x10 && + if ((IndexEntry->Data.Directory.IndexedFile & NTFS_MFT_MASK) >= 0x10 && *CurrentEntry >= *StartEntry && IndexEntry->FileName.NameType != NTFS_FILE_NAME_DOS && CompareFileName(FileName, IndexEntry, DirSearch))

7 years, 6 months

[tthompson] 75055: [NTFS] - Restructure some code in preparation for the next commit: -SetAttributeDataLength() has been split into two functions, SetNonResidentAttributeDataLength() and SetResiden...

by tthompson＠svn.reactos.org

Author: tthompson Date: Fri Jun 16 05:43:52 2017 New Revision: 75055 URL: http://svn.reactos.org/svn/reactos?rev=75055&view=rev Log: [NTFS] - Restructure some code in preparation for the next commit: -SetAttributeDataLength() has been split into two functions, SetNonResidentAttributeDataLength() and SetResidentAttributeDataLength(). This should improve code readibility and allows for resizing an attribute when there's no FileObject associated with it. -Added "MftDataOffset" member to DEVICE_EXTENSION, which stores the offset of the Mft's $DATA attribute. (I'm starting to think it's better to add a member for offset to NTFS_ATTR_CONTEXT directly, but I'll save that level of restructuring for a future commit.) Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/fsctl.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Fri Jun 16 05:43:52 2017 @@ -295,7 +295,13 @@ return Status; } - Status = FindAttribute(DeviceExt, DeviceExt->MasterFileTable, AttributeData, L"", 0, &DeviceExt->MFTContext, NULL); + Status = FindAttribute(DeviceExt, + DeviceExt->MasterFileTable, + AttributeData, + L"", + 0, + &DeviceExt->MFTContext, + &DeviceExt->MftDataOffset); if (!NT_SUCCESS(Status)) { DPRINT1("Can't find data attribute for Master File Table.\n"); Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Fri Jun 16 05:43:52 2017 @@ -234,7 +234,6 @@ PLARGE_INTEGER DataSize) { NTSTATUS Status = STATUS_SUCCESS; - ULONG BytesPerCluster = Fcb->Vcb->NtfsInfo.BytesPerCluster; // are we truncating the file? if (DataSize->QuadPart < AttributeDataLength(&AttrContext->Record)) @@ -248,229 +247,26 @@ if (AttrContext->Record.IsNonResident) { - ULONGLONG AllocationSize = ROUND_UP(DataSize->QuadPart, BytesPerCluster); - PNTFS_ATTR_RECORD DestinationAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + AttrOffset); - ULONG ExistingClusters = AttrContext->Record.NonResident.AllocatedSize / BytesPerCluster; - - // do we need to increase the allocation size? - if (AttrContext->Record.NonResident.AllocatedSize < AllocationSize) - { - ULONG ClustersNeeded = (AllocationSize / BytesPerCluster) - ExistingClusters; - LARGE_INTEGER LastClusterInDataRun; - ULONG NextAssignedCluster; - ULONG AssignedClusters; - - if (ExistingClusters == 0) - { - LastClusterInDataRun.QuadPart = 0; - } - else - { - if (!FsRtlLookupLargeMcbEntry(&AttrContext->DataRunsMCB, - (LONGLONG)AttrContext->Record.NonResident.HighestVCN, - (PLONGLONG)&LastClusterInDataRun.QuadPart, - NULL, - NULL, - NULL, - NULL)) - { - DPRINT1("Error looking up final large MCB entry!\n"); - - // Most likely, HighestVCN went above the largest mapping - DPRINT1("Highest VCN of record: %I64u\n", AttrContext->Record.NonResident.HighestVCN); - return STATUS_INVALID_PARAMETER; - } - } - - DPRINT("LastClusterInDataRun: %I64u\n", LastClusterInDataRun.QuadPart); - DPRINT("Highest VCN of record: %I64u\n", AttrContext->Record.NonResident.HighestVCN); - - while (ClustersNeeded > 0) - { - Status = NtfsAllocateClusters(Fcb->Vcb, - LastClusterInDataRun.LowPart + 1, - ClustersNeeded, - &NextAssignedCluster, - &AssignedClusters); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Error: Unable to allocate requested clusters!\n"); - return Status; - } - - // now we need to add the clusters we allocated to the data run - Status = AddRun(Fcb->Vcb, AttrContext, AttrOffset, FileRecord, NextAssignedCluster, AssignedClusters); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Error: Unable to add data run!\n"); - return Status; - } - - ClustersNeeded -= AssignedClusters; - LastClusterInDataRun.LowPart = NextAssignedCluster + AssignedClusters - 1; - } - } - else if (AttrContext->Record.NonResident.AllocatedSize > AllocationSize) - { - // shrink allocation size - ULONG ClustersToFree = ExistingClusters - (AllocationSize / BytesPerCluster); - Status = FreeClusters(Fcb->Vcb, AttrContext, AttrOffset, FileRecord, ClustersToFree); - } - - // TODO: is the file compressed, encrypted, or sparse? - - // NOTE: we need to have acquired the main resource exclusively, as well as(?) the PagingIoResource - - Fcb->RFCB.AllocationSize.QuadPart = AllocationSize; - AttrContext->Record.NonResident.AllocatedSize = AllocationSize; - AttrContext->Record.NonResident.DataSize = DataSize->QuadPart; - AttrContext->Record.NonResident.InitializedSize = DataSize->QuadPart; - - DestinationAttribute->NonResident.AllocatedSize = AllocationSize; - DestinationAttribute->NonResident.DataSize = DataSize->QuadPart; - DestinationAttribute->NonResident.InitializedSize = DataSize->QuadPart; - - DPRINT("Allocated Size: %I64u\n", DestinationAttribute->NonResident.AllocatedSize); + Status = SetNonResidentAttributeDataLength(Fcb->Vcb, + AttrContext, + AttrOffset, + FileRecord, + DataSize); } else { // resident attribute - - // find the next attribute - ULONG NextAttributeOffset = AttrOffset + AttrContext->Record.Length; - PNTFS_ATTR_RECORD NextAttribute = (PNTFS_ATTR_RECORD)((PCHAR)FileRecord + NextAttributeOffset); - - //NtfsDumpFileAttributes(Fcb->Vcb, FileRecord); - - // Do we need to increase the data length? - if (DataSize->QuadPart > AttrContext->Record.Resident.ValueLength) - { - // There's usually padding at the end of a record. Do we need to extend past it? - ULONG MaxValueLength = AttrContext->Record.Length - AttrContext->Record.Resident.ValueOffset; - if (MaxValueLength < DataSize->LowPart) - { - // If this is the last attribute, we could move the end marker to the very end of the file record - MaxValueLength += Fcb->Vcb->NtfsInfo.BytesPerFileRecord - NextAttributeOffset - (sizeof(ULONG) * 2); - - if (MaxValueLength < DataSize->LowPart || NextAttribute->Type != AttributeEnd) - { - // convert attribute to non-resident - PNTFS_ATTR_RECORD Destination = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + AttrOffset); - LARGE_INTEGER AttribDataSize; - PVOID AttribData; - ULONG EndAttributeOffset; - ULONG LengthWritten; - - DPRINT1("Converting attribute to non-resident.\n"); - - AttribDataSize.QuadPart = AttrContext->Record.Resident.ValueLength; - - // Is there existing data we need to back-up? - if (AttribDataSize.QuadPart > 0) - { - AttribData = ExAllocatePoolWithTag(NonPagedPool, AttribDataSize.QuadPart, TAG_NTFS); - if (AttribData == NULL) - { - DPRINT1("ERROR: Couldn't allocate memory for attribute data. Can't migrate to non-resident!\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - // read data to temp buffer - Status = ReadAttribute(Fcb->Vcb, AttrContext, 0, AttribData, AttribDataSize.QuadPart); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ERROR: Unable to read attribute before migrating!\n"); - ExFreePoolWithTag(AttribData, TAG_NTFS); - return Status; - } - } - - // Start by turning this attribute into a 0-length, non-resident attribute, then enlarge it. - - // Zero out the NonResident structure - RtlZeroMemory(&AttrContext->Record.NonResident.LowestVCN, - FIELD_OFFSET(NTFS_ATTR_RECORD, NonResident.CompressedSize) - FIELD_OFFSET(NTFS_ATTR_RECORD, NonResident.LowestVCN)); - RtlZeroMemory(&Destination->NonResident.LowestVCN, - FIELD_OFFSET(NTFS_ATTR_RECORD, NonResident.CompressedSize) - FIELD_OFFSET(NTFS_ATTR_RECORD, NonResident.LowestVCN)); - - // update the mapping pairs offset, which will be 0x40 + length in bytes of the name - AttrContext->Record.NonResident.MappingPairsOffset = Destination->NonResident.MappingPairsOffset = 0x40 + (Destination->NameLength * 2); - - // mark the attribute as non-resident - AttrContext->Record.IsNonResident = Destination->IsNonResident = 1; - - // update the end of the file record - // calculate position of end markers (1 byte for empty data run) - EndAttributeOffset = AttrOffset + AttrContext->Record.NonResident.MappingPairsOffset + 1; - EndAttributeOffset = ALIGN_UP_BY(EndAttributeOffset, 8); - - // Update the length - Destination->Length = EndAttributeOffset - AttrOffset; - AttrContext->Record.Length = Destination->Length; - - // Update the file record end - SetFileRecordEnd(FileRecord, - (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + EndAttributeOffset), - FILE_RECORD_END); - - // update file record on disk - Status = UpdateFileRecord(Fcb->Vcb, AttrContext->FileMFTIndex, FileRecord); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ERROR: Couldn't update file record to continue migration!\n"); - if (AttribDataSize.QuadPart > 0) - ExFreePoolWithTag(AttribData, TAG_NTFS); - return Status; - } - - // Initialize the MCB, potentially catch an exception - _SEH2_TRY{ - FsRtlInitializeLargeMcb(&AttrContext->DataRunsMCB, NonPagedPool); - } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } _SEH2_END; - - // Now we can treat the attribute as non-resident and enlarge it normally - Status = SetAttributeDataLength(FileObject, Fcb, AttrContext, AttrOffset, FileRecord, DataSize); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ERROR: Unable to migrate resident attribute!\n"); - if (AttribDataSize.QuadPart > 0) - ExFreePoolWithTag(AttribData, TAG_NTFS); - return Status; - } - - // restore the back-up attribute, if we made one - if (AttribDataSize.QuadPart > 0) - { - Status = WriteAttribute(Fcb->Vcb, AttrContext, 0, AttribData, AttribDataSize.QuadPart, &LengthWritten); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ERROR: Unable to write attribute data to non-resident clusters during migration!\n"); - // TODO: Reverse migration so no data is lost - ExFreePoolWithTag(AttribData, TAG_NTFS); - return Status; - } - - ExFreePoolWithTag(AttribData, TAG_NTFS); - } - } - } - } - else if (DataSize->LowPart < AttrContext->Record.Resident.ValueLength) - { - // we need to decrease the length - if (NextAttribute->Type != AttributeEnd) - { - DPRINT1("FIXME: Don't know how to decrease length of resident attribute unless it's the final attribute!\n"); - return STATUS_NOT_IMPLEMENTED; - } - } - - // set the new length of the resident attribute (if we didn't migrate it) - if(!AttrContext->Record.IsNonResident) - InternalSetResidentAttributeLength(AttrContext, FileRecord, AttrOffset, DataSize->LowPart); + Status = SetResidentAttributeDataLength(Fcb->Vcb, + AttrContext, + AttrOffset, + FileRecord, + DataSize); + } + + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Failed to set size of attribute!\n"); + return Status; } //NtfsDumpFileAttributes(Fcb->Vcb, FileRecord); @@ -480,6 +276,10 @@ if (NT_SUCCESS(Status)) { + if(AttrContext->Record.IsNonResident) + Fcb->RFCB.AllocationSize.QuadPart = AttrContext->Record.NonResident.AllocatedSize; + else + Fcb->RFCB.AllocationSize = *DataSize; Fcb->RFCB.FileSize = *DataSize; Fcb->RFCB.ValidDataLength = *DataSize; CcSetFileSizes(FileObject, (PCC_FILE_SIZES)&Fcb->RFCB.AllocationSize); @@ -521,6 +321,325 @@ // recalculate bytes in use FileRecord->BytesInUse = (ULONG_PTR)AttrEnd - (ULONG_PTR)FileRecord + sizeof(ULONG) * 2; +} + +/** +* @name SetNonResidentAttributeDataLength +* @implemented +* +* Called by SetAttributeDataLength() to set the size of a non-resident attribute. Doesn't update the file record. +* +* @param Vcb +* Pointer to a DEVICE_EXTENSION describing the target disk. +* +* @param AttrContext +* PNTFS_ATTR_CONTEXT describing the location of the attribute whose size is being set. +* +* @param AttrOffset +* Offset, from the beginning of the record, of the attribute being sized. +* +* @param FileRecord +* Pointer to a file record containing the attribute to be resized. Must be a complete file record, +* not just the header. +* +* @param DataSize +* Pointer to a LARGE_INTEGER describing the new size of the attribute's data. +* +* @return +* STATUS_SUCCESS on success; +* STATUS_INSUFFICIENT_RESOURCES if an allocation fails. +* STATUS_INVALID_PARAMETER if we can't find the last cluster in the data run. +* +* @remarks +* Called by SetAttributeDataLength(). Use SetAttributeDataLength() unless you have a good +* reason to use this. Doesn't update the file record on disk. Doesn't inform the cache controller of changes with +* any associated files. Synchronization is the callers responsibility. +*/ +NTSTATUS +SetNonResidentAttributeDataLength(PDEVICE_EXTENSION Vcb, + PNTFS_ATTR_CONTEXT AttrContext, + ULONG AttrOffset, + PFILE_RECORD_HEADER FileRecord, + PLARGE_INTEGER DataSize) +{ + NTSTATUS Status = STATUS_SUCCESS; + ULONG BytesPerCluster = Vcb->NtfsInfo.BytesPerCluster; + ULONGLONG AllocationSize = ROUND_UP(DataSize->QuadPart, BytesPerCluster); + PNTFS_ATTR_RECORD DestinationAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + AttrOffset); + ULONG ExistingClusters = AttrContext->Record.NonResident.AllocatedSize / BytesPerCluster; + + if (!AttrContext->Record.IsNonResident) + { + DPRINT1("ERROR: SetNonResidentAttributeDataLength() called for resident attribute!\n"); + return STATUS_INVALID_PARAMETER; + } + + // do we need to increase the allocation size? + if (AttrContext->Record.NonResident.AllocatedSize < AllocationSize) + { + ULONG ClustersNeeded = (AllocationSize / BytesPerCluster) - ExistingClusters; + LARGE_INTEGER LastClusterInDataRun; + ULONG NextAssignedCluster; + ULONG AssignedClusters; + + if (ExistingClusters == 0) + { + LastClusterInDataRun.QuadPart = 0; + } + else + { + if (!FsRtlLookupLargeMcbEntry(&AttrContext->DataRunsMCB, + (LONGLONG)AttrContext->Record.NonResident.HighestVCN, + (PLONGLONG)&LastClusterInDataRun.QuadPart, + NULL, + NULL, + NULL, + NULL)) + { + DPRINT1("Error looking up final large MCB entry!\n"); + + // Most likely, HighestVCN went above the largest mapping + DPRINT1("Highest VCN of record: %I64u\n", AttrContext->Record.NonResident.HighestVCN); + return STATUS_INVALID_PARAMETER; + } + } + + DPRINT("LastClusterInDataRun: %I64u\n", LastClusterInDataRun.QuadPart); + DPRINT("Highest VCN of record: %I64u\n", AttrContext->Record.NonResident.HighestVCN); + + while (ClustersNeeded > 0) + { + Status = NtfsAllocateClusters(Vcb, + LastClusterInDataRun.LowPart + 1, + ClustersNeeded, + &NextAssignedCluster, + &AssignedClusters); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Error: Unable to allocate requested clusters!\n"); + return Status; + } + + // now we need to add the clusters we allocated to the data run + Status = AddRun(Vcb, AttrContext, AttrOffset, FileRecord, NextAssignedCluster, AssignedClusters); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Error: Unable to add data run!\n"); + return Status; + } + + ClustersNeeded -= AssignedClusters; + LastClusterInDataRun.LowPart = NextAssignedCluster + AssignedClusters - 1; + } + } + else if (AttrContext->Record.NonResident.AllocatedSize > AllocationSize) + { + // shrink allocation size + ULONG ClustersToFree = ExistingClusters - (AllocationSize / BytesPerCluster); + Status = FreeClusters(Vcb, AttrContext, AttrOffset, FileRecord, ClustersToFree); + } + + // TODO: is the file compressed, encrypted, or sparse? + + AttrContext->Record.NonResident.AllocatedSize = AllocationSize; + AttrContext->Record.NonResident.DataSize = DataSize->QuadPart; + AttrContext->Record.NonResident.InitializedSize = DataSize->QuadPart; + + DestinationAttribute->NonResident.AllocatedSize = AllocationSize; + DestinationAttribute->NonResident.DataSize = DataSize->QuadPart; + DestinationAttribute->NonResident.InitializedSize = DataSize->QuadPart; + + DPRINT("Allocated Size: %I64u\n", DestinationAttribute->NonResident.AllocatedSize); + + return Status; +} + +/** +* @name SetResidentAttributeDataLength +* @implemented +* +* Called by SetAttributeDataLength() to set the size of a non-resident attribute. Doesn't update the file record. +* +* @param Vcb +* Pointer to a DEVICE_EXTENSION describing the target disk. +* +* @param AttrContext +* PNTFS_ATTR_CONTEXT describing the location of the attribute whose size is being set. +* +* @param AttrOffset +* Offset, from the beginning of the record, of the attribute being sized. +* +* @param FileRecord +* Pointer to a file record containing the attribute to be resized. Must be a complete file record, +* not just the header. +* +* @param DataSize +* Pointer to a LARGE_INTEGER describing the new size of the attribute's data. +* +* @return +* STATUS_SUCCESS on success; +* STATUS_INSUFFICIENT_RESOURCES if an allocation fails. +* STATUS_INVALID_PARAMETER if AttrContext describes a non-resident attribute. +* STATUS_NOT_IMPLEMENTED if requested to decrease the size of an attribute that isn't the +* last attribute listed in the file record. +* +* @remarks +* Called by SetAttributeDataLength(). Use SetAttributeDataLength() unless you have a good +* reason to use this. Doesn't update the file record on disk. Doesn't inform the cache controller of changes with +* any associated files. Synchronization is the callers responsibility. +*/ +NTSTATUS +SetResidentAttributeDataLength(PDEVICE_EXTENSION Vcb, + PNTFS_ATTR_CONTEXT AttrContext, + ULONG AttrOffset, + PFILE_RECORD_HEADER FileRecord, + PLARGE_INTEGER DataSize) +{ + NTSTATUS Status; + + // find the next attribute + ULONG NextAttributeOffset = AttrOffset + AttrContext->Record.Length; + PNTFS_ATTR_RECORD NextAttribute = (PNTFS_ATTR_RECORD)((PCHAR)FileRecord + NextAttributeOffset); + + if (AttrContext->Record.IsNonResident) + { + DPRINT1("ERROR: SetResidentAttributeDataLength() called for non-resident attribute!\n"); + return STATUS_INVALID_PARAMETER; + } + + //NtfsDumpFileAttributes(Vcb, FileRecord); + + // Do we need to increase the data length? + if (DataSize->QuadPart > AttrContext->Record.Resident.ValueLength) + { + // There's usually padding at the end of a record. Do we need to extend past it? + ULONG MaxValueLength = AttrContext->Record.Length - AttrContext->Record.Resident.ValueOffset; + if (MaxValueLength < DataSize->LowPart) + { + // If this is the last attribute, we could move the end marker to the very end of the file record + MaxValueLength += Vcb->NtfsInfo.BytesPerFileRecord - NextAttributeOffset - (sizeof(ULONG) * 2); + + if (MaxValueLength < DataSize->LowPart || NextAttribute->Type != AttributeEnd) + { + // convert attribute to non-resident + PNTFS_ATTR_RECORD Destination = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + AttrOffset); + LARGE_INTEGER AttribDataSize; + PVOID AttribData; + ULONG EndAttributeOffset; + ULONG LengthWritten; + + DPRINT1("Converting attribute to non-resident.\n"); + + AttribDataSize.QuadPart = AttrContext->Record.Resident.ValueLength; + + // Is there existing data we need to back-up? + if (AttribDataSize.QuadPart > 0) + { + AttribData = ExAllocatePoolWithTag(NonPagedPool, AttribDataSize.QuadPart, TAG_NTFS); + if (AttribData == NULL) + { + DPRINT1("ERROR: Couldn't allocate memory for attribute data. Can't migrate to non-resident!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // read data to temp buffer + Status = ReadAttribute(Vcb, AttrContext, 0, AttribData, AttribDataSize.QuadPart); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Unable to read attribute before migrating!\n"); + ExFreePoolWithTag(AttribData, TAG_NTFS); + return Status; + } + } + + // Start by turning this attribute into a 0-length, non-resident attribute, then enlarge it. + + // Zero out the NonResident structure + RtlZeroMemory(&AttrContext->Record.NonResident.LowestVCN, + FIELD_OFFSET(NTFS_ATTR_RECORD, NonResident.CompressedSize) - FIELD_OFFSET(NTFS_ATTR_RECORD, NonResident.LowestVCN)); + RtlZeroMemory(&Destination->NonResident.LowestVCN, + FIELD_OFFSET(NTFS_ATTR_RECORD, NonResident.CompressedSize) - FIELD_OFFSET(NTFS_ATTR_RECORD, NonResident.LowestVCN)); + + // update the mapping pairs offset, which will be 0x40 + length in bytes of the name + AttrContext->Record.NonResident.MappingPairsOffset = Destination->NonResident.MappingPairsOffset = 0x40 + (Destination->NameLength * 2); + + // mark the attribute as non-resident + AttrContext->Record.IsNonResident = Destination->IsNonResident = 1; + + // update the end of the file record + // calculate position of end markers (1 byte for empty data run) + EndAttributeOffset = AttrOffset + AttrContext->Record.NonResident.MappingPairsOffset + 1; + EndAttributeOffset = ALIGN_UP_BY(EndAttributeOffset, 8); + + // Update the length + Destination->Length = EndAttributeOffset - AttrOffset; + AttrContext->Record.Length = Destination->Length; + + // Update the file record end + SetFileRecordEnd(FileRecord, + (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + EndAttributeOffset), + FILE_RECORD_END); + + // update file record on disk + Status = UpdateFileRecord(Vcb, AttrContext->FileMFTIndex, FileRecord); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Couldn't update file record to continue migration!\n"); + if (AttribDataSize.QuadPart > 0) + ExFreePoolWithTag(AttribData, TAG_NTFS); + return Status; + } + + // Initialize the MCB, potentially catch an exception + _SEH2_TRY{ + FsRtlInitializeLargeMcb(&AttrContext->DataRunsMCB, NonPagedPool); + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } _SEH2_END; + + // Now we can treat the attribute as non-resident and enlarge it normally + Status = SetNonResidentAttributeDataLength(Vcb, AttrContext, AttrOffset, FileRecord, DataSize); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Unable to migrate resident attribute!\n"); + if (AttribDataSize.QuadPart > 0) + ExFreePoolWithTag(AttribData, TAG_NTFS); + return Status; + } + + // restore the back-up attribute, if we made one + if (AttribDataSize.QuadPart > 0) + { + Status = WriteAttribute(Vcb, AttrContext, 0, AttribData, AttribDataSize.QuadPart, &LengthWritten); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Unable to write attribute data to non-resident clusters during migration!\n"); + // TODO: Reverse migration so no data is lost + ExFreePoolWithTag(AttribData, TAG_NTFS); + return Status; + } + + ExFreePoolWithTag(AttribData, TAG_NTFS); + } + } + } + } + else if (DataSize->LowPart < AttrContext->Record.Resident.ValueLength) + { + // we need to decrease the length + if (NextAttribute->Type != AttributeEnd) + { + DPRINT1("FIXME: Don't know how to decrease length of resident attribute unless it's the final attribute!\n"); + return STATUS_NOT_IMPLEMENTED; + } + } + + // set the new length of the resident attribute (if we didn't migrate it) + if (!AttrContext->Record.IsNonResident) + InternalSetResidentAttributeLength(AttrContext, FileRecord, AttrOffset, DataSize->LowPart); + + return STATUS_SUCCESS; } ULONG Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Fri Jun 16 05:43:52 2017 @@ -116,6 +116,7 @@ NTFS_INFO NtfsInfo; + ULONG MftDataOffset; ULONG Flags; ULONG OpenHandleCount; @@ -869,6 +870,20 @@ PNTFS_ATTR_RECORD AttrEnd, ULONG EndMarker); +NTSTATUS +SetNonResidentAttributeDataLength(PDEVICE_EXTENSION Vcb, + PNTFS_ATTR_CONTEXT AttrContext, + ULONG AttrOffset, + PFILE_RECORD_HEADER FileRecord, + PLARGE_INTEGER DataSize); + +NTSTATUS +SetResidentAttributeDataLength(PDEVICE_EXTENSION Vcb, + PNTFS_ATTR_CONTEXT AttrContext, + ULONG AttrOffset, + PFILE_RECORD_HEADER FileRecord, + PLARGE_INTEGER DataSize); + ULONGLONG AttributeAllocatedLength(PNTFS_ATTR_RECORD AttrRecord);

7 years, 6 months

[tthompson] 75054: [NTFS] - Add some improvements to the previous commit, as suggested by Thomas.

by tthompson＠svn.reactos.org

Author: tthompson Date: Fri Jun 16 05:42:01 2017 New Revision: 75054 URL: http://svn.reactos.org/svn/reactos?rev=75054&view=rev Log: [NTFS] - Add some improvements to the previous commit, as suggested by Thomas. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Fri Jun 16 05:42:01 2017 @@ -167,9 +167,7 @@ // we need to extract the filename from the path DPRINT1("Pathname: %wZ\n", &FileObject->FileName); - RtlZeroMemory(&FilenameNoPath, sizeof(UNICODE_STRING)); - FilenameNoPath.Buffer = Buffer; - FilenameNoPath.MaximumLength = MAX_PATH; + RtlInitEmptyUnicodeString(&FilenameNoPath, Buffer, MAX_PATH); FsRtlDissectName(FileObject->FileName, &Current, &Remaining); @@ -210,7 +208,7 @@ DPRINT1("FileNameAttribute->DirectoryFileReferenceNumber: 0x%016I64x\n", FileNameAttribute->DirectoryFileReferenceNumber); - FileNameAttribute->NameLength = FilenameNoPath.Length / 2; + FileNameAttribute->NameLength = FilenameNoPath.Length / sizeof(WCHAR); // TODO: Get proper nametype, add DOS links as needed FileNameAttribute->NameType = NTFS_FILE_NAME_WIN32_AND_DOS; RtlCopyMemory(FileNameAttribute->Name, FilenameNoPath.Buffer, FilenameNoPath.Length);

7 years, 6 months

[ekohl] 75053: [ADVAPI32] ScmRpcStatusToWinError: Convert STATUS_ACCESS_VIOLATION to ERROR_INVALID_HANDLE. UnlockServiceDatabase returns ERROR_INVALID_SERVICE_LOCK instead of ERROR_INVALID_HANDLE.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Jun 15 23:19:34 2017 New Revision: 75053 URL: http://svn.reactos.org/svn/reactos?rev=75053&view=rev Log: [ADVAPI32] ScmRpcStatusToWinError: Convert STATUS_ACCESS_VIOLATION to ERROR_INVALID_HANDLE. UnlockServiceDatabase returns ERROR_INVALID_SERVICE_LOCK instead of ERROR_INVALID_HANDLE. Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Thu Jun 15 23:19:34 2017 @@ -133,6 +133,7 @@ { switch (Status) { + case STATUS_ACCESS_VIOLATION: case RPC_S_INVALID_BINDING: case RPC_X_SS_IN_NULL_CONTEXT: return ERROR_INVALID_HANDLE; @@ -2798,6 +2799,9 @@ } RpcEndExcept; + if (dwError == ERROR_INVALID_HANDLE) + dwError = ERROR_INVALID_SERVICE_LOCK; + if (dwError != ERROR_SUCCESS) { TRACE("RUnlockServiceDatabase() failed (Error %lu)\n", dwError);

7 years, 6 months

[ekohl] 75052: [ADVAPI32] CreateServiceA/W: Call SetLastError() in case of success too.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Jun 15 21:40:12 2017 New Revision: 75052 URL: http://svn.reactos.org/svn/reactos?rev=75052&view=rev Log: [ADVAPI32] CreateServiceA/W: Call SetLastError() in case of success too. Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Thu Jun 15 21:40:12 2017 @@ -654,10 +654,10 @@ if (lpPasswordW != NULL) HeapFree(GetProcessHeap(), 0, lpPasswordW); + SetLastError(dwError); if (dwError != ERROR_SUCCESS) { TRACE("RCreateServiceA() failed (Error %lu)\n", dwError); - SetLastError(dwError); return NULL; } @@ -750,10 +750,10 @@ } RpcEndExcept; + SetLastError(dwError); if (dwError != ERROR_SUCCESS) { TRACE("RCreateServiceW() failed (Error %lu)\n", dwError); - SetLastError(dwError); return NULL; }

7 years, 6 months

← Newer
1
...
17
18
19
20
21
22
23
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2017