X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpingback.cc;h=bbcd44111cb1039168606070b25904f36ff6a090;hb=dac57703ccd7205ac94c14b407b802a69f4187f1;hp=62d9191daf09c3983579d69656aaedd1b71b424f;hpb=ad017365f7a73f8ba57f667cc1aa36478b48c50e;p=ardour.git

diff --git a/gtk2_ardour/pingback.cc b/gtk2_ardour/pingback.cc
index 62d9191daf..bbcd44111c 100644
--- a/gtk2_ardour/pingback.cc
+++ b/gtk2_ardour/pingback.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Paul Davis 
+    Copyright (C) 2012 Paul Davis
     Inspired by code from Ben Loftis @ Harrison Consoles
 
     This program is free software; you can redistribute it and/or modify
@@ -19,16 +19,18 @@
 */
 
 #include <string>
-#include <iostream>
-#include <fstream>
 #include <cstring>
 
-#ifndef PLATFORM_WINDOWS
+#ifdef PLATFORM_WINDOWS
+#include <windows.h>
+#include <glibmm.h>
+#else
 #include <sys/utsname.h>
 #endif
 
 #include <curl/curl.h>
 
+#include "pbd/gstdio_compat.h"
 #include <glibmm/miscutils.h>
 
 #include "pbd/compose.h"
@@ -70,43 +72,79 @@ struct ping_call {
 	    : version (v), announce_path (a) {}
 };
 
+#ifdef PLATFORM_WINDOWS
+static bool
+_query_registry (const char *regkey, const char *regval, std::string &rv) {
+	HKEY key;
+	DWORD size = PATH_MAX;
+	char tmp[PATH_MAX+1];
+
+	if (   (ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, regkey, 0, KEY_READ, &key))
+	    && (ERROR_SUCCESS == RegQueryValueExA (key, regval, 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size))
+		 )
+	{
+		rv = Glib::locale_to_utf8 (tmp);
+		return true;
+	}
+
+	if (   (ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, regkey, 0, KEY_READ | KEY_WOW64_32KEY, &key))
+	    && (ERROR_SUCCESS == RegQueryValueExA (key, regval, 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size))
+		 )
+	{
+		rv = Glib::locale_to_utf8 (tmp);
+		return true;
+	}
+
+	return false;
+}
+#endif
+
+
 static void*
 _pingback (void *arg)
 {
-#ifndef PLATFORM_WINDOWS
 	ping_call* cm = static_cast<ping_call*> (arg);
 	CURL* c;
-	struct utsname utb;
 	string return_str;
-
-	if (uname (&utb)) {
-		return 0;
-	}
-
 	//initialize curl
 
 	curl_global_init (CURL_GLOBAL_NOTHING);
 	c = curl_easy_init ();
-	
-	curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, curl_write_data); 
-	curl_easy_setopt (c, CURLOPT_WRITEDATA, &return_str); 
+
+	curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, curl_write_data);
+	curl_easy_setopt (c, CURLOPT_WRITEDATA, &return_str);
 	char errbuf[CURL_ERROR_SIZE];
-	curl_easy_setopt (c, CURLOPT_ERRORBUFFER, errbuf); 
+	curl_easy_setopt (c, CURLOPT_ERRORBUFFER, errbuf);
 
 	string url;
 
 #ifdef __APPLE__
 	url = Config->get_osx_pingback_url ();
+#elif defined PLATFORM_WINDOWS
+	url = Config->get_windows_pingback_url ();
 #else
 	url = Config->get_linux_pingback_url ();
 #endif
 
+	if (url.compare (0, 4, "http") != 0) {
+		delete cm;
+		return 0;
+	}
+
 	char* v = curl_easy_escape (c, cm->version.c_str(), cm->version.length());
 	url += v;
 	url += '?';
 	free (v);
 
-	string uts = string_compose ("%1 %2 %3 %4", utb.sysname, utb.release, utb.version, utb.machine);
+#ifndef PLATFORM_WINDOWS
+	struct utsname utb;
+
+	if (uname (&utb)) {
+		delete cm;
+		return 0;
+	}
+
+	//string uts = string_compose ("%1 %2 %3 %4", utb.sysname, utb.release, utb.version, utb.machine);
 	string s;
 	char* query;
 
@@ -126,13 +164,47 @@ _pingback (void *arg)
 	s = string_compose ("m=%1", query);
 	url += s;
 	free (query);
+#else
+	std::string val;
+	if (_query_registry("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", "ProductName", val)) {
+		char* query = curl_easy_escape (c, val.c_str(), strlen (val.c_str()));
+		url += "r=";
+		url += query;
+		url += '&';
+		free (query);
+	} else {
+		url += "r=&";
+	}
+
+	if (_query_registry("Hardware\\Description\\System\\CentralProcessor\\0", "Identifier", val)) {
+		// remove "Family X Model YY Stepping Z" tail
+		size_t cut = val.find (" Family ");
+		if (string::npos != cut) {
+			val = val.substr (0, cut);
+		}
+		char* query = curl_easy_escape (c, val.c_str(), strlen (val.c_str()));
+		url += "m=";
+		url += query;
+		url += '&';
+		free (query);
+	} else {
+		url += "m=&";
+	}
+
+# if ( defined(__x86_64__) || defined(_M_X64) )
+	url += "s=Windows64";
+# else
+	url += "s=Windows32";
+# endif
+
+#endif /* PLATFORM_WINDOWS */
 
 	curl_easy_setopt (c, CURLOPT_URL, url.c_str());
 
 	return_str = "";
 
 	if (curl_easy_perform (c) == 0) {
-		long http_status; 
+		long http_status;
 
 		curl_easy_getinfo (c, CURLINFO_RESPONSE_CODE, &http_status);
 
@@ -145,14 +217,15 @@ _pingback (void *arg)
 			std::cerr << "Announcement string is too long (probably behind a proxy)." << std::endl;
 		} else {
 			std::cerr << "Announcement is: " << return_str << std::endl;
-			
+
 			//write announcements to local file, even if the
 			//announcement is empty
-				
-			std::ofstream annc_file (cm->announce_path.c_str());
-			
-			if (annc_file) {
-				annc_file << return_str;
+
+			FILE* fout = g_fopen (cm->announce_path.c_str(), "wb");
+
+			if (fout) {
+				fwrite (return_str.c_str(), sizeof(char), return_str.length (), fout);
+				fclose (fout);
 			}
 		}
 	} else {
@@ -161,15 +234,12 @@ _pingback (void *arg)
 
 	curl_easy_cleanup (c);
 	delete cm;
-
-#endif /* PLATFORM_WINDOWS */
-
 	return 0;
 }
 
 namespace ARDOUR {
 
-void pingback (const string& version, const string& announce_path) 
+void pingback (const string& version, const string& announce_path)
 {
 	ping_call* cm = new ping_call (version, announce_path);
 	pthread_t thread;