Disable a few unsupported items

Author: elishacloud

Dllmain/BuildNo.rc

@@ -1 +1 @@
-#define BUILD_NUMBER 8160 
+#define BUILD_NUMBER 8161 

ddraw/IDirect3DTypes.cpp

@@ -580,12 +580,12 @@ void ConvertDeviceDesc(D3DDEVICEDESC7& Desc7, const D3DCAPS9& Caps9)
 			D3DPMISCCAPS_CULLCW |
 			D3DPMISCCAPS_CULLCCW));
 	Desc7.dpcLineCaps.dwRasterCaps =
-		D3DPRASTERCAPS_ROP2 |
-		D3DPRASTERCAPS_XOR |
-		D3DPRASTERCAPS_PAT |
-		D3DPRASTERCAPS_SUBPIXEL |
-		D3DPRASTERCAPS_SUBPIXELX |
-		D3DPRASTERCAPS_STIPPLE |
+		//D3DPRASTERCAPS_ROP2 |
+		//D3DPRASTERCAPS_XOR |
+		//D3DPRASTERCAPS_PAT |
+		//D3DPRASTERCAPS_SUBPIXEL |
+		//D3DPRASTERCAPS_SUBPIXELX |
+		//D3DPRASTERCAPS_STIPPLE |
 		D3DPRASTERCAPS_ANTIALIASSORTDEPENDENT |
 		D3DPRASTERCAPS_ANTIALIASSORTINDEPENDENT |
 		D3DPRASTERCAPS_ANTIALIASEDGES |
@@ -665,10 +665,10 @@ void ConvertDeviceDesc(D3DDEVICEDESC7& Desc7, const D3DCAPS9& Caps9)
 		D3DPSHADECAPS_SPECULARPHONGMONO |
 		D3DPSHADECAPS_SPECULARPHONGRGB |
 		D3DPSHADECAPS_ALPHAFLATBLEND |
-		D3DPSHADECAPS_ALPHAFLATSTIPPLED |
-		D3DPSHADECAPS_ALPHAGOURAUDSTIPPLED |
+		//D3DPSHADECAPS_ALPHAFLATSTIPPLED |
+		//D3DPSHADECAPS_ALPHAGOURAUDSTIPPLED |
 		D3DPSHADECAPS_ALPHAPHONGBLEND |
-		D3DPSHADECAPS_ALPHAPHONGSTIPPLED |
+		//D3DPSHADECAPS_ALPHAPHONGSTIPPLED |
 		D3DPSHADECAPS_FOGFLAT |
 		D3DPSHADECAPS_FOGPHONG |
 		(Caps9.ShadeCaps &
@@ -688,8 +688,8 @@ void ConvertDeviceDesc(D3DDEVICEDESC7& Desc7, const D3DCAPS9& Caps9)
 			D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE |
 			D3DPTEXTURECAPS_ALPHAPALETTE |
 			D3DPTEXTURECAPS_NONPOW2CONDITIONAL |
-			D3DPTEXTURECAPS_PROJECTED |
-			D3DPTEXTURECAPS_CUBEMAP));
+			D3DPTEXTURECAPS_PROJECTED /*|
+			D3DPTEXTURECAPS_CUBEMAP*/));
 	Desc7.dpcLineCaps.dwTextureCaps = m_IDirect3D9Ex::AdjustPOW2Caps(Desc7.dpcLineCaps.dwTextureCaps);
 	Desc7.dpcLineCaps.dwTextureFilterCaps =
 		D3DPTFILTERCAPS_NEAREST |
@@ -725,8 +725,8 @@ void ConvertDeviceDesc(D3DDEVICEDESC7& Desc7, const D3DCAPS9& Caps9)
 			D3DPTADDRESSCAPS_CLAMP |
 			D3DPTADDRESSCAPS_BORDER |
 			D3DPTADDRESSCAPS_INDEPENDENTUV));
-	Desc7.dpcLineCaps.dwStippleWidth = 8;
-	Desc7.dpcLineCaps.dwStippleHeight = 8;
+	Desc7.dpcLineCaps.dwStippleWidth = 0 /*8*/;
+	Desc7.dpcLineCaps.dwStippleHeight = 0 /*8*/;
 
 	// Triangle capabilities (same as line caps)
 	Desc7.dpcTriCaps = Desc7.dpcLineCaps;

ddraw/IDirectDrawX.cpp

@@ -540,13 +540,15 @@ HRESULT m_IDirectDrawX::CreateSurface2(LPDDSURFACEDESC2 lpDDSurfaceDesc2, LPDIRE
 		// Check for Cube map
 		if (lpDDSurfaceDesc2->ddsCaps.dwCaps2 & (DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES))
 		{
-			LOG_LIMIT(100, __FUNCTION__ << " Warning: Cube map not Implemented.");
+			LOG_LIMIT(100, __FUNCTION__ << " Error: Cube map not Implemented.");
+			return DDERR_INVALIDCAPS;
 		}
 
 		// Check for Volume
 		if (lpDDSurfaceDesc2->ddsCaps.dwCaps2 & DDSCAPS2_VOLUME)
 		{
-			LOG_LIMIT(100, __FUNCTION__ << " Warning: Volume not Implemented.");
+			LOG_LIMIT(100, __FUNCTION__ << " Error: Volume not Implemented.");
+			return DDERR_INVALIDCAPS;
 		}
 
 		// Check for own dc