#382 Fix colorkey issues in Sanitarium

FunkyFr3sh · FunkyFr3sh · commit d45f35ab57ee · 2025-01-16T04:47:38.000+01:00
diff --git a/src/ddsurface.c b/src/ddsurface.c
@@ -909,6 +909,11 @@ HRESULT dds_GetClipper(IDirectDrawSurfaceImpl* This, IDirectDrawClipperImpl** lp
 
 HRESULT dds_GetColorKey(IDirectDrawSurfaceImpl* This, DWORD dwFlags, LPDDCOLORKEY lpColorKey)
 {
+    if (!(This->flags & DDSD_CKSRCBLT))
+    {
+        return DDERR_NOCOLORKEY;
+    }
+
     if (dwFlags != DDCKEY_SRCBLT || !lpColorKey)
     {
         TRACE("     NOT_IMPLEMENTED dwFlags=%08X, lpColorKey=%p\n", dwFlags, lpColorKey);

Original file line number	Diff line number	Diff line change
`@@ -909,6 +909,11 @@ HRESULT dds_GetClipper(IDirectDrawSurfaceImpl* This, IDirectDrawClipperImpl** lp`
`909`	`909`
`910`	`910`	`HRESULT dds_GetColorKey(IDirectDrawSurfaceImpl* This, DWORD dwFlags, LPDDCOLORKEY lpColorKey)`
`911`	`911`	`{`
	`912`	`+ if (!(This->flags & DDSD_CKSRCBLT))`
	`913`	`+ {`
	`914`	`+ return DDERR_NOCOLORKEY;`
	`915`	`+ }`
	`916`	`+`
`912`	`917`	`if (dwFlags != DDCKEY_SRCBLT \|\| !lpColorKey)`
`913`	`918`	`{`
`914`	`919`	`TRACE(" NOT_IMPLEMENTED dwFlags=%08X, lpColorKey=%p\n", dwFlags, lpColorKey);`