From 56693f67adcf345e68848675428c38dbdd30b932 Mon Sep 17 00:00:00 2001 From: FunkyFr3sh <cc.red.alert.1@googlemail.com> Date: Sun, 12 Nov 2017 18:23:26 +0100 Subject: [PATCH] revert lock/unlock changes since it doesn't work too well with GDI rendering --- ddraw.dll | Bin 171520 -> 171008 bytes surface.c | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ddraw.dll b/ddraw.dll index 58774d5125bb6e6831515c6e75c83f0aa8c258e8..8af0da04ad808f1ab7d2784a87caaa7fd2c584d6 100644 GIT binary patch delta 4665 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 K=SQ08(0>6lkk2*% delta 4754 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 diff --git a/surface.c b/surface.c index ff06862..de0b970 100644 --- a/surface.c +++ b/surface.c @@ -311,7 +311,7 @@ HRESULT __stdcall ddraw_surface_Lock(IDirectDrawSurfaceImpl *This, LPRECT lpDest HRESULT ret = ddraw_surface_GetSurfaceDesc(This, lpDDSurfaceDesc); - EnterCriticalSection(&ddraw->cs); + //EnterCriticalSection(&ddraw->cs); return ret; } @@ -368,7 +368,7 @@ HRESULT __stdcall ddraw_surface_Unlock(IDirectDrawSurfaceImpl *This, LPVOID lpRe printf("DirectDrawSurface::Unlock(This=%p, lpRect=%p)\n", This, lpRect); #endif - LeaveCriticalSection(&ddraw->cs); + //LeaveCriticalSection(&ddraw->cs); return DD_OK; }