Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 45583: [MSDMO] sync msdmo with wine 1.1.38
by cwittich＠svn.reactos.org 12 Feb '10

12 Feb '10

Author: cwittich Date: Fri Feb 12 10:20:35 2010 New Revision: 45583 URL: http://svn.reactos.org/svn/reactos?rev=45583&view=rev Log: [MSDMO] sync msdmo with wine 1.1.38 Modified: trunk/reactos/dll/directx/msdmo/dmoreg.c trunk/reactos/include/dxsdk/dmo.h trunk/reactos/include/dxsdk/dmoreg.h trunk/reactos/include/dxsdk/dmort.h Modified: trunk/reactos/dll/directx/msdmo/dmoreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdmo/dmoreg.c… ============================================================================== --- trunk/reactos/dll/directx/msdmo/dmoreg.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdmo/dmoreg.c [iso-8859-1] Fri Feb 12 10:20:35 2010 @@ -787,11 +787,11 @@ * DMOGetTypes (MSDMO.@) */ HRESULT WINAPI DMOGetTypes(REFCLSID clsidDMO, - unsigned long ulInputTypesRequested, - unsigned long* pulInputTypesSupplied, + ULONG ulInputTypesRequested, + ULONG* pulInputTypesSupplied, DMO_PARTIAL_MEDIATYPE* pInputTypes, - unsigned long ulOutputTypesRequested, - unsigned long* pulOutputTypesSupplied, + ULONG ulOutputTypesRequested, + ULONG* pulOutputTypesSupplied, DMO_PARTIAL_MEDIATYPE* pOutputTypes) { HKEY root,hkey; @@ -815,7 +815,7 @@ if (ulInputTypesRequested > 0) { - ret = read_types(hkey, szDMOInputType, (ULONG*)pulInputTypesSupplied, ulInputTypesRequested, pInputTypes ); + ret = read_types(hkey, szDMOInputType, pulInputTypesSupplied, ulInputTypesRequested, pInputTypes ); } else *pulInputTypesSupplied = 0; @@ -823,7 +823,7 @@ if (ulOutputTypesRequested > 0) { HRESULT ret2; - ret2 = read_types(hkey, szDMOOutputType, (ULONG*)pulOutputTypesSupplied, ulOutputTypesRequested, pOutputTypes ); + ret2 = read_types(hkey, szDMOOutputType, pulOutputTypesSupplied, ulOutputTypesRequested, pOutputTypes ); if (ret == S_OK) ret = ret2; Modified: trunk/reactos/include/dxsdk/dmo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmo.h?rev=45… ============================================================================== --- trunk/reactos/include/dxsdk/dmo.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/dmo.h [iso-8859-1] Fri Feb 12 10:20:35 2010 @@ -1,20 +1,34 @@ +/* + * Copyright (C) 2002 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ #ifndef __DMO_H__ #define __DMO_H__ -#include "mediaerr.h" +#include <mediaerr.h> #ifdef FIX_LOCK_NAME - #define Lock DMOLock +#define Lock DMOLock #endif +#include <mediaobj.h> +#ifdef FIX_LOCK_NAME +#undef Lock +#endif +#include <dmoreg.h> +#include <dmort.h> -#include "mediaobj.h" - -#ifdef FIX_LOCK_NAME - #undef Lock -#endif - -#include "dmoreg.h" -#include "dmort.h" - -#endif /* __DMO_H__ */ +#endif /* __DMO_H__ */ Modified: trunk/reactos/include/dxsdk/dmoreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmoreg.h?rev… ============================================================================== --- trunk/reactos/include/dxsdk/dmoreg.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/dmoreg.h [iso-8859-1] Fri Feb 12 10:20:35 2010 @@ -1,75 +1,70 @@ +/* + * Copyright (C) 2002 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + #ifndef __DMOREG_H__ #define __DMOREG_H__ #include "mediaobj.h" -DEFINE_GUID(DMOCATEGORY_ACOUSTIC_ECHO_CANCEL, 0xBF963D80, 0xC559, 0x11D0, 0x8A, 0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1); -DEFINE_GUID(DMOCATEGORY_AGC, 0xE88C9BA0, 0xC557, 0x11D0, 0x8A, 0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1); -DEFINE_GUID(DMOCATEGORY_AUDIO_CAPTURE_EFFECT, 0xF665AAba, 0x3E09, 0x4920, 0xAA, 0x5F,0x21,0x98,0x11,0x14,0x8F,0x09); -DEFINE_GUID(DMOCATEGORY_AUDIO_DECODER, 0x57F2db8b, 0xE6BB, 0x4513, 0x9D, 0x43,0xDC,0xD2,0xA6,0x59,0x31,0x25); -DEFINE_GUID(DMOCATEGORY_AUDIO_EFFECT, 0xF3602b3f, 0x0592, 0x48DF, 0xA4, 0xCD,0x67,0x47,0x21,0xE7,0xEB,0xEB); -DEFINE_GUID(DMOCATEGORY_AUDIO_ENCODER, 0x33D9A761, 0x90C8, 0x11D0, 0xBD, 0x43,0x00,0xA0,0xC9,0x11,0xCE,0x86); -DEFINE_GUID(DMOCATEGORY_AUDIO_NOISE_SUPPRESS, 0xE07f903f, 0x62FD, 0x4e60, 0x8C, 0xDD,0xDE,0xA7,0x23,0x66,0x65,0xB5); -DEFINE_GUID(DMOCATEGORY_VIDEO_DECODER, 0x4A69b442, 0x28BE, 0x4991, 0x96, 0x9C,0xB5,0x00,0xAD,0xF5,0xd8,0xA8); -DEFINE_GUID(DMOCATEGORY_VIDEO_EFFECT, 0xd990eE14, 0x776C, 0x4723, 0xBE, 0x46,0x3D,0xA2,0xF5,0x6F,0x10,0xB9); -DEFINE_GUID(DMOCATEGORY_VIDEO_ENCODER, 0x33D9A760, 0x90C8, 0x11D0, 0xBD, 0x43,0x00,0xA0,0xC9,0x11,0xCE,0x86); - typedef struct _DMO_PARTIAL_MEDIATYPE { - GUID type; - GUID subtype; + GUID type; + GUID subtype; } DMO_PARTIAL_MEDIATYPE, *PDMO_PARTIAL_MEDIATYPE; enum DMO_REGISTER_FLAGS { - DMO_REGISTERF_IS_KEYED = 0x00000001 + DMO_REGISTERF_IS_KEYED = 1 }; enum DMO_ENUM_FLAGS { - DMO_ENUMF_INCLUDE_KEYED = 0x00000001 + DMO_ENUMF_INCLUDE_KEYED = 1 }; -STDAPI -DMOEnum( - REFGUID guidCategory, - DWORD dwFlags, - DWORD cInTypes, - const DMO_PARTIAL_MEDIATYPE *pInTypes, - DWORD cOutTypes, - const DMO_PARTIAL_MEDIATYPE *pOutTypes, - IEnumDMO **ppEnum); +HRESULT WINAPI DMORegister(LPCWSTR,REFCLSID,REFGUID,DWORD,DWORD,const DMO_PARTIAL_MEDIATYPE*, + DWORD,const DMO_PARTIAL_MEDIATYPE*); +HRESULT WINAPI DMOUnregister(REFCLSID,REFGUID); +HRESULT WINAPI DMOEnum(REFGUID,DWORD,DWORD,const DMO_PARTIAL_MEDIATYPE*,DWORD, + const DMO_PARTIAL_MEDIATYPE*,IEnumDMO**); +HRESULT WINAPI DMOGetTypes(REFCLSID,ULONG,ULONG*,DMO_PARTIAL_MEDIATYPE*, + ULONG,ULONG*,DMO_PARTIAL_MEDIATYPE*); +HRESULT WINAPI DMOGetName(REFCLSID,WCHAR[80]); -STDAPI -DMOGetName( - REFCLSID clsidDMO, - WCHAR szName[80]); +DEFINE_GUID(DMOCATEGORY_AUDIO_DECODER, + 0x57f2db8b,0xe6bb,0x4513,0x9d,0x43,0xdc,0xd2,0xa6,0x59,0x31,0x25); +DEFINE_GUID(DMOCATEGORY_AUDIO_ENCODER, + 0x33d9a761,0x90c8,0x11d0,0xbd,0x43,0x00,0xa0,0xc9,0x11,0xce,0x86); +DEFINE_GUID(DMOCATEGORY_VIDEO_DECODER, + 0x4a69b442,0x28be,0x4991,0x96,0x9c,0xb5,0x00,0xad,0xf5,0xd8,0xa8); +DEFINE_GUID(DMOCATEGORY_VIDEO_ENCODER, + 0x33d9a760,0x90c8,0x11d0,0xbd,0x43,0x00,0xa0,0xc9,0x11,0xce,0x86); +DEFINE_GUID(DMOCATEGORY_AUDIO_EFFECT, + 0xf3602b3f,0x0592,0x48df,0xa4,0xcd,0x67,0x47,0x21,0xe7,0xeb,0xeb); +DEFINE_GUID(DMOCATEGORY_VIDEO_EFFECT, + 0xd990ee14,0x776c,0x4723,0xbe,0x46,0x3d,0xa2,0xf5,0x6f,0x10,0xb9); +DEFINE_GUID(DMOCATEGORY_AUDIO_CAPTURE_EFFECT, + 0xf665aaba,0x3e09,0x4920,0xaa,0x5f,0x21,0x98,0x11,0x14,0x8f,0x09); +DEFINE_GUID(DMOCATEGORY_ACOUSTIC_ECHO_CANCEL, + 0xbf963d80,0xc559,0x11d0,0x8a,0x2b,0x00,0xa0,0xc9,0x25,0x5a,0xc1); +DEFINE_GUID(DMOCATEGORY_AUDIO_NOISE_SUPPRESS, + 0xe07f903f,0x62fd,0x4e60,0x8c,0xdd,0xde,0xa7,0x23,0x66,0x65,0xb5); +DEFINE_GUID(DMOCATEGORY_AGC, + 0xe88c9ba0,0xc557,0x11d0,0x8a,0x2b,0x00,0xa0,0xc9,0x25,0x5a,0xc1); -STDAPI DMOGetTypes( - REFCLSID clsidDMO, - unsigned long ulInputTypesRequested, - unsigned long *pulInputTypesSupplied, - DMO_PARTIAL_MEDIATYPE *pInputTypes, - unsigned long ulOutputTypesRequested, - unsigned long *pulOutputTypesSupplied, - DMO_PARTIAL_MEDIATYPE *pOutputTypes -); - -STDAPI -DMORegister( - LPCWSTR szName, - REFCLSID clsidDMO, - REFGUID guidCategory, - DWORD dwFlags, - DWORD cInTypes, - const DMO_PARTIAL_MEDIATYPE *pInTypes, - DWORD cOutTypes, - const DMO_PARTIAL_MEDIATYPE *pOutTypes); - -STDAPI -DMOUnregister( - REFCLSID clsidDMO, - REFGUID guidCategory); - -#endif - +#endif /* __DMOREG_H__ */ Modified: trunk/reactos/include/dxsdk/dmort.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmort.h?rev=… ============================================================================== --- trunk/reactos/include/dxsdk/dmort.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/dmort.h [iso-8859-1] Fri Feb 12 10:20:35 2010 @@ -1,13 +1,29 @@ +/* + * Copyright (C) 2002 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ #ifndef __DMORT_H__ #define __DMORT_H__ -STDAPI MoCopyMediaType(DMO_MEDIA_TYPE *pmtDest, const DMO_MEDIA_TYPE *pmtSrc); -STDAPI MoCreateMediaType(DMO_MEDIA_TYPE **ppmt, DWORD cbFormat); -STDAPI MoDeleteMediaType(DMO_MEDIA_TYPE *pmt); -STDAPI MoDuplicateMediaType(DMO_MEDIA_TYPE **ppmtDest, const DMO_MEDIA_TYPE *pmtSrc); -STDAPI MoFreeMediaType(DMO_MEDIA_TYPE *pmt); -STDAPI MoInitMediaType(DMO_MEDIA_TYPE *pmt, DWORD cbFormat); +HRESULT WINAPI MoCopyMediaType(DMO_MEDIA_TYPE*,const DMO_MEDIA_TYPE*); +HRESULT WINAPI MoCreateMediaType(DMO_MEDIA_TYPE**,DWORD); +HRESULT WINAPI MoDeleteMediaType(DMO_MEDIA_TYPE*); +HRESULT WINAPI MoDuplicateMediaType(DMO_MEDIA_TYPE**,const DMO_MEDIA_TYPE*); +HRESULT WINAPI MoFreeMediaType(DMO_MEDIA_TYPE*); +HRESULT WINAPI MoInitMediaType(DMO_MEDIA_TYPE*,DWORD); -#endif - +#endif /* __DMORT_H__ */

1 0

[janderwald] 45582: [MMIXER, WDMAUD_KERNEL] - Implement retrieving device path
by janderwald＠svn.reactos.org 12 Feb '10

12 Feb '10

Author: janderwald Date: Fri Feb 12 07:18:31 2010 New Revision: 45582 URL: http://svn.reactos.org/svn/reactos?rev=45582&view=rev Log: [MMIXER, WDMAUD_KERNEL] - Implement retrieving device path Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mmixer.c trunk/reactos/lib/drivers/sound/mmixer/mmixer.h trunk/reactos/lib/drivers/sound/mmixer/wave.c Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mmixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mmixer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mmixer.c [iso-8859-1] Fri Feb 12 07:18:31 2010 @@ -551,10 +551,12 @@ WdmAudGetPnpNameByIndexAndType( IN ULONG DeviceIndex, IN SOUND_DEVICE_TYPE DeviceType, - OUT LPWSTR *Device) -{ - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + OUT LPWSTR *DevicePath) +{ + if (MMixerGetWaveDevicePath(&MixerContext, DeviceType == WAVE_IN_DEVICE_TYPE, DeviceIndex, DevicePath) == MM_STATUS_SUCCESS) + return STATUS_SUCCESS; + else + return STATUS_UNSUCCESSFUL; } NTSTATUS Modified: trunk/reactos/lib/drivers/sound/mmixer/mmixer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/m… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/mmixer.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/mmixer.h [iso-8859-1] Fri Feb 12 07:18:31 2010 @@ -191,4 +191,11 @@ IN HANDLE PinHandle, IN KSSTATE State); +MIXER_STATUS +MMixerGetWaveDevicePath( + IN PMIXER_CONTEXT MixerContext, + IN ULONG bWaveIn, + IN ULONG DeviceId, + OUT LPWSTR * DevicePath); + #endif Modified: trunk/reactos/lib/drivers/sound/mmixer/wave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/w… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/wave.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/wave.c [iso-8859-1] Fri Feb 12 07:18:31 2010 @@ -611,3 +611,61 @@ return MixerContext->Control(PinHandle, IOCTL_KS_PROPERTY, &Property, sizeof(KSPROPERTY), &State, sizeof(KSSTATE), &Length); } + +MIXER_STATUS +MMixerGetWaveDevicePath( + IN PMIXER_CONTEXT MixerContext, + IN ULONG bWaveIn, + IN ULONG DeviceId, + OUT LPWSTR * DevicePath) +{ + PMIXER_LIST MixerList; + LPMIXER_DATA MixerData; + LPWAVE_INFO WaveInfo; + ULONG Length; + MIXER_STATUS Status; + + // verify mixer context + Status = MMixerVerifyContext(MixerContext); + + if (Status != MM_STATUS_SUCCESS) + { + // invalid context passed + return Status; + } + + // grab mixer list + MixerList = (PMIXER_LIST)MixerContext->MixerContext; + + /* find destination wave */ + Status = MMixerGetWaveInfoByIndexAndType(MixerList, DeviceId, bWaveIn, &WaveInfo); + if (Status != MM_STATUS_SUCCESS) + { + /* failed to find wave info */ + return MM_STATUS_INVALID_PARAMETER; + } + + /* get associated device id */ + MixerData = MMixerGetDataByDeviceId(MixerList, WaveInfo->DeviceId); + if (!MixerData) + return MM_STATUS_INVALID_PARAMETER; + + /* calculate length */ + Length = wcslen(MixerData->DeviceName)+1; + + /* allocate destination buffer */ + *DevicePath = MixerContext->Alloc(Length * sizeof(WCHAR)); + + if (!*DevicePath) + { + /* no memory */ + return MM_STATUS_NO_MEMORY; + } + + /* copy device path */ + MixerContext->Copy(*DevicePath, MixerData->DeviceName, Length * sizeof(WCHAR)); + + /* done */ + return MM_STATUS_SUCCESS; +} +

1 0

[fireball] 45581: - Implement ellipse and arcs (pie/chord/arc) in the graphics driver. Heavily based on trunk's win32k.
by fireball＠svn.reactos.org 11 Feb '10

11 Feb '10

Author: fireball Date: Thu Feb 11 22:58:21 2010 New Revision: 45581 URL: http://svn.reactos.org/svn/reactos?rev=45581&view=rev Log: - Implement ellipse and arcs (pie/chord/arc) in the graphics driver. Heavily based on trunk's win32k. Added: branches/arwinss/reactos/subsystems/win32/win32k/gre/arc.c (with props) branches/arwinss/reactos/subsystems/win32/win32k/gre/drawing.c - copied, changed from r45537, trunk/reactos/subsystems/win32/win32k/objects/drawing.c branches/arwinss/reactos/subsystems/win32/win32k/gre/ellipse.c (with props) branches/arwinss/reactos/subsystems/win32/win32k/math/ (with props) branches/arwinss/reactos/subsystems/win32/win32k/math/i386/ (with props) branches/arwinss/reactos/subsystems/win32/win32k/math/i386/atan2_asm.s - copied unchanged from r45537, trunk/reactos/subsystems/win32/win32k/misc/i386/atan2_asm.s branches/arwinss/reactos/subsystems/win32/win32k/math/i386/ceil_asm.s - copied unchanged from r45537, trunk/reactos/subsystems/win32/win32k/misc/i386/ceil_asm.s branches/arwinss/reactos/subsystems/win32/win32k/math/i386/cos_asm.s - copied unchanged from r45537, trunk/reactos/subsystems/win32/win32k/misc/i386/cos_asm.s branches/arwinss/reactos/subsystems/win32/win32k/math/i386/floor_asm.s - copied unchanged from r45537, trunk/reactos/subsystems/win32/win32k/misc/i386/floor_asm.s branches/arwinss/reactos/subsystems/win32/win32k/math/i386/sin_asm.s - copied unchanged from r45537, trunk/reactos/subsystems/win32/win32k/misc/i386/sin_asm.s Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/dll/win32/winent.drv/mouse.c branches/arwinss/reactos/dll/win32/winent.drv/ogldrv.c branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/dll/win32/winent.drv/wnd.c branches/arwinss/reactos/include/psdk/ntrosgdi.h branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] Thu Feb 11 22:58:21 2010 @@ -16,6 +16,8 @@ #include "winbase.h" #include "winuser.h" #include "wingdi.h" +#include <winddi.h> +#include <win32k/ntgdityp.h> #include "ntrosgdi.h" #include "winent.h" #include "wine/unicode.h" Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Thu Feb 11 22:58:21 2010 @@ -14,6 +14,8 @@ #include "winbase.h" #include "winuser.h" #include "wingdi.h" +#include <winddi.h> +#include <win32k/ntgdityp.h> #include "ntrosgdi.h" #include "winent.h" #include "wine/debug.h" @@ -70,8 +72,22 @@ BOOL CDECL RosDrv_Arc( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { - UNIMPLEMENTED; - return FALSE; + POINT pts[4]; + + /* Map coordinates */ + pts[0].x = left; + pts[0].y = top; + pts[1].x = right; + pts[1].y = bottom; + pts[2].x = xstart; + pts[2].y = ystart; + pts[3].x = xend; + pts[3].y = yend; + + LPtoDP(physDev->hUserDC, pts, 4); + + return RosGdiArc(physDev->hKernelDC, pts[0].x, pts[0].y, pts[1].x, pts[1].y, + pts[2].x, pts[2].y, pts[3].x, pts[3].y, GdiTypeArc); } BOOL CDECL RosDrv_BitBlt( NTDRV_PDEVICE *physDevDst, INT xDst, INT yDst, @@ -116,8 +132,22 @@ BOOL CDECL RosDrv_Chord( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { - UNIMPLEMENTED; - return FALSE; + POINT pts[4]; + + /* Map coordinates */ + pts[0].x = left; + pts[0].y = top; + pts[1].x = right; + pts[1].y = bottom; + pts[2].x = xstart; + pts[2].y = ystart; + pts[3].x = xend; + pts[3].y = yend; + + LPtoDP(physDev->hUserDC, pts, 4); + + return RosGdiArc(physDev->hKernelDC, pts[0].x, pts[0].y, pts[1].x, pts[1].y, + pts[2].x, pts[2].y, pts[3].x, pts[3].y, GdiTypeChord ); } BOOL CDECL RosDrv_CreateBitmap( NTDRV_PDEVICE *physDev, HBITMAP hbitmap, LPVOID bmBits ) @@ -471,8 +501,8 @@ LPtoDP(physDev->hUserDC, pts, 4); - return RosGdiPie(physDev->hKernelDC, pts[0].x, pts[0].y, pts[1].x, pts[1].y, - pts[2].x, pts[2].y, pts[3].x, pts[3].y); + return RosGdiArc(physDev->hKernelDC, pts[0].x, pts[0].y, pts[1].x, pts[1].y, + pts[2].x, pts[2].y, pts[3].x, pts[3].y, GdiTypePie); } BOOL CDECL RosDrv_PolyPolygon( NTDRV_PDEVICE *physDev, const POINT* pt, const INT* counts, UINT polygons) Modified: branches/arwinss/reactos/dll/win32/winent.drv/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] Thu Feb 11 22:58:21 2010 @@ -28,6 +28,8 @@ #include "wingdi.h" #define NTOS_USER_MODE #include <ndk/ntndk.h> +#include <winddi.h> +#include <win32k/ntgdityp.h> #include "ntrosgdi.h" #include "win32k/rosuser.h" #include "winent.h" Modified: branches/arwinss/reactos/dll/win32/winent.drv/ogldrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/ogldrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/ogldrv.c [iso-8859-1] Thu Feb 11 22:58:21 2010 @@ -10,6 +10,8 @@ #include "windows.h" #include "wingdi.h" +#include <winddi.h> +#include <win32k/ntgdityp.h> #include "ntrosgdi.h" #include "wine/debug.h" Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Thu Feb 11 22:58:21 2010 @@ -18,6 +18,8 @@ #define NTOS_USER_MODE #include <ndk/ntndk.h> #include "winuser16.h" +#include <winddi.h> +#include <win32k/ntgdityp.h> #include "ntrosgdi.h" #include "win32k/rosuser.h" #include "winent.h" Modified: branches/arwinss/reactos/dll/win32/winent.drv/wnd.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/wnd.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/wnd.c [iso-8859-1] Thu Feb 11 22:58:21 2010 @@ -17,6 +17,8 @@ #include "wingdi.h" #define NTOS_USER_MODE #include <ndk/ntndk.h> +#include <winddi.h> +#include <win32k/ntgdityp.h> #include "ntrosgdi.h" #include "win32k/rosuser.h" #include "winent.h" Modified: branches/arwinss/reactos/include/psdk/ntrosgdi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/nt… ============================================================================== --- branches/arwinss/reactos/include/psdk/ntrosgdi.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/ntrosgdi.h [iso-8859-1] Thu Feb 11 22:58:21 2010 @@ -146,9 +146,7 @@ /* misc.c */ BOOL APIENTRY RosGdiArc( HDC physDev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ); -BOOL APIENTRY RosGdiChord( HDC physDev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ); + INT xstart, INT ystart, INT xend, INT yend, ARCTYPE arc ); BOOL APIENTRY RosGdiEllipse( HDC physDev, INT left, INT top, INT right, INT bottom ); INT APIENTRY RosGdiExtEscape( HDC physDev, INT escape, INT in_count, LPCVOID in_data, INT out_count, LPVOID out_data ); @@ -158,8 +156,6 @@ const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx, gsCacheEntryFormat *formatEntry ); BOOL APIENTRY RosGdiLineTo( HDC physDev, INT x1, INT y1, INT x2, INT y2 ); -BOOL APIENTRY RosGdiPie( HDC physDev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ); BOOL APIENTRY RosGdiPolyPolygon( HDC physDev, const POINT* pt, const INT* counts, UINT polygons); BOOL APIENTRY RosGdiPolyPolyline( HDC physDev, const POINT* pt, const DWORD* counts, DWORD polylines ); BOOL APIENTRY RosGdiPolygon( HDC physDev, const POINT* pt, INT count ); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] Thu Feb 11 22:58:21 2010 @@ -16,24 +16,25 @@ /* PUBLIC FUNCTIONS **********************************************************/ -BOOL APIENTRY RosGdiArc( HDC physDev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL APIENTRY RosGdiChord( HDC physDev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) -{ - UNIMPLEMENTED; - return FALSE; -} - BOOL APIENTRY RosGdiEllipse( HDC physDev, INT left, INT top, INT right, INT bottom ) { - UNIMPLEMENTED; - return FALSE; + PDC pDC; + + /* Get a pointer to the DC */ + pDC = DC_Lock(physDev); + + /* Add DC origin */ + left += pDC->rcVport.left + pDC->rcDcRect.left; + top += pDC->rcVport.top + pDC->rcDcRect.top; + right += pDC->rcVport.left + pDC->rcDcRect.left; + bottom += pDC->rcVport.top + pDC->rcDcRect.top; + + GreEllipse(pDC, left, top, right, bottom); + + /* Release the object */ + DC_Unlock(pDC); + + return TRUE; } INT APIENTRY RosGdiExtEscape( HDC physDev, INT escape, INT in_count, LPCVOID in_data, @@ -106,11 +107,30 @@ return TRUE; } -BOOL APIENTRY RosGdiPie( HDC physDev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) -{ - UNIMPLEMENTED; - return FALSE; +BOOL APIENTRY RosGdiArc( HDC physDev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend, ARCTYPE arc ) +{ + PDC pDC; + + /* Get a pointer to the DC */ + pDC = DC_Lock(physDev); + + /* Add DC origin */ + left += pDC->rcVport.left + pDC->rcDcRect.left; + top += pDC->rcVport.top + pDC->rcDcRect.top; + right += pDC->rcVport.left + pDC->rcDcRect.left; + bottom += pDC->rcVport.top + pDC->rcDcRect.top; + xstart += pDC->rcVport.left + pDC->rcDcRect.left; + ystart += pDC->rcVport.top + pDC->rcDcRect.top; + xend += pDC->rcVport.left + pDC->rcDcRect.left; + yend += pDC->rcVport.top + pDC->rcDcRect.top; + + GrepArc(pDC, left, top, right, bottom, xstart, ystart, xend, yend, arc); + + /* Release the object */ + DC_Unlock(pDC); + + return TRUE; } BOOL APIENTRY RosGdiPolyPolygon( HDC physDev, const POINT* pt, const INT* counts, UINT polygons) Added: branches/arwinss/reactos/subsystems/win32/win32k/gre/arc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/arc.c (added) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/arc.c [iso-8859-1] Thu Feb 11 22:58:21 2010 @@ -1,0 +1,173 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/gre/arc.c + * PURPOSE: Graphic engine: arcs + * PROGRAMMERS: Aleksey Bragin <aleksey(a)reactos.org> + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#include "math.h" +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * a couple macros to fill a single pixel or a line + */ +#define PUTPIXEL(x,y,BrushInst) \ + ret = ret && GreLineTo(&psurf->SurfObj, \ + dc->CombinedClip, \ + &BrushInst->BrushObj, \ + x, y, (x)+1, y, \ + &RectBounds, \ + ROP2_TO_MIX(R2_COPYPEN/*pdcattr->jROP2*/)); + +#define PUTLINE(x1,y1,x2,y2,BrushInst) \ + ret = ret && GreLineTo(&psurf->SurfObj, \ + dc->CombinedClip, \ + &BrushInst->BrushObj, \ + x1, y1, x2, y2, \ + &RectBounds, \ + ROP2_TO_MIX(R2_COPYPEN/*pdcattr->jROP2*/)); + +#define Rsin(d) ((d) == 0.0 ? 0.0 : ((d) == 90.0 ? 1.0 : sin(d*M_PI/180.0))) +#define Rcos(d) ((d) == 0.0 ? 1.0 : ((d) == 90.0 ? 0.0 : cos(d*M_PI/180.0))) + +BOOLEAN +APIENTRY +GrepArc(PDC dc, + int Left, + int Top, + int Right, + int Bottom, + int XRadialStart, + int YRadialStart, + int XRadialEnd, + int YRadialEnd, + ARCTYPE arctype) +{ + RECTL RectBounds, RectSEpts; + PBRUSHGDI pbrushPen; + SURFACE *psurf; + BOOLEAN ret = TRUE; + LONG PenWidth, PenOrigWidth; + double AngleStart, AngleEnd; + LONG RadiusX, RadiusY, CenterX, CenterY; + LONG SfCx, SfCy, EfCx, EfCy; + POINTL BrushOrg; + + if (Right < Left) + { + INT tmp = Right; Right = Left; Left = tmp; + } + if (Bottom < Top) + { + INT tmp = Bottom; Bottom = Top; Top = tmp; + } + if ((Left == Right) || + (Top == Bottom) || + (((arctype != GdiTypeArc) || (arctype != GdiTypeArcTo)) && + ((Right - Left == 1) || + (Bottom - Top == 1)))) + return TRUE; + + GreUpdateBrush(dc->pLineBrush, dc); + pbrushPen = dc->pLineBrush; + PenOrigWidth = PenWidth = pbrushPen->ptPenWidth.x; + if (pbrushPen->ulPenStyle == PS_NULL) PenWidth = 0; + + if (pbrushPen->ulPenStyle == PS_INSIDEFRAME) + { + if (2*PenWidth > (Right - Left)) PenWidth = (Right -Left + 1)/2; + if (2*PenWidth > (Bottom - Top)) PenWidth = (Bottom -Top + 1)/2; + Left += PenWidth / 2; + Right -= (PenWidth - 1) / 2; + Top += PenWidth / 2; + Bottom -= (PenWidth - 1) / 2; + } + + if (!PenWidth) PenWidth = 1; + pbrushPen->ptPenWidth.x = PenWidth; + + RectBounds.left = Left; + RectBounds.right = Right; + RectBounds.top = Top; + RectBounds.bottom = Bottom; + + RectSEpts.left = XRadialStart; + RectSEpts.top = YRadialStart; + RectSEpts.right = XRadialEnd; + RectSEpts.bottom = YRadialEnd; + + DPRINT("1: StartX: %d, StartY: %d, EndX: %d, EndY: %d\n", + RectSEpts.left,RectSEpts.top,RectSEpts.right,RectSEpts.bottom); + + DPRINT("1: Left: %d, Top: %d, Right: %d, Bottom: %d\n", + RectBounds.left,RectBounds.top,RectBounds.right,RectBounds.bottom); + + RadiusX = max((RectBounds.right - RectBounds.left) / 2, 1); + RadiusY = max((RectBounds.bottom - RectBounds.top) / 2, 1); + CenterX = (RectBounds.right + RectBounds.left) / 2; + CenterY = (RectBounds.bottom + RectBounds.top) / 2; + AngleEnd = atan2((RectSEpts.bottom - CenterY), RectSEpts.right - CenterX)*(360.0/(M_PI*2)); + AngleStart = atan2((RectSEpts.top - CenterY), RectSEpts.left - CenterX)*(360.0/(M_PI*2)); + + SfCx = (Rcos(AngleStart) * RadiusX); + SfCy = (Rsin(AngleStart) * RadiusY); + EfCx = (Rcos(AngleEnd) * RadiusX); + EfCy = (Rsin(AngleEnd) * RadiusY); + + BrushOrg.x = 0; + BrushOrg.y = 0; + + if ((arctype == GdiTypePie) || (arctype == GdiTypeChord)) + { + GreUpdateBrush(dc->pFillBrush, dc); + GrepFillArc( dc, + RectBounds.left, + RectBounds.top, + abs(RectBounds.right-RectBounds.left), // Width + abs(RectBounds.bottom-RectBounds.top), // Height + AngleStart, + AngleEnd, + arctype, + &BrushOrg); + } + + ret = GrepDrawArc( dc, + RectBounds.left, + RectBounds.top, + abs(RectBounds.right-RectBounds.left), // Width + abs(RectBounds.bottom-RectBounds.top), // Height + AngleStart, + AngleEnd, + arctype, + pbrushPen, + &BrushOrg); + + psurf = dc->pBitmap; + if (NULL == psurf) + { + DPRINT1("Arc Fail 2\n"); + SetLastWin32Error(ERROR_INTERNAL_ERROR); + return FALSE; + } + + if (arctype == GdiTypePie) + { + PUTLINE(CenterX, CenterY, SfCx + CenterX, SfCy + CenterY, dc->pLineBrush); + PUTLINE(EfCx + CenterX, EfCy + CenterY, CenterX, CenterY, dc->pLineBrush); + } + if (arctype == GdiTypeChord) + PUTLINE(EfCx + CenterX, EfCy + CenterY, SfCx + CenterX, SfCy + CenterY, dc->pLineBrush); + + pbrushPen->ptPenWidth.x = PenOrigWidth; + + return ret; +} + +/* EOF */ Propchange: branches/arwinss/reactos/subsystems/win32/win32k/gre/arc.c ------------------------------------------------------------------------------ svn:eol-style = native Copied: branches/arwinss/reactos/subsystems/win32/win32k/gre/drawing.c (from r45537, trunk/reactos/subsystems/win32/win32k/objects/drawing.c) URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/drawing.c [iso-8859-1] Thu Feb 11 22:58:21 2010 @@ -49,11 +49,12 @@ Modified for ReactOS */ -#include <w32k.h> - +#include <win32k.h> +#include "math.h" #define NDEBUG #include <debug.h> +#define INTERNAL_CALL APIENTRY #define DEGREES_TO_RADIANS(deg) ((deg)*2*M_PI/360) @@ -63,8 +64,8 @@ int width, height; /* width and height of rect */ } Rect, *PRect; -int FASTCALL IntFillRect(DC *dc, INT XLeft, INT YLeft, INT Width, INT Height, PBRUSH pbrush, BOOL Pen); -int FASTCALL app_fill_rect(DC *dc, Rect r, PBRUSH pbrush, BOOL Pen); +int FASTCALL IntFillRect(DC *dc, INT XLeft, INT YLeft, INT Width, INT Height, PBRUSHGDI pbrush, PPOINTL BrushOrg, BOOL Pen); +int FASTCALL app_fill_rect(DC *dc, Rect r, PBRUSHGDI pbrush, BOOL Pen); static POINT @@ -104,8 +105,8 @@ * is no way for the program to know which portions of the * window are currently obscured. */ -#define app_fill_rect( dc, r, BrushObj, Pen) \ - IntFillRect(dc, r.x, r.y, r.width, r.height, BrushObj, Pen) +#define app_fill_rect( dc, r, BrushObj, BrushOrg, Pen) \ + IntFillRect(dc, r.x, r.y, r.width, r.height, BrushObj, BrushOrg, Pen) /* * Drawing an ellipse with a certain line thickness. @@ -121,7 +122,7 @@ static int INTERNAL_CALL -app_draw_ellipse(DC *g, Rect r, PBRUSH pbrush) +app_draw_ellipse(DC *g, Rect r, PBRUSHGDI pbrush, PPOINTL brushOrg) { /* Outer ellipse: e(x,y) = b*b*x*x + a*a*y*y - a*a*b*b */ @@ -165,7 +166,7 @@ // START_DEBUG(); if ((r.width <= 2) || (r.height <= 2)) - return app_fill_rect(g, r, pbrush, TRUE); + return app_fill_rect(g, r, pbrush, brushOrg, TRUE); r1.x = r.x + a; r1.y = r.y; @@ -264,8 +265,8 @@ if ((r1.y < r.y+w) || (r1.x+W >= r1.x+r1.width-W)) { - result &= app_fill_rect(g, r1, pbrush, TRUE); - result &= app_fill_rect(g, r2, pbrush, TRUE); + result &= app_fill_rect(g, r1, pbrush, brushOrg, TRUE); + result &= app_fill_rect(g, r2, pbrush, brushOrg, TRUE); prevx = r1.x; prevy = r1.y; @@ -274,13 +275,13 @@ { /* draw distinct rectangles */ result &= app_fill_rect(g, rect(r1.x,r1.y, - W,1), pbrush, TRUE); + W,1), pbrush, brushOrg, TRUE); result &= app_fill_rect(g, rect( - r1.x+r1.width-W,r1.y,W,1), pbrush, TRUE); + r1.x+r1.width-W,r1.y,W,1), pbrush, brushOrg, TRUE); result &= app_fill_rect(g, rect(r2.x, - r2.y,W,1), pbrush, TRUE); + r2.y,W,1), pbrush, brushOrg, TRUE); result &= app_fill_rect(g, rect( - r2.x+r2.width-W,r2.y,W,1), pbrush, TRUE); + r2.x+r2.width-W,r2.y,W,1), pbrush, brushOrg, TRUE); prevx = r1.x; prevy = r1.y; @@ -310,13 +311,13 @@ if (W+W >= r.width) { result &= app_fill_rect(g, rect(r.x, r1.y, - r.width, r1.height), pbrush, TRUE); + r.width, r1.height), pbrush, brushOrg, TRUE); return result; } - result &= app_fill_rect(g, rect(r.x, r1.y, W, r1.height), pbrush, TRUE); + result &= app_fill_rect(g, rect(r.x, r1.y, W, r1.height), pbrush, brushOrg, TRUE); result &= app_fill_rect(g, rect(r.x+r.width-W, r1.y, - W, r1.height), pbrush, TRUE); + W, r1.height), pbrush, brushOrg, TRUE); } return result; } @@ -364,7 +365,8 @@ POINT p2, // End int start_angle, int end_angle, - PBRUSH pbrush, + PBRUSHGDI pbrush, + PPOINTL brushOrg, BOOL Pen) { int x1, x2; @@ -440,36 +442,36 @@ { /* fill outsides of wedge */ if (! app_fill_rect(g, rect(r.x, r.y, - x1-r.x, r.height), pbrush, Pen)) + x1-r.x, r.height), pbrush, brushOrg, Pen)) return 0; return app_fill_rect(g, rect(x2, r.y, - r.x+r.width-x2, r.height), pbrush, Pen); + r.x+r.width-x2, r.height), pbrush, brushOrg, Pen); } else { /* fill inside of wedge */ r.width = x1-x2; r.x = x2; - return app_fill_rect(g, r, pbrush, Pen); + return app_fill_rect(g, r, pbrush, brushOrg, Pen); } } else if (start_above) { /* fill to the left of the start_line */ r.width = x1-r.x; - return app_fill_rect(g, r, pbrush, Pen); + return app_fill_rect(g, r, pbrush, brushOrg, Pen); } else if (end_above) { /* fill right of end_line */ r.width = r.x+r.width-x2; r.x = x2; - return app_fill_rect(g, r, pbrush, Pen); + return app_fill_rect(g, r, pbrush, brushOrg, Pen); } else { if (start_angle > end_angle) - return app_fill_rect(g,r, pbrush, Pen); + return app_fill_rect(g,r, pbrush, brushOrg, Pen); else return 1; } @@ -535,7 +537,7 @@ if (start_above && end_above) { if (start_angle > end_angle) - return app_fill_rect(g,r, pbrush, Pen); + return app_fill_rect(g,r, pbrush, brushOrg, Pen); else return 1; } @@ -543,14 +545,14 @@ { /* fill to the left of end_line */ r.width = x2-r.x; - return app_fill_rect(g,r, pbrush, Pen); + return app_fill_rect(g,r, pbrush, brushOrg, Pen); } else if (end_above) { /* fill right of start_line */ r.width = r.x+r.width-x1; r.x = x1; - return app_fill_rect(g,r, pbrush, Pen); + return app_fill_rect(g,r, pbrush, brushOrg, Pen); } else { @@ -558,17 +560,17 @@ { /* fill outsides of wedge */ if (! app_fill_rect(g, rect(r.x, r.y, - x2-r.x, r.height), pbrush, Pen)) + x2-r.x, r.height), pbrush, brushOrg, Pen)) return 0; return app_fill_rect(g, rect(x1, r.y, - r.x+r.width-x1, r.height), pbrush, Pen); + r.x+r.width-x1, r.height), pbrush, brushOrg, Pen); } else { /* fill inside of wedge */ r.width = x2-x1; r.x = x1; - return app_fill_rect(g, r, pbrush, Pen); + return app_fill_rect(g, r, pbrush, brushOrg, Pen); } } } @@ -604,7 +606,7 @@ static int FASTCALL -app_fill_ellipse(DC *g, Rect r, PBRUSH pbrush) +app_fill_ellipse(DC *g, Rect r, PBRUSHGDI pbrush, PPOINTL brushOrg) { /* e(x,y) = b*b*x*x + a*a*y*y - a*a*b*b */ @@ -627,7 +629,7 @@ // START_DEBUG(); if ((r.width <= 2) || (r.height <= 2)) - return app_fill_rect(g, r, pbrush, FALSE); + return app_fill_rect(g, r, pbrush, brushOrg, FALSE); r1.x = r.x + a; r1.y = r.y; @@ -673,8 +675,8 @@ if (r1.y+r1.height < r2.y) { /* distinct rectangles */ - result &= app_fill_rect(g, r1, pbrush, FALSE); - result &= app_fill_rect(g, r2, pbrush, FALSE); + result &= app_fill_rect(g, r1, pbrush, brushOrg, FALSE); + result &= app_fill_rect(g, r2, pbrush, brushOrg, FALSE); } /* move down */ @@ -699,7 +701,7 @@ r1.x = r.x; r1.width = r.width; r1.height = r2.y+r2.height-r1.y; - result &= app_fill_rect(g, r1, pbrush, FALSE); + result &= app_fill_rect(g, r1, pbrush, brushOrg, FALSE); } else if (x <= a) { /* crossover, draw final line */ @@ -707,7 +709,7 @@ r1.width = r.width; r1.height = r1.y+r1.height-r2.y; r1.y = r2.y; - result &= app_fill_rect(g, r1, pbrush, FALSE); + result &= app_fill_rect(g, r1, pbrush, brushOrg, FALSE); } return result; } @@ -759,7 +761,7 @@ int FASTCALL -app_fill_arc(DC *g, Rect r, int start_angle, int end_angle, PBRUSH pbrush, BOOL Chord) +app_fill_arc(DC *g, Rect r, int start_angle, int end_angle, PBRUSHGDI pbrush, PPOINTL brushOrg, BOOL Chord) { /* e(x,y) = b*b*x*x + a*a*y*y - a*a*b*b */ @@ -789,7 +791,7 @@ if ((start_angle + 360 <= end_angle) || (start_angle - 360 >= end_angle)) { - return app_fill_ellipse(g, r, pbrush); + return app_fill_ellipse(g, r, pbrush, brushOrg); } /* make start_angle >= 0 and <= 360 */ @@ -875,10 +877,10 @@ /* distinct rectangles */ result &= app_fill_arc_rect(g, r1, p0, p1, p2, - start_angle, end_angle, pbrush, FALSE); + start_angle, end_angle, pbrush, brushOrg, FALSE); result &= app_fill_arc_rect(g, r2, p0, p1, p2, - start_angle, end_angle, pbrush, FALSE); + start_angle, end_angle, pbrush, brushOrg, FALSE); } /* move down */ @@ -900,7 +902,7 @@ while (r1.height > 0) { result &= app_fill_arc_rect(g, rect(r1.x, r1.y, r1.width, 1), - p0, p1, p2, start_angle, end_angle, pbrush, FALSE); + p0, p1, p2, start_angle, end_angle, pbrush, brushOrg, FALSE); r1.y += 1; r1.height -= 1; } @@ -914,7 +916,7 @@ while (r1.height > 0) { result &= app_fill_arc_rect(g, rect(r1.x, r1.y, r1.width, 1), - p0, p1, p2, start_angle, end_angle, pbrush, FALSE); + p0, p1, p2, start_angle, end_angle, pbrush, brushOrg, FALSE); r1.y += 1; r1.height -= 1; } @@ -922,7 +924,7 @@ return result; } -int app_draw_arc(DC *g, Rect r, int start_angle, int end_angle, PBRUSH pbrushPen, BOOL Chord) +int app_draw_arc(DC *g, Rect r, int start_angle, int end_angle, PBRUSHGDI pbrushPen, PPOINTL brushOrg, BOOL Chord) { /* Outer ellipse: e(x,y) = b*b*x*x + a*a*y*y - a*a*b*b */ @@ -973,7 +975,7 @@ if ((start_angle + 360 <= end_angle) || (start_angle - 360 >= end_angle)) { - return app_draw_ellipse(g, r, pbrushPen); + return app_draw_ellipse(g, r, pbrushPen, brushOrg); } /* make start_angle >= 0 and <= 360 */ @@ -1098,10 +1100,10 @@ { result &= app_fill_arc_rect(g, r1, p0, p1, p2, - start_angle, end_angle, pbrushPen, TRUE); + start_angle, end_angle, pbrushPen, brushOrg, TRUE); result &= app_fill_arc_rect(g, r2, p0, p1, p2, - start_angle, end_angle, pbrushPen, TRUE); + start_angle, end_angle, pbrushPen, brushOrg, TRUE); prevx = r1.x; prevy = r1.y; @@ -1112,19 +1114,19 @@ result &= app_fill_arc_rect(g, rect( r1.x,r1.y,W,1), p0, p1, p2, - start_angle, end_angle, pbrushPen, TRUE); + start_angle, end_angle, pbrushPen, brushOrg, TRUE); result &= app_fill_arc_rect(g, rect( r1.x+r1.width-W,r1.y,W,1), p0, p1, p2, - start_angle, end_angle, pbrushPen, TRUE); + start_angle, end_angle, pbrushPen, brushOrg, TRUE); result &= app_fill_arc_rect(g, rect( r2.x,r2.y,W,1), p0, p1, p2, - start_angle, end_angle, pbrushPen, TRUE); + start_angle, end_angle, pbrushPen, brushOrg, TRUE); result &= app_fill_arc_rect(g, rect( r2.x+r2.width-W,r2.y,W,1), p0, p1, p2, - start_angle, end_angle, pbrushPen, TRUE); + start_angle, end_angle, pbrushPen, brushOrg, TRUE); prevx = r1.x; prevy = r1.y; @@ -1156,7 +1158,7 @@ while (r1.height > 0) { result &= app_fill_arc_rect(g, rect(r.x, r1.y, r.width, 1), p0, p1, p2, - start_angle, end_angle, pbrushPen, TRUE); + start_angle, end_angle, pbrushPen, brushOrg, TRUE); r1.y += 1; r1.height -= 1; } @@ -1166,10 +1168,10 @@ while (r1.height > 0) { result &= app_fill_arc_rect(g, rect(r.x, r1.y, W, 1), p0, p1, p2, - start_angle, end_angle, pbrushPen, TRUE); + start_angle, end_angle, pbrushPen, brushOrg, TRUE); result &= app_fill_arc_rect(g, rect(r.x+r.width-W, r1.y, W, 1), p0, p1, p2, - start_angle, end_angle, pbrushPen, TRUE); + start_angle, end_angle, pbrushPen, brushOrg, TRUE); r1.y += 1; r1.height -= 1; } @@ -1179,7 +1181,6 @@ } /* ReactOS Interface *********************************************************/ - int FASTCALL IntFillRect( DC *dc, @@ -1187,111 +1188,69 @@ INT YLeft, INT Width, INT Height, - PBRUSH pbrush, + PBRUSHGDI pbrush, + PPOINTL BrushOrigin, BOOL Pen) { - DWORD ROP = PATCOPY; - RECTL DestRect; - SURFACE *psurf; - POINTL BrushOrigin; - BOOL Ret = TRUE; - PDC_ATTR pdcattr; - - ASSERT(pbrush); - - psurf = dc->dclevel.pSurface; - if (psurf == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } - - if (!(pbrush->flAttrs & GDIBRUSH_IS_NULL)) - { - pdcattr = dc->pdcattr; - - /* fix negative spaces */ - if (Width < 0) - { - XLeft += Width; - Width = 0 - Width; - } - if (Height < 0) - { - YLeft += Height; - Height = 0 - Height; - } - - DestRect.left = XLeft; - DestRect.right = XLeft + Width; - - DestRect.top = YLeft; - DestRect.bottom = YLeft + Height; - - BrushOrigin.x = pbrush->ptOrigin.x; - BrushOrigin.y = pbrush->ptOrigin.y; - - if (pdcattr->jROP2 == R2_XORPEN) - ROP = PATINVERT; - else - ROP = PATCOPY; - - Ret = IntEngBitBlt( - &psurf->SurfObj, - NULL, - NULL, - dc->rosdc.CombinedClip, - NULL, - &DestRect, - NULL, - NULL, - Pen ? &dc->eboLine.BrushObject : &dc->eboFill.BrushObject, - &BrushOrigin, - ROP3_TO_ROP4(ROP)); - } - - return (int)Ret; + DWORD ROP = PATCOPY; + RECTL DestRect; + SURFACE *psurf; + BOOL Ret = TRUE; + + ASSERT(pbrush); + + psurf = dc->pBitmap; + if (psurf == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + if (!(pbrush->flAttrs & GDIBRUSH_IS_NULL)) + { + /* fix negative spaces */ + if (Width < 0) + { + XLeft += Width; + Width = 0 - Width; + } + if (Height < 0) + { + YLeft += Height; + Height = 0 - Height; + } + + DestRect.left = XLeft; + DestRect.right = XLeft + Width; + + DestRect.top = YLeft; + DestRect.bottom = YLeft + Height; + + //if (pdcattr->jROP2 == R2_XORPEN) + // ROP = PATINVERT; + //else + ROP = PATCOPY; + + GrepBitBltEx(&psurf->SurfObj, + NULL, + NULL, + dc->CombinedClip, + NULL, + &DestRect, + NULL, + NULL, + Pen ? &dc->pLineBrush->BrushObj : &dc->pFillBrush->BrushObj, + BrushOrigin, + ROP3_TO_ROP4(ROP), + TRUE); + } + + return (int)Ret; } -BOOL -FASTCALL -IntFillArc( PDC dc, - INT XLeft, - INT YLeft, - INT Width, - INT Height, - double StartArc, - double EndArc, - ARCTYPE arctype) -{ - PDC_ATTR pdcattr; - PBRUSH pbrush; - int Start = ceil(StartArc); - int End = ceil(EndArc); - BOOL Chord = (arctype == GdiTypeChord), ret; - - pdcattr = dc->pdcattr; - - pbrush = BRUSH_LockBrush(pdcattr->hbrush); - if (!pbrush) - { - DPRINT1("FillArc Fail\n"); - SetLastWin32Error(ERROR_INTERNAL_ERROR); - return FALSE; - } - // Sort out alignment here. - ret = app_fill_arc(dc, rect( XLeft, YLeft, Width, Height), - (dc->dclevel.flPath & DCPATH_CLOCKWISE) ? -End : -Start, - (dc->dclevel.flPath & DCPATH_CLOCKWISE) ? -Start : -End, - pbrush, Chord); - - BRUSH_UnlockBrush(pbrush); - return ret; -} - -BOOL -FASTCALL -IntDrawArc( PDC dc, +VOID +APIENTRY +GrepFillArc( PDC dc, INT XLeft, INT YLeft, INT Width, @@ -1299,42 +1258,69 @@ double StartArc, double EndArc, ARCTYPE arctype, - PBRUSH pbrush) + PPOINTL BrushOrigin) +{ + int Start = ceil(StartArc); + int End = ceil(EndArc); + BOOL Chord = (arctype == GdiTypeChord), ret; + + // Sort out alignment here. + ret = app_fill_arc(dc, rect( XLeft, YLeft, Width, Height), + -End, //(dc->dclevel.flPath & DCPATH_CLOCKWISE) ? -End : -Start, + -Start, //(dc->dclevel.flPath & DCPATH_CLOCKWISE) ? -Start : -End, + dc->pFillBrush, BrushOrigin, Chord); +} + +BOOLEAN +APIENTRY +GrepDrawArc( PDC dc, + INT XLeft, + INT YLeft, + INT Width, + INT Height, + double StartArc, + double EndArc, + ARCTYPE arctype, + PBRUSHGDI pbrush, + PPOINTL BrushOrigin) { int Start = ceil(StartArc); int End = ceil(EndArc); BOOL Chord = (arctype == GdiTypeChord); // Sort out alignment here. return app_draw_arc(dc, rect( XLeft, YLeft, Width, Height), - (dc->dclevel.flPath & DCPATH_CLOCKWISE) ? -End : -Start, - (dc->dclevel.flPath & DCPATH_CLOCKWISE) ? -Start : -End, - pbrush, Chord); + -End, //(dc->dclevel.flPath & DCPATH_CLOCKWISE) ? -End : -Start, + -Start, //(dc->dclevel.flPath & DCPATH_CLOCKWISE) ? -Start : -End, + pbrush, BrushOrigin, Chord); } -BOOL -FASTCALL -IntDrawEllipse( PDC dc, +BOOLEAN +APIENTRY +GrepDrawEllipse(PDC dc, INT XLeft, INT YLeft, INT Width, INT Height, - PBRUSH pbrush) -{ - return (BOOL)app_draw_ellipse(dc, rect( XLeft, YLeft, Width, Height), pbrush); + PBRUSHGDI pbrush, + PPOINTL brushOrg) +{ + return (BOOLEAN)app_draw_ellipse(dc, rect( XLeft, YLeft, Width, Height), pbrush, brushOrg); } -BOOL -FASTCALL -IntFillEllipse( PDC dc, +BOOLEAN +APIENTRY +GrepFillEllipse(PDC dc, INT XLeft, INT YLeft, INT Width, - INT Height, - PBRUSH pbrush) -{ - return (BOOL)app_fill_ellipse(dc, rect( XLeft, YLeft, Width, Height), pbrush); + INT Height, + PBRUSHGDI pbrush, + PPOINTL brushOrg) +{ + return (BOOLEAN)app_fill_ellipse(dc, rect( XLeft, YLeft, Width, Height), pbrush, brushOrg); } +#if 0 BOOL FASTCALL IntFillRoundRect( PDC dc, @@ -1470,4 +1456,4 @@ } return TRUE; } - +#endif Added: branches/arwinss/reactos/subsystems/win32/win32k/gre/ellipse.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/ellipse.c (added) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/ellipse.c [iso-8859-1] Thu Feb 11 22:58:21 2010 @@ -1,0 +1,100 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/gre/ellipse.c + * PURPOSE: Graphic engine: ellipses + * PROGRAMMERS: Aleksey Bragin <aleksey(a)reactos.org> + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +VOID NTAPI +GreEllipse(PDC dc, + INT Left, + INT Top, + INT Right, + INT Bottom) +{ + RECTL RectBounds; + BOOLEAN ret = TRUE; + LONG PenWidth, PenOrigWidth; + LONG RadiusX, RadiusY, CenterX, CenterY; + POINTL BrushOrigin; + PBRUSHGDI pbrush; + + /* Update line brush and temporarily change its width */ + GreUpdateBrush(dc->pLineBrush, dc); + pbrush = dc->pLineBrush; + + PenOrigWidth = PenWidth = pbrush->ptPenWidth.x; + if (pbrush->ulPenStyle == PS_NULL) PenWidth = 0; + + if (pbrush->ulPenStyle == PS_INSIDEFRAME) + { + if (2*PenWidth > (Right - Left)) PenWidth = (Right -Left + 1)/2; + if (2*PenWidth > (Bottom - Top)) PenWidth = (Bottom -Top + 1)/2; + Left += PenWidth / 2; + Right -= (PenWidth - 1) / 2; + Top += PenWidth / 2; + Bottom -= (PenWidth - 1) / 2; + } + + if (!PenWidth) PenWidth = 1; + pbrush->ptPenWidth.x = PenWidth; + + RectBounds.left = Left; + RectBounds.right = Right; + RectBounds.top = Top; + RectBounds.bottom = Bottom; + + // Setup for dynamic width and height. + RadiusX = max((RectBounds.right - RectBounds.left) / 2, 2); // Needs room + RadiusY = max((RectBounds.bottom - RectBounds.top) / 2, 2); + CenterX = (RectBounds.right + RectBounds.left) / 2; + CenterY = (RectBounds.bottom + RectBounds.top) / 2; + + DPRINT("Ellipse 1: Left: %d, Top: %d, Right: %d, Bottom: %d\n", + RectBounds.left,RectBounds.top,RectBounds.right,RectBounds.bottom); + + DPRINT("Ellipse 2: XLeft: %d, YLeft: %d, Width: %d, Height: %d\n", + CenterX - RadiusX, CenterY + RadiusY, RadiusX*2, RadiusY*2); + + BrushOrigin.x = dc->ptBrushOrg.x + dc->rcDcRect.left; + BrushOrigin.y = dc->ptBrushOrg.y + dc->rcDcRect.top; + + /* Draw filled part */ + if (dc->pFillBrush && !(dc->pFillBrush->flAttrs & GDIBRUSH_IS_NULL)) + { + GreUpdateBrush(dc->pFillBrush, dc); + ret = GrepFillEllipse(dc, + CenterX - RadiusX, + CenterY - RadiusY, + RadiusX*2, // Width + RadiusY*2, // Height + dc->pFillBrush, + &BrushOrigin); + } + + /* Draw line part */ + if (ret) + { + ret = GrepDrawEllipse(dc, + CenterX - RadiusX, + CenterY - RadiusY, + RadiusX*2, // Width + RadiusY*2, // Height + pbrush, + &BrushOrigin); + } + + /* Restore changed width */ + pbrush->ptPenWidth.x = PenOrigWidth; +} + +/* EOF */ Propchange: branches/arwinss/reactos/subsystems/win32/win32k/gre/ellipse.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] Thu Feb 11 22:58:21 2010 @@ -1,5 +1,22 @@ #ifndef __WIN32K_GRE_H #define __WIN32K_GRE_H + +/* Math stuff */ +#define M_PI_2 1.57079632679489661923 + +/* arc.c */ +BOOLEAN +APIENTRY +GrepArc(PDC dc, + int Left, + int Top, + int Right, + int Bottom, + int XRadialStart, + int YRadialStart, + int XRadialEnd, + int YRadialEnd, + ARCTYPE arctype); /* bitblt.c */ INT NTAPI DIB_GetDIBWidthBytes(INT width, INT depth); @@ -91,6 +108,61 @@ LPDEVMODEW pDevMode, DWORD dwFlags); INT APIENTRY GreGetDeviceCaps(PDC pDC, INT cap); +/* drawing.c */ + +VOID +APIENTRY +GrepFillArc( PDC dc, + INT XLeft, + INT YLeft, + INT Width, + INT Height, + double StartArc, + double EndArc, + ARCTYPE arctype, + PPOINTL BrushOrigin); + +BOOLEAN +APIENTRY +GrepDrawArc( PDC dc, + INT XLeft, + INT YLeft, + INT Width, + INT Height, + double StartArc, + double EndArc, + ARCTYPE arctype, + PBRUSHGDI pbrush, + PPOINTL BrushOrigin); + +BOOLEAN +APIENTRY +GrepDrawEllipse(PDC dc, + INT XLeft, + INT YLeft, + INT Width, + INT Height, + PBRUSHGDI pbrush, + PPOINTL brushOrg); + +BOOLEAN +APIENTRY +GrepFillEllipse(PDC dc, + INT XLeft, + INT YLeft, + INT Width, + INT Height, + PBRUSHGDI pbrush, + PPOINTL brushOrg); + +/* ellipse.c */ +VOID NTAPI +GreEllipse(PDC dc, + INT Left, + INT Top, + INT Right, + INT Bottom); + /* font.c */ VOID NTAPI GreTextOut(PDC pDC, INT x, INT y, UINT flags, Propchange: branches/arwinss/reactos/subsystems/win32/win32k/math/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Feb 11 22:58:21 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/arwinss/reactos/subsystems/win32/win32k/math/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/arwinss/reactos/subsystems/win32/win32k/math/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/arwinss/reactos/subsystems/win32/win32k/math/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/math/i386/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Feb 11 22:58:21 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/arwinss/reactos/subsystems/win32/win32k/math/i386/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/arwinss/reactos/subsystems/win32/win32k/math/i386/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/arwinss/reactos/subsystems/win32/win32k/math/i386/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Thu Feb 11 22:58:21 2010 @@ -46,14 +46,12 @@ RosGdiGetSystemPaletteEntries 4 RosGdiGetTextExtentExPoint 7 RosGdiGetTextMetrics 2 -RosGdiArc 9 -RosGdiChord 9 +RosGdiArc 10 RosGdiEllipse 5 RosGdiExtEscape 6 RosGdiExtFloodFill 5 RosGdiExtTextOut 9 RosGdiLineTo 5 -RosGdiPie 9 RosGdiPolyPolygon 4 RosGdiPolyPolyline 4 RosGdiPolygon 3 Modified: branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Thu Feb 11 22:58:21 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="win32k" type="kernelmodedriver" installbase="system32" installname="win32k.sys"> +<module name="win32k" type="kernelmodedriver" installbase="system32" installname="win32k.sys" crt="libcntpr"> <importlibrary definition="win32k.pspec" /> <define name="_WIN32K_" /> @@ -95,9 +95,12 @@ <file>misc.c</file> </directory> <directory name="gre"> + <file>arc.c</file> <file>bitblt.c</file> <file>brushobj.c</file> <file>clipobj.c</file> + <file>drawing.c</file> + <file>ellipse.c</file> <file>font.c</file> <file>gdiobj.c</file> <file>lineto.c</file> @@ -118,6 +121,17 @@ <file>monitor.c</file> <file>kbdlayout.c</file> <file>keyboard.c</file> + </directory> + <directory name="math"> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>cos_asm.s</file> + <file>sin_asm.s</file> + <file>atan2_asm.s</file> + <file>floor_asm.s</file> + <file>ceil_asm.s</file> + </directory> + </if> </directory> <directory name="swm"> <file>winman.c</file>

1 0

[janderwald] 45580: - Revert 44564
by janderwald＠svn.reactos.org 11 Feb '10

11 Feb '10

Author: janderwald Date: Thu Feb 11 22:19:35 2010 New Revision: 45580 URL: http://svn.reactos.org/svn/reactos?rev=45580&view=rev Log: - Revert 44564 Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Thu Feb 11 22:19:35 2010 @@ -156,7 +156,7 @@ dll\directx\dmusic\dmusic.dll 1 dll\directx\dplay\dplay.dll 1 dll\directx\dplayx\dplayx.dll 1 -dll\directx\dsound_new\dsound.dll 1 +dll\directx\dsound\dsound.dll 1 dll\directx\dxdiagn\dxdiagn.dll 1 dll\directx\wine\ddraw\ddraw.dll 1 dll\directx\d3d8thk\d3d8thk.dll 1 @@ -515,7 +515,7 @@ ;drivers\usb\miniport\usbuhci\usbuhci.sys 2 ;drivers\usb\usbhub\usbhub.sys 2 ;drivers\usb\usbport\usbport.sys 2 -;drivers\usb\nt4compat\usbdriver\usbdriver.sys 2 +drivers\usb\nt4compat\usbdriver\usbdriver.sys 2 drivers\video\displays\vga\vgaddi.dll 1 drivers\video\displays\framebuf\framebuf.dll 1 @@ -528,7 +528,6 @@ drivers\wdm\audio\sysaudio\sysaudio.sys 2 drivers\wdm\audio\legacy\wdmaud\wdmaud.sys 2 drivers\wdm\audio\backpln\portcls\portcls.sys 2 -drivers\wdm\audio\backpln\audio_test\audio_test.exe 1 drivers\wdm\audio\drm\drmk\drmk.sys 2 drivers\wmi\wmilib.sys 2 @@ -801,19 +800,3 @@ modules\wallpaper\Angelus_02_ROSWP.bmp 4 optional -modules\windows\alcxwdm.sys 2 optional -modules\windows\dlkfet5b.sys 2 optional -modules\windows\cmaudio.sys 2 optional -modules\windows\cmaudio.inf 6 optional -;modules\windows\es1370mp.sys 2 optional -;modules\windows\es1371mp.sys 2 optional -modules\windows\alcxwdm.inf 6 optional -modules\windows\netdlfet.inf 6 optional -modules\windows\ks.inf 6 optional -;modules\windows\wdma_ens.inf 6 optional -modules\windows\b.mp3 7 optional -modules\windows\winamp.exe 7 optional -modules\windows\windows.wav 7 optional -modules\windows\D530.exe 7 optional -modules\windows\vmaudio.sys 2 optional -modules\windows\vmaudio.inf 6 optional

1 0

[janderwald] 45579: [WDMAUD_KERNEL] - Replace mixer / wave support code by mmixer library [MMIXER] - Compare device name from 2 character onwards as there are difference in paths in user mode / kernel mode - Invoke create pin callback if the caller provides it [WDMAUD.DRV] - Apply changes from mmixer library -- Tested in Vbox with Winamp / ReactOS mplay32
by janderwald＠svn.reactos.org 11 Feb '10

11 Feb '10

Author: janderwald Date: Thu Feb 11 22:04:57 2010 New Revision: 45579 URL: http://svn.reactos.org/svn/reactos?rev=45579&view=rev Log: [WDMAUD_KERNEL] - Replace mixer / wave support code by mmixer library [MMIXER] - Compare device name from 2 character onwards as there are difference in paths in user mode / kernel mode - Invoke create pin callback if the caller provides it [WDMAUD.DRV] - Apply changes from mmixer library -- Tested in Vbox with Winamp / ReactOS mplay32 Added: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mmixer.c (with props) Removed: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wave.c Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/wdmaud.drv/mmixer.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/sup.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild trunk/reactos/lib/drivers/sound/mmixer/mmixer.h trunk/reactos/lib/drivers/sound/mmixer/sup.c trunk/reactos/lib/drivers/sound/mmixer/wave.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Modified: trunk/reactos/dll/win32/wdmaud.drv/mmixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/mmixe… Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… Removed: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… Added: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mmixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… Removed: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… Modified: trunk/reactos/lib/drivers/sound/mmixer/mmixer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/m… Modified: trunk/reactos/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/s… Modified: trunk/reactos/lib/drivers/sound/mmixer/wave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/w…

1 0

[ekohl] 45578: [DEVMGR] Display Matching Device ID.
by ekohl＠svn.reactos.org 11 Feb '10

11 Feb '10

Author: ekohl Date: Thu Feb 11 21:23:48 2010 New Revision: 45578 URL: http://svn.reactos.org/svn/reactos?rev=45578&view=rev Log: [DEVMGR] Display Matching Device ID. Modified: trunk/reactos/dll/win32/devmgr/advprop.c Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Thu Feb 11 21:23:48 2010 @@ -852,6 +852,52 @@ static VOID +DisplayMatchingDeviceId(IN PDEVADVPROP_INFO dap, + IN HWND hwndListView) +{ + HDEVINFO DeviceInfoSet; + PSP_DEVINFO_DATA DeviceInfoData; + WCHAR szBuffer[256]; + HKEY hKey; + DWORD dwSize; + DWORD dwType; + + if (dap->CurrentDeviceInfoSet != INVALID_HANDLE_VALUE) + { + DeviceInfoSet = dap->CurrentDeviceInfoSet; + DeviceInfoData = &dap->CurrentDeviceInfoData; + } + else + { + DeviceInfoSet = dap->DeviceInfoSet; + DeviceInfoData = &dap->DeviceInfoData; + } + + hKey = SetupDiOpenDevRegKey(DeviceInfoSet, + DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DRV, + KEY_QUERY_VALUE); + if (hKey != INVALID_HANDLE_VALUE) + { + dwSize = 256 * sizeof(WCHAR); + if (RegQueryValueEx(hKey, + L"MatchingDeviceId", + NULL, + &dwType, + (LPBYTE)szBuffer, + &dwSize) == ERROR_SUCCESS) + { + SetListViewText(hwndListView, 0, szBuffer); + } + + RegCloseKey(hKey); + } +} + + +static VOID DisplayDeviceProperties(IN PDEVADVPROP_INFO dap, IN HWND hwndComboBox, IN HWND hwndListView) @@ -873,7 +919,6 @@ SetListViewText(hwndListView, 0, dap->szDeviceID); break; - case 1: /* Hardware ID */ DisplayDevicePropertyText(dap, hwndListView, @@ -886,10 +931,10 @@ SPDRP_COMPATIBLEIDS); break; -#if 0 case 3: /* Matching ID */ + DisplayMatchingDeviceId(dap, + hwndListView); break; -#endif case 4: /* Service */ DisplayDevicePropertyText(dap,

1 0

[sir_richard] 45577: [NTOS]: Remove many hacks in freelist.c regarding the differences between PHYSICAL_PAGE and MMPFN. ReferenceCount field is now accessed directly. LockCount is gone. Type is gone: if a page is used, it has a consumer and is in the ActiveAndValid state, if it's free, it's on the free or zero page list. Get rid of Zero, if a page is zeroed, it is on the zero page list. [NTOS]: These changes will allow a smoother migration to MMPFN later on.
by sir_richard＠svn.reactos.org 11 Feb '10

11 Feb '10

Author: sir_richard Date: Thu Feb 11 19:44:28 2010 New Revision: 45577 URL: http://svn.reactos.org/svn/reactos?rev=45577&view=rev Log: [NTOS]: Remove many hacks in freelist.c regarding the differences between PHYSICAL_PAGE and MMPFN. ReferenceCount field is now accessed directly. LockCount is gone. Type is gone: if a page is used, it has a consumer and is in the ActiveAndValid state, if it's free, it's on the free or zero page list. Get rid of Zero, if a page is zeroed, it is on the zero page list. [NTOS]: These changes will allow a smoother migration to MMPFN later on. Modified: trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Thu Feb 11 19:44:28 2010 @@ -232,6 +232,8 @@ PsGetCurrentThread() == MiBalancerThreadId.UniqueThread; } +VOID NTAPI MiSetConsumer(IN PFN_TYPE Pfn, IN ULONG Consumer); + NTSTATUS NTAPI MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait, @@ -316,8 +318,8 @@ { KeBugCheck(NO_PAGES_AVAILABLE); } - /* Update the Consumer */ - MiGetPfnEntry(Page)->u3.e1.PageLocation = Consumer; + /* Update the Consumer and make the page active */ + MiSetConsumer(Page, Consumer); if(Consumer == MC_USER) MmInsertLRULastUserPage(Page); *AllocatedPage = Page; (void)InterlockedDecrementUL(&MiPagesRequired); Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Thu Feb 11 19:44:28 2010 @@ -21,11 +21,6 @@ #define MODULE_INVOLVED_IN_ARM3 #include "ARM3/miarm.h" -/* TYPES *******************************************************************/ - -#define MM_PHYSICAL_PAGE_FREE (0x1) -#define MM_PHYSICAL_PAGE_USED (0x2) - /* GLOBALS ****************************************************************/ // @@ -34,14 +29,9 @@ // // REACTOS NT // -#define Consumer PageLocation -#define Type CacheAttribute -#define Zero PrototypePte -#define LockCount u3.e1.PageColor +#define Consumer u3.e1.PageColor #define RmapListHead AweReferenceCount #define SavedSwapEntry u4.EntireFrame -#define Flags u3.e1 -#define ReferenceCount u3.ReferenceCount #define RemoveEntryList(x) RemoveEntryList((PLIST_ENTRY)x) #define InsertTailList(x, y) InsertTailList(x, (PLIST_ENTRY)y) #define ListEntry u1 @@ -100,7 +90,6 @@ return 0; } PageDescriptor = CONTAINING_RECORD(NextListEntry, PHYSICAL_PAGE, ListEntry); - ASSERT_PFN(PageDescriptor); KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return PageDescriptor - MmPfnDatabase[0]; } @@ -114,9 +103,9 @@ oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); - ASSERT(Page); - ASSERT(Page->Flags.Type == MM_PHYSICAL_PAGE_USED); - ASSERT(Page->Flags.Consumer == MC_USER); +// if (!Page->Consumer != MC_USER) DPRINT1("Page Consumer: %d\n", Page->Consumer); + ASSERT(Page->Consumer == MC_USER); + ASSERT(Page->u3.e1.PageLocation = ActiveAndValid); InsertTailList(&UserPageListHead, &Page->ListEntry); KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } @@ -132,9 +121,8 @@ oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(PreviousPfn); - ASSERT(Page); - ASSERT(Page->Flags.Type == MM_PHYSICAL_PAGE_USED); - ASSERT(Page->Flags.Consumer == MC_USER); + ASSERT(Page->Consumer == MC_USER); + ASSERT(Page->u3.e1.PageLocation = ActiveAndValid); NextListEntry = (PLIST_ENTRY)Page->ListEntry.Flink; if (NextListEntry == &UserPageListHead) { @@ -153,6 +141,14 @@ RemoveEntryList(&MiGetPfnEntry(Page)->ListEntry); } +BOOLEAN +NTAPI +MiIsPfnInUse(IN PMMPFN Pfn1) +{ + return ((Pfn1->u3.e1.PageLocation != FreePageList) && + (Pfn1->u3.e1.PageLocation != ZeroedPageList)); +} + PFN_NUMBER NTAPI MiFindContiguousPages(IN PFN_NUMBER LowestPfn, @@ -209,7 +205,7 @@ // // If this PFN is in use, ignore it // - if (Pfn1->Flags.Type != MM_PHYSICAL_PAGE_FREE) continue; + if (MiIsPfnInUse(Pfn1)) continue; // // If we haven't chosen a start PFN yet and the caller specified an @@ -244,7 +240,7 @@ // // Things might've changed for us. Is the page still free? // - if (Pfn1->Flags.Type != MM_PHYSICAL_PAGE_FREE) break; + if (MiIsPfnInUse(Pfn1)) break; // // So far so good. Is this the last confirmed valid page? @@ -265,7 +261,7 @@ // // If this was an unzeroed page, there are now less // - if (Pfn1->Flags.Zero == 0) UnzeroedPageCount--; + if (Pfn1->u3.e1.PageLocation == ZeroedPageList) UnzeroedPageCount--; // // One less free page @@ -276,22 +272,25 @@ // This PFN is now a used page, set it up // RemoveEntryList(&Pfn1->ListEntry); - Pfn1->Flags.Type = MM_PHYSICAL_PAGE_USED; - Pfn1->Flags.Consumer = MC_NPPOOL; - Pfn1->ReferenceCount = 1; - Pfn1->LockCount = 0; + Pfn1->Consumer = MC_NPPOOL; + Pfn1->u3.e2.ReferenceCount = 1; Pfn1->SavedSwapEntry = 0; // // Check if it was already zeroed // - if (Pfn1->Flags.Zero == 0) + if (Pfn1->u3.e1.PageLocation != ZeroedPageList) { // // It wasn't, so zero it // MiZeroPage(MiGetPfnEntryIndex(Pfn1)); } + + // + // Mark it in use + // + Pfn1->u3.e1.PageLocation = ActiveAndValid; // // Check if this is the last PFN, otherwise go on @@ -303,8 +302,8 @@ // // Mark the first and last PFN so we can find them later // - Pfn1->Flags.StartOfAllocation = 1; - (Pfn1 + SizeInPages - 1)->Flags.EndOfAllocation = 1; + Pfn1->u3.e1.StartOfAllocation = 1; + (Pfn1 + SizeInPages - 1)->u3.e1.EndOfAllocation = 1; // // Now it's safe to let go of the PFN lock @@ -466,18 +465,17 @@ // // Make sure it's really free // - ASSERT(Pfn1->Flags.Type == MM_PHYSICAL_PAGE_FREE); - ASSERT(Pfn1->ReferenceCount == 0); + ASSERT(MiIsPfnInUse(Pfn1) == FALSE); + ASSERT(Pfn1->u3.e2.ReferenceCount == 0); // // Allocate it and mark it // - Pfn1->Flags.Type = MM_PHYSICAL_PAGE_USED; - Pfn1->Flags.Consumer = MC_NPPOOL; - Pfn1->Flags.StartOfAllocation = 1; - Pfn1->Flags.EndOfAllocation = 1; - Pfn1->ReferenceCount = 1; - Pfn1->LockCount = 0; + Pfn1->Consumer = MC_NPPOOL; + Pfn1->u3.e1.StartOfAllocation = 1; + Pfn1->u3.e1.EndOfAllocation = 1; + Pfn1->u3.e2.ReferenceCount = 1; + Pfn1->u3.e1.PageLocation = ActiveAndValid; Pfn1->SavedSwapEntry = 0; // @@ -513,29 +511,27 @@ // // Make sure it's free and if this is our first pass, zeroed // - if (Pfn1->Flags.Type != MM_PHYSICAL_PAGE_FREE) continue; - if (Pfn1->Flags.Zero != LookForZeroedPages) continue; + if (!MiIsPfnInUse(Pfn1)) continue; + if ((Pfn1->u3.e1.PageLocation == ZeroedPageList) != LookForZeroedPages) continue; // // Sanity checks // - ASSERT(Pfn1->ReferenceCount == 0); + ASSERT(Pfn1->u3.e2.ReferenceCount == 0); // // Now setup the page and mark it // - Pfn1->Flags.Type = MM_PHYSICAL_PAGE_USED; - Pfn1->Flags.Consumer = MC_NPPOOL; - Pfn1->ReferenceCount = 1; - Pfn1->Flags.StartOfAllocation = 1; - Pfn1->Flags.EndOfAllocation = 1; - Pfn1->LockCount = 0; + Pfn1->Consumer = MC_NPPOOL; + Pfn1->u3.e2.ReferenceCount = 1; + Pfn1->u3.e1.StartOfAllocation = 1; + Pfn1->u3.e1.EndOfAllocation = 1; Pfn1->SavedSwapEntry = 0; // // If this page was unzeroed, we've consumed such a page // - if (!Pfn1->Flags.Zero) UnzeroedPageCount--; + if (Pfn1->u3.e1.PageLocation != ZeroedPageList) UnzeroedPageCount--; // // Decrease available pages @@ -603,7 +599,8 @@ // Pfn1 = MiGetPfnEntry(Page); ASSERT(Pfn1); - if (Pfn1->Flags.Zero == 0) MiZeroPage(Page); + if (Pfn1->u3.e1.PageLocation != ZeroedPageList) MiZeroPage(Page); + Pfn1->u3.e1.PageLocation = ActiveAndValid; } // @@ -620,7 +617,7 @@ { ULONG i; PPHYSICAL_PAGE Pfn1; - PCHAR State = "????", Consumer = "Unknown"; + PCHAR State = "????", Type = "Unknown"; KIRQL OldIrql; ULONG Totals[5] = {0}, FreePages = 0; @@ -637,67 +634,63 @@ // // Get the consumer // - switch (Pfn1->Flags.Consumer) + switch (Pfn1->Consumer) { case MC_NPPOOL: - Consumer = "Nonpaged Pool"; + Type = "Nonpaged Pool"; break; case MC_PPOOL: - Consumer = "Paged Pool"; + Type = "Paged Pool"; break; case MC_CACHE: - Consumer = "File System Cache"; + Type = "File System Cache"; break; case MC_USER: - Consumer = "Process Working Set"; + Type = "Process Working Set"; break; case MC_SYSTEM: - Consumer = "System"; + Type = "System"; break; } // // Get the type // - switch (Pfn1->Flags.Type) + if (MiIsPfnInUse(Pfn1)) { - case MM_PHYSICAL_PAGE_USED: - - State = "Used"; - Totals[Pfn1->Flags.Consumer]++; - break; - - case MM_PHYSICAL_PAGE_FREE: - - State = "Free"; - Consumer = "Free"; - FreePages++; - break; + State = "Used"; + Totals[Pfn1->Consumer]++; } - + else + { + State = "Free"; + Type = "Free"; + FreePages++; + break; + } + // // Pretty-print the page // - DbgPrint("0x%08p:\t%04s\t%20s\t(%02d.%02d) [%08p])\n", + DbgPrint("0x%08p:\t%04s\t%20s\t(%02d) [%08p])\n", i << PAGE_SHIFT, State, - Consumer, - Pfn1->ReferenceCount, - Pfn1->LockCount, + Type, + Pfn1->u3.e2.ReferenceCount, Pfn1->RmapListHead); } DbgPrint("Nonpaged Pool: %d pages\t[%d KB]\n", Totals[MC_NPPOOL], (Totals[MC_NPPOOL] << PAGE_SHIFT) / 1024); - DbgPrint("Paged Pool: %d pages\t[%d KB]\n", Totals[MC_PPOOL], (Totals[MC_PPOOL] << PAGE_SHIFT) / 1024); + DbgPrint("Paged Pool: %d pages\t[%d KB]\n", Totals[MC_PPOOL], (Totals[MC_PPOOL] << PAGE_SHIFT) / 1024); DbgPrint("File System Cache: %d pages\t[%d KB]\n", Totals[MC_CACHE], (Totals[MC_CACHE] << PAGE_SHIFT) / 1024); DbgPrint("Process Working Set: %d pages\t[%d KB]\n", Totals[MC_USER], (Totals[MC_USER] << PAGE_SHIFT) / 1024); DbgPrint("System: %d pages\t[%d KB]\n", Totals[MC_SYSTEM], (Totals[MC_SYSTEM] << PAGE_SHIFT) / 1024); @@ -723,9 +716,9 @@ /* This is what a used page looks like */ RtlZeroMemory(&UsedPage, sizeof(UsedPage)); - UsedPage.Flags.Type = MM_PHYSICAL_PAGE_USED; - UsedPage.Flags.Consumer = MC_NPPOOL; - UsedPage.ReferenceCount = 1; + UsedPage.Consumer = MC_NPPOOL; + UsedPage.u3.e1.PageLocation = ActiveAndValid; + UsedPage.u3.e2.ReferenceCount = 1; /* Loop the memory descriptors */ for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; @@ -759,7 +752,7 @@ for (i = 0; i < Md->PageCount; i++) { /* Mark it as a free page */ - MmPfnDatabase[0][Md->BasePage + i].Flags.Type = MM_PHYSICAL_PAGE_FREE; + MmPfnDatabase[0][Md->BasePage + i].u3.e1.PageLocation = FreePageList; InsertTailList(&FreeUnzeroedPageListHead, &MmPfnDatabase[0][Md->BasePage + i].ListEntry); UnzeroedPageCount++; @@ -782,7 +775,7 @@ for (i = MxOldFreeDescriptor.BasePage; i < MxFreeDescriptor->BasePage; i++) { /* Ensure this page was not added previously */ - ASSERT(MmPfnDatabase[0][i].Flags.Type == 0); + ASSERT(MmPfnDatabase[0][i].Consumer == 0); /* Mark it as used kernel memory */ MmPfnDatabase[0][i] = UsedPage; @@ -859,13 +852,8 @@ Page = MiGetPfnEntry(Pfn); ASSERT(Page); - if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) - { - DPRINT1("Referencing non-used page\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - - Page->ReferenceCount++; + + Page->u3.e2.ReferenceCount++; } ULONG @@ -881,13 +869,8 @@ oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); ASSERT(Page); - if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) - { - DPRINT1("Getting reference count for free page\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - - RCount = Page->ReferenceCount; + + RCount = Page->u3.e2.ReferenceCount; KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return(RCount); @@ -897,10 +880,16 @@ NTAPI MmIsPageInUse(PFN_TYPE Pfn) { - - DPRINT("MmIsPageInUse(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - - return (MiGetPfnEntry(Pfn)->Flags.Type == MM_PHYSICAL_PAGE_USED); + return MiIsPfnInUse(MiGetPfnEntry(Pfn)); +} + +VOID +NTAPI +MiSetConsumer(IN PFN_TYPE Pfn, + IN ULONG Type) +{ + MiGetPfnEntry(Pfn)->Consumer = Type; + MiGetPfnEntry(Pfn)->u3.e1.PageLocation = ActiveAndValid; } VOID @@ -914,45 +903,12 @@ Page = MiGetPfnEntry(Pfn); ASSERT(Page); - if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) - { - DPRINT1("Dereferencing free page\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - if (Page->ReferenceCount == 0) - { - DPRINT1("Derefrencing page with reference count 0\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - - Page->ReferenceCount--; - if (Page->ReferenceCount == 0) + Page->u3.e2.ReferenceCount--; + if (Page->u3.e2.ReferenceCount == 0) { MmAvailablePages++; - if (Page->Flags.Consumer == MC_USER) RemoveEntryList(&Page->ListEntry); - if (Page->RmapListHead != (LONG)NULL) - { - DPRINT1("Freeing page with rmap entries.\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - if (Page->LockCount > 0) - { - DPRINT1("Freeing locked page\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - if (Page->SavedSwapEntry != 0) - { - DPRINT1("Freeing page with swap entry.\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) - { - DPRINT1("Freeing page with flags %x\n", - Page->Flags.Type); - KeBugCheck(MEMORY_MANAGEMENT); - } - Page->Flags.Type = MM_PHYSICAL_PAGE_FREE; - Page->Flags.Consumer = MC_MAXIMUM; + if (Page->Consumer == MC_USER) RemoveEntryList(&Page->ListEntry); + Page->u3.e1.PageLocation = FreePageList; InsertTailList(&FreeUnzeroedPageListHead, &Page->ListEntry); UnzeroedPageCount++; @@ -963,73 +919,9 @@ } } -ULONG -NTAPI -MmGetLockCountPage(PFN_TYPE Pfn) -{ - KIRQL oldIrql; - ULONG CurrentLockCount; - PPHYSICAL_PAGE Page; - - DPRINT("MmGetLockCountPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - - Page = MiGetPfnEntry(Pfn); - ASSERT(Page); - if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) - { - DPRINT1("Getting lock count for free page\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - - CurrentLockCount = Page->LockCount; - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); - - return(CurrentLockCount); -} - -VOID -NTAPI -MmLockPage(PFN_TYPE Pfn) -{ - PPHYSICAL_PAGE Page; - - DPRINT("MmLockPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - - Page = MiGetPfnEntry(Pfn); - ASSERT(Page); - if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) - { - DPRINT1("Locking free page\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - - Page->LockCount++; -} - -VOID -NTAPI -MmUnlockPage(PFN_TYPE Pfn) -{ - PPHYSICAL_PAGE Page; - - DPRINT("MmUnlockPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - - Page = MiGetPfnEntry(Pfn); - ASSERT(Page); - if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) - { - DPRINT1("Unlocking free page\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - - Page->LockCount--; -} - PFN_TYPE NTAPI -MmAllocPage(ULONG Consumer, SWAPENTRY SwapEntry) +MmAllocPage(ULONG Type, SWAPENTRY SwapEntry) { PFN_TYPE PfnOffset; PLIST_ENTRY ListEntry; @@ -1065,29 +957,19 @@ PageDescriptor = CONTAINING_RECORD(ListEntry, PHYSICAL_PAGE, ListEntry); } - if (PageDescriptor->Flags.Type != MM_PHYSICAL_PAGE_FREE) - { - DPRINT1("Got non-free page from freelist\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - if (PageDescriptor->ReferenceCount != 0) - { - DPRINT1("%d\n", PageDescriptor->ReferenceCount); - KeBugCheck(MEMORY_MANAGEMENT); - } - PageDescriptor->Flags.Type = MM_PHYSICAL_PAGE_USED; - PageDescriptor->Flags.Consumer = Consumer; - PageDescriptor->ReferenceCount = 1; - PageDescriptor->LockCount = 0; + PageDescriptor->Consumer = Type; + PageDescriptor->u3.e2.ReferenceCount = 1; PageDescriptor->SavedSwapEntry = SwapEntry; MmAvailablePages--; PfnOffset = PageDescriptor - MmPfnDatabase[0]; - if ((NeedClear) && (Consumer != MC_SYSTEM)) + if ((NeedClear) && (Type != MC_SYSTEM)) { MiZeroPage(PfnOffset); } + + PageDescriptor->u3.e1.PageLocation = ActiveAndValid; return PfnOffset; } @@ -1135,11 +1017,6 @@ KernelMode, FALSE, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ZeroPageThread: Wait failed\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } if (ZeroPageThreadShouldTerminate) { @@ -1154,14 +1031,12 @@ UnzeroedPageCount--; PageDescriptor = CONTAINING_RECORD(ListEntry, PHYSICAL_PAGE, ListEntry); /* We set the page to used, because MmCreateVirtualMapping failed with unused pages */ - PageDescriptor->Flags.Type = MM_PHYSICAL_PAGE_USED; KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); Pfn = PageDescriptor - MmPfnDatabase[0]; Status = MiZeroPage(Pfn); oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - PageDescriptor->Flags.Zero = 1; - PageDescriptor->Flags.Type = MM_PHYSICAL_PAGE_FREE; + PageDescriptor->u3.e1.PageLocation = ZeroedPageList; if (NT_SUCCESS(Status)) { InsertHeadList(&FreeZeroedPageListHead, ListEntry);

1 0

[sir_richard] 45576: [NTOS]: Get rid of page locking mechanism for MDL since I can't see a reason this would make sense, since these pages won't be scheduled for page out anyway, and that is the only code that looked at this value.
by sir_richard＠svn.reactos.org 11 Feb '10

11 Feb '10

Author: sir_richard Date: Thu Feb 11 19:41:45 2010 New Revision: 45576 URL: http://svn.reactos.org/svn/reactos?rev=45576&view=rev Log: [NTOS]: Get rid of page locking mechanism for MDL since I can't see a reason this would make sense, since these pages won't be scheduled for page out anyway, and that is the only code that looked at this value. Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/mmfault.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Thu Feb 11 19:41:45 2010 @@ -966,7 +966,6 @@ // Now lock the page // MmReferencePage(PageFrameIndex); - MmLockPage(PageFrameIndex); } else { @@ -1124,7 +1123,6 @@ // // Unlock and dereference // - MmUnlockPage(*MdlPages); MmDereferencePage(*MdlPages); } } while (++MdlPages < LastPage); @@ -1218,7 +1216,6 @@ // // Unlock and dereference // - MmUnlockPage(*MdlPages); MmDereferencePage(*MdlPages); } while (++MdlPages < LastPage); Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Thu Feb 11 19:41:45 2010 @@ -258,7 +258,6 @@ PMM_REGION Region; PMM_PAGEOP PageOp; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); - KIRQL OldIrql; /* * There is a window between taking the page fault and locking the @@ -267,12 +266,6 @@ */ if (MmIsPagePresent(NULL, Address)) { - if (Locked) - { - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - MmLockPage(MmGetPfnForProcess(NULL, Address)); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - } return(STATUS_SUCCESS); } @@ -363,12 +356,6 @@ return(Status); } MmLockAddressSpace(AddressSpace); - if (Locked) - { - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - MmLockPage(MmGetPfnForProcess(NULL, Address)); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - } KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); MmReleasePageOp(PageOp); return(STATUS_SUCCESS); @@ -440,12 +427,6 @@ /* * Finish the operation */ - if (Locked) - { - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - MmLockPage(Page); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - } PageOp->Status = STATUS_SUCCESS; KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); MmReleasePageOp(PageOp); Modified: trunk/reactos/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmfault.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] Thu Feb 11 19:41:45 2010 @@ -305,7 +305,6 @@ { NTSTATUS Status; PFN_TYPE AllocatedPage; - KIRQL OldIrql; Status = MmRequestPageMemoryConsumer(MC_PPOOL, FALSE, &AllocatedPage); if (!NT_SUCCESS(Status)) @@ -320,11 +319,5 @@ PAGE_READWRITE, &AllocatedPage, 1); - if (Locked) - { - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - MmLockPage(AllocatedPage); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - } return(Status); } Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=455… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Thu Feb 11 19:41:45 2010 @@ -202,7 +202,7 @@ ExAcquireFastMutex(&RmapListLock); entry = MmGetRmapListHeadPage(Page); - if (entry == NULL || MmGetLockCountPage(Page) != 0) + if (entry == NULL) { ExReleaseFastMutex(&RmapListLock); return(STATUS_UNSUCCESSFUL); Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Thu Feb 11 19:41:45 2010 @@ -792,7 +792,6 @@ PMM_REGION Region; BOOLEAN HasSwapEntry; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); - KIRQL OldIrql; /* * There is a window between taking the page fault and locking the @@ -801,12 +800,6 @@ */ if (MmIsPagePresent(Process, Address)) { - if (Locked) - { - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - MmLockPage(MmGetPfnForProcess(Process, Address)); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - } return(STATUS_SUCCESS); } @@ -930,12 +923,6 @@ } MmInsertRmap(Page, Process, (PVOID)PAddress); } - if (Locked) - { - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - MmLockPage(Page); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - } MmUnlockSectionSegment(Segment); PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); @@ -1002,12 +989,6 @@ /* * Finish the operation */ - if (Locked) - { - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - MmLockPage(Page); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - } PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); DPRINT("Address 0x%.8X\n", Address); @@ -1035,16 +1016,6 @@ KeBugCheck(MEMORY_MANAGEMENT); return(Status); } - /* - * Don't add an rmap entry since the page mapped could be for - * anything. - */ - if (Locked) - { - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - MmLockPage(Page); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - } /* * Cleanup and release locks @@ -1084,12 +1055,6 @@ return(Status); } MmInsertRmap(Page, Process, (PVOID)PAddress); - if (Locked) - { - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - MmLockPage(Page); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - } /* * Cleanup and release locks @@ -1186,12 +1151,6 @@ } MmInsertRmap(Page, Process, (PVOID)PAddress); - if (Locked) - { - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - MmLockPage(Page); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - } PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); DPRINT("Address 0x%.8X\n", Address); @@ -1262,12 +1221,6 @@ KeBugCheck(MEMORY_MANAGEMENT); } MmInsertRmap(Page, Process, (PVOID)PAddress); - if (Locked) - { - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - MmLockPage(Page); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - } PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); DPRINT("Address 0x%.8X\n", Address); @@ -1296,12 +1249,6 @@ KeBugCheck(MEMORY_MANAGEMENT); } MmInsertRmap(Page, Process, (PVOID)PAddress); - if (Locked) - { - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - MmLockPage(Page); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - } PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); DPRINT("Address 0x%.8X\n", Address); @@ -1327,7 +1274,6 @@ PMM_REGION Region; ULONG Entry; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); - KIRQL OldIrql; DPRINT("MmAccessFaultSectionView(%x, %x, %x, %x)\n", AddressSpace, MemoryArea, Address, Locked); @@ -1465,13 +1411,6 @@ { DPRINT1("Unable to create virtual mapping\n"); KeBugCheck(MEMORY_MANAGEMENT); - } - if (Locked) - { - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - MmLockPage(NewPage); - MmUnlockPage(OldPage); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } /*

1 0

[sir_richard] 45575: [NTOS]: Remove bogus assertion.
by sir_richard＠svn.reactos.org 11 Feb '10

11 Feb '10

Author: sir_richard Date: Thu Feb 11 19:33:52 2010 New Revision: 45575 URL: http://svn.reactos.org/svn/reactos?rev=45575&view=rev Log: [NTOS]: Remove bogus assertion. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Thu Feb 11 19:33:52 2010 @@ -1082,8 +1082,6 @@ /* freelist.c **********************************************************/ -#define ASSERT_PFN(x) ASSERT((x)->u3.e1.CacheAttribute != 0) - FORCEINLINE PMMPFN MiGetPfnEntry(IN PFN_TYPE Pfn) @@ -1099,9 +1097,6 @@ /* Get the entry */ Page = &MmPfnDatabase[0][Pfn]; - - /* Make sure it's valid */ - ASSERT_PFN(Page); /* Return it */ return Page;

1 0

[sir_richard] 45574: [NTOS]: Fix broken MI_PFNENTRY_TO_PFN macro.
by sir_richard＠svn.reactos.org 11 Feb '10

11 Feb '10

Author: sir_richard Date: Thu Feb 11 19:31:54 2010 New Revision: 45574 URL: http://svn.reactos.org/svn/reactos?rev=45574&view=rev Log: [NTOS]: Fix broken MI_PFNENTRY_TO_PFN macro. Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Thu Feb 11 19:31:54 2010 @@ -213,7 +213,7 @@ extern ULONG MmLargeStackSize; #define MI_PFN_TO_PFNENTRY(x) (&MmPfnDatabase[1][x]) -#define MI_PFNENTRY_TO_PFN(x) (Pfn - &MmPfnDatabase[1]) +#define MI_PFNENTRY_TO_PFN(x) (x - MmPfnDatabase[1]) NTSTATUS NTAPI

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