Browse Source

Add missing arg to j_lock_buf_priv and j_unlock_buf_priv (#374)

pull/25/head
Robin Eklind 8 years ago committed by GitHub
parent
commit
3103da7f1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      Source/capture.cpp
  2. 8
      Source/dx.cpp
  3. 4
      Source/dx.h
  4. 4
      Source/interfac.cpp
  5. 24
      Source/scrollrt.cpp

4
Source/capture.cpp

@ -14,7 +14,7 @@ void __cdecl CaptureScreen()
lpDDPalette->GetEntries(0, 0, 256, palette); lpDDPalette->GetEntries(0, 0, 256, palette);
RedPalette(palette); RedPalette(palette);
lock_buf_priv(); j_lock_buf_priv(2);
bool success = CaptureHdr(hObject, 640, 480); bool success = CaptureHdr(hObject, 640, 480);
if (success) if (success)
{ {
@ -24,7 +24,7 @@ void __cdecl CaptureScreen()
success = CapturePal(hObject, palette); success = CapturePal(hObject, palette);
} }
} }
unlock_buf_priv(); j_unlock_buf_priv(2);
CloseHandle(hObject); CloseHandle(hObject);
if (!success) if (!success)

8
Source/dx.cpp

@ -184,6 +184,10 @@ HRESULT __fastcall dx_DirectDrawCreate(GUID *guid, IDirectDraw **DD, void *unkno
return ((int (__stdcall *)(GUID *, IDirectDraw **, void *))v5)(v8, v3, unknown); return ((int (__stdcall *)(GUID *, IDirectDraw **, void *))v5)(v8, v3, unknown);
} }
void __fastcall j_lock_buf_priv(char a1) {
lock_buf_priv();
}
void __cdecl lock_buf_priv() void __cdecl lock_buf_priv()
{ {
Screen *v0; // eax Screen *v0; // eax
@ -215,6 +219,10 @@ LABEL_9:
} }
// 69CF0C: using guessed type int gpBufEnd; // 69CF0C: using guessed type int gpBufEnd;
void __fastcall j_unlock_buf_priv(char a1) {
unlock_buf_priv();
}
void __cdecl unlock_buf_priv() void __cdecl unlock_buf_priv()
{ {
Screen *v0; // eax Screen *v0; // eax

4
Source/dx.h

@ -23,9 +23,9 @@ void __fastcall dx_init(HWND hWnd);
void __cdecl dx_create_back_buffer(); void __cdecl dx_create_back_buffer();
void __cdecl dx_create_primary_surface(); void __cdecl dx_create_primary_surface();
HRESULT __fastcall dx_DirectDrawCreate(GUID *guid, IDirectDraw **DD, void *unknown); HRESULT __fastcall dx_DirectDrawCreate(GUID *guid, IDirectDraw **DD, void *unknown);
void __cdecl j_lock_buf_priv(); void __fastcall j_lock_buf_priv(char a1);
void __cdecl lock_buf_priv(); void __cdecl lock_buf_priv();
void __cdecl j_unlock_buf_priv(); void __fastcall j_unlock_buf_priv(char a1);
void __cdecl unlock_buf_priv(); void __cdecl unlock_buf_priv();
void __cdecl dx_cleanup(); void __cdecl dx_cleanup();
void __cdecl dx_reinit(); void __cdecl dx_reinit();

4
Source/interfac.cpp

@ -49,7 +49,7 @@ void __cdecl DrawCutscene()
{ {
unsigned int v0; // esi unsigned int v0; // esi
lock_buf_priv(); j_lock_buf_priv(1);
CelDecodeOnly(64, 639, sgpBackCel, 1, 640); CelDecodeOnly(64, 639, sgpBackCel, 1, 640);
v0 = 0; v0 = 0;
if ( sgdwProgress ) if ( sgdwProgress )
@ -61,7 +61,7 @@ void __cdecl DrawCutscene()
progress_id); progress_id);
while ( v0 < sgdwProgress ); while ( v0 < sgdwProgress );
} }
unlock_buf_priv(); j_unlock_buf_priv(1);
drawpanflag = 255; drawpanflag = 255;
scrollrt_draw_game_screen(0); scrollrt_draw_game_screen(0);
} }

24
Source/scrollrt.cpp

@ -2828,12 +2828,12 @@ void __cdecl ClearScreenBuffer()
{ {
int i; // edx int i; // edx
lock_buf_priv(); j_lock_buf_priv(3);
for(i = 0; i < 480; i++) for(i = 0; i < 480; i++)
memset(gpBuffer->row[i].pixels, 0, 640); memset(gpBuffer->row[i].pixels, 0, 640);
unlock_buf_priv(); j_unlock_buf_priv(3);
} }
#ifdef _DEBUG #ifdef _DEBUG
@ -2973,16 +2973,16 @@ void __fastcall scrollrt_draw_game_screen(bool draw_cursor)
} }
if ( draw_cursor ) if ( draw_cursor )
{ {
lock_buf_priv(); j_lock_buf_priv(0);
scrollrt_draw_cursor_item(); scrollrt_draw_cursor_item();
unlock_buf_priv(); j_unlock_buf_priv(0);
} }
DrawMain(dwHgt, 0, 0, 0, 0, 0); DrawMain(dwHgt, 0, 0, 0, 0, 0);
if ( draw_cursor ) if ( draw_cursor )
{ {
lock_buf_priv(); j_lock_buf_priv(0);
scrollrt_draw_cursor_back_buffer(); scrollrt_draw_cursor_back_buffer();
unlock_buf_priv(); j_unlock_buf_priv(0);
} }
} }
// 52571C: using guessed type int drawpanflag; // 52571C: using guessed type int drawpanflag;
@ -3312,7 +3312,7 @@ void __fastcall DoBlitScreen(int dwX, int dwY, int dwWdt, int dwHgt)
v6 = 768 - dwWdt; v6 = 768 - dwWdt;
error_codea = (unsigned int)dwWdt >> 2; error_codea = (unsigned int)dwWdt >> 2;
v16 = v6; v16 = v6;
lock_buf_priv(); j_lock_buf_priv(6);
v7 = (char *)gpBuffer + v14; v7 = (char *)gpBuffer + v14;
v8 = (char *)DDS_desc.lpSurface + v15; v8 = (char *)DDS_desc.lpSurface + v15;
v9 = dwHgt; v9 = dwHgt;
@ -3324,7 +3324,7 @@ void __fastcall DoBlitScreen(int dwX, int dwY, int dwWdt, int dwHgt)
--v9; --v9;
} }
while ( v9 ); while ( v9 );
unlock_buf_priv(); j_unlock_buf_priv(6);
} }
} }
@ -3355,7 +3355,7 @@ void __cdecl DrawAndBlit()
dwHgt = 352; dwHgt = 352;
} }
drawpanflag = 0; drawpanflag = 0;
lock_buf_priv(); j_lock_buf_priv(0);
if ( leveltype ) if ( leveltype )
DrawView(ViewX, ViewY); DrawView(ViewX, ViewY);
else else
@ -3376,11 +3376,11 @@ void __cdecl DrawAndBlit()
dwHgt = 480; dwHgt = 480;
} }
scrollrt_draw_cursor_item(); scrollrt_draw_cursor_item();
unlock_buf_priv(); j_unlock_buf_priv(0);
DrawMain(dwHgt, ddsdesc, drawhpflag, drawmanaflag, drawsbarflag, drawbtnflag); DrawMain(dwHgt, ddsdesc, drawhpflag, drawmanaflag, drawsbarflag, drawbtnflag);
lock_buf_priv(); j_lock_buf_priv(0);
scrollrt_draw_cursor_back_buffer(); scrollrt_draw_cursor_back_buffer();
unlock_buf_priv(); j_unlock_buf_priv(0);
drawhpflag = FALSE; drawhpflag = FALSE;
drawmanaflag = FALSE; drawmanaflag = FALSE;
drawbtnflag = 0; drawbtnflag = 0;

Loading…
Cancel
Save