diff --git a/contrib/win32/openssh/Win32-OpenSSH.sln b/contrib/win32/openssh/Win32-OpenSSH.sln index 50715fa..e1f9691 100644 --- a/contrib/win32/openssh/Win32-OpenSSH.sln +++ b/contrib/win32/openssh/Win32-OpenSSH.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssh", "ssh.vcxproj", "{74E69D5E-A1EF-46EA-9173-19A412774104}" ProjectSection(ProjectDependencies) = postProject @@ -110,6 +110,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scp", "scp.vcxproj", "{29B9 {8660C2FE-9874-432D-B047-E042BB41DBE0} = {8660C2FE-9874-432D-B047-E042BB41DBE0} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32compatUnittests", "win32compatUnittests.vcxproj", "{780CAFE4-4BC5-407B-B3A6-71C4114826A7}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -246,6 +248,14 @@ Global {29B98ADF-1285-49CE-BF6C-AA92C5D2FB24}.Release|x64.Build.0 = Release|x64 {29B98ADF-1285-49CE-BF6C-AA92C5D2FB24}.Release|x86.ActiveCfg = Release|Win32 {29B98ADF-1285-49CE-BF6C-AA92C5D2FB24}.Release|x86.Build.0 = Release|Win32 + {780CAFE4-4BC5-407B-B3A6-71C4114826A7}.Debug|x64.ActiveCfg = Debug|x64 + {780CAFE4-4BC5-407B-B3A6-71C4114826A7}.Debug|x64.Build.0 = Debug|x64 + {780CAFE4-4BC5-407B-B3A6-71C4114826A7}.Debug|x86.ActiveCfg = Debug|Win32 + {780CAFE4-4BC5-407B-B3A6-71C4114826A7}.Debug|x86.Build.0 = Debug|Win32 + {780CAFE4-4BC5-407B-B3A6-71C4114826A7}.Release|x64.ActiveCfg = Release|x64 + {780CAFE4-4BC5-407B-B3A6-71C4114826A7}.Release|x64.Build.0 = Release|x64 + {780CAFE4-4BC5-407B-B3A6-71C4114826A7}.Release|x86.ActiveCfg = Release|Win32 + {780CAFE4-4BC5-407B-B3A6-71C4114826A7}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/contrib/win32/openssh/win32compat.vcxproj b/contrib/win32/openssh/win32compat.vcxproj index 874ec42..86351cd 100644 --- a/contrib/win32/openssh/win32compat.vcxproj +++ b/contrib/win32/openssh/win32compat.vcxproj @@ -152,6 +152,10 @@ + + + + @@ -178,6 +182,7 @@ + diff --git a/contrib/win32/w32-posix-prototype/win32posix/UnitTests/UnitTests.vcxproj b/contrib/win32/openssh/win32compatUnittests.vcxproj similarity index 51% rename from contrib/win32/w32-posix-prototype/win32posix/UnitTests/UnitTests.vcxproj rename to contrib/win32/openssh/win32compatUnittests.vcxproj index 5131338..adffa02 100644 --- a/contrib/win32/w32-posix-prototype/win32posix/UnitTests/UnitTests.vcxproj +++ b/contrib/win32/openssh/win32compatUnittests.vcxproj @@ -1,55 +1,57 @@  + Debug Win32 - - Release - Win32 - Debug x64 + + Release + Win32 + Release x64 - {31E868FF-DE6C-4CF7-9BF0-2C9B51DB58AD} + {780CAFE4-4BC5-407B-B3A6-71C4114826A7} Win32Proj - UnitTests + Win32OpenSSH 8.1 + win32compatUnittests Application true v140 - Unicode + MultiByte + + + Application + true + v140 + MultiByte Application false v140 true - Unicode - - - Application - true - v140 - Unicode + MultiByte Application false v140 true - Unicode + MultiByte @@ -59,118 +61,139 @@ + + + - - - - + - true - $(SolutionDir)bin\unittests\$(Platform)\$(Configuration)\ + false $(Platform)\$(Configuration)\$(TargetName)\ - $(SolutionDir)\win32posix\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); + ssh + $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ - true - $(SolutionDir)\win32posix\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); - $(SolutionDir)bin\unittests\$(Platform)\$(Configuration)\ + false $(Platform)\$(Configuration)\$(TargetName)\ + ssh + $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ false - $(SolutionDir)\win32posix\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); - $(SolutionDir)bin\unittests\$(Platform)\$(Configuration)\ + $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\$(TargetName)\ + ssh false - $(SolutionDir)\win32posix\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath); - $(SolutionDir)bin\unittests\$(Platform)\$(Configuration)\ + $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\$(TargetName)\ + ssh - - - Level3 + NotUsing + Level1 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - + _WIN32_WINNT=0x501;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + false + $(OpenSSH-Src-Path)contrib\win32\win32compat\inc + CompileAsC + MultiThreadedDebug + Sync + ProgramDatabase Console true - $(SolutionDir)bin\lib\$(Platform)\$(Configuration)\ - Mswsock.lib;Ws2_32.lib;win32posix.lib;%(AdditionalDependencies) + $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + win32compat.lib;mswsock.lib;ws2_32.lib;%(AdditionalDependencies) + + targetos.manifest + - - - Level3 + NotUsing + Level1 Disabled - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _WIN32_WINNT=0x501;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + false + $(OpenSSH-Src-Path)contrib\win32\win32compat\inc + CompileAsC + MultiThreadedDebug + ProgramDatabase Console true - Mswsock.lib;Ws2_32.lib;win32posix.lib;%(AdditionalDependencies) - $(SolutionDir)bin\lib\$(Platform)\$(Configuration)\ + $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + libssh.lib;win32compat.lib;mswsock.lib;ws2_32.lib;%(AdditionalDependencies) + + targetos.manifest + - Level3 - - + Level1 + NotUsing MaxSpeed true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + _WIN32_WINNT=0x501;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + $(OpenSSH-Src-Path)contrib\win32\win32compat\inc + MultiThreaded Console - true + No true true - Mswsock.lib;Ws2_32.lib;win32posix.lib;%(AdditionalDependencies) - $(SolutionDir)bin\lib\$(Platform)\$(Configuration)\ + $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + win32compat.lib;mswsock.lib;ws2_32.lib;%(AdditionalDependencies) + + targetos.manifest + - Level3 - - + Level1 + NotUsing MaxSpeed true true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + _WIN32_WINNT=0x501;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + $(OpenSSH-Src-Path)contrib\win32\win32compat\inc + MultiThreaded + true Console - true + No true true - Mswsock.lib;Ws2_32.lib;win32posix.lib;%(AdditionalDependencies) - $(SolutionDir)bin\lib\$(Platform)\$(Configuration)\ + $(OpenSSH-Lib-Path)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + win32compat.lib;mswsock.lib;ws2_32.lib;%(AdditionalDependencies) + + targetos.manifest + - - - - - - - + + + + diff --git a/contrib/win32/w32-posix-prototype/win32posix/UnitTests/UnitTests.vcxproj.filters b/contrib/win32/w32-posix-prototype/win32posix/UnitTests/UnitTests.vcxproj.filters deleted file mode 100644 index 513a58a..0000000 --- a/contrib/win32/w32-posix-prototype/win32posix/UnitTests/UnitTests.vcxproj.filters +++ /dev/null @@ -1,36 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix.sln b/contrib/win32/w32-posix-prototype/win32posix/win32posix.sln deleted file mode 100644 index b5273e8..0000000 --- a/contrib/win32/w32-posix-prototype/win32posix/win32posix.sln +++ /dev/null @@ -1,41 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32posix", "win32posix\win32posix.vcxproj", "{D8744F47-1741-4FB8-97D3-EBB9C3A13E67}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "UnitTests\UnitTests.vcxproj", "{31E868FF-DE6C-4CF7-9BF0-2C9B51DB58AD}" - ProjectSection(ProjectDependencies) = postProject - {D8744F47-1741-4FB8-97D3-EBB9C3A13E67} = {D8744F47-1741-4FB8-97D3-EBB9C3A13E67} - EndProjectSection -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 - {D8744F47-1741-4FB8-97D3-EBB9C3A13E67}.Debug|Win32.ActiveCfg = Debug|Win32 - {D8744F47-1741-4FB8-97D3-EBB9C3A13E67}.Debug|Win32.Build.0 = Debug|Win32 - {D8744F47-1741-4FB8-97D3-EBB9C3A13E67}.Debug|x64.ActiveCfg = Debug|x64 - {D8744F47-1741-4FB8-97D3-EBB9C3A13E67}.Debug|x64.Build.0 = Debug|x64 - {D8744F47-1741-4FB8-97D3-EBB9C3A13E67}.Release|Win32.ActiveCfg = Release|Win32 - {D8744F47-1741-4FB8-97D3-EBB9C3A13E67}.Release|Win32.Build.0 = Release|Win32 - {D8744F47-1741-4FB8-97D3-EBB9C3A13E67}.Release|x64.ActiveCfg = Release|x64 - {D8744F47-1741-4FB8-97D3-EBB9C3A13E67}.Release|x64.Build.0 = Release|x64 - {31E868FF-DE6C-4CF7-9BF0-2C9B51DB58AD}.Debug|Win32.ActiveCfg = Debug|Win32 - {31E868FF-DE6C-4CF7-9BF0-2C9B51DB58AD}.Debug|Win32.Build.0 = Debug|Win32 - {31E868FF-DE6C-4CF7-9BF0-2C9B51DB58AD}.Debug|x64.ActiveCfg = Debug|x64 - {31E868FF-DE6C-4CF7-9BF0-2C9B51DB58AD}.Debug|x64.Build.0 = Debug|x64 - {31E868FF-DE6C-4CF7-9BF0-2C9B51DB58AD}.Release|Win32.ActiveCfg = Release|Win32 - {31E868FF-DE6C-4CF7-9BF0-2C9B51DB58AD}.Release|Win32.Build.0 = Release|Win32 - {31E868FF-DE6C-4CF7-9BF0-2C9B51DB58AD}.Release|x64.ActiveCfg = Release|x64 - {31E868FF-DE6C-4CF7-9BF0-2C9B51DB58AD}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/debug.c b/contrib/win32/w32-posix-prototype/win32posix/win32posix/debug.c deleted file mode 100644 index c6c4a2f..0000000 --- a/contrib/win32/w32-posix-prototype/win32posix/win32posix/debug.c +++ /dev/null @@ -1,42 +0,0 @@ -/* -* Author: Manoj Ampalam -*/ - -#include -#include -#include - - -FILE* log; - -int debug_initialize() { - char filename[MAX_PATH]; - int len = 0; - SYSTEMTIME time; - - len = GetModuleFileNameA(NULL, filename, MAX_PATH); - GetLocalTime(&time); - - sprintf_s(filename + len, MAX_PATH-len, "_%d_%d_%d.log", time.wHour, time.wMinute, time.wSecond); - //sprintf(filename, "%s", "e:\\tmp.log"); - fopen_s(&log, filename, "w"); - return 0; -} - -void debug_done() { - if (log) - fclose(log); -} - - -void write_log(const char *source_name, const char *function_name, int line_num, const char *fmt, ...) { - if (!log) - return; - - va_list args; - fprintf(log,"\n%s:%d: ", function_name, line_num); - va_start(args, fmt); - vfprintf(log,fmt, args); - va_end(args); - fflush(log); -} \ No newline at end of file diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/debug.h b/contrib/win32/w32-posix-prototype/win32posix/win32posix/debug.h deleted file mode 100644 index 910a219..0000000 --- a/contrib/win32/w32-posix-prototype/win32posix/win32posix/debug.h +++ /dev/null @@ -1,9 +0,0 @@ - - -#define debug(cformat, ...) write_log(__FILE__, __FUNCTION__, __LINE__, cformat, __VA_ARGS__) -#define debug2(cformat, ...) write_log(__FILE__, __FUNCTION__, __LINE__, cformat, __VA_ARGS__) -#define debug3(cformat, ...) write_log(__FILE__, __FUNCTION__, __LINE__, cformat, __VA_ARGS__) - -int debug_initialize(); -void debug_done(); -void write_log(const char *source_name,const char *function_name, int line_num, const char *fmt, ...); diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/win32posix.vcxproj b/contrib/win32/w32-posix-prototype/win32posix/win32posix/win32posix.vcxproj deleted file mode 100644 index 5405c0c..0000000 --- a/contrib/win32/w32-posix-prototype/win32posix/win32posix/win32posix.vcxproj +++ /dev/null @@ -1,166 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {D8744F47-1741-4FB8-97D3-EBB9C3A13E67} - Win32Proj - win32posix - 8.1 - - - - StaticLibrary - true - v140 - Unicode - - - StaticLibrary - true - v140 - Unicode - - - StaticLibrary - false - v140 - true - Unicode - - - StaticLibrary - false - v140 - true - Unicode - - - - - - - - - - - - - - - - - - - $(SolutionDir)bin\lib\$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(TargetName)\ - - - $(SolutionDir)bin\lib\$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(TargetName)\ - - - $(SolutionDir)bin\lib\$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(TargetName)\ - - - $(SolutionDir)bin\lib\$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\$(TargetName)\ - - - - - - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - - - Windows - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - - - Windows - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - - - Windows - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - - - Windows - true - true - true - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/win32posix.vcxproj.filters b/contrib/win32/w32-posix-prototype/win32posix/win32posix/win32posix.vcxproj.filters deleted file mode 100644 index e81afa9..0000000 --- a/contrib/win32/w32-posix-prototype/win32posix/win32posix/win32posix.vcxproj.filters +++ /dev/null @@ -1,66 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {bcb2ad09-217d-43e3-b3f0-0e95ef6b8023} - - - {a8ebc7ed-da32-4692-82b6-6d49d420dd5b} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - inc - - - inc\sys - - - inc - - - inc - - - inc\sys - - - inc - - - \ No newline at end of file diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/fileio.c b/contrib/win32/win32compat/fileio.c similarity index 100% rename from contrib/win32/w32-posix-prototype/win32posix/win32posix/fileio.c rename to contrib/win32/win32compat/fileio.c diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/defs.h b/contrib/win32/win32compat/inc/defs.h similarity index 100% rename from contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/defs.h rename to contrib/win32/win32compat/inc/defs.h diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/signal.h b/contrib/win32/win32compat/inc/signal.h similarity index 100% rename from contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/signal.h rename to contrib/win32/win32compat/inc/signal.h diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/sys/select.h b/contrib/win32/win32compat/inc/sys/select.h similarity index 100% rename from contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/sys/select.h rename to contrib/win32/win32compat/inc/sys/select.h diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/sys/socket.h b/contrib/win32/win32compat/inc/sys/socket.h similarity index 100% rename from contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/sys/socket.h rename to contrib/win32/win32compat/inc/sys/socket.h diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/unistd.h b/contrib/win32/win32compat/inc/unistd.h similarity index 100% rename from contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/unistd.h rename to contrib/win32/win32compat/inc/unistd.h diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/w32posix.h b/contrib/win32/win32compat/inc/w32posix.h similarity index 100% rename from contrib/win32/w32-posix-prototype/win32posix/win32posix/inc/w32posix.h rename to contrib/win32/win32compat/inc/w32posix.h diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/signal.c b/contrib/win32/win32compat/signal.c similarity index 100% rename from contrib/win32/w32-posix-prototype/win32posix/win32posix/signal.c rename to contrib/win32/win32compat/signal.c diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/socketio.c b/contrib/win32/win32compat/socketio.c similarity index 100% rename from contrib/win32/w32-posix-prototype/win32posix/win32posix/socketio.c rename to contrib/win32/win32compat/socketio.c diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/w32fd.c b/contrib/win32/win32compat/w32fd.c similarity index 100% rename from contrib/win32/w32-posix-prototype/win32posix/win32posix/w32fd.c rename to contrib/win32/win32compat/w32fd.c diff --git a/contrib/win32/w32-posix-prototype/win32posix/win32posix/w32fd.h b/contrib/win32/win32compat/w32fd.h similarity index 100% rename from contrib/win32/w32-posix-prototype/win32posix/win32posix/w32fd.h rename to contrib/win32/win32compat/w32fd.h diff --git a/contrib/win32/w32-posix-prototype/win32posix/UnitTests/file_tests.c b/regress/unittests/win32compat/file_tests.c similarity index 100% rename from contrib/win32/w32-posix-prototype/win32posix/UnitTests/file_tests.c rename to regress/unittests/win32compat/file_tests.c diff --git a/contrib/win32/w32-posix-prototype/win32posix/UnitTests/socket_tests.c b/regress/unittests/win32compat/socket_tests.c similarity index 100% rename from contrib/win32/w32-posix-prototype/win32posix/UnitTests/socket_tests.c rename to regress/unittests/win32compat/socket_tests.c diff --git a/contrib/win32/w32-posix-prototype/win32posix/UnitTests/test_helper.c b/regress/unittests/win32compat/test_helper.c similarity index 100% rename from contrib/win32/w32-posix-prototype/win32posix/UnitTests/test_helper.c rename to regress/unittests/win32compat/test_helper.c diff --git a/contrib/win32/w32-posix-prototype/win32posix/UnitTests/test_helper.h b/regress/unittests/win32compat/test_helper.h similarity index 100% rename from contrib/win32/w32-posix-prototype/win32posix/UnitTests/test_helper.h rename to regress/unittests/win32compat/test_helper.h diff --git a/contrib/win32/w32-posix-prototype/win32posix/UnitTests/tests.c b/regress/unittests/win32compat/tests.c similarity index 100% rename from contrib/win32/w32-posix-prototype/win32posix/UnitTests/tests.c rename to regress/unittests/win32compat/tests.c