Browse Source

Change version number in Windows installer, cleanup.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3082 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.1
sletz 16 years ago
parent
commit
c7fe1cc107
2 changed files with 13 additions and 10 deletions
  1. +11
    -8
      windows/JackWinNamedPipe.cpp
  2. +2
    -2
      windows/Setup/jack.ci

+ 11
- 8
windows/JackWinNamedPipe.cpp View File

@@ -31,11 +31,11 @@ int JackWinNamedPipe::Read(void* data, int len)
{
DWORD read;
BOOL res = ReadFile(fNamedPipe, data, len, &read, NULL);
if (read != (DWORD)len) {
if (res && read == (DWORD)len) {
return 0;
} else {
jack_error("Cannot read named pipe err = %ld", GetLastError());
return -1;
} else {
return 0;
}
}

@@ -43,11 +43,11 @@ int JackWinNamedPipe::Write(void* data, int len)
{
DWORD written;
BOOL res = WriteFile(fNamedPipe, data, len, &written, NULL);
if (written != (DWORD)len) {
if (res && written == (DWORD)len) {
return 0;
} else {
jack_error("Cannot write named pipe err = %ld", GetLastError());
return -1;
} else {
return 0;
}
}

@@ -113,7 +113,7 @@ void JackWinNamedPipeClient::SetWriteTimeOut(long sec)
{}

JackWinAsyncNamedPipeClient::JackWinAsyncNamedPipeClient()
: JackWinNamedPipeClient(), fIOState(kIdle), fPendingIO(false)
: JackWinNamedPipeClient(), fPendingIO(false), fIOState(kIdle)
{
fIOState = kIdle;
fOverlap.hEvent = CreateEvent(NULL, // default security attribute
@@ -123,7 +123,7 @@ JackWinAsyncNamedPipeClient::JackWinAsyncNamedPipeClient()
}

JackWinAsyncNamedPipeClient::JackWinAsyncNamedPipeClient(HANDLE pipe, bool pending)
: JackWinNamedPipeClient(pipe), fIOState(kIdle), fPendingIO(pending)
: JackWinNamedPipeClient(pipe), fPendingIO(pending), fIOState(kIdle)
{
fOverlap.hEvent = CreateEvent(NULL, // default security attribute
TRUE, // manual-reset event
@@ -174,6 +174,9 @@ int JackWinAsyncNamedPipeClient::FinishIO()
}
fIOState = kReading;
break;

default:
break;
}

return 0;


+ 2
- 2
windows/Setup/jack.ci View File

@@ -1,9 +1,9 @@
<*project
version = 4 civer = "Free v4.14.3" winver = "2.6/5.1.2600" >
<output> .</>
<exename> Jack_v1.90_setup.exe</>
<exename> Jack_v1.9.1_setup.exe</>
<digitsign> </>
<appname> Jack v1.90</>
<appname> Jack v1.9.1</>
<password> </>
<addlang> </>
<icon> Default - 2</>


Loading…
Cancel
Save