Register upgrade (#2)

* Update init to take an optional Steam ID. Add register for steam game. Remove url from cmd line params to launched game.

* Start on a build script

src/CMakeLists.txt

@@ -10,6 +10,7 @@ endif (NOT ${ENABLE_IO_THREAD})
 set(BASE_RPC_SRC
     ${PROJECT_SOURCE_DIR}/include/discord-rpc.h
     discord-rpc.cpp
+    discord-register.h
     discord-register.cpp
     rpc_connection.h
     rpc_connection.cpp

src/discord-register.cpp

@@ -12,27 +12,31 @@
 #pragma comment(lib, "Psapi.lib")
 #endif
 
-void Discord_Register(const char* applicationId)
-{
 #ifdef _WIN32
+void Discord_RegisterW(const wchar_t* applicationId, const wchar_t* command)
+{
     // https://msdn.microsoft.com/en-us/library/aa767914(v=vs.85).aspx
     // we want to register games so we can run them as discord-<appid>://
     // Update the HKEY_CURRENT_USER, because it doesn't seem to require special permissions.
 
-    wchar_t appId[32];
-    MultiByteToWideChar(CP_UTF8, 0, applicationId, -1, appId, 32);
-
     wchar_t exeFilePath[MAX_PATH];
-    GetModuleFileNameExW(GetCurrentProcess(), nullptr, exeFilePath, MAX_PATH);
+    int exeLen = GetModuleFileNameExW(GetCurrentProcess(), nullptr, exeFilePath, MAX_PATH);
+    wchar_t openCommand[1024];
+    const auto commandBufferLen = sizeof(openCommand) / sizeof(*openCommand);
+
+    if (command && command[0]) {
+        StringCbPrintfW(openCommand, sizeof(openCommand), L"%s", command);
+    }
+    else {
+        lstrcpyW(openCommand, exeFilePath);
+    }
 
     wchar_t protocolName[64];
-    StringCbPrintfW(protocolName, sizeof(protocolName), L"discord-%s", appId);
+    StringCbPrintfW(protocolName, sizeof(protocolName), L"discord-%s", applicationId);
     wchar_t protocolDescription[128];
     StringCbPrintfW(
-      protocolDescription, sizeof(protocolDescription), L"URL:Run game %s protocol", appId);
+      protocolDescription, sizeof(protocolDescription), L"URL:Run game %s protocol", applicationId);
     wchar_t urlProtocol = 0;
-    wchar_t openCommand[MAX_PATH + 8];
-    StringCbPrintfW(openCommand, sizeof(openCommand), L"\"%s\" \"%%1\"", exeFilePath);
 
     wchar_t keyName[256];
     StringCbPrintfW(keyName, sizeof(keyName), L"Software\\Classes\\%s", protocolName);
@@ -58,9 +62,8 @@ void Discord_Register(const char* applicationId)
         fprintf(stderr, "Error writing description\n");
     }
 
-    len = lstrlenW(exeFilePath) + 1;
-    result =
-      RegSetKeyValueW(key, L"DefaultIcon", nullptr, REG_SZ, exeFilePath, len * sizeof(wchar_t));
+    result = RegSetKeyValueW(
+      key, L"DefaultIcon", nullptr, REG_SZ, exeFilePath, (exeLen + 1) * sizeof(wchar_t));
     if (FAILED(result)) {
         fprintf(stderr, "Error writing icon\n");
     }
@@ -72,5 +75,63 @@ void Discord_Register(const char* applicationId)
         fprintf(stderr, "Error writing command\n");
     }
     RegCloseKey(key);
+}
+#endif
+
+void Discord_Register(const char* applicationId, const char* command)
+{
+#ifdef _WIN32
+
+    wchar_t appId[32];
+    MultiByteToWideChar(CP_UTF8, 0, applicationId, -1, appId, 32);
+
+    wchar_t openCommand[1024];
+    const wchar_t* wcommand = nullptr;
+    if (command && command[0]) {
+        const auto commandBufferLen = sizeof(openCommand) / sizeof(*openCommand);
+        MultiByteToWideChar(CP_UTF8, 0, command, -1, openCommand, commandBufferLen);
+        wcommand = openCommand;
+    }
+
+    Discord_RegisterW(appId, wcommand);
+#endif
+}
+
+void Discord_RegisterSteamGame(const char* applicationId, const char* steamId)
+{
+#ifdef _WIN32
+    wchar_t appId[32];
+    MultiByteToWideChar(CP_UTF8, 0, applicationId, -1, appId, 32);
+
+    wchar_t wSteamId[32];
+    MultiByteToWideChar(CP_UTF8, 0, steamId, -1, wSteamId, 32);
+
+    HKEY key;
+    auto status = RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\Valve\\Steam", 0, KEY_READ, &key);
+    if (status != ERROR_SUCCESS) {
+        fprintf(stderr, "Error opening Steam key\n");
+        return;
+    }
+
+    wchar_t steamPath[MAX_PATH];
+    DWORD pathBytes = sizeof(steamPath);
+    status = RegQueryValueExW(key, L"SteamExe", nullptr, nullptr, (BYTE*)steamPath, &pathBytes);
+    RegCloseKey(key);
+    if (status != ERROR_SUCCESS || pathBytes < 1) {
+        fprintf(stderr, "Error reading SteamExe key\n");
+        return;
+    }
+
+    DWORD pathChars = pathBytes / sizeof(wchar_t);
+    for (DWORD i = 0; i < pathChars; ++i) {
+        if (steamPath[i] == L'/') {
+            steamPath[i] = L'\\';
+        }
+    }
+
+    wchar_t command[1024];
+    StringCbPrintfW(command, sizeof(command), L"\"%s\" steam://run/%s", steamPath, wSteamId);
+
+    Discord_RegisterW(appId, command);
 #endif
 }

src/discord-register.h

@@ -1,3 +1,4 @@
 #pragma once
 
-void Discord_Register(const char* applicationId);
+void Discord_Register(const char* applicationId, const char* command);
+void Discord_RegisterSteamGame(const char* applicationId, const char* steamId);

src/discord-rpc.cpp

@@ -208,10 +208,16 @@ bool RegisterForEvent(const char* evtName)
 
 extern "C" void Discord_Initialize(const char* applicationId,
                                    DiscordEventHandlers* handlers,
-                                   int autoRegister)
+                                   int autoRegister,
+                                   const char* optionalSteamId)
 {
     if (autoRegister) {
-        Discord_Register(applicationId);
+        if (optionalSteamId && optionalSteamId[0]) {
+            Discord_RegisterSteamGame(applicationId, optionalSteamId);
+        }
+        else {
+            Discord_Register(applicationId, nullptr);
+        }
     }
 
     Pid = GetProcessId();