Marged chris/win32/merge/07-win32-fixes at r210 to trunk

1 files changed, 18 insertions, 1 deletions

diff --git a/bin/bbackupquery/bbackupquery.cpp b/bin/bbackupquery/bbackupquery.cpp
index 1eb86db6..d76664fb 100755
--- a/bin/bbackupquery/bbackupquery.cpp
+++ b/bin/bbackupquery/bbackupquery.cpp
@@ -56,6 +56,19 @@ int main(int argc, const char *argv[])
 {
 	MAINHELPER_SETUP_MEMORY_LEAK_EXIT_REPORT("bbackupquery.memleaks", "bbackupquery")
 
+#ifdef WIN32
+	WSADATA info;
+	
+	// Under Win32 we must initialise the Winsock library
+	// before using it.
+	
+	if (WSAStartup(MAKELONG(1, 1), &info) == SOCKET_ERROR) 
+	{
+		// throw error?    perhaps give it its own id in the furture
+		THROW_EXCEPTION(BackupStoreException, Internal)
+	}
+#endif
+
 	// Really don't want trace statements happening, even in debug mode
 	#ifndef NDEBUG
 		BoxDebugTraceOn = false;
@@ -253,7 +266,11 @@ int main(int argc, const char *argv[])
 	
 	MAINHELPER_END
 	
-	exit(returnCode);	
+#ifdef WIN32
+	// Clean up our sockets
+	WSACleanup();
+#endif
+
 	return returnCode;
 }