diff --git a/example-clients/midi_latency_test.c b/example-clients/midi_latency_test.c
index 88dad6ee..60d13882 100644
--- a/example-clients/midi_latency_test.c
+++ b/example-clients/midi_latency_test.c
@@ -77,7 +77,7 @@ typedef sem_t *semaphore_t;
const char *ERROR_RESERVE = "could not reserve MIDI event on port buffer";
const char *ERROR_SHUTDOWN = "the JACK server has been shutdown";
-const char *ERROR_TIMEOUT = "timed out while waiting for MIDI message";
+const char *ERROR_TIMEOUT1 = "timed out while waiting for MIDI message";
const char *SOURCE_EVENT_RESERVE = "jack_midi_event_reserve";
const char *SOURCE_PROCESS = "handle_process";
@@ -209,7 +209,7 @@ get_semaphore_error()
if (! FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error,
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
semaphore_error_msg, 1024, NULL)) {
- sprintf(semaphore_error_msg, 1023, "Unknown OS error code '%d'",
+ snprintf(semaphore_error_msg, 1023, "Unknown OS error code '%d'",
error);
}
return semaphore_error_msg;
@@ -284,7 +284,7 @@ handle_process(jack_nframes_t frames, void *arg)
microseconds = jack_frames_to_time(client, last_frame_time) -
last_activity_time;
if ((microseconds / 1000000) >= timeout) {
- set_process_error(SOURCE_PROCESS, ERROR_TIMEOUT);
+ set_process_error(SOURCE_PROCESS, ERROR_TIMEOUT1);
}
break;
found_message:
diff --git a/windows/JackRouter/JackRouter.cpp b/windows/JackRouter/JackRouter.cpp
index 46194024..c5dbc495 100644
--- a/windows/JackRouter/JackRouter.cpp
+++ b/windows/JackRouter/JackRouter.cpp
@@ -104,7 +104,7 @@ HRESULT _stdcall DllRegisterServer()
if (rc) {
memset(errstr,0,128);
- sprintf(errstr,"Register Server failed ! (%s %d)",JACK_ROUTER, rc);
+ sprintf(errstr,"Register Server failed ! (%d)", rc);
MessageBox(0,(LPCTSTR)errstr,(LPCTSTR)"JackRouter",MB_OK);
return -1;
}
diff --git a/windows/JackRouter/JackRouter.vcxproj b/windows/JackRouter/JackRouter.vcxproj
new file mode 100644
index 00000000..bb9a751b
--- /dev/null
+++ b/windows/JackRouter/JackRouter.vcxproj
@@ -0,0 +1,280 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+
+
+
+
+
+ DynamicLibrary
+ false
+
+
+ DynamicLibrary
+ false
+
+
+ DynamicLibrary
+ false
+
+
+ DynamicLibrary
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ .\Debug\
+ .\Debug\
+ true
+
+
+ .\Debug\
+ .\Debug\
+ true
+
+
+ .\Release\
+ .\Release\
+ false
+
+
+ .\Release\
+ .\Release\
+ false
+
+
+
+ MultiThreadedDebugDLL
+ Default
+ false
+ Disabled
+ true
+ Level3
+ true
+ ..\..\..\..\..\ASIOSDK2\common;..\..\common;..\..\common\jack;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ .\Debug\
+ true
+ .\Debug\JackRouter.pch
+ .\Debug\
+ .\Debug\
+ EnableFastChecks
+
+
+ true
+ _DEBUG;%(PreprocessorDefinitions)
+ .\Debug\JackRouter.tlb
+ true
+ Win32
+
+
+ 0x0409
+ _DEBUG;%(PreprocessorDefinitions)
+
+
+ true
+ .\Debug\JackRouter.bsc
+
+
+ true
+ true
+ true
+ Windows
+ Debug/JackRouter_debug.dll
+ .\Debug\JackRouter_debug.lib
+ odbc32.lib;odbccp32.lib;winmm.lib;%(AdditionalDependencies)
+ .\JackRouter.def
+
+
+
+
+ MultiThreadedDebugDLL
+ Default
+ false
+ Disabled
+ true
+ Level3
+ ..\..\..\..\..\ASIOSDK2\common;..\..\common;..\..\common\jack;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ .\Debug\
+ true
+ .\Debug\JackRouter.pch
+ .\Debug\
+ .\Debug\
+ EnableFastChecks
+
+
+ true
+ _DEBUG;%(PreprocessorDefinitions)
+ .\Debug\JackRouter.tlb
+ true
+
+
+ 0x0409
+ _DEBUG;%(PreprocessorDefinitions)
+
+
+ true
+ .\Debug\JackRouter.bsc
+
+
+ true
+ true
+ true
+ Windows
+ Debug/JackRouter_debug.dll
+ .\Debug\JackRouter_debug.lib
+ odbc32.lib;odbccp32.lib;winmm.lib;%(AdditionalDependencies)
+ .\JackRouter.def
+
+
+
+
+ MultiThreadedDLL
+ OnlyExplicitInline
+ true
+ true
+ MaxSpeed
+ true
+ Level3
+ ..\..\..\..\..\ASIOSDK2\common;..\..\common;..\..\common\jack;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+ .\Release\
+ true
+ .\Release\JackRouter.pch
+ .\Release\
+ .\Release\
+
+
+ true
+ NDEBUG;%(PreprocessorDefinitions)
+ .\Release\JackRouter.tlb
+ true
+ Win32
+
+
+ 0x0409
+ NDEBUG;%(PreprocessorDefinitions)
+
+
+ true
+ .\Release\JackRouter.bsc
+
+
+ true
+ true
+ Windows
+ .\Release\JackRouter.dll
+ .\Release\JackRouter.lib
+ odbc32.lib;odbccp32.lib;winmm.lib;%(AdditionalDependencies)
+ .\JackRouter.def
+
+
+
+
+ MultiThreadedDLL
+ OnlyExplicitInline
+ true
+ true
+ MaxSpeed
+ true
+ Level3
+ ..\..\..\..\..\ASIOSDK2\common;..\..\common;..\..\common\jack;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;PSAPI_VERSION=2;%(PreprocessorDefinitions)
+ .\Release\
+ true
+ .\Release\JackRouter.pch
+ .\Release\
+ .\Release\
+
+
+ true
+ NDEBUG;%(PreprocessorDefinitions)
+ .\Release\JackRouter.tlb
+ true
+
+
+ 0x0409
+ NDEBUG;%(PreprocessorDefinitions)
+
+
+ true
+ .\Release\JackRouter64.bsc
+
+
+ true
+ true
+ Windows
+ .\Release\JackRouter64.dll
+ .\Release\JackRouter64.lib
+ odbc32.lib;odbccp32.lib;winmm.lib;%(AdditionalDependencies)
+ .\JackRouter.def
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/windows/JackRouter/JackRouter.vcxproj.filters b/windows/JackRouter/JackRouter.vcxproj.filters
new file mode 100644
index 00000000..899efbc8
--- /dev/null
+++ b/windows/JackRouter/JackRouter.vcxproj.filters
@@ -0,0 +1,69 @@
+
+
+
+
+ {72f2b2b0-dbea-4574-94fa-0c1ea89a3c8e}
+ cpp;c;cxx;rc;def;r;odl;idl;hpj;bat
+
+
+ {9590ca0b-94c8-4c22-88b2-66724eb0ea21}
+ h;hpp;hxx;hm;inl
+
+
+ {9742e150-2741-4bf4-9b81-bea4aab464af}
+ ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
+
+ Source Files
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+
+
+
+
+
+
+
+ Source Files
+
+
+
\ No newline at end of file
diff --git a/windows/JackRouter/JackRouter.vcxproj.user b/windows/JackRouter/JackRouter.vcxproj.user
new file mode 100644
index 00000000..695b5c78
--- /dev/null
+++ b/windows/JackRouter/JackRouter.vcxproj.user
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/windows/JackRouter/README b/windows/JackRouter/README
index 5f2bce1d..0f59b441 100644
--- a/windows/JackRouter/README
+++ b/windows/JackRouter/README
@@ -1,3 +1,7 @@
This folder contains the sources for ASIO/JACK bridge ASIO driver called "JackRouter". The included project is a Microsoft VC++ 6 one.
It requires some files (combase.cpp, dllentry.cpp, register.cpp) that are part on the ASIO driver SDK. The produced "JackRouter.dll" file
-has to be registered in the system using the "regsvr32" tool.
\ No newline at end of file
+has to be registered in the system using the "regsvr32" tool.
+
+64 bits compilation
+====================
+A Visual Studio 10 project has been added to compile 64 and 32 bits targets.
\ No newline at end of file
diff --git a/windows/Setup/README b/windows/Setup/README
index 78588ece..fa854b37 100644
--- a/windows/Setup/README
+++ b/windows/Setup/README
@@ -14,4 +14,11 @@ Just use : 'dlltool -l libjackserver.lib -D libjackserver.dll -d libjackserver.d
Once all binaries are available, just execute the script in 'CreateInstall' to make 'setup.exe'.
The setup will copy all binaries to a specified folder, register the JackRouter (in order to have it in the ASIO drivers list) and create some shortcuts in the start menu.
-It's a good and proper way to get jack installed on windows.
\ No newline at end of file
+It's a good and proper way to get jack installed on windows.
+
+64 bits compilation
+====================
+
+- for some reasons CodeBlocks create libjack.dll.a and libjack.dll.def names. So the ".dll" part has to be removed before using "lib" tool to create ".lib" files.
+
+- to create 64 bits ".lib" files, the "/MACHINE:X64 option has to be used.
diff --git a/windows/Setup/jack.ci b/windows/Setup/jack.ci
index a97ec0ad..2d6712d3 100644
--- a/windows/Setup/jack.ci
+++ b/windows/Setup/jack.ci
@@ -66,6 +66,7 @@
<_>..\Release\bin\jack_lsp.exeinstovernewer0
<_>..\Release\bin\jack_metro.exeinstovernewer0
<_>..\Release\bin\jack_unload.exeinstovernewer0
+<_>..\Release\bin\jack_midi_latency_test.exeinstovernewer0
<_>..\Release\bin\jackd.exeinstovernewer0
<_>..\Release\bin\libjack.dllsysovernewer0
<_>..\Release\bin\libjackserver.dllsysovernewer0
diff --git a/windows/Setup/jack64.ci b/windows/Setup/jack64.ci
index f7bc78a9..89e0a8f4 100644
--- a/windows/Setup/jack64.ci
+++ b/windows/Setup/jack64.ci
@@ -76,6 +76,7 @@
<_>..\Release64\bin\jack_lsp.exeinstovernewer0
<_>..\Release64\bin\jack_metro.exeinstovernewer0
<_>..\Release64\bin\jack_unload.exeinstovernewer0
+<_>..\Release64\bin\jack_midi_latency_test.exeinstovernewer0
<_>..\Release64\bin\jackd.exeinstovernewer0
<_>..\Release64\bin\libsamplerate_x86_64.dllinstovernewer0
<_>..\Release64\bin\portaudio_x86_64.dllinstovernewer0
diff --git a/windows/jackd.workspace b/windows/jackd.workspace
index 7a05eb57..ab9f650b 100644
--- a/windows/jackd.workspace
+++ b/windows/jackd.workspace
@@ -14,7 +14,7 @@
-
+
@@ -23,5 +23,6 @@
+
diff --git a/windows/libjackserver.cbp b/windows/libjackserver.cbp
index 25e6338d..720aee33 100644
--- a/windows/libjackserver.cbp
+++ b/windows/libjackserver.cbp
@@ -70,7 +70,7 @@
-
+