diff --git a/libol-test.vcxproj b/libol-test.vcxproj new file mode 100644 index 00000000..c0fd32fd --- /dev/null +++ b/libol-test.vcxproj @@ -0,0 +1,160 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + Win32Proj + + + + Application + true + + + Application + true + + + Application + false + + + Application + false + + + + + + + + + + + + + + + + + + + true + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + + + true + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + + + true + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + + + true + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + + + + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Level3 + ProgramDatabase + Disabled + + + MachineX86 + true + Console + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies) + + + + + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Level3 + ProgramDatabase + Disabled + + + true + Console + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies) + + + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + ProgramDatabase + + + MachineX86 + true + Console + true + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies) + + + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + ProgramDatabase + + + true + Console + true + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + {301fe650-cd34-14e5-6b63-42e383fa02bc} + + + + + + \ No newline at end of file diff --git a/libol-tests.vcxproj b/libol-tests.vcxproj deleted file mode 100644 index 24351d8f..00000000 --- a/libol-tests.vcxproj +++ /dev/null @@ -1,96 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - - {301fe650-cd34-14e5-6b63-42e383fa02bc} - false - true - false - true - false - - - - - - - - - - - - - - - - - - - test - {B30D70EF-2678-4393-B322-74E1476757DC} - ManagedCProj - liboltests - - - - Application - Unicode - - - Application - Unicode - - - - - - - - - - - - if exist app.config copy app.config "$(OutDir)app.config" - true - false - .exe - .exe - - - - Level3 - Disabled - WIN32;_DEBUG;%(PreprocessorDefinitions) - NotUsing - - - true - ws2_32.lib - Default - - - - - Level3 - WIN32;NDEBUG;%(PreprocessorDefinitions) - NotUsing - - - true - ws2_32.lib - - - - - - \ No newline at end of file diff --git a/libol.sln b/libol.sln index 45cef918..e3e753e3 100644 --- a/libol.sln +++ b/libol.sln @@ -3,22 +3,32 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libol", "libol.vcxproj", "{301FE650-CD34-14E5-6B63-42E383FA02BC}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libol-tests", "libol-tests.vcxproj", "{B30D70EF-2678-4393-B322-74E1476757DC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libol-test", "libol-test.vcxproj", "{1D7C3F6C-A4AF-DD73-2D20-B2FC919B3744}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {301FE650-CD34-14E5-6B63-42E383FA02BC}.Debug|Win32.ActiveCfg = Debug|Win32 {301FE650-CD34-14E5-6B63-42E383FA02BC}.Debug|Win32.Build.0 = Debug|Win32 + {301FE650-CD34-14E5-6B63-42E383FA02BC}.Debug|x64.ActiveCfg = Debug|x64 + {301FE650-CD34-14E5-6B63-42E383FA02BC}.Debug|x64.Build.0 = Debug|x64 {301FE650-CD34-14E5-6B63-42E383FA02BC}.Release|Win32.ActiveCfg = Release|Win32 {301FE650-CD34-14E5-6B63-42E383FA02BC}.Release|Win32.Build.0 = Release|Win32 - {B30D70EF-2678-4393-B322-74E1476757DC}.Debug|Win32.ActiveCfg = Debug|Win32 - {B30D70EF-2678-4393-B322-74E1476757DC}.Debug|Win32.Build.0 = Debug|Win32 - {B30D70EF-2678-4393-B322-74E1476757DC}.Release|Win32.ActiveCfg = Release|Win32 - {B30D70EF-2678-4393-B322-74E1476757DC}.Release|Win32.Build.0 = Release|Win32 + {301FE650-CD34-14E5-6B63-42E383FA02BC}.Release|x64.ActiveCfg = Release|x64 + {301FE650-CD34-14E5-6B63-42E383FA02BC}.Release|x64.Build.0 = Release|x64 + {1D7C3F6C-A4AF-DD73-2D20-B2FC919B3744}.Debug|Win32.ActiveCfg = Debug|Win32 + {1D7C3F6C-A4AF-DD73-2D20-B2FC919B3744}.Debug|Win32.Build.0 = Debug|Win32 + {1D7C3F6C-A4AF-DD73-2D20-B2FC919B3744}.Debug|x64.ActiveCfg = Debug|x64 + {1D7C3F6C-A4AF-DD73-2D20-B2FC919B3744}.Debug|x64.Build.0 = Debug|x64 + {1D7C3F6C-A4AF-DD73-2D20-B2FC919B3744}.Release|Win32.ActiveCfg = Release|Win32 + {1D7C3F6C-A4AF-DD73-2D20-B2FC919B3744}.Release|Win32.Build.0 = Release|Win32 + {1D7C3F6C-A4AF-DD73-2D20-B2FC919B3744}.Release|x64.ActiveCfg = Release|x64 + {1D7C3F6C-A4AF-DD73-2D20-B2FC919B3744}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/libol.vcxproj b/libol.vcxproj index 30861fdb..aa2ff28e 100644 --- a/libol.vcxproj +++ b/libol.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + Win32Proj @@ -18,64 +26,76 @@ StaticLibrary true + + StaticLibrary + true + StaticLibrary false + + StaticLibrary + false + + + + + + + - true + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration) - true + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration) + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration) + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration) - WIN32;_DEBUG;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDebugDLL Level3 ProgramDatabase Disabled - - MachineX86 - true - Console - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies) - - + - WIN32;NDEBUG;%(PreprocessorDefinitions) - MultiThreadedDLL + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDebugDLL Level3 ProgramDatabase + Disabled - - MachineX86 - true - Console - true - true - - - - + + + diff --git a/test/echo-demo.c b/test/echo-demo.c deleted file mode 100644 index 025ceb85..00000000 --- a/test/echo-demo.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "../ol.h" -#include "echo.h" - -int main(int argc, char** argv) { - int r; - - ol_init(); - - r = echo_start(8000); - if (r) { - return r; - } - - ol_run(); - - return 0; -} diff --git a/test/test-runner-win32.c b/test/test-runner-win32.c index ed562b22..638c229c 100644 --- a/test/test-runner-win32.c +++ b/test/test-runner-win32.c @@ -17,7 +17,7 @@ int process_start(char *name, process_info_t *p) { PROCESS_INFORMATION pi; DWORD result; - if (GetTempPathW(sizeof(path), (WCHAR*)&path) == 0) + if (GetTempPathW(sizeof(path) / sizeof(WCHAR), (WCHAR*)&path) == 0) goto error; if (GetTempFileNameW((WCHAR*)&path, L"ol_", 0, (WCHAR*)&filename) == 0) goto error; @@ -48,7 +48,7 @@ int process_start(char *name, process_info_t *p) { if (!SetHandleInformation(nul, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT)) goto error; - result = GetModuleFileName(NULL, (WCHAR*)&image, sizeof(image)); + result = GetModuleFileNameW(NULL, (WCHAR*)&image, sizeof(image) / sizeof(WCHAR)); if (result == 0 || result == sizeof(image)) goto error; @@ -83,12 +83,11 @@ int process_start(char *name, process_info_t *p) { return 0; - error: if (file != INVALID_HANDLE_VALUE) CloseHandle(file); if (nul != INVALID_HANDLE_VALUE) - CloseHandle(file); + CloseHandle(nul); return -1; }