ghaerr
commented
5 years ago Thanks for your changes. I will merge your entire pull request, then make a few modifications and recommit. I would also like to mention a few thoughts:
1) I ported the system to Windows last weekend, using an old VS 2008 compiler (_MSC_VER==1500). I was able to get the Win32 API ported using a mechanism different that you're using, which manages to link both Microwindows Win32 API routines and the real Win32 API routines into the same program without having to use DLLs. The mechanism used is that the only drivers\scr/kbd/mou_win32.c use the real windows.h, and thus has WINAPI defined as __stdcall to call the real win32 routines. All the rest of Microwindows is compiled seperately using the internal windows.h WINAPI defined as blank, which defaults to _cdecl. Thus, the internal Win32 routines are name mangled as _Sleep, say, and the external real Win32 routines are called as Sleep$4 (parameter size mangled). The only restriction is that we can't have the same-named routines in the same source file.
2) Since you're building DLLs rather than linking statically, you require declspec(dllimport). This also happens to use stdcall, which means the above name-mangling distinction isn't being taken advantage of. That's ok, so I am going to use "#if _MSC_VER == 1500" in order to make the distinction between our dual use of the MS C compiler. FYI. You may want to consider not using the same names as the real Win32 routines for simplicity, later.
3) The reason why MwDelay() was removed from nanox/srvmain.c is for the reason above, which is that we can't have the real win32 Sleep() called from internal routine, so the entire routine was moved to drivers\scr_win32.c as discussed above. I'm currently thinking of some implementation ideas to get rid of system-dependent stuff in the engine/, nanox/ and mwin/ files, and move them into operating system-depending driver/ files, so you can expect more changes here in the future.
4) Lets have you use "#if _MSC_VER > 1500" for your future changes, to differentiate between my port (using "#if _MSC_VER == 1500" and your Win32 port for the time being, e.g. just like you did for winextra/gettimeofday.c.
5) I'm a little worried about whether the EPRINTF ##__VA_ARGS__ will work, but will add it for now. If it doesn't work, I will have to revert it and I suggest that you set HAVE_FPRINTF=0 like I did for my win32 port, which forces GdError() to be called directly instead. Far better, really. The only problem is that I had to move GdError() into drivers\scr_win32.c since it calls OutputDebugString() to print all debug messages directly to the VS output window. If you want to go this route, you can copy GdError over to winextra/error.c and include that in your compile. I also plan on fixing this problem and moving nanox/ and engine/ GdError() into an operating system dependent drivers/ file in the future as well.
6) Your directory.build.props file uses the define _CRT_SECURE_NO_WARNINGSl; do you really mean to have the "l" at the end of that?
7) Did you happen to notice that I added an include/mwconfig.h, which allows you to set all options in a single file, rather than in the VS project? You're welcome to add a section "#if WINEXTRA" at the top so that it is easier to track what defines you need set, rather than in your project file. I also listed all options and explain them to make porting easier. You can also see my Windows compile settings to compare with yours.
Thanks again for your interest and changes. Sorry I've had to drag you through this a couple times with my changes, your interest peaked my interest in getting Microwindows to compile and run natively on Windows, which now works.
roozbehid
This will make visual studio port compilable again. each commit description should tell the reason of why.