dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed a bunch of bugs that caused lzma and bzip2 not to function without solid compression

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3362 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2004-01-06 00:53:12 +00:00
parent e9919e7f89
commit dd8a4388ac
6 changed files with 42 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Source/clzma.h
View file

@ -45,6 +45,7 @@ public:
hCompressionThread = NULL;
compressor_finished = FALSE;
finish = FALSE;
ct_locked = TRUE;
End();
InitializeCriticalSection(&cs);
}
@ -102,6 +103,22 @@ public:
int End()
{
if (!compressor_finished && !ct_locked)
{
// kill compression thread
avail_in = 0;
avail_out = 0;
finish = TRUE;
LeaveCriticalSection(&cs);
while (!ct_locked)
Sleep(0);
nt_locked = FALSE;
EnterCriticalSection(&cs);
while (ct_locked)
Sleep(0);
nt_locked = TRUE;
LeaveCriticalSection(&cs);
}
if (hCompressionThread)
{
CloseHandle(hCompressionThread);
@ -167,17 +184,18 @@ public:
return -1;
}
finish = flush;
if (!hCompressionThread)
{
DWORD dwThreadId;
finish = flush;
hCompressionThread = CreateThread(0, 0, lzmaCompressThread, (LPVOID) this, 0, &dwThreadId);
if (!hCompressionThread)
return -2;
}
else
{
finish = flush;
LeaveCriticalSection(&cs);
}
@ -189,15 +207,15 @@ public:
EnterCriticalSection(&cs);
nt_locked = TRUE;
while (ct_locked)
Sleep(0);
if (compressor_finished)
{
LeaveCriticalSection(&cs);
return res;
}
while (ct_locked)
Sleep(0);
return C_OK;
}