Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[gbrunmar] 33266: * Updated faulty documentation about Adapter parameter for IDirect3D9 methods * Implemented IDirect3DDevice9::GetSwapChain()
by gbrunmar＠svn.reactos.org 04 May '08

04 May '08

Author: gbrunmar Date: Sun May 4 07:47:57 2008 New Revision: 33266 URL: http://svn.reactos.org/svn/reactos?rev=33266&view=rev Log: * Updated faulty documentation about Adapter parameter for IDirect3D9 methods * Implemented IDirect3DDevice9::GetSwapChain() Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c trunk/reactos/dll/directx/d3d9/d3d9_impl.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] Sun May 4 07:47:57 2008 @@ -30,7 +30,7 @@ { IUnknown_AddRef(iface); *ppvObject = &This->lpVtbl; - return S_OK; + return D3D_OK; } *ppvObject = NULL; @@ -66,56 +66,56 @@ { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static UINT WINAPI IDirect3DDevice9Impl_GetAvailableTextureMem(LPDIRECT3DDEVICE9 iface) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_EvictManagedResources(LPDIRECT3DDEVICE9 iface) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetDirect3D(LPDIRECT3DDEVICE9 iface, IDirect3D9** ppD3D9) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetDeviceCaps(LPDIRECT3DDEVICE9 iface, D3DCAPS9* pCaps) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetDisplayMode(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, D3DDISPLAYMODE* pMode) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetCreationParameters(LPDIRECT3DDEVICE9 iface, D3DDEVICE_CREATION_PARAMETERS *pParameters) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetCursorProperties(LPDIRECT3DDEVICE9 iface, UINT XHotSpot, UINT YHotSpot, IDirect3DSurface9* pCursorBitmap) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static void WINAPI IDirect3DDevice9Impl_SetCursorPosition(LPDIRECT3DDEVICE9 iface, int X, int Y, DWORD Flags) @@ -130,60 +130,109 @@ return TRUE; } -static HRESULT WINAPI IDirect3DDevice9Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE9 iface, D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DSwapChain9** pSwapChain) -{ - UNIMPLEMENTED - - return S_OK; -} - -static HRESULT WINAPI IDirect3DDevice9Impl_GetSwapChain(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, IDirect3DSwapChain9** pSwapChain) -{ - UNIMPLEMENTED - - return S_OK; +static HRESULT WINAPI IDirect3DDevice9Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE9 iface, D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DSwapChain9** ppSwapChain) +{ + UNIMPLEMENTED + + return D3D_OK; +} + +/*++ +* @name IDirect3DDevice9::GetSwapChain +* @implemented +* +* The function IDirect3DDevice9Impl_GetSwapChain returns a pointer to a swap chain object. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3DDevice9 object returned from IDirect3D9->CreateDevice() +* +* @param UINT iSwapChain +* Swap chain index to get. +* The maximum value for this is the value returned by IDirect3DDevice9::GetNumberOfSwapChains() - 1. +* +* @param IDirect3DSwapChain9** ppSwapChain +* Pointer to a IDirect3DSwapChain9* to receive the swap chain object pointer. +* +* @return HRESULT +* If the method successfully fills the ppSwapChain structure, the return value is D3D_OK. +* If iSwapChain is out of range or ppSwapChain is a bad pointer, the return value +* will be D3DERR_INVALIDCALL. +* +*/ +static HRESULT WINAPI IDirect3DDevice9Impl_GetSwapChain(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, IDirect3DSwapChain9** ppSwapChain) +{ + LPDIRECT3DDEVICE9_INT This = impl_from_IDirect3DDevice9(iface); + LOCK_D3DDEVICE9(); + + if (iSwapChain >= IDirect3DDevice9_GetNumberOfSwapChains(iface)) + { + DPRINT1("Invalid iSwapChain parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + if (IsBadWritePtr(ppSwapChain, sizeof(IDirect3DSwapChain9*))) + { + DPRINT1("Invalid ppSwapChain parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + if (This->pSwapChains[iSwapChain] != NULL) + { + IDirect3DSwapChain9* pSwapChain = (IDirect3DSwapChain9*)This->pSwapChains[iSwapChain]->lpVtbl; + IDirect3DSwapChain9_AddRef(pSwapChain); + *ppSwapChain = pSwapChain; + } + else + { + *ppSwapChain = NULL; + } + + UNLOCK_D3DDEVICE9(); + return D3D_OK; } static UINT WINAPI IDirect3DDevice9Impl_GetNumberOfSwapChains(LPDIRECT3DDEVICE9 iface) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_Reset(LPDIRECT3DDEVICE9 iface, D3DPRESENT_PARAMETERS* pPresentationParameters) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_Present(LPDIRECT3DDEVICE9 iface, CONST RECT* pSourceRect, CONST RECT* pDestRect, HWND hDestWindowOverride, CONST RGNDATA* pDirtyRegion) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetBackBuffer(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, IDirect3DSurface9** ppBackBuffer) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetRasterStatus(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, D3DRASTER_STATUS* pRasterStatus) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetDialogBoxMode(LPDIRECT3DDEVICE9 iface, BOOL bEnableDialogs) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static void WINAPI IDirect3DDevice9Impl_SetGammaRamp(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, DWORD Flags, CONST D3DGAMMARAMP* pRamp) @@ -200,385 +249,385 @@ { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_CreateVolumeTexture(LPDIRECT3DDEVICE9 iface, UINT Width, UINT Height, UINT Depth, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DVolumeTexture9** ppVolumeTexture, HANDLE* pSharedHandle) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_CreateCubeTexture(LPDIRECT3DDEVICE9 iface, UINT EdgeLength, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DCubeTexture9** ppCubeTexture, HANDLE* pSharedHandle) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexBuffer(LPDIRECT3DDEVICE9 iface, UINT Length, DWORD Usage, DWORD FVF, D3DPOOL Pool, IDirect3DVertexBuffer9** ppVertexBuffer, HANDLE* pSharedHandle) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_CreateIndexBuffer(LPDIRECT3DDEVICE9 iface, UINT Length, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DIndexBuffer9** ppIndexBuffer, HANDLE* pSharedHandle) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_CreateRenderTarget(LPDIRECT3DDEVICE9 iface, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality, BOOL Lockable, IDirect3DSurface9** ppSurface, HANDLE* pSharedHandle) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_CreateDepthStencilSurface(LPDIRECT3DDEVICE9 iface, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality, BOOL Discard, IDirect3DSurface9** ppSurface, HANDLE* pSharedHandle) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_UpdateSurface(LPDIRECT3DDEVICE9 iface, IDirect3DSurface9* pSourceSurface, CONST RECT* pSourceRect, IDirect3DSurface9* pDestinationSurface, CONST POINT* pDestPoint) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_UpdateTexture(LPDIRECT3DDEVICE9 iface, IDirect3DBaseTexture9* pSourceTexture, IDirect3DBaseTexture9* pDestinationTexture) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTargetData(LPDIRECT3DDEVICE9 iface, IDirect3DSurface9* pRenderTarget, IDirect3DSurface9* pDestSurface) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetFrontBufferData(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, IDirect3DSurface9* pDestSurface) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_StretchRect(LPDIRECT3DDEVICE9 iface, IDirect3DSurface9* pSourceSurface, CONST RECT* pSourceRect, IDirect3DSurface9* pDestSurface, CONST RECT* pDestRect, D3DTEXTUREFILTERTYPE Filter) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_ColorFill(LPDIRECT3DDEVICE9 iface, IDirect3DSurface9* pSurface, CONST RECT* pRect, D3DCOLOR color) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_CreateOffscreenPlainSurface(LPDIRECT3DDEVICE9 iface, UINT Width, UINT Height, D3DFORMAT Format, D3DPOOL Pool, IDirect3DSurface9** ppSurface, HANDLE* pSharedHandle) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetRenderTarget(LPDIRECT3DDEVICE9 iface, DWORD RenderTargetIndex, IDirect3DSurface9* pRenderTarget) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTarget(LPDIRECT3DDEVICE9 iface, DWORD RenderTargetIndex,IDirect3DSurface9** ppRenderTarget) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetDepthStencilSurface(LPDIRECT3DDEVICE9 iface, IDirect3DSurface9* pNewZStencil) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetDepthStencilSurface(LPDIRECT3DDEVICE9 iface, IDirect3DSurface9** ppZStencilSurface) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_BeginScene(LPDIRECT3DDEVICE9 iface) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_EndScene(LPDIRECT3DDEVICE9 iface) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_Clear(LPDIRECT3DDEVICE9 iface, DWORD Count, CONST D3DRECT* pRects, DWORD Flags, D3DCOLOR Color, float Z, DWORD Stencil) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetTransform(LPDIRECT3DDEVICE9 iface, D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX* pMatrix) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetTransform(LPDIRECT3DDEVICE9 iface, D3DTRANSFORMSTATETYPE State, D3DMATRIX* pMatrix) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_MultiplyTransform(LPDIRECT3DDEVICE9 iface, D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX* pMatrix) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetViewport(LPDIRECT3DDEVICE9 iface, CONST D3DVIEWPORT9* pViewport) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetViewport(LPDIRECT3DDEVICE9 iface, D3DVIEWPORT9* pViewport) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetMaterial(LPDIRECT3DDEVICE9 iface, CONST D3DMATERIAL9* pMaterial) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetMaterial(LPDIRECT3DDEVICE9 iface, D3DMATERIAL9* pMaterial) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetLight(LPDIRECT3DDEVICE9 iface, DWORD Index, CONST D3DLIGHT9* pLight) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetLight(LPDIRECT3DDEVICE9 iface, DWORD Index, D3DLIGHT9* pLight) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_LightEnable(LPDIRECT3DDEVICE9 iface, DWORD Index, BOOL Enable) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetLightEnable(LPDIRECT3DDEVICE9 iface, DWORD Index, BOOL* pEnable) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetClipPlane(LPDIRECT3DDEVICE9 iface, DWORD Index, CONST float* pPlane) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetClipPlane(LPDIRECT3DDEVICE9 iface, DWORD Index, float* pPlane) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetRenderState(LPDIRECT3DDEVICE9 iface, D3DRENDERSTATETYPE State, DWORD Value) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderState(LPDIRECT3DDEVICE9 iface, D3DRENDERSTATETYPE State, DWORD* pValue) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_CreateStateBlock(LPDIRECT3DDEVICE9 iface, D3DSTATEBLOCKTYPE Type, IDirect3DStateBlock9** ppSB) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_BeginStateBlock(LPDIRECT3DDEVICE9 iface) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_EndStateBlock(LPDIRECT3DDEVICE9 iface, IDirect3DStateBlock9** ppSB) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetClipStatus(LPDIRECT3DDEVICE9 iface, CONST D3DCLIPSTATUS9* pClipStatus) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetClipStatus(LPDIRECT3DDEVICE9 iface, D3DCLIPSTATUS9* pClipStatus) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetTexture(LPDIRECT3DDEVICE9 iface, DWORD Stage, IDirect3DBaseTexture9** ppTexture) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetTexture(LPDIRECT3DDEVICE9 iface, DWORD Stage, IDirect3DBaseTexture9* pTexture) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetTextureStageState(LPDIRECT3DDEVICE9 iface, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD* pValue) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetTextureStageState(LPDIRECT3DDEVICE9 iface, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetSamplerState(LPDIRECT3DDEVICE9 iface, DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD* pValue) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetSamplerState(LPDIRECT3DDEVICE9 iface, DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD Value) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_ValidateDevice(LPDIRECT3DDEVICE9 iface, DWORD* pNumPasses) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetPaletteEntries(LPDIRECT3DDEVICE9 iface, UINT PaletteNumber, CONST PALETTEENTRY* pEntries) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetPaletteEntries(LPDIRECT3DDEVICE9 iface, UINT PaletteNumber, PALETTEENTRY* pEntries) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetCurrentTexturePalette(LPDIRECT3DDEVICE9 iface, UINT PaletteNumber) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetCurrentTexturePalette(LPDIRECT3DDEVICE9 iface, UINT* pPaletteNumber) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetScissorRect(LPDIRECT3DDEVICE9 iface, CONST RECT* pRect) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetScissorRect(LPDIRECT3DDEVICE9 iface, RECT* pRect) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetSoftwareVertexProcessing(LPDIRECT3DDEVICE9 iface, BOOL bSoftware) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static BOOL WINAPI IDirect3DDevice9Impl_GetSoftwareVertexProcessing(LPDIRECT3DDEVICE9 iface) @@ -592,7 +641,7 @@ { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static float WINAPI IDirect3DDevice9Impl_GetNPatchMode(LPDIRECT3DDEVICE9 iface) @@ -606,266 +655,266 @@ { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_DrawIndexedPrimitive(LPDIRECT3DDEVICE9 iface, D3DPRIMITIVETYPE PrimitiveType, INT BaseVertexIndex, UINT MinVertexIndex, UINT NumVertices, UINT startIndex, UINT primCount) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_DrawPrimitiveUP(LPDIRECT3DDEVICE9 iface, D3DPRIMITIVETYPE PrimitiveType, UINT PrimitiveCount, CONST void* pVertexStreamZeroData, UINT VertexStreamZeroStride) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_DrawIndexedPrimitiveUP(LPDIRECT3DDEVICE9 iface, D3DPRIMITIVETYPE PrimitiveType, UINT MinVertexIndex, UINT NumVertices, UINT PrimitiveCount, CONST void* pIndexData, D3DFORMAT IndexDataFormat, CONST void* pVertexStreamZeroData, UINT VertexStreamZeroStride) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_ProcessVertices(LPDIRECT3DDEVICE9 iface, UINT SrcStartIndex, UINT DestIndex, UINT VertexCount, IDirect3DVertexBuffer9* pDestBuffer, IDirect3DVertexDeclaration9* pVertexDecl, DWORD Flags) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(LPDIRECT3DDEVICE9 iface, CONST D3DVERTEXELEMENT9* pVertexElements, IDirect3DVertexDeclaration9** ppDecl) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetVertexDeclaration(LPDIRECT3DDEVICE9 iface, IDirect3DVertexDeclaration9* pDecl) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetVertexDeclaration(LPDIRECT3DDEVICE9 iface, IDirect3DVertexDeclaration9** ppDecl) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetFVF(LPDIRECT3DDEVICE9 iface, DWORD FVF) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetFVF(LPDIRECT3DDEVICE9 iface, DWORD* pFVF) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexShader(LPDIRECT3DDEVICE9 iface, CONST DWORD* pFunction, IDirect3DVertexShader9** ppShader) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShader(LPDIRECT3DDEVICE9 iface, IDirect3DVertexShader9* pShader) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShader(LPDIRECT3DDEVICE9 iface, IDirect3DVertexShader9** ppShader) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShaderConstantF(LPDIRECT3DDEVICE9 iface, UINT StartRegister, CONST float* pConstantData, UINT Vector4fCount) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShaderConstantF(LPDIRECT3DDEVICE9 iface, UINT StartRegister, float* pConstantData, UINT Vector4fCount) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShaderConstantI(LPDIRECT3DDEVICE9 iface, UINT StartRegister, CONST int* pConstantData, UINT Vector4iCount) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShaderConstantI(LPDIRECT3DDEVICE9 iface, UINT StartRegister, int* pConstantData, UINT Vector4iCount) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShaderConstantB(LPDIRECT3DDEVICE9 iface, UINT StartRegister, CONST BOOL* pConstantData, UINT BoolCount) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShaderConstantB(LPDIRECT3DDEVICE9 iface, UINT StartRegister, BOOL* pConstantData, UINT BoolCount) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetStreamSource(LPDIRECT3DDEVICE9 iface, UINT StreamNumber, IDirect3DVertexBuffer9* pStreamData, UINT OffsetInBytes, UINT Stride) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetStreamSource(LPDIRECT3DDEVICE9 iface, UINT StreamNumber, IDirect3DVertexBuffer9** ppStreamData, UINT* pOffsetInBytes, UINT* pStride) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetStreamSourceFreq(LPDIRECT3DDEVICE9 iface, UINT StreamNumber,UINT Setting) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetStreamSourceFreq(LPDIRECT3DDEVICE9 iface, UINT StreamNumber, UINT* pSetting) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetIndices(LPDIRECT3DDEVICE9 iface, IDirect3DIndexBuffer9* pIndexData) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetIndices(LPDIRECT3DDEVICE9 iface, IDirect3DIndexBuffer9** ppIndexData) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_CreatePixelShader(LPDIRECT3DDEVICE9 iface, CONST DWORD* pFunction, IDirect3DPixelShader9** ppShader) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShader(LPDIRECT3DDEVICE9 iface, IDirect3DPixelShader9* pShader) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShader(LPDIRECT3DDEVICE9 iface, IDirect3DPixelShader9** ppShader) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantF(LPDIRECT3DDEVICE9 iface, UINT StartRegister, CONST float* pConstantData, UINT Vector4fCount) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantF(LPDIRECT3DDEVICE9 iface, UINT StartRegister, float* pConstantData, UINT Vector4fCount) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantI(LPDIRECT3DDEVICE9 iface, UINT StartRegister, CONST int* pConstantData, UINT Vector4iCount) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantI(LPDIRECT3DDEVICE9 iface, UINT StartRegister, int* pConstantData, UINT Vector4iCount) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantB(LPDIRECT3DDEVICE9 iface, UINT StartRegister, CONST BOOL* pConstantData, UINT BoolCount) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantB(LPDIRECT3DDEVICE9 iface, UINT StartRegister, BOOL* pConstantData, UINT BoolCount) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_DrawRectPatch(LPDIRECT3DDEVICE9 iface, UINT Handle, CONST float* pNumSegs, CONST D3DRECTPATCH_INFO* pRectPatchInfo) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_DrawTriPatch(LPDIRECT3DDEVICE9 iface, UINT Handle, CONST float* pNumSegs, CONST D3DTRIPATCH_INFO* pTriPatchInfo) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_DeletePatch(LPDIRECT3DDEVICE9 iface, UINT Handle) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_CreateQuery(LPDIRECT3DDEVICE9 iface, D3DQUERYTYPE Type, IDirect3DQuery9** ppQuery) { UNIMPLEMENTED - return S_OK; + return D3D_OK; } IDirect3DDevice9Vtbl Direct3DDevice9_Vtbl = Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c [iso-8859-1] Sun May 4 07:47:57 2008 @@ -80,7 +80,7 @@ * The function IDirect3D9Impl_GetAdapterCount returns the number of adapters * * @param LPDIRECT3D iface -* Pointer to the IDirect3D object returned from Direct3DCreate9() +* Pointer to the IDirect3D9 object returned from Direct3DCreate9() * * @return UINT * The number of display adapters on the system when Direct3DCreate9() was called. @@ -107,11 +107,11 @@ * a specified display adapter and fills the pIdentifier argument with the available information. * * @param LPDIRECT3D iface -* Pointer to the IDirect3D object returned from Direct3DCreate9() +* Pointer to the IDirect3D9 object returned from Direct3DCreate9() * * @param UINT Adapter * Adapter index to get information about. D3DADAPTER_DEFAULT is the primary display. -* The maximum value for this is the value returned by IDirect3D::GetAdapterCount(). +* The maximum value for this is the value returned by IDirect3D::GetAdapterCount() - 1. * * @param DWORD Flags * Ignored at the moment, but the only valid flag is D3DENUM_WHQL_LEVEL @@ -174,11 +174,11 @@ * a specific pixel format and counts the available display modes for that format. * * @param LPDIRECT3D iface -* Pointer to the IDirect3D object returned from Direct3DCreate9() +* Pointer to the IDirect3D9 object returned from Direct3DCreate9() * * @param UINT Adapter * Adapter index to get information about. D3DADAPTER_DEFAULT is the primary display. -* The maximum value for this is the value returned by IDirect3D::GetAdapterCount(). +* The maximum value for this is the value returned by IDirect3D9::GetAdapterCount() - 1. * * @param D3DFORMAT Format * The pixel format to search for @@ -230,18 +230,18 @@ * This function is often used in a loop to enumerate all the display modes the adapter supports. * * @param LPDIRECT3D iface -* Pointer to the IDirect3D object returned from Direct3DCreate9() +* Pointer to the IDirect3D9 object returned from Direct3DCreate9() * * @param UINT Adapter * Adapter index to get information about. D3DADAPTER_DEFAULT is the primary display. -* The maximum value for this is the value returned by IDirect3D::GetAdapterCount(). +* The maximum value for this is the value returned by IDirect3D9::GetAdapterCount() - 1. * * @param D3DFORMAT Format * The pixel format to search for * * @param UINT Mode * Index within the pixel format to be returned. -* The maximym value for this is the value returned by IDirect3D9::GetAdapterModeCount(). +* The maximym value for this is the value returned by IDirect3D9::GetAdapterModeCount() - 1. * * @param D3DDISPLAYMODE* pMode * Pointer to a D3DDISPLAYMODE structure to be filled with the display mode information @@ -312,11 +312,11 @@ * currently set display mode. * * @param LPDIRECT3D iface -* Pointer to the IDirect3D object returned from Direct3DCreate9() +* Pointer to the IDirect3D9 object returned from Direct3DCreate9() * * @param UINT Adapter * Adapter index to get information about. D3DADAPTER_DEFAULT is the primary display. -* The maximum value for this is the value returned by IDirect3D::GetAdapterCount(). +* The maximum value for this is the value returned by IDirect3D9::GetAdapterCount() - 1. * * @param D3DDISPLAYMODE* pMode * Pointer to a D3DDISPLAYMODE structure to be filled with the current display mode information. @@ -362,11 +362,11 @@ * on the specified display adapter. * * @param LPDIRECT3D iface -* Pointer to the IDirect3D object returned from Direct3DCreate9() +* Pointer to the IDirect3D9 object returned from Direct3DCreate9() * * @param UINT Adapter * Adapter index to get information about. D3DADAPTER_DEFAULT is the primary display. -* The maximum value for this is the value returned by IDirect3D::GetAdapterCount(). +* The maximum value for this is the value returned by IDirect3D9::GetAdapterCount() - 1. * * @param D3DDEVTYPE DeviceType * One of the D3DDEVTYPE enum members. @@ -454,11 +454,11 @@ * on the specified display adapter. * * @param LPDIRECT3D iface -* Pointer to the IDirect3D object returned from Direct3DCreate9() +* Pointer to the IDirect3D9 object returned from Direct3DCreate9() * * @param UINT Adapter * Adapter index to get information about. D3DADAPTER_DEFAULT is the primary display. -* The maximum value for this is the value returned by IDirect3D::GetAdapterCount(). +* The maximum value for this is the value returned by IDirect3D9::GetAdapterCount() - 1. * * @param D3DDEVTYPE DeviceType * One of the D3DDEVTYPE enum members. @@ -653,11 +653,11 @@ * D3DFORMAT on the specified display adapter. * * @param LPDIRECT3D iface -* Pointer to the IDirect3D object returned from Direct3DCreate9() +* Pointer to the IDirect3D9 object returned from Direct3DCreate9() * * @param UINT Adapter * Adapter index to get information about. D3DADAPTER_DEFAULT is the primary display. -* The maximum value for this is the value returned by IDirect3D::GetAdapterCount(). +* The maximum value for this is the value returned by IDirect3D9::GetAdapterCount() - 1. * * @param D3DDEVTYPE DeviceType * One of the D3DDEVTYPE enum members. @@ -729,11 +729,11 @@ * can be converted to another on the specified display adapter. * * @param LPDIRECT3D iface -* Pointer to the IDirect3D object returned from Direct3DCreate9() +* Pointer to the IDirect3D9 object returned from Direct3DCreate9() * * @param UINT Adapter * Adapter index to get information about. D3DADAPTER_DEFAULT is the primary display. -* The maximum value for this is the value returned by IDirect3D::GetAdapterCount(). +* The maximum value for this is the value returned by IDirect3D9::GetAdapterCount() - 1. * * @param D3DDEVTYPE DeviceType * One of the D3DDEVTYPE enum members. Only D3DDEVTYPE_HAL can potentially return D3D_OK. @@ -804,11 +804,11 @@ * capabilities of the specified adapter and device type. * * @param LPDIRECT3D iface -* Pointer to the IDirect3D object returned from Direct3DCreate9() +* Pointer to the IDirect3D9 object returned from Direct3DCreate9() * * @param UINT Adapter * Adapter index to get information about. D3DADAPTER_DEFAULT is the primary display. -* The maximum value for this is the value returned by IDirect3D::GetAdapterCount(). +* The maximum value for this is the value returned by IDirect3D9::GetAdapterCount() - 1. * * @param D3DDEVTYPE DeviceType * One of the D3DDEVTYPE enum members. @@ -857,11 +857,11 @@ * with the specified display adapter. * * @param LPDIRECT3D iface -* Pointer to the IDirect3D object returned from Direct3DCreate9() +* Pointer to the IDirect3D9 object returned from Direct3DCreate9() * * @param UINT Adapter * Adapter index to get information about. D3DADAPTER_DEFAULT is the primary display. -* The maximum value for this is the value returned by IDirect3D::GetAdapterCount(). +* The maximum value for this is the value returned by IDirect3D9::GetAdapterCount() - 1. * * @return HMONITOR * If the method successfully it returns the HMONITOR belonging to the specified adapter.

1 0

[greatlrd] 33265: Bugfix : NtGdiDdDeleteDirectDrawObject thx irc : stefan100 to spotted the misake
by greatlrd＠svn.reactos.org 04 May '08

04 May '08

Author: greatlrd Date: Sun May 4 07:42:52 2008 New Revision: 33265 URL: http://svn.reactos.org/svn/reactos?rev=33265&view=rev Log: Bugfix : NtGdiDdDeleteDirectDrawObject thx irc : stefan100 to spotted the misake Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Sun May 4 07:42:52 2008 @@ -380,13 +380,13 @@ if (pfnDdDeleteDirectDrawObject == NULL) { DPRINT1("Warning: no pfnDdDeleteDirectDrawObject\n"); - return DDHAL_DRIVER_NOTHANDLED; + return FALSE; } if (hDirectDrawLocal == NULL) { DPRINT1("Warning: hDirectDrawLocal is NULL\n"); - return DDHAL_DRIVER_HANDLED; + return FALSE; } DPRINT1("hDirectDrawLocal = %lx \n",hDirectDrawLocal);

1 0

[greatlrd] 33264: Fixed a stupied bug inside intEnableReactXDriver, we only allown create dx context handler one time, second time it fail. note directdraw/dxg.sys have own handler table that work exacly same as gdi handler table and have same limit.
by greatlrd＠svn.reactos.org 04 May '08

04 May '08

Author: greatlrd Date: Sun May 4 07:00:31 2008 New Revision: 33264 URL: http://svn.reactos.org/svn/reactos?rev=33264&view=rev Log: Fixed a stupied bug inside intEnableReactXDriver, we only allown create dx context handler one time, second time it fail. note directdraw/dxg.sys have own handler table that work exacly same as gdi handler table and have same limit. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Sun May 4 07:00:31 2008 @@ -71,7 +71,7 @@ { /* CHeck see if dx have been enable or not */ - if (pDev->pEDDgpl->hDev != pDC->pPDev) + if ( pDev->pEDDgpl->pvmList == NULL) { pDev->pEDDgpl->ddCallbacks.dwSize = sizeof(DD_CALLBACKS); pDev->pEDDgpl->ddSurfaceCallbacks.dwSize = sizeof(DD_SURFACECALLBACKS); @@ -87,12 +87,18 @@ DPRINT1(" call to pfnDdEnableDirectDraw \n "); /* Note it is the hdev struct it want, not the drv hPDev aka pdc->PDev */ success = pfnDdEnableDirectDraw(pDC->pPDev, TRUE); - + dump_edd_directdraw_global(pDev->pEDDgpl); dump_halinfo(&pDev->pEDDgpl->ddHalInfo); } } - } + else + { + DPRINT1(" The dxg.sys and graphic card driver interface is enable \n "); + success = TRUE; + } + } + DPRINT1("Return value : 0x%08x\n",success); DC_UnlockDc(pDC); @@ -216,7 +222,7 @@ NtGdiDdCreateDirectDrawObject(HDC hdc) { PGD_DDCREATEDIRECTDRAWOBJECT pfnDdCreateDirectDrawObject; - + if (hdc == NULL) { DPRINT1("Warning : hdc is NULL\n"); @@ -426,6 +432,10 @@ DWORD *puNumFourCC, DWORD *puFourCC) { +#if DXDBG + BOOL status = FALSE; +#endif + PGD_DXDDQUERYDIRECTDRAWOBJECT pfnDdQueryDirectDrawObject = (PGD_DXDDQUERYDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdQueryDirectDrawObject].pfn; if (pfnDdQueryDirectDrawObject == NULL) @@ -436,11 +446,21 @@ DPRINT1("Calling dxg.sys pfnDdQueryDirectDrawObject\n"); +#if DXDBG + status = pfnDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, + puD3dBufferCallbacks, puD3dTextureFormats, puNumHeaps, puvmList, puNumFourCC, puFourCC); + + dump_edd_directdraw_global(&edd_DdirectDraw_Global); dump_edd_directdraw_local(edd_DdirectDraw_Global.peDirectDrawLocalList); + return status; +#else return pfnDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, puNumHeaps, puvmList, puNumFourCC, puFourCC); + +#endif + } @@ -672,22 +692,52 @@ { DPRINT1("0x%08lx 0x000 PEDD_DIRECTDRAW_GLOBAL->dhpdev : 0x%08lx\n",(((DWORD)&pEddgbl->dhpdev) - (DWORD)pEddgbl), pEddgbl->dhpdev); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->dwReserved1 : 0x%08lx\n",(((DWORD)&pEddgbl->dwReserved1) - (DWORD)pEddgbl),pEddgbl->dwReserved1); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->dwReserved2 : 0x%08lx\n",(((DWORD)&pEddgbl->dwReserved2) - (DWORD)pEddgbl),pEddgbl->dwReserved2); + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->dwReserved2 : 0x%08lx\n",(((DWORD)&pEddgbl->dwReserved2) - (DWORD)pEddgbl),pEddgbl->dwReserved2); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_000c[0] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_000c[0]) - (DWORD)pEddgbl),pEddgbl->unk_000c[0]); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_000c[1] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_000c[1]) - (DWORD)pEddgbl),pEddgbl->unk_000c[1]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_000c[2] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_000c[2]) - (DWORD)pEddgbl),pEddgbl->unk_000c[2]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->cDriverReferences : 0x%08lx\n",(((DWORD)&pEddgbl->cDriverReferences) - (DWORD)pEddgbl),pEddgbl->cDriverReferences); + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_000c[2] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_000c[2]) - (DWORD)pEddgbl),pEddgbl->unk_000c[2]); + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->cDriverReferences : 0x%08lx\n",(((DWORD)&pEddgbl->cDriverReferences) - (DWORD)pEddgbl),pEddgbl->cDriverReferences); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_01c : 0x%08lx\n",(((DWORD)&pEddgbl->unk_01c) - (DWORD)pEddgbl),pEddgbl->unk_01c); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->dwCallbackFlags : 0x%08lx\n",(((DWORD)&pEddgbl->dwCallbackFlags) - (DWORD)pEddgbl),pEddgbl->dwCallbackFlags); + + DPRINT1("0x%08lx 0x020 PEDD_DIRECTDRAW_GLOBAL->dwCallbackFlags : 0x%08lx\n",(((DWORD)&pEddgbl->dwCallbackFlags) - (DWORD)pEddgbl),pEddgbl->dwCallbackFlags); + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_024 : 0x%08lx\n",(((DWORD)&pEddgbl->unk_024) - (DWORD)pEddgbl),pEddgbl->unk_024); + DPRINT1("0x%08lx 0x028 PEDD_DIRECTDRAW_GLOBAL->llAssertModeTimeout : 0x%x\n",(((DWORD)&pEddgbl->llAssertModeTimeout) - (DWORD)pEddgbl),pEddgbl->llAssertModeTimeout); DPRINT1("0x%08lx 0x030 PEDD_DIRECTDRAW_GLOBAL->dwNumHeaps : 0x%08lx\n",(((DWORD)&pEddgbl->dwNumHeaps) - (DWORD)pEddgbl),pEddgbl->dwNumHeaps); // VIDEOMEMORY *pvmList; DPRINT1("0x%08lx 0x034 PEDD_DIRECTDRAW_GLOBAL->pvmList : 0x%08lx\n",(((DWORD)&pEddgbl->pvmList) - (DWORD)pEddgbl),pEddgbl->pvmList); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->dwNumFourCC : 0x%08lx\n",(((DWORD)&pEddgbl->dwNumFourCC) - (DWORD)pEddgbl),pEddgbl->dwNumFourCC); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->pdwFourCC : 0x%08lx\n",(((DWORD)&pEddgbl->pdwFourCC) - (DWORD)pEddgbl),pEddgbl->pdwFourCC); + + DPRINT1("0x%08lx 0x038 PEDD_DIRECTDRAW_GLOBAL->dwNumFourCC : 0x%08lx\n",(((DWORD)&pEddgbl->dwNumFourCC) - (DWORD)pEddgbl),pEddgbl->dwNumFourCC); + DPRINT1("0x%08lx 0x03C PEDD_DIRECTDRAW_GLOBAL->pdwFourCC : 0x%08lx\n",(((DWORD)&pEddgbl->pdwFourCC) - (DWORD)pEddgbl),pEddgbl->pdwFourCC); + // DD_HALINFO ddHalInfo; - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddHalInfo : 0x%08lx\n",(((DWORD)&pEddgbl->ddHalInfo) - (DWORD)pEddgbl),pEddgbl->ddHalInfo); + DPRINT1("0x%08lx 0x040 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.dwSize : 0x%08lx\n",(((DWORD)&pEddgbl->ddHalInfo.dwSize) - (DWORD)pEddgbl),pEddgbl->ddHalInfo.dwSize); + DPRINT1("0x%08lx 0x044 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.fpPrimary : 0x%08lx\n",(((DWORD)&pEddgbl->ddHalInfo.vmiData.fpPrimary) - (DWORD)pEddgbl),pEddgbl->ddHalInfo.vmiData.fpPrimary); + DPRINT1("0x%08lx 0x048 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.dwFlags : 0x%08lx\n",(((DWORD)&pEddgbl->ddHalInfo.vmiData.dwFlags) - (DWORD)pEddgbl),pEddgbl->ddHalInfo.vmiData.dwFlags); + DPRINT1("0x%08lx 0x04C PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.dwDisplayWidth : 0x%08lx\n",(((DWORD)&pEddgbl->ddHalInfo.vmiData.dwDisplayWidth) - (DWORD)pEddgbl),pEddgbl->ddHalInfo.vmiData.dwDisplayWidth); + DPRINT1("0x%08lx 0x050 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.dwDisplayHeight : 0x%08lx\n",(((DWORD)&pEddgbl->ddHalInfo.vmiData.dwDisplayHeight) - (DWORD)pEddgbl),pEddgbl->ddHalInfo.vmiData.dwDisplayHeight); + DPRINT1("0x%08lx 0x054 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.lDisplayPitch : 0x%08lx\n",(((DWORD)&pEddgbl->ddHalInfo.vmiData.lDisplayPitch) - (DWORD)pEddgbl),pEddgbl->ddHalInfo.vmiData.lDisplayPitch); + DPRINT1("0x%08lx 0x058 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.ddpfDisplay.dwSize : 0x%08lx\n",(((DWORD)&pEddgbl->ddHalInfo.vmiData.ddpfDisplay.dwSize) - (DWORD)pEddgbl),pEddgbl->ddHalInfo.vmiData.ddpfDisplay.dwSize); + DPRINT1("0x%08lx 0x05C PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.ddpfDisplay.dwFlags : 0x%08lx\n",(((DWORD)&pEddgbl->ddHalInfo.vmiData.ddpfDisplay.dwFlags) - (DWORD)pEddgbl),pEddgbl->ddHalInfo.vmiData.ddpfDisplay.dwFlags); + DPRINT1("0x%08lx 0x060 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.ddpfDisplay.dwFourCC : 0x%08lx\n",(((DWORD)&pEddgbl->ddHalInfo.vmiData.ddpfDisplay.dwFourCC) - (DWORD)pEddgbl),pEddgbl->ddHalInfo.vmiData.ddpfDisplay.dwFourCC); + DPRINT1("0x%08lx 0x064 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.ddpfDisplay.dwRGBBitCount : 0x%08lx\n",(((DWORD)&pEddgbl->ddHalInfo.vmiData.ddpfDisplay.dwRGBBitCount) - (DWORD)pEddgbl),pEddgbl->ddHalInfo.vmiData.ddpfDisplay.dwRGBBitCount); + DPRINT1("0x%08lx 0x068 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.ddpfDisplay.dwRBitMask : 0x%08lx\n",(((DWORD)&pEddgbl->ddHalInfo.vmiData.ddpfDisplay.dwRBitMask) - (DWORD)pEddgbl),pEddgbl->ddHalInfo.vmiData.ddpfDisplay.dwRBitMask); + DPRINT1("0x%08lx 0x06C PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.ddpfDisplay.dwGBitMask : 0x%08lx\n",(((DWORD)&pEddgbl->ddHalInfo.vmiData.ddpfDisplay.dwGBitMask) - (DWORD)pEddgbl),pEddgbl->ddHalInfo.vmiData.ddpfDisplay.dwGBitMask); + DPRINT1("0x%08lx 0x070 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.ddpfDisplay.dwBBitMask : 0x%08lx\n",(((DWORD)&pEddgbl->ddHalInfo.vmiData.ddpfDisplay.dwBBitMask) - (DWORD)pEddgbl),pEddgbl->ddHalInfo.vmiData.ddpfDisplay.dwGBitMask); + DPRINT1("0x%08lx 0x074 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.ddpfDisplay.dwRGBAlphaBitMask : 0x%08lx\n",(((DWORD)&pEddgbl->ddHalInfo.vmiData.ddpfDisplay.dwRGBAlphaBitMask) - (DWORD)pEddgbl),pEddgbl->ddHalInfo.vmiData.ddpfDisplay.dwRGBAlphaBitMask); + + DPRINT1("0x%08lx 0x078 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.dwOffscreenAlign : 0x%08lx\n",(((DWORD)&pEddgbl->ddHalInfo.vmiData.dwOffscreenAlign) - (DWORD)pEddgbl),pEddgbl->ddHalInfo.vmiData.dwOffscreenAlign); + DPRINT1("0x%08lx 0x07C PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.dwOverlayAlign : 0x%08lx\n",(((DWORD)&pEddgbl->ddHalInfo.vmiData.dwOverlayAlign ) - (DWORD)pEddgbl),pEddgbl->ddHalInfo.vmiData.dwOverlayAlign); + DPRINT1("0x%08lx 0x080 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.dwTextureAlign : 0x%08lx\n",(((DWORD)&pEddgbl->ddHalInfo.vmiData.dwTextureAlign) - (DWORD)pEddgbl),pEddgbl->ddHalInfo.vmiData.dwTextureAlign); + DPRINT1("0x%08lx 0x084 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.dwZBufferAlign : 0x%08lx\n",(((DWORD)&pEddgbl->ddHalInfo.vmiData.dwZBufferAlign) - (DWORD)pEddgbl),pEddgbl->ddHalInfo.vmiData.dwZBufferAlign); + DPRINT1("0x%08lx 0x088 PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.dwAlphaAlign : 0x%08lx\n",(((DWORD)&pEddgbl->ddHalInfo.vmiData.dwAlphaAlign) - (DWORD)pEddgbl),pEddgbl->ddHalInfo.vmiData.dwAlphaAlign); + DPRINT1("0x%08lx 0x08C PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.vmiData.pvPrimary : 0x%08lx\n",(((DWORD)&pEddgbl->ddHalInfo.vmiData.pvPrimary) - (DWORD)pEddgbl),pEddgbl->ddHalInfo.vmiData.pvPrimary); + DPRINT1("0x%08lx 0x08C PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.ddCaps.dwSize : 0x%08lx\n",(((DWORD)&pEddgbl->ddHalInfo.ddCaps.dwSize) - (DWORD)pEddgbl),pEddgbl->ddHalInfo.ddCaps.dwSize); + DPRINT1("0x%08lx 0x08C PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.ddCaps.dwCaps : 0x%08lx\n",(((DWORD)&pEddgbl->ddHalInfo.ddCaps.dwCaps) - (DWORD)pEddgbl),pEddgbl->ddHalInfo.ddCaps.dwCaps); + + + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[0] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_1e0[0]) - (DWORD)pEddgbl),pEddgbl->unk_1e0[0]); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[1] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_1e0[1]) - (DWORD)pEddgbl),pEddgbl->unk_1e0[1]); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[2] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_1e0[2]) - (DWORD)pEddgbl),pEddgbl->unk_1e0[2]);

1 0

[gbrunmar] 33263: * Added stubs for IDirect3DDevice9 * Moved IDirect3D9 specific helper functions from generic helpers to implementation file * Renamed a couple of internal D3D9 structs
by gbrunmar＠svn.reactos.org 04 May '08

04 May '08

Author: gbrunmar Date: Sun May 4 06:48:06 2008 New Revision: 33263 URL: http://svn.reactos.org/svn/reactos?rev=33263&view=rev Log: * Added stubs for IDirect3DDevice9 * Moved IDirect3D9 specific helper functions from generic helpers to implementation file * Renamed a couple of internal D3D9 structs Added: trunk/reactos/dll/directx/d3d9/d3d9_device.c (with props) Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild trunk/reactos/dll/directx/d3d9/d3d9_create.c trunk/reactos/dll/directx/d3d9/d3d9_device.h trunk/reactos/dll/directx/d3d9/d3d9_helpers.c trunk/reactos/dll/directx/d3d9/d3d9_helpers.h trunk/reactos/dll/directx/d3d9/d3d9_impl.c trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.rbui… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.rbuild [iso-8859-1] Sun May 4 06:48:06 2008 @@ -18,6 +18,7 @@ <file>d3d9_impl.c</file> <file>d3d9_create.c</file> <file>d3d9_caps.c</file> + <file>d3d9_device.c</file> <file>adapter.c</file> <file>format.c</file> <file>d3d9.rc</file> Modified: trunk/reactos/dll/directx/d3d9/d3d9_create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_crea… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_create.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_create.c [iso-8859-1] Sun May 4 06:48:06 2008 @@ -238,7 +238,7 @@ pDirect3D9->lpVtbl = &Direct3D9_Vtbl; pDirect3D9->dwProcessId = GetCurrentThreadId(); - pDirect3D9->dwRefCnt = 1; + pDirect3D9->lRefCnt = 1; pDirect3D9->SDKVersion = SDKVersion; Added: 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 (added) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Sun May 4 06:48:06 2008 @@ -1,0 +1,996 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/d3d9_device.c + * PURPOSE: d3d9.dll internal device methods + * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> + */ +#include "d3d9_device.h" +#include "d3d9_helpers.h" +#include "debug.h" + +#define LOCK_D3DDEVICE9() EnterCriticalSection(&This->CriticalSection); +#define UNLOCK_D3DDEVICE9() LeaveCriticalSection(&This->CriticalSection); + +/* Convert a IDirect3D9 pointer safely to the internal implementation struct */ +LPDIRECT3DDEVICE9_INT impl_from_IDirect3DDevice9(LPDIRECT3DDEVICE9 iface) +{ + if (IsBadWritePtr(iface, sizeof(LPDIRECT3DDEVICE9_INT))) + return NULL; + + return (LPDIRECT3DDEVICE9_INT)((ULONG_PTR)iface - FIELD_OFFSET(DIRECT3DDEVICE9_INT, lpVtbl)); +} + +/* IDirect3DDevice9: IUnknown implementation */ +static HRESULT WINAPI IDirect3DDevice9Impl_QueryInterface(LPDIRECT3DDEVICE9 iface, REFIID riid, void** ppvObject) +{ + LPDIRECT3DDEVICE9_INT This = impl_from_IDirect3DDevice9(iface); + + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DDevice9)) + { + IUnknown_AddRef(iface); + *ppvObject = &This->lpVtbl; + return S_OK; + } + + *ppvObject = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI IDirect3DDevice9Impl_AddRef(LPDIRECT3DDEVICE9 iface) +{ + LPDIRECT3DDEVICE9_INT This = impl_from_IDirect3DDevice9(iface); + ULONG ref = InterlockedIncrement(&This->lRefCnt); + + return ref; +} + +static ULONG WINAPI IDirect3DDevice9Impl_Release(LPDIRECT3DDEVICE9 iface) +{ + LPDIRECT3DDEVICE9_INT This = impl_from_IDirect3DDevice9(iface); + ULONG ref = InterlockedDecrement(&This->lRefCnt); + + if (ref == 0) + { + EnterCriticalSection(&This->CriticalSection); + /* TODO: Free resources here */ + LeaveCriticalSection(&This->CriticalSection); + AlignedFree(This); + } + + return ref; +} + +/* IDirect3D9Device interface */ +static HRESULT WINAPI IDirect3DDevice9Impl_TestCooperativeLevel(LPDIRECT3DDEVICE9 iface) +{ + UNIMPLEMENTED + + return S_OK; +} + +static UINT WINAPI IDirect3DDevice9Impl_GetAvailableTextureMem(LPDIRECT3DDEVICE9 iface) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_EvictManagedResources(LPDIRECT3DDEVICE9 iface) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetDirect3D(LPDIRECT3DDEVICE9 iface, IDirect3D9** ppD3D9) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetDeviceCaps(LPDIRECT3DDEVICE9 iface, D3DCAPS9* pCaps) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetDisplayMode(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, D3DDISPLAYMODE* pMode) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetCreationParameters(LPDIRECT3DDEVICE9 iface, D3DDEVICE_CREATION_PARAMETERS *pParameters) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetCursorProperties(LPDIRECT3DDEVICE9 iface, UINT XHotSpot, UINT YHotSpot, IDirect3DSurface9* pCursorBitmap) +{ + UNIMPLEMENTED + + return S_OK; +} + +static void WINAPI IDirect3DDevice9Impl_SetCursorPosition(LPDIRECT3DDEVICE9 iface, int X, int Y, DWORD Flags) +{ + UNIMPLEMENTED +} + +static BOOL WINAPI IDirect3DDevice9Impl_ShowCursor(LPDIRECT3DDEVICE9 iface, BOOL bShow) +{ + UNIMPLEMENTED + + return TRUE; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE9 iface, D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DSwapChain9** pSwapChain) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetSwapChain(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, IDirect3DSwapChain9** pSwapChain) +{ + UNIMPLEMENTED + + return S_OK; +} + +static UINT WINAPI IDirect3DDevice9Impl_GetNumberOfSwapChains(LPDIRECT3DDEVICE9 iface) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_Reset(LPDIRECT3DDEVICE9 iface, D3DPRESENT_PARAMETERS* pPresentationParameters) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_Present(LPDIRECT3DDEVICE9 iface, CONST RECT* pSourceRect, CONST RECT* pDestRect, HWND hDestWindowOverride, CONST RGNDATA* pDirtyRegion) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetBackBuffer(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, IDirect3DSurface9** ppBackBuffer) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetRasterStatus(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, D3DRASTER_STATUS* pRasterStatus) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetDialogBoxMode(LPDIRECT3DDEVICE9 iface, BOOL bEnableDialogs) +{ + UNIMPLEMENTED + + return S_OK; +} + +static void WINAPI IDirect3DDevice9Impl_SetGammaRamp(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, DWORD Flags, CONST D3DGAMMARAMP* pRamp) +{ + UNIMPLEMENTED +} + +static void WINAPI IDirect3DDevice9Impl_GetGammaRamp(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, D3DGAMMARAMP* pRamp) +{ + UNIMPLEMENTED +} + +static HRESULT WINAPI IDirect3DDevice9Impl_CreateTexture(LPDIRECT3DDEVICE9 iface, UINT Width, UINT Height, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DTexture9** ppTexture, HANDLE* pSharedHandle) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_CreateVolumeTexture(LPDIRECT3DDEVICE9 iface, UINT Width, UINT Height, UINT Depth, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DVolumeTexture9** ppVolumeTexture, HANDLE* pSharedHandle) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_CreateCubeTexture(LPDIRECT3DDEVICE9 iface, UINT EdgeLength, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DCubeTexture9** ppCubeTexture, HANDLE* pSharedHandle) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexBuffer(LPDIRECT3DDEVICE9 iface, UINT Length, DWORD Usage, DWORD FVF, D3DPOOL Pool, IDirect3DVertexBuffer9** ppVertexBuffer, HANDLE* pSharedHandle) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_CreateIndexBuffer(LPDIRECT3DDEVICE9 iface, UINT Length, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DIndexBuffer9** ppIndexBuffer, HANDLE* pSharedHandle) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_CreateRenderTarget(LPDIRECT3DDEVICE9 iface, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality, BOOL Lockable, IDirect3DSurface9** ppSurface, HANDLE* pSharedHandle) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_CreateDepthStencilSurface(LPDIRECT3DDEVICE9 iface, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality, BOOL Discard, IDirect3DSurface9** ppSurface, HANDLE* pSharedHandle) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_UpdateSurface(LPDIRECT3DDEVICE9 iface, IDirect3DSurface9* pSourceSurface, CONST RECT* pSourceRect, IDirect3DSurface9* pDestinationSurface, CONST POINT* pDestPoint) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_UpdateTexture(LPDIRECT3DDEVICE9 iface, IDirect3DBaseTexture9* pSourceTexture, IDirect3DBaseTexture9* pDestinationTexture) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTargetData(LPDIRECT3DDEVICE9 iface, IDirect3DSurface9* pRenderTarget, IDirect3DSurface9* pDestSurface) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetFrontBufferData(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, IDirect3DSurface9* pDestSurface) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_StretchRect(LPDIRECT3DDEVICE9 iface, IDirect3DSurface9* pSourceSurface, CONST RECT* pSourceRect, IDirect3DSurface9* pDestSurface, CONST RECT* pDestRect, D3DTEXTUREFILTERTYPE Filter) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_ColorFill(LPDIRECT3DDEVICE9 iface, IDirect3DSurface9* pSurface, CONST RECT* pRect, D3DCOLOR color) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_CreateOffscreenPlainSurface(LPDIRECT3DDEVICE9 iface, UINT Width, UINT Height, D3DFORMAT Format, D3DPOOL Pool, IDirect3DSurface9** ppSurface, HANDLE* pSharedHandle) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetRenderTarget(LPDIRECT3DDEVICE9 iface, DWORD RenderTargetIndex, IDirect3DSurface9* pRenderTarget) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTarget(LPDIRECT3DDEVICE9 iface, DWORD RenderTargetIndex,IDirect3DSurface9** ppRenderTarget) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetDepthStencilSurface(LPDIRECT3DDEVICE9 iface, IDirect3DSurface9* pNewZStencil) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetDepthStencilSurface(LPDIRECT3DDEVICE9 iface, IDirect3DSurface9** ppZStencilSurface) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_BeginScene(LPDIRECT3DDEVICE9 iface) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_EndScene(LPDIRECT3DDEVICE9 iface) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_Clear(LPDIRECT3DDEVICE9 iface, DWORD Count, CONST D3DRECT* pRects, DWORD Flags, D3DCOLOR Color, float Z, DWORD Stencil) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetTransform(LPDIRECT3DDEVICE9 iface, D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX* pMatrix) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetTransform(LPDIRECT3DDEVICE9 iface, D3DTRANSFORMSTATETYPE State, D3DMATRIX* pMatrix) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_MultiplyTransform(LPDIRECT3DDEVICE9 iface, D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX* pMatrix) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetViewport(LPDIRECT3DDEVICE9 iface, CONST D3DVIEWPORT9* pViewport) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetViewport(LPDIRECT3DDEVICE9 iface, D3DVIEWPORT9* pViewport) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetMaterial(LPDIRECT3DDEVICE9 iface, CONST D3DMATERIAL9* pMaterial) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetMaterial(LPDIRECT3DDEVICE9 iface, D3DMATERIAL9* pMaterial) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetLight(LPDIRECT3DDEVICE9 iface, DWORD Index, CONST D3DLIGHT9* pLight) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetLight(LPDIRECT3DDEVICE9 iface, DWORD Index, D3DLIGHT9* pLight) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_LightEnable(LPDIRECT3DDEVICE9 iface, DWORD Index, BOOL Enable) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetLightEnable(LPDIRECT3DDEVICE9 iface, DWORD Index, BOOL* pEnable) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetClipPlane(LPDIRECT3DDEVICE9 iface, DWORD Index, CONST float* pPlane) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetClipPlane(LPDIRECT3DDEVICE9 iface, DWORD Index, float* pPlane) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetRenderState(LPDIRECT3DDEVICE9 iface, D3DRENDERSTATETYPE State, DWORD Value) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderState(LPDIRECT3DDEVICE9 iface, D3DRENDERSTATETYPE State, DWORD* pValue) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_CreateStateBlock(LPDIRECT3DDEVICE9 iface, D3DSTATEBLOCKTYPE Type, IDirect3DStateBlock9** ppSB) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_BeginStateBlock(LPDIRECT3DDEVICE9 iface) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_EndStateBlock(LPDIRECT3DDEVICE9 iface, IDirect3DStateBlock9** ppSB) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetClipStatus(LPDIRECT3DDEVICE9 iface, CONST D3DCLIPSTATUS9* pClipStatus) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetClipStatus(LPDIRECT3DDEVICE9 iface, D3DCLIPSTATUS9* pClipStatus) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetTexture(LPDIRECT3DDEVICE9 iface, DWORD Stage, IDirect3DBaseTexture9** ppTexture) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetTexture(LPDIRECT3DDEVICE9 iface, DWORD Stage, IDirect3DBaseTexture9* pTexture) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetTextureStageState(LPDIRECT3DDEVICE9 iface, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD* pValue) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetTextureStageState(LPDIRECT3DDEVICE9 iface, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetSamplerState(LPDIRECT3DDEVICE9 iface, DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD* pValue) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetSamplerState(LPDIRECT3DDEVICE9 iface, DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD Value) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_ValidateDevice(LPDIRECT3DDEVICE9 iface, DWORD* pNumPasses) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetPaletteEntries(LPDIRECT3DDEVICE9 iface, UINT PaletteNumber, CONST PALETTEENTRY* pEntries) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetPaletteEntries(LPDIRECT3DDEVICE9 iface, UINT PaletteNumber, PALETTEENTRY* pEntries) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetCurrentTexturePalette(LPDIRECT3DDEVICE9 iface, UINT PaletteNumber) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetCurrentTexturePalette(LPDIRECT3DDEVICE9 iface, UINT* pPaletteNumber) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetScissorRect(LPDIRECT3DDEVICE9 iface, CONST RECT* pRect) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetScissorRect(LPDIRECT3DDEVICE9 iface, RECT* pRect) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetSoftwareVertexProcessing(LPDIRECT3DDEVICE9 iface, BOOL bSoftware) +{ + UNIMPLEMENTED + + return S_OK; +} + +static BOOL WINAPI IDirect3DDevice9Impl_GetSoftwareVertexProcessing(LPDIRECT3DDEVICE9 iface) +{ + UNIMPLEMENTED + + return TRUE; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetNPatchMode(LPDIRECT3DDEVICE9 iface, float nSegments) +{ + UNIMPLEMENTED + + return S_OK; +} + +static float WINAPI IDirect3DDevice9Impl_GetNPatchMode(LPDIRECT3DDEVICE9 iface) +{ + UNIMPLEMENTED + + return 0.0f; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_DrawPrimitive(LPDIRECT3DDEVICE9 iface, D3DPRIMITIVETYPE PrimitiveType, UINT StartVertex, UINT PrimitiveCount) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_DrawIndexedPrimitive(LPDIRECT3DDEVICE9 iface, D3DPRIMITIVETYPE PrimitiveType, INT BaseVertexIndex, UINT MinVertexIndex, UINT NumVertices, UINT startIndex, UINT primCount) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_DrawPrimitiveUP(LPDIRECT3DDEVICE9 iface, D3DPRIMITIVETYPE PrimitiveType, UINT PrimitiveCount, CONST void* pVertexStreamZeroData, UINT VertexStreamZeroStride) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_DrawIndexedPrimitiveUP(LPDIRECT3DDEVICE9 iface, D3DPRIMITIVETYPE PrimitiveType, UINT MinVertexIndex, UINT NumVertices, UINT PrimitiveCount, CONST void* pIndexData, D3DFORMAT IndexDataFormat, CONST void* pVertexStreamZeroData, UINT VertexStreamZeroStride) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_ProcessVertices(LPDIRECT3DDEVICE9 iface, UINT SrcStartIndex, UINT DestIndex, UINT VertexCount, IDirect3DVertexBuffer9* pDestBuffer, IDirect3DVertexDeclaration9* pVertexDecl, DWORD Flags) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(LPDIRECT3DDEVICE9 iface, CONST D3DVERTEXELEMENT9* pVertexElements, IDirect3DVertexDeclaration9** ppDecl) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetVertexDeclaration(LPDIRECT3DDEVICE9 iface, IDirect3DVertexDeclaration9* pDecl) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetVertexDeclaration(LPDIRECT3DDEVICE9 iface, IDirect3DVertexDeclaration9** ppDecl) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetFVF(LPDIRECT3DDEVICE9 iface, DWORD FVF) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetFVF(LPDIRECT3DDEVICE9 iface, DWORD* pFVF) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexShader(LPDIRECT3DDEVICE9 iface, CONST DWORD* pFunction, IDirect3DVertexShader9** ppShader) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShader(LPDIRECT3DDEVICE9 iface, IDirect3DVertexShader9* pShader) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShader(LPDIRECT3DDEVICE9 iface, IDirect3DVertexShader9** ppShader) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShaderConstantF(LPDIRECT3DDEVICE9 iface, UINT StartRegister, CONST float* pConstantData, UINT Vector4fCount) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShaderConstantF(LPDIRECT3DDEVICE9 iface, UINT StartRegister, float* pConstantData, UINT Vector4fCount) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShaderConstantI(LPDIRECT3DDEVICE9 iface, UINT StartRegister, CONST int* pConstantData, UINT Vector4iCount) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShaderConstantI(LPDIRECT3DDEVICE9 iface, UINT StartRegister, int* pConstantData, UINT Vector4iCount) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShaderConstantB(LPDIRECT3DDEVICE9 iface, UINT StartRegister, CONST BOOL* pConstantData, UINT BoolCount) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShaderConstantB(LPDIRECT3DDEVICE9 iface, UINT StartRegister, BOOL* pConstantData, UINT BoolCount) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetStreamSource(LPDIRECT3DDEVICE9 iface, UINT StreamNumber, IDirect3DVertexBuffer9* pStreamData, UINT OffsetInBytes, UINT Stride) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetStreamSource(LPDIRECT3DDEVICE9 iface, UINT StreamNumber, IDirect3DVertexBuffer9** ppStreamData, UINT* pOffsetInBytes, UINT* pStride) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetStreamSourceFreq(LPDIRECT3DDEVICE9 iface, UINT StreamNumber,UINT Setting) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetStreamSourceFreq(LPDIRECT3DDEVICE9 iface, UINT StreamNumber, UINT* pSetting) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetIndices(LPDIRECT3DDEVICE9 iface, IDirect3DIndexBuffer9* pIndexData) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetIndices(LPDIRECT3DDEVICE9 iface, IDirect3DIndexBuffer9** ppIndexData) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_CreatePixelShader(LPDIRECT3DDEVICE9 iface, CONST DWORD* pFunction, IDirect3DPixelShader9** ppShader) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShader(LPDIRECT3DDEVICE9 iface, IDirect3DPixelShader9* pShader) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShader(LPDIRECT3DDEVICE9 iface, IDirect3DPixelShader9** ppShader) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantF(LPDIRECT3DDEVICE9 iface, UINT StartRegister, CONST float* pConstantData, UINT Vector4fCount) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantF(LPDIRECT3DDEVICE9 iface, UINT StartRegister, float* pConstantData, UINT Vector4fCount) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantI(LPDIRECT3DDEVICE9 iface, UINT StartRegister, CONST int* pConstantData, UINT Vector4iCount) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantI(LPDIRECT3DDEVICE9 iface, UINT StartRegister, int* pConstantData, UINT Vector4iCount) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantB(LPDIRECT3DDEVICE9 iface, UINT StartRegister, CONST BOOL* pConstantData, UINT BoolCount) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantB(LPDIRECT3DDEVICE9 iface, UINT StartRegister, BOOL* pConstantData, UINT BoolCount) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_DrawRectPatch(LPDIRECT3DDEVICE9 iface, UINT Handle, CONST float* pNumSegs, CONST D3DRECTPATCH_INFO* pRectPatchInfo) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_DrawTriPatch(LPDIRECT3DDEVICE9 iface, UINT Handle, CONST float* pNumSegs, CONST D3DTRIPATCH_INFO* pTriPatchInfo) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_DeletePatch(LPDIRECT3DDEVICE9 iface, UINT Handle) +{ + UNIMPLEMENTED + + return S_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_CreateQuery(LPDIRECT3DDEVICE9 iface, D3DQUERYTYPE Type, IDirect3DQuery9** ppQuery) +{ + UNIMPLEMENTED + + return S_OK; +} + +IDirect3DDevice9Vtbl Direct3DDevice9_Vtbl = +{ + /* IUnknown */ + IDirect3DDevice9Impl_QueryInterface, + IDirect3DDevice9Impl_AddRef, + IDirect3DDevice9Impl_Release, + + /* IDirect3D9Device */ + IDirect3DDevice9Impl_TestCooperativeLevel, + IDirect3DDevice9Impl_GetAvailableTextureMem, + IDirect3DDevice9Impl_EvictManagedResources, + IDirect3DDevice9Impl_GetDirect3D, + IDirect3DDevice9Impl_GetDeviceCaps, + IDirect3DDevice9Impl_GetDisplayMode, + IDirect3DDevice9Impl_GetCreationParameters, + IDirect3DDevice9Impl_SetCursorProperties, + IDirect3DDevice9Impl_SetCursorPosition, + IDirect3DDevice9Impl_ShowCursor, + IDirect3DDevice9Impl_CreateAdditionalSwapChain, + IDirect3DDevice9Impl_GetSwapChain, + IDirect3DDevice9Impl_GetNumberOfSwapChains, + IDirect3DDevice9Impl_Reset, + IDirect3DDevice9Impl_Present, + IDirect3DDevice9Impl_GetBackBuffer, + IDirect3DDevice9Impl_GetRasterStatus, + IDirect3DDevice9Impl_SetDialogBoxMode, + IDirect3DDevice9Impl_SetGammaRamp, + IDirect3DDevice9Impl_GetGammaRamp, + IDirect3DDevice9Impl_CreateTexture, + IDirect3DDevice9Impl_CreateVolumeTexture, + IDirect3DDevice9Impl_CreateCubeTexture, + IDirect3DDevice9Impl_CreateVertexBuffer, + IDirect3DDevice9Impl_CreateIndexBuffer, + IDirect3DDevice9Impl_CreateRenderTarget, + IDirect3DDevice9Impl_CreateDepthStencilSurface, + IDirect3DDevice9Impl_UpdateSurface, + IDirect3DDevice9Impl_UpdateTexture, + IDirect3DDevice9Impl_GetRenderTargetData, + IDirect3DDevice9Impl_GetFrontBufferData, + IDirect3DDevice9Impl_StretchRect, + IDirect3DDevice9Impl_ColorFill, + IDirect3DDevice9Impl_CreateOffscreenPlainSurface, + IDirect3DDevice9Impl_SetRenderTarget, + IDirect3DDevice9Impl_GetRenderTarget, + IDirect3DDevice9Impl_SetDepthStencilSurface, + IDirect3DDevice9Impl_GetDepthStencilSurface, + IDirect3DDevice9Impl_BeginScene, + IDirect3DDevice9Impl_EndScene, + IDirect3DDevice9Impl_Clear, + IDirect3DDevice9Impl_SetTransform, + IDirect3DDevice9Impl_GetTransform, + IDirect3DDevice9Impl_MultiplyTransform, + IDirect3DDevice9Impl_SetViewport, + IDirect3DDevice9Impl_GetViewport, + IDirect3DDevice9Impl_SetMaterial, + IDirect3DDevice9Impl_GetMaterial, + IDirect3DDevice9Impl_SetLight, + IDirect3DDevice9Impl_GetLight, + IDirect3DDevice9Impl_LightEnable, + IDirect3DDevice9Impl_GetLightEnable, + IDirect3DDevice9Impl_SetClipPlane, + IDirect3DDevice9Impl_GetClipPlane, + IDirect3DDevice9Impl_SetRenderState, + IDirect3DDevice9Impl_GetRenderState, + IDirect3DDevice9Impl_CreateStateBlock, + IDirect3DDevice9Impl_BeginStateBlock, + IDirect3DDevice9Impl_EndStateBlock, + IDirect3DDevice9Impl_SetClipStatus, + IDirect3DDevice9Impl_GetClipStatus, + IDirect3DDevice9Impl_GetTexture, + IDirect3DDevice9Impl_SetTexture, + IDirect3DDevice9Impl_GetTextureStageState, + IDirect3DDevice9Impl_SetTextureStageState, + IDirect3DDevice9Impl_GetSamplerState, + IDirect3DDevice9Impl_SetSamplerState, + IDirect3DDevice9Impl_ValidateDevice, + IDirect3DDevice9Impl_SetPaletteEntries, + IDirect3DDevice9Impl_GetPaletteEntries, + IDirect3DDevice9Impl_SetCurrentTexturePalette, + IDirect3DDevice9Impl_GetCurrentTexturePalette, + IDirect3DDevice9Impl_SetScissorRect, + IDirect3DDevice9Impl_GetScissorRect, + IDirect3DDevice9Impl_SetSoftwareVertexProcessing, + IDirect3DDevice9Impl_GetSoftwareVertexProcessing, + IDirect3DDevice9Impl_SetNPatchMode, + IDirect3DDevice9Impl_GetNPatchMode, + IDirect3DDevice9Impl_DrawPrimitive, + IDirect3DDevice9Impl_DrawIndexedPrimitive, + IDirect3DDevice9Impl_DrawPrimitiveUP, + IDirect3DDevice9Impl_DrawIndexedPrimitiveUP, + IDirect3DDevice9Impl_ProcessVertices, + IDirect3DDevice9Impl_CreateVertexDeclaration, + IDirect3DDevice9Impl_SetVertexDeclaration, + IDirect3DDevice9Impl_GetVertexDeclaration, + IDirect3DDevice9Impl_SetFVF, + IDirect3DDevice9Impl_GetFVF, + IDirect3DDevice9Impl_CreateVertexShader, + IDirect3DDevice9Impl_SetVertexShader, + IDirect3DDevice9Impl_GetVertexShader, + IDirect3DDevice9Impl_SetVertexShaderConstantF, + IDirect3DDevice9Impl_GetVertexShaderConstantF, + IDirect3DDevice9Impl_SetVertexShaderConstantI, + IDirect3DDevice9Impl_GetVertexShaderConstantI, + IDirect3DDevice9Impl_SetVertexShaderConstantB, + IDirect3DDevice9Impl_GetVertexShaderConstantB, + IDirect3DDevice9Impl_SetStreamSource, + IDirect3DDevice9Impl_GetStreamSource, + IDirect3DDevice9Impl_SetStreamSourceFreq, + IDirect3DDevice9Impl_GetStreamSourceFreq, + IDirect3DDevice9Impl_SetIndices, + IDirect3DDevice9Impl_GetIndices, + IDirect3DDevice9Impl_CreatePixelShader, + IDirect3DDevice9Impl_SetPixelShader, + IDirect3DDevice9Impl_GetPixelShader, + IDirect3DDevice9Impl_SetPixelShaderConstantF, + IDirect3DDevice9Impl_GetPixelShaderConstantF, + IDirect3DDevice9Impl_SetPixelShaderConstantI, + IDirect3DDevice9Impl_GetPixelShaderConstantI, + IDirect3DDevice9Impl_SetPixelShaderConstantB, + IDirect3DDevice9Impl_GetPixelShaderConstantB, + IDirect3DDevice9Impl_DrawRectPatch, + IDirect3DDevice9Impl_DrawTriPatch, + IDirect3DDevice9Impl_DeletePatch, + IDirect3DDevice9Impl_CreateQuery, +}; + Propchange: trunk/reactos/dll/directx/d3d9/d3d9_device.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_device.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.h [iso-8859-1] Sun May 4 06:48:06 2008 @@ -34,7 +34,7 @@ typedef struct _tagD3D9BaseSurface_ { /* 0x0000 */ LPDWORD lpVtbl; -/* 0x0024 */ D3DFORMAT DisplayFormat2; +/* 0x0024 */ D3DFORMAT DisplayFormat2; // Back buffer format? /* 0x0028 */ DWORD dwUnknown0028; // Constant/ref count? (1) /* 0x002c */ DWORD dwUnknown002c; // Refresh rate? /* 0x0030 */ D3DPOOL SurfacePool; @@ -85,7 +85,26 @@ /* 0x0014 - 0x0174 */ LPDWORD pFirstHeapTexture; } D3D9ResourceManager; -typedef struct _tagD3D9SwapChain_ +typedef struct _tagDirect3D9Cursor_ +{ +/* 0x0000 */ DWORD dwUnknown0000; +/* 0x0004 */ DWORD dwUnknown0004; +/* 0x0008 */ DWORD dwUnknown0008; +/* 0x000c */ DWORD dwUnknown000c; +/* 0x0010 */ DWORD dwUnknown0010; +/* 0x0014 */ DWORD dwUnknown0014; +/* 0x0018 */ DWORD dwWidth; +/* 0x001c */ DWORD dwHeight; +/* 0x0020 */ DWORD dwUnknown0020[18]; +/* 0x0070 */ struct _tagD3D9BaseDevice_* pBaseDevice; +/* 0x0074 */ struct _tagD3D9SwapChain_* pSwapChain; +/* 0x0078 */ DWORD dwUnknown0078; +/* 0x007c */ DWORD dwMonitorVirtualX; +/* 0x0080 */ DWORD dwMonitorVirtualY; +/* 0x0084 */ DWORD dwUnknown0084; +} D3D9Cursor; + +typedef struct _tagDirect3DSwapChain9_INT_ { /* 0x0000 */ D3D9BaseObject BaseObject; /* 0x0020 */ struct IDirect3DSwapChain9Vtbl* lpVtbl; @@ -99,13 +118,33 @@ /* 0x0040 */ DWORD AdapterGroupIndex; /* 0x0044 */ D3DPRESENT_PARAMETERS PresentParameters; /* 0x007c */ DWORD dwUnknown007c; -/* 0x0080 */ DWORD dwUnknown0080[2]; -/* 0x0088 */ LPDWORD dwUnknown0088; +/* 0x0080 */ DWORD dwUnknown0080[2]; /* Extended format? */ +/* 0x0088 */ D3D9Cursor* pCursor; /* 0x008c */ DWORD dwUnknown008c[4]; /* 0x009c */ D3D9_Unknown6BC* pUnknown6BC; /* 0x00a0 */ LPDWORD dwUnknown00a0; -/* 0x00a4 */ DWORD dwUnknown00a4[46]; -/* 0x015c */ LPDWORD pUnknown0174; +/* 0x00a4 */ DWORD dwUnknown00a4; +/* 0x00a8 */ DWORD dwUnknown00a8; +/* 0x00ac */ DWORD dwWidth; +/* 0x00b0 */ DWORD dwHeight; +/* 0x00b4 */ DWORD dwUnknown00b4; +/* 0x00b8 */ DWORD dwUnknown00b8; +/* 0x00bc */ DWORD dwUnknown00bc; +/* 0x00c0 */ DWORD dwWidth2; +/* 0x00c4 */ DWORD dwHeight2; +/* 0x00c8 */ DWORD dwUnknown00c8; +/* 0x00cc */ DWORD dwUnknown00cc; +/* 0x00d0 */ DWORD dwUnknown00d0; +/* 0x00d4 */ DWORD dwUnknown00d4; +/* 0x00d8 */ DWORD dwUnknown00d8; +/* 0x00dc */ DWORD dwUnknown00dc; +/* 0x00e0 */ DWORD dwDevModeScale; +/* 0x00e4 */ DWORD dwUnknown00e4; +/* 0x00e8 */ DWORD dwUnknown00e8; +/* 0x00ec */ DWORD dwUnknown00ec; +/* 0x00f0 */ DWORD dwUnknown00f0[27]; + +/* 0x015c */ LPDWORD pUnknown0174; // points to 0x0174 /* 0x0160 */ DWORD dwUnknown0160[4]; /* 0x0170 */ HRESULT hResult; @@ -119,12 +158,12 @@ /* 0x01f8 */ DWORD dwUnknown01f8; /* 0x01fc */ DWORD dwUnknown01fc; /* 0x0200 */ DDGAMMARAMP GammaRamp; -} D3D9SwapChain_INT; - -typedef struct _tagD3D9BaseDevice_ +} Direct3DSwapChain9_INT, FAR* LPDIRECT3DSWAPCHAIN9_INT; + +typedef struct _tagDirect3DDevice9_INT_ { /* 0x0000 */ struct IDirect3D9DeviceVtbl* lpVtbl; -/* 0x0004 */ CRITICAL_SECTION d3d9device_cs; +/* 0x0004 */ CRITICAL_SECTION CriticalSection; #ifdef D3D_DEBUG_INFO /* N/A - 0x001c */ DWORD dbg0004; /* N/A - 0x0020 */ DWORD dbg0008; @@ -146,7 +185,7 @@ /* 0x0024 - 0x005c */ struct _tagD3D9PUREDEVICE_* lpThis; /* 0x0028 - 0x0060 */ DWORD dwDXVersion; /* 0x002c - 0x0064 */ DWORD unknown000011; -/* 0x0030 - 0x0068 */ DWORD dwRefCnt; +/* 0x0030 - 0x0068 */ LONG lRefCnt; /* 0x0034 - 0x006c */ DWORD unknown000013; /* 0x0038 - 0x0070 */ D3D9ResourceManager* pResourceManager; /* 0x003c - 0x0074 */ HWND hWnd; @@ -201,9 +240,9 @@ /* 0x010c - 0x0144 */ DWORD unknown000067; /* 0x0110 - 0x0148 */ DWORD AdapterIndexInGroup[D3D9_INT_MAX_NUM_ADAPTERS]; /* 0x0140 - 0x0178 */ D3D9_DEVICEDATA DeviceData[D3D9_INT_MAX_NUM_ADAPTERS]; -/* 0x1df0 */ D3D9SwapChain_INT* pSwapChains[D3D9_INT_MAX_NUM_ADAPTERS]; -/* 0x1e20 */ D3D9SwapChain_INT* pSwapChains2[D3D9_INT_MAX_NUM_ADAPTERS]; -/* 0x1e50 */ D3D9BaseSurface* pUnknown001940; +/* 0x1df0 - 0x1e28 */ LPDIRECT3DSWAPCHAIN9_INT pSwapChains[D3D9_INT_MAX_NUM_ADAPTERS]; +/* 0x1e20 */ LPDIRECT3DSWAPCHAIN9_INT pSwapChains2[D3D9_INT_MAX_NUM_ADAPTERS]; +/* 0x1e50 */ D3D9BaseSurface* pRenderTargetList; /* 0x1e54 */ DWORD unknown001941; /* 0x1e58 */ DWORD unknown001942; /* 0x1e5c */ DWORD unknown001943; @@ -265,11 +304,11 @@ /* 0x1f3c */ DWORD unknown001999; /* 0x1f40 */ DWORD unknown002000; /* 0x1f44 */ DWORD unknown002001; -} D3D9BaseDevice; - -typedef struct _tagD3D9PUREDEVICE_INT_ +} DIRECT3DDEVICE9_INT, FAR* LPDIRECT3DDEVICE9_INT; + +typedef struct _tagD3D9PUREDEVICE_ { -/* 0x0000 - 0x0000 */ D3D9BaseDevice BaseDevice; +/* 0x0000 - 0x0000 */ DIRECT3DDEVICE9_INT BaseDevice; /* 0x1f48 */ DWORD unknown002002; /* 0x1f4c */ DWORD unknown002003; /* 0x1f50 */ DWORD unknown002004; @@ -586,11 +625,11 @@ /* 0x242c */ DWORD unknown002315; /* 0x2430 */ DWORD unknown002316; /* 0x2434 */ DWORD unknown002317; -} D3D9PUREDEVICE_INT, FAR *LPD3D9PUREDEVICE_INT; - -typedef struct _tagD3D9HALDEVICE_INT_ +} D3D9PUREDEVICE, FAR *LPD3D9PUREDEVICE; + +typedef struct _tagD3D9HALDEVICE_ { -/* 0x0000 */ D3D9PUREDEVICE_INT PureDevice; +/* 0x0000 */ D3D9PUREDEVICE PureDevice; #ifdef D3D_DEBUG_INFO /* N/A - 0x0004 */ DWORD dbg0004; /* N/A - 0x0008 */ DWORD dbg0008; @@ -1579,6 +1618,6 @@ /* 0x3324 */ DWORD unknown003324; /* 0x3328 */ DWORD unknown003328; /* 0x332c */ DWORD unknown00332c; -} D3D9HALDEVICE_INT, FAR *LPD3D9HALDEVICE_INT; +} D3D9HALDEVICE, FAR *LPD3D9HALDEVICE; #endif /* _D3D9_DEVICE_H_ */ Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.c [iso-8859-1] Sun May 4 06:48:06 2008 @@ -15,14 +15,6 @@ #define MEM_ALIGNMENT 0x20 static LPCSTR D3D9_DebugRegPath = "Software\\Microsoft\\Direct3D"; - -LPDIRECT3D9_INT impl_from_IDirect3D9(LPDIRECT3D9 iface) -{ - if (IsBadWritePtr(iface, sizeof(LPDIRECT3D9_INT))) - return NULL; - - return (LPDIRECT3D9_INT)((ULONG_PTR)iface - FIELD_OFFSET(DIRECT3D9_INT, lpVtbl)); -} BOOL ReadRegistryValue(IN DWORD ValueType, IN LPCSTR ValueName, OUT LPBYTE DataBuffer, IN OUT LPDWORD DataBufferSize) { Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.h [iso-8859-1] Sun May 4 06:48:06 2008 @@ -11,11 +11,6 @@ #include "d3d9_common.h" #include "d3d9_private.h" -#define LOCK_D3D9() EnterCriticalSection(&This->d3d9_cs); -#define UNLOCK_D3D9() LeaveCriticalSection(&This->d3d9_cs); - -/* Convert a IDirect3D9 pointer safely to the internal implementation struct */ -LPDIRECT3D9_INT impl_from_IDirect3D9(LPDIRECT3D9 iface); /* Reads a registry value if it's of the correct value type */ BOOL ReadRegistryValue(IN DWORD ValueType, IN LPCSTR ValueName, OUT LPBYTE DataBuffer, IN OUT LPDWORD DataBufferSize); Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c [iso-8859-1] Sun May 4 06:48:06 2008 @@ -13,6 +13,18 @@ #include "adapter.h" #include "format.h" +#define LOCK_D3D9() EnterCriticalSection(&This->d3d9_cs); +#define UNLOCK_D3D9() LeaveCriticalSection(&This->d3d9_cs); + +/* Convert a IDirect3D9 pointer safely to the internal implementation struct */ +static LPDIRECT3D9_INT impl_from_IDirect3D9(LPDIRECT3D9 iface) +{ + if (IsBadWritePtr(iface, sizeof(LPDIRECT3D9_INT))) + return NULL; + + return (LPDIRECT3D9_INT)((ULONG_PTR)iface - FIELD_OFFSET(DIRECT3D9_INT, lpVtbl)); +} + /* IDirect3D9: IUnknown implementation */ static HRESULT WINAPI IDirect3D9Impl_QueryInterface(LPDIRECT3D9 iface, REFIID riid, LPVOID* ppvObject) { @@ -32,7 +44,7 @@ static ULONG WINAPI IDirect3D9Impl_AddRef(LPDIRECT3D9 iface) { LPDIRECT3D9_INT This = impl_from_IDirect3D9(iface); - ULONG ref = InterlockedIncrement(&This->dwRefCnt); + ULONG ref = InterlockedIncrement(&This->lRefCnt); return ref; } @@ -40,7 +52,7 @@ static ULONG WINAPI IDirect3D9Impl_Release(LPDIRECT3D9 iface) { LPDIRECT3D9_INT This = impl_from_IDirect3D9(iface); - ULONG ref = InterlockedDecrement(&This->dwRefCnt); + ULONG ref = InterlockedDecrement(&This->lRefCnt); if (ref == 0) { 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] Sun May 4 06:48:06 2008 @@ -170,7 +170,7 @@ /* 0x001c */ DWORD unknown000007; /* 0x00000001 */ /* 0x0020 */ DWORD dwProcessId; /* 0x0024 */ struct _tagDIRECT3D9_INT_ *lpInt; -/* 0x0028 */ LONG dwRefCnt; /* Increases and decreases by AddRef() and Release() */ +/* 0x0028 */ LONG lRefCnt; /* Increases and decreases by AddRef() and Release() */ /* 0x002c */ UINT NumDisplayAdapters; /* 0x0030 */ Direct3D9DisplayAdapterInfo DisplayAdapters[D3D9_INT_MAX_NUM_ADAPTERS]; /* 0x2100 */ DWORD unknown002112;

1 0

[cfinck] 33262: Move console.dll properly, Part 2/2. This commit will fix build again.
by cfinck＠svn.reactos.org 04 May '08

04 May '08

Author: cfinck Date: Sun May 4 04:04:14 2008 New Revision: 33262 URL: http://svn.reactos.org/svn/reactos?rev=33262&view=rev Log: Move console.dll properly, Part 2/2. This commit will fix build again. Added: trunk/reactos/dll/cpl/console/ - copied from r33236, trunk/reactos/dll/win32/console/

1 0

[cfinck] 33261: Move console.dll properly, Part 1/2. This commit will break build.
by cfinck＠svn.reactos.org 04 May '08

04 May '08

Author: cfinck Date: Sun May 4 04:01:59 2008 New Revision: 33261 URL: http://svn.reactos.org/svn/reactos?rev=33261&view=rev Log: Move console.dll properly, Part 1/2. This commit will break build. Removed: trunk/reactos/dll/cpl/console/

1 0

[dchapyshev] 33260: - Update icons
by dchapyshev＠svn.reactos.org 04 May '08

04 May '08

Author: dchapyshev Date: Sun May 4 01:49:27 2008 New Revision: 33260 URL: http://svn.reactos.org/svn/reactos?rev=33260&view=rev Log: - Update icons Modified: trunk/reactos/dll/cpl/main/resources/mouse_button.ico trunk/reactos/dll/cpl/main/resources/mouse_pointer.ico trunk/reactos/dll/cpl/main/resources/mouse_speed.ico trunk/reactos/dll/cpl/main/resources/mouse_trails.ico Modified: trunk/reactos/dll/cpl/main/resources/mouse_button.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/mou… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/mouse_pointer.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/mou… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/mouse_speed.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/mou… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/mouse_trails.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/mou… ============================================================================== Binary files - no diff available.

1 0

[jimtabor] 33259: Fix DxEngCreateMemoryDC, GetDesktopDC and DeleteDC.
by jimtabor＠svn.reactos.org 03 May '08

03 May '08

Author: jimtabor Date: Sat May 3 18:30:19 2008 New Revision: 33259 URL: http://svn.reactos.org/svn/reactos?rev=33259&view=rev Log: Fix DxEngCreateMemoryDC, GetDesktopDC and DeleteDC. Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] Sat May 3 18:30:19 2008 @@ -1,3 +1,4 @@ + /************************************************************************/ /* These functions are imported from win32k.sys by dxg.sys */ @@ -96,15 +97,15 @@ BOOLEAN STDCALL DxEngCleanDC(HDC hdc); BOOLEAN STDCALL DxEngIncDispUniq(); -DWORD STDCALL DxEngCreateMemoryDC(DWORD x1); +HDC STDCALL DxEngCreateMemoryDC(HDEV hDev); DWORD STDCALL DxEngIsHdevLockedByCurrentThread(DWORD x1); DWORD STDCALL DxEngUnreferenceHdev(DWORD x1); DWORD STDCALL DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3); DWORD STDCALL DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3); DWORD STDCALL DxEngSpSpritesVisible(DWORD x1); -HDC STDCALL DxEngGetDesktopDC(BOOLEAN CreateDesktopDc, DWORD x2, DWORD x3); -DWORD STDCALL DxEngDeleteDC(HDC hdc, DWORD x2); +HDC STDCALL DxEngGetDesktopDC(ULONG DcType, BOOL EmptyDC, BOOL ValidatehWnd); +BOOLEAN STDCALL DxEngDeleteDC(HDC hdc, BOOL Force); DWORD STDCALL DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3); DWORD STDCALL DxEngSelectBitmap(DWORD x1, DWORD x2); DWORD STDCALL DxEngSetBitmapOwner(DWORD x1, DWORD x2); 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] Sat May 3 18:30:19 2008 @@ -1,4 +1,4 @@ -/* + /* * PROJECT: ReactOS Win32 Subsystem * LICENSE: GPL - See COPYING in the top level directory * FILE: subsystems/win32/win32k/ntddraw/dxeng.c @@ -658,12 +658,12 @@ /************************************************************************/ /* DxEngCreateMemoryDC */ /************************************************************************/ -DWORD -STDCALL -DxEngCreateMemoryDC(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; +HDC +STDCALL +DxEngCreateMemoryDC(HDEV hDev) +{ + UNIMPLEMENTED; + return NULL; } /************************************************************************/ @@ -705,12 +705,12 @@ /************************************************************************/ HDC STDCALL -DxEngGetDesktopDC(BOOLEAN CreateDesktopDc, DWORD x2, DWORD x3) +DxEngGetDesktopDC(ULONG DcType, BOOL EmptyDC, BOOL ValidatehWnd) { PWINDOW_OBJECT DesktopObject = 0; HDC DesktopHDC = 0; - if (CreateDesktopDc == FALSE) + if (DcType == DC_TYPE_DIRECT) { DesktopObject = UserGetDesktopWindow(); DesktopHDC = (HDC)UserGetWindowDC(DesktopObject); @@ -726,140 +726,138 @@ /************************************************************************/ /* DxEngDeleteDC */ /************************************************************************/ +BOOLEAN +STDCALL +DxEngDeleteDC(HDC hdc, BOOL Force) +{ + return IntGdiDeleteDC(hdc, Force); +} + +/************************************************************************/ +/* DxEngCleanDC */ +/************************************************************************/ +BOOLEAN +STDCALL +DxEngCleanDC(HDC hdc) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSetDCOwner */ +/************************************************************************/ +BOOL STDCALL DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask) +{ + DPRINT1("ReactX Calling : DxEngSetDCOwner \n"); + + return IntGdiSetDCOwnerEx( hObject, OwnerMask, FALSE); +} + +/************************************************************************/ +/* DxEngSetDCState */ +/************************************************************************/ +DWORD STDCALL DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSelectBitmap */ +/************************************************************************/ +DWORD STDCALL DxEngSelectBitmap(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSetBitmapOwner */ +/************************************************************************/ +DWORD STDCALL DxEngSetBitmapOwner(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngDeleteSurface */ +/************************************************************************/ +DWORD STDCALL DxEngDeleteSurface(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngGetSurfaceData */ +/************************************************************************/ +DWORD STDCALL DxEngGetSurfaceData(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngAltLockSurface */ +/************************************************************************/ +DWORD STDCALL DxEngAltLockSurface(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngUploadPaletteEntryToSurface */ +/************************************************************************/ +DWORD STDCALL DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngMarkSurfaceAsDirectDraw */ +/************************************************************************/ +DWORD STDCALL DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSelectPaletteToSurface */ +/************************************************************************/ +DWORD STDCALL DxEngSelectPaletteToSurface(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSyncPaletteTableWithDevice */ +/************************************************************************/ +DWORD STDCALL DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSetPaletteState */ +/************************************************************************/ +DWORD STDCALL DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngGetRedirectionBitmap */ +/************************************************************************/ DWORD STDCALL -DxEngDeleteDC(HDC hdc, DWORD x2) -{ - - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngCleanDC */ -/************************************************************************/ -BOOLEAN -STDCALL -DxEngCleanDC(HDC hdc) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSetDCOwner */ -/************************************************************************/ -BOOL STDCALL DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask) -{ - DPRINT1("ReactX Calling : DxEngSetDCOwner \n"); - - return IntGdiSetDCOwnerEx( hObject, OwnerMask, FALSE); -} - -/************************************************************************/ -/* DxEngSetDCState */ -/************************************************************************/ -DWORD STDCALL DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSelectBitmap */ -/************************************************************************/ -DWORD STDCALL DxEngSelectBitmap(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSetBitmapOwner */ -/************************************************************************/ -DWORD STDCALL DxEngSetBitmapOwner(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngDeleteSurface */ -/************************************************************************/ -DWORD STDCALL DxEngDeleteSurface(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngGetSurfaceData */ -/************************************************************************/ -DWORD STDCALL DxEngGetSurfaceData(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngAltLockSurface */ -/************************************************************************/ -DWORD STDCALL DxEngAltLockSurface(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngUploadPaletteEntryToSurface */ -/************************************************************************/ -DWORD STDCALL DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngMarkSurfaceAsDirectDraw */ -/************************************************************************/ -DWORD STDCALL DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSelectPaletteToSurface */ -/************************************************************************/ -DWORD STDCALL DxEngSelectPaletteToSurface(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSyncPaletteTableWithDevice */ -/************************************************************************/ -DWORD STDCALL DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSetPaletteState */ -/************************************************************************/ -DWORD STDCALL DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngGetRedirectionBitmap */ -/************************************************************************/ -DWORD -STDCALL DxEngGetRedirectionBitmap(DWORD x1) { return FALSE; // Normal return.

1 0

[dchapyshev] 33258: - Update translations
by dchapyshev＠svn.reactos.org 03 May '08

03 May '08

Author: dchapyshev Date: Sat May 3 10:41:57 2008 New Revision: 33258 URL: http://svn.reactos.org/svn/reactos?rev=33258&view=rev Log: - Update translations Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/cpl/input/lang/el-GR.rc trunk/reactos/dll/cpl/input/lang/en-US.rc trunk/reactos/dll/cpl/input/lang/es-ES.rc trunk/reactos/dll/cpl/input/lang/fr-FR.rc trunk/reactos/dll/cpl/input/lang/it-IT.rc trunk/reactos/dll/cpl/input/lang/pl-PL.rc trunk/reactos/dll/cpl/input/lang/ru-RU.rc trunk/reactos/dll/cpl/input/lang/sk-SK.rc trunk/reactos/dll/cpl/input/lang/uk-UA.rc trunk/reactos/dll/cpl/input/resource.h Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/bg-BG.rc [iso-8859-1] Sat May 3 10:41:57 2008 @@ -228,4 +228,5 @@ IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" IDS_BURMESE_LAYOUT, "Burmese" -END + IDS_UKRAINIAN_STUDENT_LAYOUT, "Ukrainian (Student)" +END Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/de-DE.rc [iso-8859-1] Sat May 3 10:41:57 2008 @@ -229,4 +229,5 @@ IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" IDS_BURMESE_LAYOUT, "Burmese" -END + IDS_UKRAINIAN_STUDENT_LAYOUT, "Ukrainian (Student)" +END Modified: trunk/reactos/dll/cpl/input/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/el-GR.rc [iso-8859-1] Sat May 3 10:41:57 2008 @@ -228,4 +228,5 @@ IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" IDS_BURMESE_LAYOUT, "Burmese" -END + IDS_UKRAINIAN_STUDENT_LAYOUT, "Ukrainian (Student)" +END Modified: trunk/reactos/dll/cpl/input/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/en-US.rc [iso-8859-1] Sat May 3 10:41:57 2008 @@ -228,4 +228,5 @@ IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" IDS_BURMESE_LAYOUT, "Burmese" -END + IDS_UKRAINIAN_STUDENT_LAYOUT, "Ukrainian (Student)" +END Modified: trunk/reactos/dll/cpl/input/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/es-ES.rc [iso-8859-1] Sat May 3 10:41:57 2008 @@ -233,4 +233,5 @@ IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" IDS_BURMESE_LAYOUT, "Burmese" -END + IDS_UKRAINIAN_STUDENT_LAYOUT, "Ukrainian (Student)" +END Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/fr-FR.rc [iso-8859-1] Sat May 3 10:41:57 2008 @@ -230,4 +230,5 @@ IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" IDS_BURMESE_LAYOUT, "Burmese" -END + IDS_UKRAINIAN_STUDENT_LAYOUT, "Ukrainian (Student)" +END Modified: trunk/reactos/dll/cpl/input/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/it-IT.rc [iso-8859-1] Sat May 3 10:41:57 2008 @@ -228,4 +228,5 @@ IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" IDS_BURMESE_LAYOUT, "Burmese" -END + IDS_UKRAINIAN_STUDENT_LAYOUT, "Ukrainian (Student)" +END Modified: trunk/reactos/dll/cpl/input/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/pl-PL.rc [iso-8859-1] Sat May 3 10:41:57 2008 @@ -235,4 +235,5 @@ IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" IDS_BURMESE_LAYOUT, "Burmese" -END + IDS_UKRAINIAN_STUDENT_LAYOUT, "Ukrainian (Student)" +END Modified: trunk/reactos/dll/cpl/input/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/ru-RU.rc [iso-8859-1] Sat May 3 10:41:57 2008 @@ -224,8 +224,9 @@ IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Áîëãàðñêàÿ ôîíåòè÷åñêàÿ (êëàññè÷åñêàÿ)" IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Áîëãàðñêàÿ ôîíåòè÷åñêàÿ (BDS)" IDS_BULGARIAN_BDS_LAYOUT, "Áîëãàðñêàÿ (BDS 5237-1978)" - IDS_GERMAN_RISTOME_LAYOUT, "German (RISTOME)" - IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" - IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" - IDS_BURMESE_LAYOUT, "Burmese" -END + IDS_GERMAN_RISTOME_LAYOUT, "Íåìåöêàÿ (RISTOME)" + IDS_GERMAN_NEO_11_LAYOUT, "Íåìåöêàÿ (NEO-1.1)" + IDS_GERMAN_DE_ERGO_LAYOUT, "Íåìåöêàÿ (de_ergo)" + IDS_BURMESE_LAYOUT, "Áèðìàíñêàÿ" + IDS_UKRAINIAN_STUDENT_LAYOUT, "Óêðàèíñêàÿ (ñòóäåí÷åñêàÿ)" +END Modified: trunk/reactos/dll/cpl/input/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/sk-SK.rc [iso-8859-1] Sat May 3 10:41:57 2008 @@ -232,4 +232,5 @@ IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" IDS_BURMESE_LAYOUT, "Burmese" -END + IDS_UKRAINIAN_STUDENT_LAYOUT, "Ukrainian (Student)" +END Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/uk-UA.rc [iso-8859-1] Sat May 3 10:41:57 2008 @@ -237,4 +237,5 @@ IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" IDS_BURMESE_LAYOUT, "Burmese" -END + IDS_UKRAINIAN_STUDENT_LAYOUT, "Ukrainian (Student)" +END Modified: trunk/reactos/dll/cpl/input/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/input/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/resource.h [iso-8859-1] Sat May 3 10:41:57 2008 @@ -190,6 +190,7 @@ #define IDS_GERMAN_NEO_11_LAYOUT 5138 #define IDS_GERMAN_DE_ERGO_LAYOUT 5139 #define IDS_BURMESE_LAYOUT 5140 +#define IDS_UKRAINIAN_STUDENT_LAYOUT 5141 #endif /* __CPL_RESOURCE_H */

1 0

[dchapyshev] 33257: - Add new layouts to bootcd
by dchapyshev＠svn.reactos.org 03 May '08

03 May '08

Author: dchapyshev Date: Sat May 3 10:30:11 2008 New Revision: 33257 URL: http://svn.reactos.org/svn/reactos?rev=33257&view=rev Log: - Add new layouts to bootcd Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sat May 3 10:30:11 2008 @@ -143,6 +143,15 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041c","Layout Text",0x00000000,"Albanian" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041c","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5029" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041f","Layout File",0x00000000,"kbdtuq.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041f","Layout Text",0x00000000,"Turkish Q" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041f","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5060" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041f","Layout File",0x00000000,"kbdtuf.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041f","Layout Text",0x00000000,"Turkish F" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041f","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5059" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041f","Layout Id",0x00000000,"0014" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000080c","Layout File",0x00000000,"kbdbe.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000080c","Layout Text",0x00000000,"Belgian (French)" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000080c","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5002" @@ -191,6 +200,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000422","Layout Text",0x00000000,"Ukrainian" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000422","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5058" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010422","Layout File",0x00000000,"kbdurs.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010422","Layout Text",0x00000000,"Ukrainian (Student)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010422","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5141" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000425","Layout File",0x00000000,"kbdest.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000425","Layout Text",0x00000000,"Estonian" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000425","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5042" @@ -203,6 +216,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000427","Layout Text",0x00000000,"Lithuanian IBM" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000427","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5045" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042a","Layout File",0x00000000,"kbdvntc.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042a","Layout Text",0x00000000,"Vietnamese" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042a","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5118" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042f","Layout File",0x00000000,"kbdmac.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042f","Layout Text",0x00000000,"Macedonian (FYRO)" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042f","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5109" @@ -210,6 +227,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000437","Layout File",0x00000000,"kbdgeo.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000437","Layout Text",0x00000000,"Georgian" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000437","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5119" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000843","Layout File",0x00000000,"kbduzb.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000843","Layout Text",0x00000000,"Uzbek (Cyrillic)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000843","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5114" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000444","Layout File",0x00000000,"kbdtat.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000444","Layout Text",0x00000000,"Tatar" 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] Sat May 3 10:30:11 2008 @@ -180,13 +180,18 @@ dll\keyboard\kbdsw\kbdsw.dll 1 dll\keyboard\kbdtat\kbdtat.dll 1 dll\keyboard\kbdth\kbdth.dll 1 +dll\keyboard\kbdtuf\kbdtuf.dll 1 +dll\keyboard\kbdtuq\kbdtuq.dll 1 dll\keyboard\kbduk\kbduk.dll 1 dll\keyboard\kbdur\kbdur.dll 1 +dll\keyboard\kbdurs\kbdurs.dll 1 dll\keyboard\kbdus\kbdus.dll 1 dll\keyboard\kbdusa\kbdusa.dll 1 dll\keyboard\kbdusl\kbdusl.dll 1 dll\keyboard\kbdusr\kbdusr.dll 1 dll\keyboard\kbdusx\kbdusx.dll 1 +dll\keyboard\kbduzb\kbduzb.dll 1 +dll\keyboard\kbdvntc\kbdvntc.dll 1 dll\keyboard\kbdycc\kbdycc.dll 1 dll\keyboard\kbdycl\kbdycl.dll 1 Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Sat May 3 10:30:11 2008 @@ -178,11 +178,16 @@ 0000041D = "Swedish (Sweden)" 00000444 = "Tatar" 0000041E = "Thai (traditional)" +0000041F = "Turkish Q" +0001041F = "Turkish F" 00000422 = "Ukrainian" +00010422 = "Ukrainian (Student)" 00030409 = "US Dvorak for left hand" 00040409 = "US Dvorak for right hand" 00050409 = "US English (IBM Arabic 238_L)" 00020409 = "US International" +00000843 = "Uzbek (Cyrillic)" +0000042A = "Vietnamese" [Files.KeyboardLayout] 00020402 = kbdbgt.dll @@ -214,6 +219,8 @@ 00000410 = kbdit.dll 00000411 = kbdja.dll 0000041C = kbdal.dll +0000041F = kbdtuq.dll +0001041F = kbdtuf.dll 00000427 = kbdlt.dll 00000413 = kbdne.dll 00000414 = kbdno.dll @@ -229,10 +236,13 @@ 0000041E = kbdth.dll 00000809 = kbduk.dll 00000422 = kbdur.dll +00010422 = kbdurs.dll 00000425 = kbdest.dll 00000426 = kbdlv.dll +0000042A = kbdvntc.dll 0000042F = kbdmac.dll 00000437 = kbdgeo.dll +00000843 = kbduzb.dll 00000444 = kbdtat.dll 00011009 = kbdcan.dll 00000C0C = kbdfc.dll

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
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