Getting Winsock.h instead of Winsock2.h MSVC++ Problem # 2

[imaloner]

I am posting two threads because I have two different problems, but both have the same background information.

Common Background Information:

I am trying to rebuild code for a working, commercially sold application with only partial build instructions. The previous maintainer of the code (a

mixture of C and C++) is no longer with the company, but when he built the code he used MSVC++, and though I am not certain of the version he was

using, I think it was either 4.0 or 6.0. I have only a little experience building with this environment (I am otherwise a seasoned developer) so I need

help getting past a couple of issues that I have encountered. Computers (and backups of those computers) previously used for running this build are

now completely unavailable.

I have set up the build on my system using MSVC++ 6.0. The source repository contained a workspace (.dsw) file that I am using for all of the projects. I

do not have specific instructions for this product on how to adjust the references to libraries, includes, etc. for a particular machine, but I am using

instructions for this from a similar (in terms of languages and tools used) product that was written around the same time. I have gotten 43 of 53 classes

(projects) to build, but am getting primarily two errors with the remaining 10 clases (projects).

Because I know this code base was building properly (for someone else who is no longer available on a machine that is no longer available), I would

strongly prefer adjustments to the build environment over code modification to get it to work, so please focus your assistance/suggestions in this area.

Thanks !

Problem #2: Getting Winsock.h instead of Winsock2.h

Here is part of the output I am receiving when I build:

Compiling...
srvsys.c
D:\DEVELOP\Sour ce\FAXFX\FAXFX\ CCODE\FXAPI\SRV API\srvsys.c(70 1) : error C2065: 'WSANETWORKEVEN TS' : undeclared identifier
D:\DEVELOP\Sour ce\FAXFX\FAXFX\ CCODE\FXAPI\SRV API\srvsys.c(70 1) : error C2146: syntax error : missing ';' before identifier 'netevents'
D:\DEVELOP\Sour ce\FAXFX\FAXFX\ CCODE\FXAPI\SRV API\srvsys.c(70 1) : error C2065: 'netevents' : undeclared identifier
D:\DEVELOP\Sour ce\FAXFX\FAXFX\ CCODE\FXAPI\SRV API\srvsys.c(70 2) : error C2275: 'DWORD' : illegal use of this type as an expression
C:\PROGRAM FILES\MICROSOFT SDK\INCLUDE\win def.h(141) : see declaration of 'DWORD'
D:\DEVELOP\Sour ce\FAXFX\FAXFX\ CCODE\FXAPI\SRV API\srvsys.c(70 2) : error C2146: syntax error : missing ';' before identifier 'wait_value'
D:\DEVELOP\Sour ce\FAXFX\FAXFX\ CCODE\FXAPI\SRV API\srvsys.c(70 2) : error C2065: 'wait_value' : undeclared identifier
D:\DEVELOP\Sour ce\FAXFX\FAXFX\ CCODE\FXAPI\SRV API\srvsys.c(70 2) : error C2065: 'wait_index' : undeclared identifier
D:\DEVELOP\Sour ce\FAXFX\FAXFX\ CCODE\FXAPI\SRV API\srvsys.c(70 3) : error C2275: 'HANDLE' : illegal use of this type as an expression
C:\PROGRAM FILES\MICROSOFT SDK\INCLUDE\win nt.h(342) : see declaration of 'HANDLE'
D:\DEVELOP\Sour ce\FAXFX\FAXFX\ CCODE\FXAPI\SRV API\srvsys.c(70 3) : error C2146: syntax error : missing ';' before identifier 'hSocketEvent'
D:\DEVELOP\Sour ce\FAXFX\FAXFX\ CCODE\FXAPI\SRV API\srvsys.c(70 3) : error C2065: 'hSocketEvent' : undeclared identifier
D:\DEVELOP\Sour ce\FAXFX\FAXFX\ CCODE\FXAPI\SRV API\srvsys.c(70 4) : error C2275: 'SOCKET' : illegal use of this type as an expression
C:\PROGRAM FILES\MICROSOFT SDK\INCLUDE\win sock.h(40) : see declaration of 'SOCKET'
D:\DEVELOP\Sour ce\FAXFX\FAXFX\ CCODE\FXAPI\SRV API\srvsys.c(70 4) : error C2146: syntax error : missing ';' before identifier 'hIpcSocket'
D:\DEVELOP\Sour ce\FAXFX\FAXFX\ CCODE\FXAPI\SRV API\srvsys.c(70 4) : error C2065: 'hIpcSocket' : undeclared identifier
D:\DEVELOP\Sour ce\FAXFX\FAXFX\ CCODE\FXAPI\SRV API\srvsys.c(70 5) : error C2143: syntax error : missing ';' before 'type'
D:\DEVELOP\Sour ce\FAXFX\FAXFX\ CCODE\FXAPI\SRV API\srvsys.c(71 6) : warning C4013: 'WSACreateEvent ' undefined; assuming extern returning

int
D:\DEVELOP\Sour ce\FAXFX\FAXFX\ CCODE\FXAPI\SRV API\srvsys.c(71 6) : error C2065: 'WSA_INVALID_EV ENT' : undeclared identifier
D:\DEVELOP\Sour ce\FAXFX\FAXFX\ CCODE\FXAPI\SRV API\srvsys.c(72 2) : warning C4013: 'WSAEventSelect ' undefined; assuming extern returning

int
D:\DEVELOP\Sour ce\FAXFX\FAXFX\ CCODE\FXAPI\SRV API\srvsys.c(73 0) : warning C4022: 'WaitForSingleO bject' : pointer mismatch for actual parameter

1

Here are lines 701 through 730 of srvsys.c:

	WSANETWORKEVENTS netevents;
	DWORD wait_value, wait_index;
	HANDLE hSocketEvent;
	SOCKET hIpcSocket;
	struct FXDEV_DS_MSG msg;

	sprintf( tcaller, "fxcipc(%6d)", GetCurrentThreadId( ) );
	trace_add_caller( 0, tcaller );

	trace( 7, "Start IPCThreadProc.\n");
	
	del_shut( );

	hIpcSocket = ( SOCKET ) SocketHandle;

	if ( ( hSocketEvent = WSACreateEvent( ) ) == WSA_INVALID_EVENT )
	{
		trace( 3, "Error: Unable to create monitor event [%d].\n", WSAGetLastError( ) );
		ExitProcess( 0 );
	}

	if ( WSAEventSelect( hIpcSocket, hSocketEvent, FD_READ | FD_CLOSE ) == SOCKET_ERROR )
	{
		trace( 3, "Error: Unable to set monitor event [%d].\n", WSAGetLastError( ) );
		ExitProcess( 0 );
	}

	while ( 1 )
	{	trace( 7, "Run IPCThreadProc.\n");
		wait_value = WaitForSingleObject( hSocketEvent, INFINITE );

The WSA stuff is only in Winsock2.h, but for some reason I am getting Winsock.h. I know this for two reasons: 1) the error messages (see above)

indicate it, and 2) when I right click on SOCKET (in line 704 or in line 714) and chose "Go to Definition of SOCKET" it takes me to Winsock.H (not

Winsock2.h).

So the question is, "How am I getting Winsock.h when I know the code is designed and was previously built using Winsock2.h?"

Any thoughts or suggestions from an experienced MSVC++ user would be greatly appreciated.

[unauthorized]

You need to #define WIN32_LEAN_AND_ MEAN before every #include <Windows.h>

[donbock]

You need to #define WIN32_LEAN_AND_ MEAN before every #include <Windows.h>

Or define it on the command line to avoid changing any source code.

[imaloner]

This is an update from the original poster....

I received some suggestions that WIN32_LEAN_AND_ MEAN should probably be set so that windows.h doesn't include winsock.h. I gave it a try even though my instincts told me that this would not be the root problem, since the workspace contains preprocessor definitions on every project, so if this is required it would already be there. Adding WIN32_LEAN_AND_ MEAN to the preprocessor definitions of a couple of project caused a whole bunch of new errors and did not get rid of the old ones.

In response to suggestions that I have received regarding changing the order of include and library directory searches... I have tried several different orders with no noticeable impact. The order I have right now is Microsoft SDK first, third party includes and libraries second, and VC98 includes and libraries last. This seems the safest, but again no order seems to work (trying every single permutation would take quite a while.)

Lastly, and most importantly, it has come to my attention that the product that I am building is sold only for Server 2000 and Server 2003 and that the previous building of this code base was running on a Server 2003 system. Since I have been trying my builds on an XP machine, I am leaning towards setting up a virtual machine running Server 2003 in which to compile to see if this helps. However, since that will take a while to set up, I was hoping someone out there might have thoughts about whether or not this is likely to help.

[unauthorized]

It doesn't matter what OS you use to build the executable(s) so long as you are running it in a compatible OS and have the required libraries installed. It's not uncommon to built binaries that cannot be run in the local OS and debug them using a VM or a remote debugger. In fact, I do it all the time, since I can't be bothered to migrate to a x64 OS.

WIN32_LEAN_AND_ MEAN will remove a bunch of stuff which was moved away from windows.h. You can still include these headers one by one, but you would have to look up the undefined symbols in MSDN and possibly inspect windows.h. If you want to get rid of winsock.h, you have to #define it.

With that said, the simplest course of action to debug this particular problem would be to edit your winsock.h by putting an #error directive in it, and if necessary increase the verbosity level of your compiler. This will give you a pretty good idea where it's being included.