ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Use WINED3D_OK rather than D3D_OK.

Browse Source
This commit is contained in:
H. Verbeet 2007-02-14 23:30:40 +01:00 committed by Alexandre Julliard
parent 3e77ffc563
commit 34e74ffc2a
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/wined3d/device.c
View File

@ -1667,7 +1667,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR
/* Setup the implicit swapchain */ /* Setup the implicit swapchain */
TRACE("Creating implicit swapchain\n"); 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"); WARN("Failed to create implicit swapchain\n");
return WINED3DERR_INVALIDCALL; 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))); 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) 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) { 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_height == pMode->Height) &&
(This->ddraw_format == pMode->Format) && (This->ddraw_format == pMode->Format) &&
(pMode->RefreshRate == 0) ) { (pMode->RefreshRate == 0) ) {
return D3D_OK; return WINED3D_OK;
} }
ret = ChangeDisplaySettingsExW(NULL, &devmode, NULL, CDS_FULLSCREEN, NULL); ret = ChangeDisplaySettingsExW(NULL, &devmode, NULL, CDS_FULLSCREEN, NULL);

10
dlls/wined3d/surface_gdi.c
View File

@ -243,7 +243,7 @@ IWineGDISurfaceImpl_LockRect(IWineD3DSurface *iface,
TRACE("returning memory@%p, pitch(%d)\n", pLockedRect->pBits, pLockedRect->Pitch); TRACE("returning memory@%p, pitch(%d)\n", pLockedRect->pBits, pLockedRect->Pitch);
This->Flags |= SFLAG_LOCKED; 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 */ /* Lock the union of the two rectangles */
ret = IWineD3DSurface_LockRect(iface, &dlock, &lock_union, 0); ret = IWineD3DSurface_LockRect(iface, &dlock, &lock_union, 0);
if(ret != D3D_OK) goto error; if(ret != WINED3D_OK) goto error;
pitch = dlock.Pitch; pitch = dlock.Pitch;
slock.Pitch = dlock.Pitch; slock.Pitch = dlock.Pitch;
@ -1221,9 +1221,9 @@ IWineGDISurfaceImpl_BltFast(IWineD3DSurface *iface,
else else
{ {
ret = IWineD3DSurface_LockRect(Source, &slock, &lock_src, WINED3DLOCK_READONLY); 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); ret = IWineD3DSurface_LockRect(iface, &dlock, &lock_dst, 0);
if(ret != D3D_OK) goto error; if(ret != WINED3D_OK) goto error;
sbuf = slock.pBits; sbuf = slock.pBits;
dbuf = dlock.pBits; dbuf = dlock.pBits;
@ -1497,7 +1497,7 @@ const char* filename)
* avoid confusion in the shared surface code. * avoid confusion in the shared surface code.
* *
* Returns: * Returns:
* D3D_OK on success * WINED3D_OK on success
* The return values of called methods on failure * The return values of called methods on failure
* *
*****************************************************************************/ *****************************************************************************/

2
dlls/wined3d/vertexbuffer.c
View File

@ -433,7 +433,7 @@ HRESULT WINAPI IWineD3DVertexBufferImpl_Unlock(IWineD3DVertexBuffer *iface) {
if(lockcount > 0) { if(lockcount > 0) {
/* Delay loading the buffer until everything is unlocked */ /* Delay loading the buffer until everything is unlocked */
TRACE("Ignoring the unlock\n"); TRACE("Ignoring the unlock\n");
return D3D_OK; return WINED3D_OK;
} }
if(This->Flags & VBFLAG_HASDESC) { if(This->Flags & VBFLAG_HASDESC) {

2
dlls/wined3d/vertexshader.c
View File

@ -1244,7 +1244,7 @@ static HRESULT WINAPI IWIneD3DVertexShaderImpl_SetLocalConstantsF(IWineD3DVertex
list_add_head(&This->baseShader.constantsF, &lconst->entry); list_add_head(&This->baseShader.constantsF, &lconst->entry);
} }
return D3D_OK; return WINED3D_OK;
} }
static HRESULT WINAPI IWineD3DVertexShaderImpl_CompileShader(IWineD3DVertexShader *iface) { static HRESULT WINAPI IWineD3DVertexShaderImpl_CompileShader(IWineD3DVertexShader *iface) {