Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[fireball] 33307: - Buffer size is in bytes, not in pages. Fixes boot breakage.
by fireball＠svn.reactos.org 05 May '08

05 May '08

Author: fireball Date: Mon May 5 16:07:32 2008 New Revision: 33307 URL: http://svn.reactos.org/svn/reactos?rev=33307&view=rev Log: - Buffer size is in bytes, not in pages. Fixes boot breakage. Modified: trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Mon May 5 16:07:32 2008 @@ -80,8 +80,8 @@ PAGED_CODE(); /* Calculate the maximum amount of data to move */ - TotalSize = MI_MAPPED_COPY_PAGES - 2; - if (BufferSize <= (MI_MAPPED_COPY_PAGES - 2)) TotalSize = BufferSize; + TotalSize = (MI_MAPPED_COPY_PAGES - 2) * PAGE_SIZE; + if (BufferSize <= TotalSize) TotalSize = BufferSize; CurrentSize = BufferSize; RemainingSize = TotalSize;

1 0

[hpoussin] 33306: Initialize size field of the OLEINPLACEFRAMEINFO structure. This should prevent Explorer to disappear when user doesn't want to download the Mozilla ActiveX control. See issue #3126 for more details.
by hpoussin＠svn.reactos.org 05 May '08

05 May '08

Author: hpoussin Date: Mon May 5 15:16:34 2008 New Revision: 33306 URL: http://svn.reactos.org/svn/reactos?rev=33306&view=rev Log: Initialize size field of the OLEINPLACEFRAMEINFO structure. This should prevent Explorer to disappear when user doesn't want to download the Mozilla ActiveX control. See issue #3126 for more details. Modified: trunk/reactos/dll/win32/shdocvw/oleobject.c Modified: trunk/reactos/dll/win32/shdocvw/oleobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/oleobjec… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/oleobject.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/oleobject.c [iso-8859-1] Mon May 5 15:16:34 2008 @@ -706,6 +706,7 @@ memset(&This->pos_rect, 0, sizeof(RECT)); memset(&This->clip_rect, 0, sizeof(RECT)); memset(&This->frameinfo, 0, sizeof(OLEINPLACEFRAMEINFO)); + This->frameinfo.cb = sizeof(OLEINPLACEFRAMEINFO); } void WebBrowser_OleObject_Destroy(WebBrowser *This)

1 0

[greatlrd] 33305: bye bye DXG_GET_INDEX_FUNCTION patch from Stefan Ginsberg stefan__100__at hotmail dot com it remove the bad macro DXG_GET_INDEX_FUNCTION that never worked as it should.
by greatlrd＠svn.reactos.org 05 May '08

05 May '08

Author: greatlrd Date: Mon May 5 14:42:23 2008 New Revision: 33305 URL: http://svn.reactos.org/svn/reactos?rev=33305&view=rev Log: bye bye DXG_GET_INDEX_FUNCTION patch from Stefan Ginsberg stefan__100__at hotmail dot com it remove the bad macro DXG_GET_INDEX_FUNCTION that never worked as it should. Modified: trunk/reactos/subsystems/win32/win32k/include/intddraw.h trunk/reactos/subsystems/win32/win32k/ntddraw/dvp.c Modified: trunk/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intddraw.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/intddraw.h [iso-8859-1] Mon May 5 14:42:23 2008 @@ -108,18 +108,6 @@ typedef PDD_SURFACE_LOCAL (NTAPI *PGD_ENGLOCKDIRECTDRAWSURFACE)(HANDLE); typedef BOOL (NTAPI *PGD_ENGUNLOCKDIRECTDRAWSURFACE)(PDD_SURFACE_LOCAL); - -/* Standard macro */ -#define DXG_GET_INDEX_FUNCTION(INDEX, FUNCTION) \ - for (i = 0; i <= DXG_INDEX_DxDdIoctl; i++) \ - { \ - if (gpDxFuncs[i].iFunc == INDEX) \ - { \ - FUNCTION = (VOID *)gpDxFuncs[i].pfn; \ - break; \ - } \ - } - /* Gammaramp internal prototype */ BOOL FASTCALL IntGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp); BOOL FASTCALL IntSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL); Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dvp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dvp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dvp.c [iso-8859-1] Mon May 5 14:42:23 2008 @@ -1,4 +1,3 @@ - /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -187,10 +186,7 @@ NtGdiDvpGetVideoPortLine(HANDLE hVideoPort, PDD_GETVPORTLINEDATA puGetVPortLineData) { - PGD_DXDVPGETVIDEOPORTLINE pfnDvpGetVideoPortLine = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortLine, pfnDvpGetVideoPortLine); + PGD_DXDVPGETVIDEOPORTLINE pfnDvpGetVideoPortLine = (PGD_DXDVPGETVIDEOPORTLINE)gpDxFuncs[DXG_INDEX_DxDvpGetVideoPortLine].pfn; if (pfnDvpGetVideoPortLine == NULL) { @@ -211,10 +207,7 @@ NtGdiDvpGetVideoPortOutputFormats(HANDLE hVideoPort, PDD_GETVPORTOUTPUTFORMATDATA puGetVPortOutputFormatData) { - PGD_DXDVPGETVIDEOPORTOUTPUTFORMATS pfnDvpGetVideoPortOutputFormats = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortOutputFormats, puGetVPortOutputFormatData); + PGD_DXDVPGETVIDEOPORTOUTPUTFORMATS pfnDvpGetVideoPortOutputFormats = (PGD_DXDVPGETVIDEOPORTOUTPUTFORMATS)gpDxFuncs[DXG_INDEX_DxDvpGetVideoPortOutputFormats].pfn; if (pfnDvpGetVideoPortOutputFormats == NULL) { @@ -236,10 +229,7 @@ NtGdiDvpGetVideoPortConnectInfo(HANDLE hDirectDraw, PDD_GETVPORTCONNECTDATA puGetVPortConnectData) { - PGD_DXDVPGETVIDEOPORTCONNECTINFO pfnDvpGetVideoPortConnectInfo = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortConnectInfo, pfnDvpGetVideoPortConnectInfo); + PGD_DXDVPGETVIDEOPORTCONNECTINFO pfnDvpGetVideoPortConnectInfo = (PGD_DXDVPGETVIDEOPORTCONNECTINFO)gpDxFuncs[DXG_INDEX_DxDvpGetVideoPortConnectInfo].pfn; if (pfnDvpGetVideoPortConnectInfo == NULL) { @@ -260,10 +250,7 @@ NtGdiDvpGetVideoSignalStatus(HANDLE hVideoPort, PDD_GETVPORTSIGNALDATA puGetVPortSignalData) { - PGD_DXDVPGETVIDEOSIGNALSTATUS pfnDvpGetVideoSignalStatus = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoSignalStatus, pfnDvpGetVideoSignalStatus); + PGD_DXDVPGETVIDEOSIGNALSTATUS pfnDvpGetVideoSignalStatus = (PGD_DXDVPGETVIDEOSIGNALSTATUS)gpDxFuncs[DXG_INDEX_DxDvpGetVideoSignalStatus].pfn; if (pfnDvpGetVideoSignalStatus == NULL) { @@ -287,10 +274,7 @@ HANDLE* phSurfaceVbi, PDD_UPDATEVPORTDATA puUpdateVPortData) { - PGD_DXDVPUPDATEVIDEOPORT pfnDvpUpdateVideoPort = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpUpdateVideoPort, pfnDvpUpdateVideoPort); + PGD_DXDVPUPDATEVIDEOPORT pfnDvpUpdateVideoPort = (PGD_DXDVPUPDATEVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpUpdateVideoPort].pfn; if (pfnDvpUpdateVideoPort == NULL) { @@ -312,10 +296,7 @@ NtGdiDvpWaitForVideoPortSync(HANDLE hVideoPort, PDD_WAITFORVPORTSYNCDATA puWaitForVPortSyncData) { - PGD_DXDVPWAITFORVIDEOPORTSYNC pfnDvpWaitForVideoPortSync = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpWaitForVideoPortSync, pfnDvpWaitForVideoPortSync); + PGD_DXDVPWAITFORVIDEOPORTSYNC pfnDvpWaitForVideoPortSync = (PGD_DXDVPWAITFORVIDEOPORTSYNC)gpDxFuncs[DXG_INDEX_DxDvpWaitForVideoPortSync].pfn; if (pfnDvpWaitForVideoPortSync == NULL) { @@ -337,10 +318,7 @@ HANDLE* hEvent, LPDDVIDEOPORTNOTIFY pNotify) { - PGD_DXDVPACQUIRENOTIFICATION pfnDvpAcquireNotification = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpAcquireNotification, pfnDvpAcquireNotification); + PGD_DXDVPACQUIRENOTIFICATION pfnDvpAcquireNotification = (PGD_DXDVPACQUIRENOTIFICATION)gpDxFuncs[DXG_INDEX_DxDvpAcquireNotification].pfn; if (pfnDvpAcquireNotification == NULL) { @@ -361,10 +339,7 @@ NtGdiDvpReleaseNotification(HANDLE hVideoPort, HANDLE hEvent) { - PGD_DXDVPRELEASENOTIFICATION pfnDvpReleaseNotification = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpReleaseNotification, pfnDvpReleaseNotification); + PGD_DXDVPRELEASENOTIFICATION pfnDvpReleaseNotification = (PGD_DXDVPRELEASENOTIFICATION)gpDxFuncs[DXG_INDEX_DxDvpReleaseNotification].pfn; if (pfnDvpReleaseNotification == NULL) { @@ -386,10 +361,7 @@ NtGdiDvpGetVideoPortField(HANDLE hVideoPort, PDD_GETVPORTFIELDDATA puGetVPortFieldData) { - PGD_DXDVPGETVIDEOPORTFIELD pfnDvpGetVideoPortField = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortField, pfnDvpGetVideoPortField); + PGD_DXDVPGETVIDEOPORTFIELD pfnDvpGetVideoPortField = (PGD_DXDVPGETVIDEOPORTFIELD)gpDxFuncs[DXG_INDEX_DxDvpGetVideoPortField].pfn; if (pfnDvpGetVideoPortField == NULL) { @@ -401,4 +373,3 @@ return pfnDvpGetVideoPortField(hVideoPort, puGetVPortFieldData); } -

1 0

[gbrunmar] 33304: Made IDirect3DDevice9::GetAvailableTextureMem() less error prone, based on feedback from GreatLord
by gbrunmar＠svn.reactos.org 05 May '08

05 May '08

Author: gbrunmar Date: Mon May 5 14:32:41 2008 New Revision: 33304 URL: http://svn.reactos.org/svn/reactos?rev=33304&view=rev Log: Made IDirect3DDevice9::GetAvailableTextureMem() less error prone, based on feedback from GreatLord Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Mon May 5 14:32:41 2008 @@ -95,6 +95,7 @@ memset(&ddGetAvailDriverMemoryData, 0, sizeof(ddGetAvailDriverMemoryData)); ddGetAvailDriverMemoryData.lpDD = (LPDDRAWI_DIRECTDRAW_GBL)&This->DeviceData[0].pUnknown6BC->hDD; + ddGetAvailDriverMemoryData.ddRVal = DDERR_GENERIC; if (DDHAL_DRIVER_HANDLED == (*This->DeviceData[0].D3D9Callbacks.DdGetAvailDriverMemory)(&ddGetAvailDriverMemoryData)) {

1 0

[gbrunmar] 33303: Changed struct in IDirect3DDevice9::GetAvailableTextureMem() based on feedback from GreatLord
by gbrunmar＠svn.reactos.org 05 May '08

05 May '08

Author: gbrunmar Date: Mon May 5 14:15:26 2008 New Revision: 33303 URL: http://svn.reactos.org/svn/reactos?rev=33303&view=rev Log: Changed struct in IDirect3DDevice9::GetAvailableTextureMem() based on feedback from GreatLord Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Mon May 5 14:15:26 2008 @@ -88,13 +88,13 @@ static UINT WINAPI IDirect3DDevice9Impl_GetAvailableTextureMem(LPDIRECT3DDEVICE9 iface) { UINT AvailableTextureMemory = 0; - DD_GETAVAILDRIVERMEMORYDATA ddGetAvailDriverMemoryData; + DDHAL_GETAVAILDRIVERMEMORYDATA ddGetAvailDriverMemoryData; LPDIRECT3DDEVICE9_INT This = impl_from_IDirect3DDevice9(iface); LOCK_D3DDEVICE9(); memset(&ddGetAvailDriverMemoryData, 0, sizeof(ddGetAvailDriverMemoryData)); - ddGetAvailDriverMemoryData.lpDD = (PDD_DIRECTDRAW_GLOBAL)&This->DeviceData[0].pUnknown6BC->hDD; + ddGetAvailDriverMemoryData.lpDD = (LPDDRAWI_DIRECTDRAW_GBL)&This->DeviceData[0].pUnknown6BC->hDD; if (DDHAL_DRIVER_HANDLED == (*This->DeviceData[0].D3D9Callbacks.DdGetAvailDriverMemory)(&ddGetAvailDriverMemoryData)) { Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h [iso-8859-1] Mon May 5 14:15:26 2008 @@ -10,7 +10,7 @@ #include <windows.h> #include <ddraw.h> -#include <ddrawint.h> +#include <ddrawi.h> #define D3D9_INT_MAX_NUM_ADAPTERS 12 @@ -108,7 +108,7 @@ /* 0x0044 */ DWORD DdFlip; /* 0x0048 */ DWORD DdGetBltStatus; /* 0x004c */ DWORD DdGetFlipStatus; -/* 0x0050 */ PDD_GETAVAILDRIVERMEMORY DdGetAvailDriverMemory; +/* 0x0050 */ LPDDHAL_GETAVAILDRIVERMEMORY DdGetAvailDriverMemory; /* 0x0054 */ DWORD unknown0115; /* 0x0058 */ DWORD DdSetMode; /* 0x005c */ DWORD DdSetExclusiveMode;

1 0

[greatlrd] 33302: patch from Stefan Ginsberg stefan__100__at hotmail dot com it remove the bad macro DXG_GET_INDEX_FUNCTION that never worked as it should.
by greatlrd＠svn.reactos.org 05 May '08

05 May '08

Author: greatlrd Date: Mon May 5 13:30:14 2008 New Revision: 33302 URL: http://svn.reactos.org/svn/reactos?rev=33302&view=rev Log: patch from Stefan Ginsberg stefan__100__at hotmail dot com it remove the bad macro DXG_GET_INDEX_FUNCTION that never worked as it should. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/mocomp.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/mocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/mocomp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/mocomp.c [iso-8859-1] Mon May 5 13:30:14 2008 @@ -20,10 +20,7 @@ NtGdiDdBeginMoCompFrame(HANDLE hMoComp, PDD_BEGINMOCOMPFRAMEDATA puBeginFrameData) { - PGD_DDBEGINMOCOMPFRAME pfnDdBeginMoCompFrame = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdBeginMoCompFrame, pfnDdBeginMoCompFrame); + PGD_DDBEGINMOCOMPFRAME pfnDdBeginMoCompFrame = (PGD_DDBEGINMOCOMPFRAME)gpDxFuncs[DXG_INDEX_DxDdBeginMoCompFrame].pfn; if (pfnDdBeginMoCompFrame == NULL) { @@ -42,10 +39,7 @@ STDCALL NtGdiDdCreateMoComp(HANDLE hDirectDraw, PDD_CREATEMOCOMPDATA puCreateMoCompData) { - PGD_DXDDCREATEMOCOMP pfnDdCreateMoComp = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdCreateMoComp, pfnDdCreateMoComp); + PGD_DXDDCREATEMOCOMP pfnDdCreateMoComp = (PGD_DXDDCREATEMOCOMP)gpDxFuncs[DXG_INDEX_DxDdCreateMoComp].pfn; if (pfnDdCreateMoComp == NULL) { @@ -65,10 +59,7 @@ NtGdiDdDestroyMoComp(HANDLE hMoComp, PDD_DESTROYMOCOMPDATA puBeginFrameData) { - PGD_DXDDDESTROYMOCOMP pfnDxDdDestroyMoComp = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdDestroyMoComp, pfnDxDdDestroyMoComp); + PGD_DXDDDESTROYMOCOMP pfnDxDdDestroyMoComp = (PGD_DXDDDESTROYMOCOMP)gpDxFuncs[DXG_INDEX_DxDdDestroyMoComp].pfn; if (pfnDxDdDestroyMoComp == NULL) { @@ -88,10 +79,7 @@ NtGdiDdEndMoCompFrame(HANDLE hMoComp, PDD_ENDMOCOMPFRAMEDATA puEndFrameData) { - PGD_DXDDENDMOCOMPFRAME pfnDdEndMoCompFrame = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdEndMoCompFrame, pfnDdEndMoCompFrame); + PGD_DXDDENDMOCOMPFRAME pfnDdEndMoCompFrame = (PGD_DXDDENDMOCOMPFRAME)gpDxFuncs[DXG_INDEX_DxDdEndMoCompFrame].pfn; if (pfnDdEndMoCompFrame == NULL) { @@ -111,10 +99,7 @@ NtGdiDdGetInternalMoCompInfo(HANDLE hDirectDraw, PDD_GETINTERNALMOCOMPDATA puGetInternalData) { - PGD_DXDDGETINTERNALMOCOMPINFO pfnDdGetInternalMoCompInfo = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetInternalMoCompInfo, pfnDdGetInternalMoCompInfo); + PGD_DXDDGETINTERNALMOCOMPINFO pfnDdGetInternalMoCompInfo = (PGD_DXDDGETINTERNALMOCOMPINFO)gpDxFuncs[DXG_INDEX_DxDdGetInternalMoCompInfo].pfn; if (pfnDdGetInternalMoCompInfo == NULL) { @@ -135,10 +120,7 @@ NtGdiDdGetMoCompBuffInfo(HANDLE hDirectDraw, PDD_GETMOCOMPCOMPBUFFDATA puGetBuffData) { - PGD_DXDDGETMOCOMPBUFFINFO pfnDdGetMoCompBuffInfo = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetMoCompBuffInfo, pfnDdGetMoCompBuffInfo); + PGD_DXDDGETMOCOMPBUFFINFO pfnDdGetMoCompBuffInfo = (PGD_DXDDGETMOCOMPBUFFINFO)gpDxFuncs[DXG_INDEX_DxDdGetMoCompBuffInfo].pfn; if (pfnDdGetMoCompBuffInfo == NULL) { @@ -158,10 +140,7 @@ NtGdiDdGetMoCompFormats(HANDLE hDirectDraw, PDD_GETMOCOMPFORMATSDATA puGetMoCompFormatsData) { - PGD_DXDDGETMOCOMPFORMATS pfnDdGetMoCompFormats = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetMoCompFormats, pfnDdGetMoCompFormats); + PGD_DXDDGETMOCOMPFORMATS pfnDdGetMoCompFormats = (PGD_DXDDGETMOCOMPFORMATS)gpDxFuncs[DXG_INDEX_DxDdGetMoCompFormats].pfn; if (pfnDdGetMoCompFormats == NULL) { @@ -182,10 +161,7 @@ NtGdiDdGetMoCompGuids(HANDLE hDirectDraw, PDD_GETMOCOMPGUIDSDATA puGetMoCompGuidsData) { - PGD_DXDDGETMOCOMPGUIDS pfnDdGetMoCompGuids = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetMoCompGuids, pfnDdGetMoCompGuids); + PGD_DXDDGETMOCOMPGUIDS pfnDdGetMoCompGuids = (PGD_DXDDGETMOCOMPGUIDS)gpDxFuncs[DXG_INDEX_DxDdGetMoCompGuids].pfn; if (pfnDdGetMoCompGuids == NULL) { @@ -207,10 +183,7 @@ NtGdiDdQueryMoCompStatus(HANDLE hMoComp, PDD_QUERYMOCOMPSTATUSDATA puQueryMoCompStatusData) { - PGD_DXDDQUERYMOCOMPSTATUS pfnDdQueryMoCompStatus = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdQueryMoCompStatus, pfnDdQueryMoCompStatus); + PGD_DXDDQUERYMOCOMPSTATUS pfnDdQueryMoCompStatus = (PGD_DXDDQUERYMOCOMPSTATUS)gpDxFuncs[DXG_INDEX_DxDdQueryMoCompStatus].pfn; if (pfnDdQueryMoCompStatus == NULL) { @@ -231,10 +204,7 @@ NtGdiDdRenderMoComp(HANDLE hMoComp, PDD_RENDERMOCOMPDATA puRenderMoCompData) { - PGD_DXDDRENDERMOCOMP pfnDdRenderMoComp = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdRenderMoComp, pfnDdRenderMoComp); + PGD_DXDDRENDERMOCOMP pfnDdRenderMoComp = (PGD_DXDDRENDERMOCOMP)gpDxFuncs[DXG_INDEX_DxDdRenderMoComp].pfn; if (pfnDdRenderMoComp == NULL) { @@ -246,5 +216,3 @@ return pfnDdRenderMoComp(hMoComp, puRenderMoCompData); } - -

1 0

[fireball] 33301: - Fix two typos in the buffer size calculation code, spotted by Stefan Ginsberg.
by fireball＠svn.reactos.org 05 May '08

05 May '08

Author: fireball Date: Mon May 5 13:23:55 2008 New Revision: 33301 URL: http://svn.reactos.org/svn/reactos?rev=33301&view=rev Log: - Fix two typos in the buffer size calculation code, spotted by Stefan Ginsberg. Modified: trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Mon May 5 13:23:55 2008 @@ -78,28 +78,28 @@ _SEH_DECLARE_LOCALS(MiGetExceptionInfo); NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - + /* Calculate the maximum amount of data to move */ TotalSize = MI_MAPPED_COPY_PAGES - 2; - if (TotalSize <= (MI_MAPPED_COPY_PAGES - 2)) TotalSize = BufferSize; + if (BufferSize <= (MI_MAPPED_COPY_PAGES - 2)) TotalSize = BufferSize; CurrentSize = BufferSize; RemainingSize = TotalSize; - + /* Loop as long as there is still data */ while (RemainingSize > 0) { /* Check if this transfer will finish everything off */ if (RemainingSize < CurrentSize) CurrentSize = RemainingSize; - + /* Attach to the source address space */ KeStackAttachProcess(&SourceProcess->Pcb, &ApcState); - + /* Reset state for this pass */ MdlAddress = NULL; PagesLocked = FALSE; FailedInMoving = FALSE; ASSERT(FailedInProbe == FALSE); - + /* Protect user-mode copy */ _SEH_TRY { @@ -108,19 +108,19 @@ { /* Catch a failure here */ FailedInProbe = TRUE; - + /* Do the probe */ ProbeForRead(SourceAddress, BufferSize, sizeof(CHAR)); - + /* Passed */ FailedInProbe = FALSE; } - + /* Initialize and probe and lock the MDL */ MmInitializeMdl (Mdl, CurrentAddress, CurrentSize); MmProbeAndLockPages (Mdl, PreviousMode, IoReadAccess); PagesLocked = TRUE; - + /* Now map the pages */ MdlAddress = MmMapLockedPagesSpecifyCache(Mdl, KernelMode, @@ -134,24 +134,24 @@ FailedInMapping = TRUE; ExRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); } - + /* Now let go of the source and grab to the target process */ KeUnstackDetachProcess(&ApcState); KeStackAttachProcess(&TargetProcess->Pcb, &ApcState); - + /* Check if this is our first time through */ if ((CurrentAddress == SourceAddress) && (PreviousMode != KernelMode)) { /* Catch a failure here */ FailedInProbe = TRUE; - + /* Do the probe */ ProbeForWrite(TargetAddress, BufferSize, sizeof(CHAR)); - + /* Passed */ FailedInProbe = FALSE; } - + /* Now do the actual move */ FailedInMoving = TRUE; RtlCopyMemory(CurrentTargetAddress, MdlAddress, CurrentSize); @@ -160,13 +160,13 @@ { /* Detach from whoever we may be attached to */ KeUnstackDetachProcess(&ApcState); - + /* Check if we had mapped the pages */ if (MdlAddress) MmUnmapLockedPages(MdlAddress, Mdl); - + /* Check if we had locked the pages */ if (PagesLocked) MmUnlockPages(Mdl); - + /* Check if we failed during the probe or mapping */ if ((FailedInProbe) || (FailedInMapping)) { @@ -174,7 +174,7 @@ Status = _SEH_GetExceptionCode(); _SEH_YIELD(); } - + /* Otherwise, we failed probably during the move */ *ReturnSize = BufferSize - RemainingSize; if (FailedInMoving) @@ -186,28 +186,28 @@ *ReturnSize = _SEH_VAR(BadAddress) - (ULONG_PTR)SourceAddress; } } - + /* Return partial copy */ Status = STATUS_PARTIAL_COPY; } _SEH_END; - + /* Check for SEH status */ if (Status != STATUS_SUCCESS) return Status; - + /* Detach from target */ KeUnstackDetachProcess(&ApcState); - + /* Unmap and unlock */ MmUnmapLockedPages(MdlAddress, Mdl); MmUnlockPages(Mdl); - + /* Update location and size */ RemainingSize -= CurrentSize; CurrentAddress = (PVOID)((ULONG_PTR)CurrentAddress + CurrentSize); CurrentTargetAddress = (PVOID)((ULONG_PTR)CurrentTargetAddress + CurrentSize); } - + /* All bytes read */ *ReturnSize = BufferSize; return STATUS_SUCCESS; @@ -232,13 +232,13 @@ _SEH_DECLARE_LOCALS(MiGetExceptionInfo); NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - + /* Calculate the maximum amount of data to move */ TotalSize = MI_MAX_TRANSFER_SIZE; - if (TotalSize <= MI_MAX_TRANSFER_SIZE) TotalSize = BufferSize; + if (BufferSize <= MI_MAX_TRANSFER_SIZE) TotalSize = BufferSize; CurrentSize = BufferSize; RemainingSize = TotalSize; - + /* Check if we can use the stack */ if (BufferSize <= MI_POOL_COPY_BYTES) { @@ -252,20 +252,20 @@ if (!PoolAddress) ASSERT(FALSE); HavePoolAddress = TRUE; } - + /* Loop as long as there is still data */ while (RemainingSize > 0) { /* Check if this transfer will finish everything off */ if (RemainingSize < CurrentSize) CurrentSize = RemainingSize; - + /* Attach to the source address space */ KeStackAttachProcess(&SourceProcess->Pcb, &ApcState); - + /* Reset state for this pass */ FailedInMoving = FALSE; ASSERT(FailedInProbe == FALSE); - + /* Protect user-mode copy */ _SEH_TRY { @@ -274,34 +274,34 @@ { /* Catch a failure here */ FailedInProbe = TRUE; - + /* Do the probe */ ProbeForRead(SourceAddress, BufferSize, sizeof(CHAR)); - + /* Passed */ FailedInProbe = FALSE; } - + /* Do the copy */ RtlCopyMemory(PoolAddress, CurrentAddress, CurrentSize); - + /* Now let go of the source and grab to the target process */ KeUnstackDetachProcess(&ApcState); KeStackAttachProcess(&TargetProcess->Pcb, &ApcState); - + /* Check if this is our first time through */ if ((CurrentAddress == SourceAddress) && (PreviousMode != KernelMode)) { /* Catch a failure here */ FailedInProbe = TRUE; - + /* Do the probe */ ProbeForWrite(TargetAddress, BufferSize, sizeof(CHAR)); - + /* Passed */ FailedInProbe = FALSE; } - + /* Now do the actual move */ FailedInMoving = TRUE; RtlCopyMemory(CurrentTargetAddress, PoolAddress, CurrentSize); @@ -310,10 +310,10 @@ { /* Detach from whoever we may be attached to */ KeUnstackDetachProcess(&ApcState); - + /* Check if we had allocated pool */ if (HavePoolAddress) ExFreePool(PoolAddress); - + /* Check if we failed during the probe */ if (FailedInProbe) { @@ -321,7 +321,7 @@ Status = _SEH_GetExceptionCode(); _SEH_YIELD(); } - + /* Otherwise, we failed probably during the move */ *ReturnSize = BufferSize - RemainingSize; if (FailedInMoving) @@ -333,27 +333,27 @@ *ReturnSize = _SEH_VAR(BadAddress) - (ULONG_PTR)SourceAddress; } } - + /* Return partial copy */ Status = STATUS_PARTIAL_COPY; } _SEH_END; - + /* Check for SEH status */ if (Status != STATUS_SUCCESS) return Status; - + /* Detach from target */ KeUnstackDetachProcess(&ApcState); - + /* Update location and size */ RemainingSize -= CurrentSize; CurrentAddress = (PVOID)((ULONG_PTR)CurrentAddress + CurrentSize); CurrentTargetAddress = (PVOID)((ULONG_PTR)CurrentTargetAddress + CurrentSize); } - + /* Check if we had allocated pool */ if (HavePoolAddress) ExFreePool(PoolAddress); - + /* All bytes read */ *ReturnSize = BufferSize; return STATUS_SUCCESS;

1 0

[jimtabor] 33300: Implement XxxRedrawDesktop for Dx, needs testing.
by jimtabor＠svn.reactos.org 05 May '08

05 May '08

Author: jimtabor Date: Mon May 5 12:45:20 2008 New Revision: 33300 URL: http://svn.reactos.org/svn/reactos?rev=33300&view=rev Log: Implement XxxRedrawDesktop for Dx, needs testing. Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] Mon May 5 12:45:20 2008 @@ -117,6 +117,8 @@ BOOL FASTCALL IntDesktopUpdatePerUserSettings(BOOL bEnable); +VOID APIENTRY UserRedrawDesktop(VOID); + BOOL IntRegisterShellHookWindow(HWND hWnd); BOOL IntDeRegisterShellHookWindow(HWND hWnd); Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Mon May 5 12:45:20 2008 @@ -627,10 +627,11 @@ APIENTRY DxEngRedrawDesktop() { - /* FIXME add redraw code */ - UNIMPLEMENTED; + UserRedrawDesktop(); return TRUE; } + + ULONG gulVisRgnUniqueness; // Increase count everytime client region is updated. /************************************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Mon May 5 12:45:20 2008 @@ -625,6 +625,25 @@ } /* PUBLIC FUNCTIONS ***********************************************************/ + +VOID APIENTRY +UserRedrawDesktop() +{ + PWINDOW_OBJECT Window = NULL; + + UserEnterExclusive(); + + Window = UserGetDesktopWindow(); + + IntInvalidateWindows( Window, + Window->UpdateRegion, + RDW_FRAME | + RDW_ERASE | + RDW_INVALIDATE | + RDW_ALLCHILDREN); + UserLeave(); +} + NTSTATUS FASTCALL co_IntShowDesktop(PDESKTOP_OBJECT Desktop, ULONG Width, ULONG Height)

1 0

[gbrunmar] 33299: Implemented IDirect3DDevice9::GetAvailableTextureMem()
by gbrunmar＠svn.reactos.org 05 May '08

05 May '08

Author: gbrunmar Date: Mon May 5 11:49:13 2008 New Revision: 33299 URL: http://svn.reactos.org/svn/reactos?rev=33299&view=rev Log: Implemented IDirect3DDevice9::GetAvailableTextureMem() Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Mon May 5 11:49:13 2008 @@ -70,11 +70,43 @@ return D3D_OK; } +/*++ +* @name IDirect3DDevice9::GetAvailableTextureMem +* @implemented +* +* The function IDirect3DDevice9Impl_GetAvailableTextureMem returns a pointer to the IDirect3D9 object +* that created this device. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3DDevice9 object returned from IDirect3D9::CreateDevice() +* +* @return UINT +* The method returns an estimated the currently available texture memory in bytes rounded +* to the nearest MB. Applications should NOT use this as an exact number. +* +*/ static UINT WINAPI IDirect3DDevice9Impl_GetAvailableTextureMem(LPDIRECT3DDEVICE9 iface) { - UNIMPLEMENTED - - return D3D_OK; + UINT AvailableTextureMemory = 0; + DD_GETAVAILDRIVERMEMORYDATA ddGetAvailDriverMemoryData; + + LPDIRECT3DDEVICE9_INT This = impl_from_IDirect3DDevice9(iface); + LOCK_D3DDEVICE9(); + + memset(&ddGetAvailDriverMemoryData, 0, sizeof(ddGetAvailDriverMemoryData)); + ddGetAvailDriverMemoryData.lpDD = (PDD_DIRECTDRAW_GLOBAL)&This->DeviceData[0].pUnknown6BC->hDD; + + if (DDHAL_DRIVER_HANDLED == (*This->DeviceData[0].D3D9Callbacks.DdGetAvailDriverMemory)(&ddGetAvailDriverMemoryData)) + { + if (DD_OK == ddGetAvailDriverMemoryData.ddRVal) + { + /* Round it up to the nearest MB */ + AvailableTextureMemory = (ddGetAvailDriverMemoryData.dwFree + 0x80000) & 0xFFF00000; + } + } + + UNLOCK_D3DDEVICE9(); + return AvailableTextureMemory; } static HRESULT WINAPI IDirect3DDevice9Impl_EvictManagedResources(LPDIRECT3DDEVICE9 iface) Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h [iso-8859-1] Mon May 5 11:49:13 2008 @@ -10,6 +10,7 @@ #include <windows.h> #include <ddraw.h> +#include <ddrawint.h> #define D3D9_INT_MAX_NUM_ADAPTERS 12 @@ -107,7 +108,7 @@ /* 0x0044 */ DWORD DdFlip; /* 0x0048 */ DWORD DdGetBltStatus; /* 0x004c */ DWORD DdGetFlipStatus; -/* 0x0050 */ DWORD DdGetAvailDriverMemory; +/* 0x0050 */ PDD_GETAVAILDRIVERMEMORY DdGetAvailDriverMemory; /* 0x0054 */ DWORD unknown0115; /* 0x0058 */ DWORD DdSetMode; /* 0x005c */ DWORD DdSetExclusiveMode;

1 0

[gbrunmar] 33298: * Implemented IDirect3DDevice9::GetDirect3D() and GetDeviceCaps() * Added a DevCaps filter when retrieving D3DCAPS9 from device caps
by gbrunmar＠svn.reactos.org 05 May '08

05 May '08

Author: gbrunmar Date: Mon May 5 10:58:23 2008 New Revision: 33298 URL: http://svn.reactos.org/svn/reactos?rev=33298&view=rev Log: * Implemented IDirect3DDevice9::GetDirect3D() and GetDeviceCaps() * Added a DevCaps filter when retrieving D3DCAPS9 from device caps Modified: trunk/reactos/dll/directx/d3d9/adapter.c trunk/reactos/dll/directx/d3d9/d3d9_device.c Modified: trunk/reactos/dll/directx/d3d9/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/adapter.c… ============================================================================== --- trunk/reactos/dll/directx/d3d9/adapter.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/adapter.c [iso-8859-1] Mon May 5 10:58:23 2008 @@ -20,6 +20,13 @@ #define D3D9_PRE_XP_CAPS2 (D3DCAPS2_CANAUTOGENMIPMAP | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_RESERVED | D3DCAPS2_FULLSCREENGAMMA) #define D3D9_XP_OR_LATER_CAPS2 (D3D9_PRE_XP_CAPS2 | D3DCAPS2_CANMANAGERESOURCE) #define D3D9_CAPS3 (D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD | D3DCAPS3_LINEAR_TO_SRGB_PRESENTATION | D3DCAPS3_COPY_TO_VIDMEM | D3DCAPS3_COPY_TO_SYSTEMMEM) +#define D3D9_DEVCAPS (D3DDEVCAPS_EXECUTESYSTEMMEMORY | D3DDEVCAPS_EXECUTEVIDEOMEMORY | D3DDEVCAPS_TLVERTEXSYSTEMMEMORY \ + | D3DDEVCAPS_TLVERTEXVIDEOMEMORY | D3DDEVCAPS_TEXTURESYSTEMMEMORY | D3DDEVCAPS_TEXTUREVIDEOMEMORY \ + | D3DDEVCAPS_DRAWPRIMTLVERTEX | D3DDEVCAPS_CANRENDERAFTERFLIP | D3DDEVCAPS_TEXTURENONLOCALVIDMEM \ + | D3DDEVCAPS_DRAWPRIMITIVES2 | D3DDEVCAPS_SEPARATETEXTUREMEMORIES | D3DDEVCAPS_DRAWPRIMITIVES2EX \ + | D3DDEVCAPS_HWTRANSFORMANDLIGHT | D3DDEVCAPS_CANBLTSYSTONONLOCAL | D3DDEVCAPS_HWRASTERIZATION \ + | D3DDEVCAPS_PUREDEVICE | D3DDEVCAPS_QUINTICRTPATCHES | D3DDEVCAPS_RTPATCHES | D3DDEVCAPS_RTPATCHHANDLEZERO \ + | D3DDEVCAPS_NPATCHES) #define D3DCAPS2_PRESENT_INTERVAL_SEVERAL 0x00200000 #define D3DCAPS2_PRESENT_INTERVAL_IMMEDIATE 0x00400000 @@ -211,6 +218,7 @@ pDstCaps->Caps2 = pSrcCaps->Caps2 & D3D9_PRE_XP_CAPS2; pDstCaps->Caps3 = pSrcCaps->Caps3 & D3D9_CAPS3; + pDstCaps->DevCaps = pSrcCaps->DevCaps & D3D9_DEVCAPS; pDstCaps->PresentationIntervals = D3DPRESENT_INTERVAL_ONE; if (pSrcCaps->Caps2 & D3DCAPS2_PRESENT_INTERVAL_SEVERAL) Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Mon May 5 10:58:23 2008 @@ -7,6 +7,7 @@ */ #include "d3d9_device.h" #include "d3d9_helpers.h" +#include "adapter.h" #include "debug.h" #define LOCK_D3DDEVICE9() if (This->bLockDevice) EnterCriticalSection(&This->CriticalSection); @@ -83,17 +84,78 @@ return D3D_OK; } +/*++ +* @name IDirect3DDevice9::GetDirect3D +* @implemented +* +* The function IDirect3DDevice9Impl_GetDirect3D returns a pointer to the IDirect3D9 object +* that created this device. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3DDevice9 object returned from IDirect3D9::CreateDevice() +* +* @param IDirect3D9** ppD3D9 +* Pointer to a IDirect3D9* to receive the IDirect3D9 object pointer. +* +* @return HRESULT +* If the method successfully fills the ppD3D9 structure, the return value is D3D_OK. +* If ppD3D9 is a bad pointer, the return value will be D3DERR_INVALIDCALL. +* +*/ static HRESULT WINAPI IDirect3DDevice9Impl_GetDirect3D(LPDIRECT3DDEVICE9 iface, IDirect3D9** ppD3D9) { - UNIMPLEMENTED - - return D3D_OK; -} - + IDirect3D9* pDirect3D9; + LPDIRECT3DDEVICE9_INT This = impl_from_IDirect3DDevice9(iface); + LOCK_D3DDEVICE9(); + + if (IsBadWritePtr(ppD3D9, sizeof(IDirect3D9*))) + { + DPRINT1("Invalid ppD3D9 parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + pDirect3D9 = (IDirect3D9*)&This->pDirect3D9->lpVtbl; + IDirect3D9_AddRef(pDirect3D9); + *ppD3D9 = pDirect3D9; + + UNLOCK_D3DDEVICE9(); + return D3D_OK; +} + +/*++ +* @name IDirect3DDevice9::GetDeviceCaps +* @implemented +* +* The function IDirect3DDevice9Impl_GetDeviceCaps fills the pCaps argument with the +* capabilities of the device. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3D9 object returned from Direct3DCreate9() +* +* @param D3DCAPS9* pCaps +* Pointer to a D3DCAPS9 structure to be filled with the device's capabilities. +* +* @return HRESULT +* If the method successfully fills the pCaps structure, the return value is D3D_OK. +* If pCaps is a bad pointer the return value will be D3DERR_INVALIDCALL. +* +*/ static HRESULT WINAPI IDirect3DDevice9Impl_GetDeviceCaps(LPDIRECT3DDEVICE9 iface, D3DCAPS9* pCaps) { - UNIMPLEMENTED - + LPDIRECT3DDEVICE9_INT This = impl_from_IDirect3DDevice9(iface); + LOCK_D3DDEVICE9(); + + if (IsBadWritePtr(pCaps, sizeof(D3DCAPS9))) + { + DPRINT1("Invalid pCaps parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + GetAdapterCaps(&This->pDirect3D9->DisplayAdapters[0], This->DeviceData[0].DeviceType, pCaps); + + UNLOCK_D3DDEVICE9(); return D3D_OK; }

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
59
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2008