Also fixes a minor issue in MSVC Makefile for 64x64, which tried 0x0801 for Windows 8 and 0x1001 for Windows 10. The latter would actually be 0x0A00. See https://docs.microsoft.com/de-de/cpp/porting/modifying-winver-and-win32-winnt Also in the Makefile for 64x64, define both _WIN32 and _WIN64. See https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros Also in the Makefile for 64x64, define both WIN32 and WIN64 because those can be used to identify the Windows platform in application code such as in processors/IA32/bochs. I am not aware of any #ifdef WIN64 at the moment. Most code uses #ifdef _WIN64 to check for that. Note that, having defined both _WIN32 and _WIN64, code for 32-bit and 64-bit must always begin with #ifdef _WIN64 and only then #elif _WIN32. I think that the MSVC compiler defines _WIN32 and _WIN64 automatically. Yet, now it is documented in the Makefile. You can view, comment on, or merge this pull request online at:https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/499 Commit Summary
File Changes
Patch Links:
— |
That error on TravisCI is misleading. All builds pass. — |
In reply to this post by David T Lewis
@nicolas-cellier-aka-nice commented on this pull request. In build.win32x86/common/Makefile.msvc.tools: > @@ -53,16 +53,17 @@ ifdef MSVC MEMACCESS:=-DUSE_INLINE_MEMORY_ACCESSORS=1 endif -# Set minimum version to WindowsXP (see /cygwin/usr/include/w32api/w32api.h) -WINVER:=-D_WIN32_WINNT=0x0501 -DWINVER=0x0501 +# Set minimum version to Windows 8 (see /cygwin/usr/include/w32api/w32api.h) +WINVER:=-D_WIN32_WINNT=0x0602 -DWINVER=0x0602 As suggested on the mailing list, I would just use 0x0600 See also https://docs.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt?view=vs-2019 for the list of _WIN32_WINNT version. — |
In reply to this post by David T Lewis
@nicolas-cellier-aka-nice commented on this pull request. In platforms/win32/vm/sqWin32Main.c: > - LPVOID lpFileInformation, - DWORD dwBufferSize - ); - static pfnGetFileInformationByHandleEx pGetFileInformationByHandleEx = NULL; - if (!pGetFileInformationByHandleEx) { - pGetFileInformationByHandleEx = (pfnGetFileInformationByHandleEx) - GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "GetFileInformationByHandleEx"); - if (!pGetFileInformationByHandleEx) - return -1; - } - - nameinfo = malloc(size); - if (nameinfo == NULL) { - return -1; - } + nameinfo = alloca(size); Why not, alloca is a bit shorter, but the pairs of malloc and free seems correct here... — |
In reply to this post by David T Lewis
@marceltaeumel pushed 2 commits. — |
In reply to this post by David T Lewis
@marceltaeumel pushed 1 commit.
— |
In reply to this post by David T Lewis
wanna merge? care to first update — |
In reply to this post by David T Lewis
@eliotmiranda commented on this pull request. In build.win32x86/common/Makefile.msvc.tools: > @@ -53,16 +53,17 @@ ifdef MSVC MEMACCESS:=-DUSE_INLINE_MEMORY_ACCESSORS=1 endif -# Set minimum version to WindowsXP (see /cygwin/usr/include/w32api/w32api.h) -WINVER:=-D_WIN32_WINNT=0x0501 -DWINVER=0x0501 +# Set minimum version to Windows 8 (see /cygwin/usr/include/w32api/w32api.h) +WINVER:=-D_WIN32_WINNT=0x0602 -DWINVER=0x0602 How would you feel about setting minimum supported version to 8.0? I want to do this because of the GetSystemTimePreciseAsFileTime function, which appears in 8.0 nd neatly solves the time issues in the win32 VM (use of the millisecond clock to derive greater precision than the 15ms tick in GetSystemTimeAsFileTime causes significant direct over the course of several days). — |
In reply to this post by David T Lewis
@krono commented on this pull request. In build.win32x86/common/Makefile.msvc.tools: > @@ -53,16 +53,17 @@ ifdef MSVC MEMACCESS:=-DUSE_INLINE_MEMORY_ACCESSORS=1 endif -# Set minimum version to WindowsXP (see /cygwin/usr/include/w32api/w32api.h) -WINVER:=-D_WIN32_WINNT=0x0501 -DWINVER=0x0501 +# Set minimum version to Windows 8 (see /cygwin/usr/include/w32api/w32api.h) +WINVER:=-D_WIN32_WINNT=0x0602 -DWINVER=0x0602 We can have — |
Free forum by Nabble | Edit this page |