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

Small round of patches for various issues. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5830 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2.code 2014-01-25 14:25:48 +00:00
parent 18b345fab9
commit b99aa05cbf
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/GSdx/GPURenderer.h
View File

@ -123,11 +123,15 @@ protected:
int maxcount = std::max<int>(m_maxcount * 3 / 2, 10000); int maxcount = std::max<int>(m_maxcount * 3 / 2, 10000);
Vertex* vertices = (Vertex*)_aligned_malloc(sizeof(Vertex) * maxcount, 32); Vertex* vertices = (Vertex*)_aligned_malloc(sizeof(Vertex) * maxcount, 32);
if(m_vertices != NULL) if (m_vertices != NULL && vertices != NULL)
{ {
memcpy(vertices, m_vertices, sizeof(Vertex) * m_maxcount); memcpy(vertices, m_vertices, sizeof(Vertex) * m_maxcount);
_aligned_free(m_vertices); _aligned_free(m_vertices);
} }
else // very bad!
{
printf("GSdx: failed to allocate %d bytes for verticles. We will proceed to crash now.\n", sizeof(Vertex) * maxcount);
}
m_vertices = vertices; m_vertices = vertices;
m_maxcount = maxcount - 100; m_maxcount = maxcount - 100;

1
plugins/GSdx/GSThread.cpp
View File

@ -129,6 +129,7 @@ void GSThread::CloseThread()
{ {
if(WaitForSingleObject(m_hThread, 5000) != WAIT_OBJECT_0) if(WaitForSingleObject(m_hThread, 5000) != WAIT_OBJECT_0)
{ {
printf("GSdx: WARNING: GSThread Thread did not close itself in time. Assuming hung. Terminating.\n");
TerminateThread(m_hThread, 1); TerminateThread(m_hThread, 1);
} }

3
plugins/spu2-x/src/Debug.cpp
View File

@ -207,8 +207,9 @@ void DoFullDump()
} }
fprintf(dump,"#### END OF DUMP.\n\n"); fprintf(dump,"#### END OF DUMP.\n\n");
} }
}
fclose(dump); fclose(dump);
}
dump = fopen( "logs/effects.txt", "wt" ); dump = fopen( "logs/effects.txt", "wt" );
if (dump) if (dump)
{ {

1
plugins/spu2-x/src/Windows/dsp.cpp
View File

@ -108,6 +108,7 @@ void DspCloseLibrary()
running=false; running=false;
if(WaitForSingleObject(hUpdateThread,1000)==WAIT_TIMEOUT) if(WaitForSingleObject(hUpdateThread,1000)==WAIT_TIMEOUT)
{ {
ConLog("SPU2-X: WARNING: DSP Thread did not close itself in time. Assuming hung. Terminating.\n");
TerminateThread(hUpdateThread,1); TerminateThread(hUpdateThread,1);
} }
} }