ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Have error-checking when drawing RSP command window.

This commit is contained in:
unknown 2015-09-17 21:49:00 -04:00
parent 341f2c2752
commit 17b7b0857c
1 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Source/RSP/RSP Command.c
View File

@ -247,6 +247,7 @@ void DumpRSPData (void)
void DrawRSPCommand ( LPARAM lParam ) void DrawRSPCommand ( LPARAM lParam )
{ {
char Command[150], Offset[30], Instruction[30], Arguments[40]; char Command[150], Offset[30], Instruction[30], Arguments[40];
int printed_offset, printed_instruction, printed_arguments;
LPDRAWITEMSTRUCT ditem; LPDRAWITEMSTRUCT ditem;
COLORREF oldColor = {0}; COLORREF oldColor = {0};
int ResetColor; int ResetColor;
@ -260,26 +261,31 @@ void DrawRSPCommand ( LPARAM lParam )
if (strchr(Command,'\t')) if (strchr(Command,'\t'))
{ {
p1 = strchr(Command,'\t'); p1 = strchr(Command,'\t');
sprintf(Offset,"%.*s",p1 - Command, Command); printed_offset = sprintf(Offset, "%.*s", p1 - Command, Command);
p1++; p1++;
if (strchr(p1,'\t')) if (strchr(p1,'\t'))
{ {
p2 = strchr(p1,'\t'); p2 = strchr(p1,'\t');
sprintf(Instruction,"%.*s",p2 - p1, p1); printed_instruction = sprintf(Instruction, "%.*s", p2 - p1, p1);
sprintf(Arguments,"%s",p2 + 1); printed_arguments = sprintf(Arguments, "%s", p2 + 1);
} }
else else
{ {
sprintf(Instruction,"%s",p1); printed_instruction = sprintf(Instruction, "%s", p1);
sprintf(Arguments,"\0"); printed_arguments = sprintf(Arguments, "\0");
} }
sprintf(Command,"\0"); Command[0] = '\0';
} }
else else
{ {
sprintf(Offset,"\0"); printed_offset = sprintf(Offset, "\0");
sprintf(Instruction,"\0"); printed_instruction = sprintf(Instruction, "\0");
sprintf(Arguments,"\0"); printed_arguments = sprintf(Arguments, "\0");
}
if (printed_offset < 0 || printed_instruction < 0 || printed_arguments < 0)
{
DisplayError("Failed to sprintf from item %u.", ditem -> itemID);
} }
if (*PrgCount == RSPCommandLine[ditem->itemID].Location) if (*PrgCount == RSPCommandLine[ditem->itemID].Location)
@ -310,23 +316,43 @@ void DrawRSPCommand ( LPARAM lParam )
FillRect( ditem->hDC, &ditem->rcItem,hBrush); FillRect( ditem->hDC, &ditem->rcItem,hBrush);
SetBkMode( ditem->hDC, TRANSPARENT ); SetBkMode( ditem->hDC, TRANSPARENT );
if (strlen (Command) == 0 ) if (Command[0] == '\0')
{ {
SetRect(&TextRect,ditem->rcItem.left,ditem->rcItem.top, ditem->rcItem.left + 83, SetRect(&TextRect,ditem->rcItem.left,ditem->rcItem.top, ditem->rcItem.left + 83,
ditem->rcItem.bottom); ditem->rcItem.bottom);
DrawText(ditem->hDC,Offset,strlen(Offset), &TextRect,DT_SINGLELINE | DT_VCENTER); DrawText(
ditem->hDC,
&Offset[0], printed_offset,
&TextRect,
DT_SINGLELINE | DT_VCENTER
);
SetRect(&TextRect,ditem->rcItem.left + 83,ditem->rcItem.top, ditem->rcItem.left + 165, SetRect(&TextRect,ditem->rcItem.left + 83,ditem->rcItem.top, ditem->rcItem.left + 165,
ditem->rcItem.bottom); ditem->rcItem.bottom);
DrawText(ditem->hDC,Instruction,strlen(Instruction), &TextRect,DT_SINGLELINE | DT_VCENTER); DrawText(
ditem->hDC,
&Instruction[0], printed_instruction,
&TextRect,
DT_SINGLELINE | DT_VCENTER
);
SetRect(&TextRect,ditem->rcItem.left + 165,ditem->rcItem.top, ditem->rcItem.right, SetRect(&TextRect,ditem->rcItem.left + 165,ditem->rcItem.top, ditem->rcItem.right,
ditem->rcItem.bottom); ditem->rcItem.bottom);
DrawText(ditem->hDC,Arguments,strlen(Arguments), &TextRect,DT_SINGLELINE | DT_VCENTER); DrawText(
ditem->hDC,
&Arguments[0], printed_arguments,
&TextRect,
DT_SINGLELINE | DT_VCENTER
);
} }
else else
{ {
DrawText(ditem->hDC,Command,strlen(Command), &ditem->rcItem,DT_SINGLELINE | DT_VCENTER); DrawText(
ditem->hDC,
&Command[0], (signed int)strlen(Command),
&ditem->rcItem,
DT_SINGLELINE | DT_VCENTER
);
} }
if (ResetColor == TRUE) { if (ResetColor == TRUE) {