Henri Verbeet : wined3d: Get rid of unused error codes.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9c96a525e7989974e165a0c044ee90fda5d97e05
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9c96a525e7989974e165a0c044...

Author: Henri Verbeet 
Date:   Tue Jan  5 15:04:57 2016 +0100

wined3d: Get rid of unused error codes.

Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/d3d8/device.c     |  2 +-
 dlls/d3d9/device.c     |  4 ++--
 dlls/ddraw/surface.c   |  2 --
 include/wine/wined3d.h | 18 ------------------
 4 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 6c94243..653a158 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -1288,7 +1288,7 @@ static HRESULT WINAPI d3d8_device_GetDepthStencilSurface(IDirect3DDevice8 *iface
     }
     else
     {
-        hr = WINED3DERR_NOTFOUND;
+        hr = D3DERR_NOTFOUND;
         *depth_stencil = NULL;
     }
     wined3d_mutex_unlock();
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 16b27e5..294e680 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -1525,7 +1525,7 @@ static HRESULT WINAPI d3d9_device_GetRenderTarget(IDirect3DDevice9Ex *iface, DWO
     }
     else
     {
-        hr = WINED3DERR_NOTFOUND;
+        hr = D3DERR_NOTFOUND;
         *surface = NULL;
     }
     wined3d_mutex_unlock();
@@ -1571,7 +1571,7 @@ static HRESULT WINAPI d3d9_device_GetDepthStencilSurface(IDirect3DDevice9Ex *ifa
     }
     else
     {
-        hr = WINED3DERR_NOTFOUND;
+        hr = D3DERR_NOTFOUND;
         *depth_stencil = NULL;
     }
     wined3d_mutex_unlock();
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 0969650..0976603 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -1653,7 +1653,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 *
     switch(hr)
     {
         case WINED3DERR_NOTAVAILABLE:       return DDERR_UNSUPPORTED;
-        case WINED3DERR_WRONGTEXTUREFORMAT: return DDERR_INVALIDPIXELFORMAT;
         default:                            return hr;
     }
 }
@@ -4164,7 +4163,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_BltFast(IDirectDrawSurfac
     switch(hr)
     {
         case WINED3DERR_NOTAVAILABLE:           return DDERR_UNSUPPORTED;
-        case WINED3DERR_WRONGTEXTUREFORMAT:     return DDERR_INVALIDPIXELFORMAT;
         default:                                return hr;
     }
 }
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index e38bc7d..9f39a6d 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -39,35 +39,17 @@
 #define WINED3DOK_NOAUTOGEN                                     MAKE_WINED3DSTATUS(2159)

#define MAKE_WINED3DHRESULT(code)                               MAKE_HRESULT(1, _FACWINED3D, code)
-#define WINED3DERR_WRONGTEXTUREFORMAT                           MAKE_WINED3DHRESULT(2072)
-#define WINED3DERR_UNSUPPORTEDCOLOROPERATION                    MAKE_WINED3DHRESULT(2073)
-#define WINED3DERR_UNSUPPORTEDCOLORARG                          MAKE_WINED3DHRESULT(2074)
-#define WINED3DERR_UNSUPPORTEDALPHAOPERATION                    MAKE_WINED3DHRESULT(2075)
-#define WINED3DERR_UNSUPPORTEDALPHAARG                          MAKE_WINED3DHRESULT(2076)
-#define WINED3DERR_TOOMANYOPERATIONS                            MAKE_WINED3DHRESULT(2077)
-#define WINED3DERR_CONFLICTINGTEXTUREFILTER                     MAKE_WINED3DHRESULT(2078)
-#define WINED3DERR_UNSUPPORTEDFACTORVALUE                       MAKE_WINED3DHRESULT(2079)
 #define WINED3DERR_CONFLICTINGRENDERSTATE                       MAKE_WINED3DHRESULT(2081)
 #define WINED3DERR_UNSUPPORTEDTEXTUREFILTER                     MAKE_WINED3DHRESULT(2082)
-#define WINED3DERR_CONFLICTINGTEXTUREPALETTE                    MAKE_WINED3DHRESULT(2086)
-#define WINED3DERR_DRIVERINTERNALERROR                          MAKE_WINED3DHRESULT(2087)
-#define WINED3DERR_NOTFOUND                                     MAKE_WINED3DHRESULT(2150)
-#define WINED3DERR_MOREDATA                                     MAKE_WINED3DHRESULT(2151)
-#define WINED3DERR_DEVICENOTRESET                               MAKE_WINED3DHRESULT(2153)
 #define WINED3DERR_NOTAVAILABLE                                 MAKE_WINED3DHRESULT(2154)
 #define WINED3DERR_OUTOFVIDEOMEMORY                             MAKE_WINED3DHRESULT(380)
-#define WINED3DERR_INVALIDDEVICE                                MAKE_WINED3DHRESULT(2155)
 #define WINED3DERR_INVALIDCALL                                  MAKE_WINED3DHRESULT(2156)
-#define WINED3DERR_DRIVERINVALIDCALL                            MAKE_WINED3DHRESULT(2157)
-#define WINED3DERR_WASSTILLDRAWING                              MAKE_WINED3DHRESULT(540)
 #define WINEDDERR_NOTAOVERLAYSURFACE                            MAKE_WINED3DHRESULT(580)
 #define WINEDDERR_NOTLOCKED                                     MAKE_WINED3DHRESULT(584)
 #define WINEDDERR_NODC                                          MAKE_WINED3DHRESULT(586)
 #define WINEDDERR_DCALREADYCREATED                              MAKE_WINED3DHRESULT(620)
-#define WINEDDERR_NOTFLIPPABLE                                  MAKE_WINED3DHRESULT(582)
 #define WINEDDERR_SURFACEBUSY                                   MAKE_WINED3DHRESULT(430)
 #define WINEDDERR_INVALIDRECT                                   MAKE_WINED3DHRESULT(150)
-#define WINEDDERR_NOCLIPLIST                                    MAKE_WINED3DHRESULT(205)
 #define WINEDDERR_OVERLAYNOTVISIBLE                             MAKE_WINED3DHRESULT(577)

enum wined3d_light_type