diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 25fd4d4f0bf..536d7a4d9f4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -23,7 +23,6 @@ */ #include "config.h" -#include #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); @@ -242,7 +241,6 @@ static void WineD3D_ReleaseFakeGLContext(void) { wined3d_fake_gl_context_hwnd = NULL; wined3d_fake_gl_context_available = FALSE; } - assert(wined3d_fake_gl_context_ref >= 0); LeaveCriticalSection(&wined3d_fake_gl_context_cs); } @@ -254,7 +252,6 @@ static BOOL WineD3D_CreateFakeGLContext(void) { TRACE("getting context...\n"); if(wined3d_fake_gl_context_ref > 0) goto ret; - assert(0 == wined3d_fake_gl_context_ref); wined3d_fake_gl_context_foreign = TRUE; diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 338e66e0906..a5447d07335 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -22,7 +22,6 @@ #include "winerror.h" #include "wine/debug.h" -#include #include #include "wined3d_private.h" @@ -78,7 +77,9 @@ DWORD IWineD3DPaletteImpl_Size(DWORD dwFlags) { case WINEDDPCAPS_2BIT: return 4; case WINEDDPCAPS_4BIT: return 16; case WINEDDPCAPS_8BIT: return 256; - default: assert(0); return 256; + default: + FIXME("Unhandled size bits %#x.\n", dwFlags & SIZE_BITS); + return 256; } } diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index d776785a018..44b94236caa 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -30,8 +30,6 @@ #include "wine/port.h" #include "wined3d_private.h" -#include - WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); /* See also float_16_to_32() in wined3d_private.h */ @@ -1117,8 +1115,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D dstwidth = xdst.right - xdst.left; width = (xdst.right - xdst.left) * bpp; - assert(width <= dlock.Pitch); - if (DestRect && Src != This) dbuf = dlock.pBits; else @@ -1619,7 +1615,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst slock.Pitch = dlock.Pitch; /* Since slock was originally copied from this surface's description, we can just reuse it */ - assert(This->resource.allocatedMemory != NULL); sbuf = This->resource.allocatedMemory + lock_src.top * pitch + lock_src.left * bpp; dbuf = This->resource.allocatedMemory + lock_dst.top * pitch + lock_dst.left * bpp; sEntry = Src->resource.format_desc; diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index a1945691e6d..96054d9ce86 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -29,7 +29,6 @@ #include "wine/port.h" #include "wined3d_private.h" -#include #include /* Use the d3d_surface debug channel to have one channel for all surfaces */