Henri Verbeet : wined3d: Get rid of some asserts.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 404f4f73214c52c985adaeae6e18187c1a08cb66
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=404f4f73214c52c985adaeae6e...

Author: Henri Verbeet 
Date:   Mon Jun 22 10:16:00 2009 +0200

wined3d: Get rid of some asserts.

---

dlls/wined3d/directx.c      |    3 ---
 dlls/wined3d/palette.c      |    5 +++--
 dlls/wined3d/surface_base.c |    5 -----
 dlls/wined3d/surface_gdi.c  |    1 -
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 25fd4d4..536d7a4 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -23,7 +23,6 @@
  */

#include "config.h"
-#include <assert.h>
 #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 338e66e..a5447d0 100644
--- a/dlls/wined3d/palette.c
+++ b/dlls/wined3d/palette.c
@@ -22,7 +22,6 @@
 #include "winerror.h"
 #include "wine/debug.h"

-#include <assert.h>
 #include <string.h>

#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 d776785..44b9423 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 <assert.h>
-
 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 a194569..96054d9 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 <assert.h>
 #include <stdio.h>

/* Use the d3d_surface debug channel to have one channel for all surfaces */