H. Verbeet : wined3d: Use WINED3D_OK rather than D3D_OK.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Feb 15 05:27:56 CST 2007
Module: wine
Branch: master
Commit: 34e74ffc2a085b51c64a89b9b63609aadd24139c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=34e74ffc2a085b51c64a89b9b63609aadd24139c
Author: H. Verbeet <hverbeet at gmail.com>
Date: Wed Feb 14 23:30:40 2007 +0100
wined3d: Use WINED3D_OK rather than D3D_OK.
---
dlls/wined3d/device.c | 8 ++++----
dlls/wined3d/surface_gdi.c | 10 +++++-----
dlls/wined3d/vertexbuffer.c | 2 +-
dlls/wined3d/vertexshader.c | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index f511108..a80c3e7 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1667,7 +1667,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR
/* Setup the implicit swapchain */
TRACE("Creating implicit swapchain\n");
- if (D3D_OK != D3DCB_CreateAdditionalSwapChain((IUnknown *) This->parent, pPresentationParameters, (IWineD3DSwapChain **)&swapchain) || swapchain == NULL) {
+ if (FAILED(D3DCB_CreateAdditionalSwapChain((IUnknown *) This->parent, pPresentationParameters, (IWineD3DSwapChain **)&swapchain)) || !swapchain) {
WARN("Failed to create implicit swapchain\n");
return WINED3DERR_INVALIDCALL;
}
@@ -1845,10 +1845,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_EnumDisplayModes(IWineD3DDevice *iface,
TRACE("Enumerating %dx%d@%s\n", DevModeW.dmPelsWidth, DevModeW.dmPelsHeight, debug_d3dformat(pixelformat_for_depth(DevModeW.dmBitsPerPel)));
if (callback((IUnknown *) This, (UINT) DevModeW.dmPelsWidth, (UINT) DevModeW.dmPelsHeight, pixelformat_for_depth(DevModeW.dmBitsPerPel), 60.0, context) == DDENUMRET_CANCEL)
- return D3D_OK;
+ return WINED3D_OK;
}
- return D3D_OK;
+ return WINED3D_OK;
}
static HRESULT WINAPI IWineD3DDeviceImpl_SetDisplayMode(IWineD3DDevice *iface, UINT iSwapChain, WINED3DDISPLAYMODE* pMode) {
@@ -1882,7 +1882,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDisplayMode(IWineD3DDevice *iface, U
(This->ddraw_height == pMode->Height) &&
(This->ddraw_format == pMode->Format) &&
(pMode->RefreshRate == 0) ) {
- return D3D_OK;
+ return WINED3D_OK;
}
ret = ChangeDisplaySettingsExW(NULL, &devmode, NULL, CDS_FULLSCREEN, NULL);
diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c
index 34d6bff..cd02007 100644
--- a/dlls/wined3d/surface_gdi.c
+++ b/dlls/wined3d/surface_gdi.c
@@ -243,7 +243,7 @@ IWineGDISurfaceImpl_LockRect(IWineD3DSurface *iface,
TRACE("returning memory@%p, pitch(%d)\n", pLockedRect->pBits, pLockedRect->Pitch);
This->Flags |= SFLAG_LOCKED;
- return D3D_OK;
+ return WINED3D_OK;
}
/*****************************************************************************
@@ -1206,7 +1206,7 @@ IWineGDISurfaceImpl_BltFast(IWineD3DSurface *iface,
/* Lock the union of the two rectangles */
ret = IWineD3DSurface_LockRect(iface, &dlock, &lock_union, 0);
- if(ret != D3D_OK) goto error;
+ if(ret != WINED3D_OK) goto error;
pitch = dlock.Pitch;
slock.Pitch = dlock.Pitch;
@@ -1221,9 +1221,9 @@ IWineGDISurfaceImpl_BltFast(IWineD3DSurface *iface,
else
{
ret = IWineD3DSurface_LockRect(Source, &slock, &lock_src, WINED3DLOCK_READONLY);
- if(ret != D3D_OK) goto error;
+ if(ret != WINED3D_OK) goto error;
ret = IWineD3DSurface_LockRect(iface, &dlock, &lock_dst, 0);
- if(ret != D3D_OK) goto error;
+ if(ret != WINED3D_OK) goto error;
sbuf = slock.pBits;
dbuf = dlock.pBits;
@@ -1497,7 +1497,7 @@ const char* filename)
* avoid confusion in the shared surface code.
*
* Returns:
- * D3D_OK on success
+ * WINED3D_OK on success
* The return values of called methods on failure
*
*****************************************************************************/
diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c
index 84d0ca3..2e97c20 100644
--- a/dlls/wined3d/vertexbuffer.c
+++ b/dlls/wined3d/vertexbuffer.c
@@ -433,7 +433,7 @@ HRESULT WINAPI IWineD3DVertexBufferImpl_Unlock(IWineD3DVertexBuffer *iface) {
if(lockcount > 0) {
/* Delay loading the buffer until everything is unlocked */
TRACE("Ignoring the unlock\n");
- return D3D_OK;
+ return WINED3D_OK;
}
if(This->Flags & VBFLAG_HASDESC) {
diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c
index 52101f2..eeeb743 100644
--- a/dlls/wined3d/vertexshader.c
+++ b/dlls/wined3d/vertexshader.c
@@ -1244,7 +1244,7 @@ static HRESULT WINAPI IWIneD3DVertexShaderImpl_SetLocalConstantsF(IWineD3DVertex
list_add_head(&This->baseShader.constantsF, &lconst->entry);
}
- return D3D_OK;
+ return WINED3D_OK;
}
static HRESULT WINAPI IWineD3DVertexShaderImpl_CompileShader(IWineD3DVertexShader *iface) {
More information about the wine-cvs
mailing list