Let's not add the Panda3D Runtime to PATH, instead, let's locate it in registry

direct/src/p3d/p3dWrapper.c

@@ -30,8 +30,16 @@ int main (int argc, char* argv[]) {
   int i;
   char buffer [BUFFER_SIZE];
   char* p3dfile;
-  char** newargv;
+  char* runtime = NULL;
   DWORD size;
+  STARTUPINFO si;
+  PROCESS_INFORMATION pi;
+  char *cmd;
+  char *newcmd;
+  HKEY hKey = 0;
+  char buf [1024] = {0};
+  DWORD dwType = 0;
+  DWORD dwBufSize = sizeof(buf);
   size = GetModuleFileName (NULL, buffer, BUFFER_SIZE);
   assert (size > 0);
 
@@ -41,18 +49,44 @@ int main (int argc, char* argv[]) {
   p3dfile [size] = 0;
   memcpy (p3dfile + size - 3, "p3d", 3);
 
-  /* Fill in a new argv object to pass to panda3d(.exe). */
-  newargv = (char**) malloc (sizeof (char*) * (argc + 2));
-  newargv [0] = "panda3d.exe";
-  newargv [1] = p3dfile;
-  for (i = 1; i < argc; ++i) {
-    newargv [i + 1] = _strdup (argv [i]);
+  /* Find the Panda3D applet\DefaultIcon key and extract the path to the runtime from there. */
+  if (RegOpenKey (HKEY_CLASSES_ROOT, "Panda3D applet\\DefaultIcon", &hKey) == ERROR_SUCCESS) {
+    dwType = REG_SZ;
+    if (RegQueryValueEx(hKey, 0, 0, &dwType, (BYTE*) buf, &dwBufSize) == ERROR_SUCCESS) {
+      for (i = dwBufSize - 1; i >= 0; --i) {
+        if (buf [i] == '/' || buf [i] == '\\') {
+          runtime = (char*) malloc (i + 13);
+          memcpy (runtime, buf, i);
+          runtime [i] = 0;         
+          strcat (runtime, "\\panda3d.exe");      
+          break;
+        }
+      }
+    } else {
+      fprintf (stderr, "Failed to read registry key. Try reinstalling the Panda3D Runtime.\n");
+      return 1;
+    }
+    RegCloseKey(hKey);
+  } else {
+    fprintf (stderr, "The Panda3D Runtime does not appear to be installed!\n");
+    return 1;
   }
-  newargv [argc + 1] = NULL;
-  if (_execvp ("panda3d.exe", newargv) == -1) {
-    fprintf (stderr, "panda3d.exe: %s", _strerror (NULL));
+
+  if (runtime == NULL) {
+    fprintf (stderr, "Failed to find panda3d.exe in registry. Try reinstalling the Panda3D Runtime.\n");
     return 1;
   }
+
+  /* Build the command-line and run panda3d.exe. */
+  cmd = GetCommandLine();
+  newcmd = (char*) malloc (strlen(runtime) + strlen(p3dfile) + strlen (cmd) - strlen (argv[0]) + 7);
+  sprintf (newcmd, "\"%s\" \"%s\" %s", runtime, p3dfile, cmd + strlen (argv[0]));
+  memset(&si, 0, sizeof(si));
+  si.cb = sizeof(STARTUPINFO);
+  if (CreateProcess(runtime, newcmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) {
+    WaitForSingleObject(pi.hProcess, INFINITE);
+  }
+  free (newcmd);
   return 0;
 }
 

direct/src/plugin_installer/AddToPath.nsh

@@ -1,442 +0,0 @@
-# Code taken from http://nsis.sourceforge.net/Path_Manipulation
-!ifndef _AddToPath_nsh
-!define _AddToPath_nsh
- 
-!verbose 3
-!include "WinMessages.NSH"
-!verbose 4
- 
-!ifndef WriteEnvStr_RegKey
-  !ifdef ALL_USERS
-    !define WriteEnvStr_RegKey \
-       'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
-  !else
-    !define WriteEnvStr_RegKey 'HKCU "Environment"'
-  !endif
-!endif
- 
-; AddToPath - Adds the given dir to the search path.
-;        Input - head of the stack
-;        Note - Win9x systems requires reboot
- 
-Function AddToPath
-  Exch $0
-  Push $1
-  Push $2
-  Push $3
- 
-  # don't add if the path doesn't exist
-  IfFileExists "$0\*.*" "" AddToPath_done
- 
-  ReadEnvStr $1 PATH
-  Push "$1;"
-  Push "$0;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-  Push "$1;"
-  Push "$0\;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-  GetFullPathName /SHORT $3 $0
-  Push "$1;"
-  Push "$3;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-  Push "$1;"
-  Push "$3\;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
- 
-  Call IsNT
-  Pop $1
-  StrCmp $1 1 AddToPath_NT
-    ; Not on NT
-    StrCpy $1 $WINDIR 2
-    FileOpen $1 "$1\autoexec.bat" a
-    FileSeek $1 -1 END
-    FileReadByte $1 $2
-    IntCmp $2 26 0 +2 +2 # DOS EOF
-      FileSeek $1 -1 END # write over EOF
-    FileWrite $1 "$\r$\nSET PATH=%PATH%;$3$\r$\n"
-    FileClose $1
-    SetRebootFlag true
-    Goto AddToPath_done
- 
-  AddToPath_NT:
-    ReadRegStr $1 ${WriteEnvStr_RegKey} "PATH"
-    StrCmp $1 "" AddToPath_NTdoIt
-      Push $1
-      Call Trim
-      Pop $1
-      StrCpy $0 "$1;$0"
-    AddToPath_NTdoIt:
-      WriteRegExpandStr ${WriteEnvStr_RegKey} "PATH" $0
-      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
- 
-  AddToPath_done:
-    Pop $3
-    Pop $2
-    Pop $1
-    Pop $0
-FunctionEnd
- 
-; RemoveFromPath - Remove a given dir from the path
-;     Input: head of the stack
- 
-Function un.RemoveFromPath
-  Exch $0
-  Push $1
-  Push $2
-  Push $3
-  Push $4
-  Push $5
-  Push $6
- 
-  IntFmt $6 "%c" 26 # DOS EOF
- 
-  Call un.IsNT
-  Pop $1
-  StrCmp $1 1 unRemoveFromPath_NT
-    ; Not on NT
-    StrCpy $1 $WINDIR 2
-    FileOpen $1 "$1\autoexec.bat" r
-    GetTempFileName $4
-    FileOpen $2 $4 w
-    GetFullPathName /SHORT $0 $0
-    StrCpy $0 "SET PATH=%PATH%;$0"
-    Goto unRemoveFromPath_dosLoop
- 
-    unRemoveFromPath_dosLoop:
-      FileRead $1 $3
-      StrCpy $5 $3 1 -1 # read last char
-      StrCmp $5 $6 0 +2 # if DOS EOF
-        StrCpy $3 $3 -1 # remove DOS EOF so we can compare
-      StrCmp $3 "$0$\r$\n" unRemoveFromPath_dosLoopRemoveLine
-      StrCmp $3 "$0$\n" unRemoveFromPath_dosLoopRemoveLine
-      StrCmp $3 "$0" unRemoveFromPath_dosLoopRemoveLine
-      StrCmp $3 "" unRemoveFromPath_dosLoopEnd
-      FileWrite $2 $3
-      Goto unRemoveFromPath_dosLoop
-      unRemoveFromPath_dosLoopRemoveLine:
-        SetRebootFlag true
-        Goto unRemoveFromPath_dosLoop
- 
-    unRemoveFromPath_dosLoopEnd:
-      FileClose $2
-      FileClose $1
-      StrCpy $1 $WINDIR 2
-      Delete "$1\autoexec.bat"
-      CopyFiles /SILENT $4 "$1\autoexec.bat"
-      Delete $4
-      Goto unRemoveFromPath_done
- 
-  unRemoveFromPath_NT:
-    ReadRegStr $1 ${WriteEnvStr_RegKey} "PATH"
-    StrCpy $5 $1 1 -1 # copy last char
-    StrCmp $5 ";" +2 # if last char != ;
-      StrCpy $1 "$1;" # append ;
-    Push $1
-    Push "$0;"
-    Call un.StrStr ; Find `$0;` in $1
-    Pop $2 ; pos of our dir
-    StrCmp $2 "" unRemoveFromPath_done
-      ; else, it is in path
-      # $0 - path to add
-      # $1 - path var
-      StrLen $3 "$0;"
-      StrLen $4 $2
-      StrCpy $5 $1 -$4 # $5 is now the part before the path to remove
-      StrCpy $6 $2 "" $3 # $6 is now the part after the path to remove
-      StrCpy $3 $5$6
- 
-      StrCpy $5 $3 1 -1 # copy last char
-      StrCmp $5 ";" 0 +2 # if last char == ;
-        StrCpy $3 $3 -1 # remove last char
- 
-      WriteRegExpandStr ${WriteEnvStr_RegKey} "PATH" $3
-      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
- 
-  unRemoveFromPath_done:
-    Pop $6
-    Pop $5
-    Pop $4
-    Pop $3
-    Pop $2
-    Pop $1
-    Pop $0
-FunctionEnd
- 
- 
- 
-; AddToEnvVar - Adds the given value to the given environment var
-;        Input - head of the stack $0 environement variable $1=value to add
-;        Note - Win9x systems requires reboot
- 
-Function AddToEnvVar
- 
-  Exch $1 ; $1 has environment variable value
-  Exch
-  Exch $0 ; $0 has environment variable name
- 
-  DetailPrint "Adding $1 to $0"
-  Push $2
-  Push $3
-  Push $4
- 
- 
-  ReadEnvStr $2 $0
-  Push "$2;"
-  Push "$1;"
-  Call StrStr
-  Pop $3
-  StrCmp $3 "" "" AddToEnvVar_done
- 
-  Push "$2;"
-  Push "$1\;"
-  Call StrStr
-  Pop $3
-  StrCmp $3 "" "" AddToEnvVar_done
- 
- 
-  Call IsNT
-  Pop $2
-  StrCmp $2 1 AddToEnvVar_NT
-    ; Not on NT
-    StrCpy $2 $WINDIR 2
-    FileOpen $2 "$2\autoexec.bat" a
-    FileSeek $2 -1 END
-    FileReadByte $2 $3
-    IntCmp $3 26 0 +2 +2 # DOS EOF
-      FileSeek $2 -1 END # write over EOF
-    FileWrite $2 "$\r$\nSET $0=%$0%;$4$\r$\n"
-    FileClose $2
-    SetRebootFlag true
-    Goto AddToEnvVar_done
- 
-  AddToEnvVar_NT:
-    ReadRegStr $2 ${WriteEnvStr_RegKey} $0
-    StrCpy $3 $2 1 -1 # copy last char
-    StrCmp $3 ";" 0 +2 # if last char == ;
-      StrCpy $2 $2 -1 # remove last char
-    StrCmp $2 "" AddToEnvVar_NTdoIt
-      StrCpy $1 "$2;$1"
-    AddToEnvVar_NTdoIt:
-      WriteRegExpandStr ${WriteEnvStr_RegKey} $0 $1
-      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
- 
-  AddToEnvVar_done:
-    Pop $4
-    Pop $3
-    Pop $2
-    Pop $0
-    Pop $1
- 
-FunctionEnd
- 
-; RemoveFromEnvVar - Remove a given value from a environment var
-;     Input: head of the stack
- 
-Function un.RemoveFromEnvVar
- 
-  Exch $1 ; $1 has environment variable value
-  Exch
-  Exch $0 ; $0 has environment variable name
- 
-  DetailPrint "Removing $1 from $0"
-  Push $2
-  Push $3
-  Push $4
-  Push $5
-  Push $6
-  Push $7
- 
-  IntFmt $7 "%c" 26 # DOS EOF
- 
-  Call un.IsNT
-  Pop $2
-  StrCmp $2 1 unRemoveFromEnvVar_NT
-    ; Not on NT
-    StrCpy $2 $WINDIR 2
-    FileOpen $2 "$2\autoexec.bat" r
-    GetTempFileName $5
-    FileOpen $3 $5 w
-    GetFullPathName /SHORT $1 $1
-    StrCpy $1 "SET $0=%$0%;$1"
-    Goto unRemoveFromEnvVar_dosLoop
- 
-    unRemoveFromEnvVar_dosLoop:
-      FileRead $2 $4
-      StrCpy $6 $4 1 -1 # read last char
-      StrCmp $6 $7 0 +2 # if DOS EOF
-        StrCpy $4 $4 -1 # remove DOS EOF so we can compare
-      StrCmp $4 "$1$\r$\n" unRemoveFromEnvVar_dosLoopRemoveLine
-      StrCmp $4 "$1$\n" unRemoveFromEnvVar_dosLoopRemoveLine
-      StrCmp $4 "$1" unRemoveFromEnvVar_dosLoopRemoveLine
-      StrCmp $4 "" unRemoveFromEnvVar_dosLoopEnd
-      FileWrite $3 $4
-      Goto unRemoveFromEnvVar_dosLoop
-      unRemoveFromEnvVar_dosLoopRemoveLine:
-        SetRebootFlag true
-        Goto unRemoveFromEnvVar_dosLoop
- 
-    unRemoveFromEnvVar_dosLoopEnd:
-      FileClose $3
-      FileClose $2
-      StrCpy $2 $WINDIR 2
-      Delete "$2\autoexec.bat"
-      CopyFiles /SILENT $5 "$2\autoexec.bat"
-      Delete $5
-      Goto unRemoveFromEnvVar_done
- 
-  unRemoveFromEnvVar_NT:
-    ReadRegStr $2 ${WriteEnvStr_RegKey} $0
-    StrCpy $6 $2 1 -1 # copy last char
-    StrCmp $6 ";" +2 # if last char != ;
-      StrCpy $2 "$2;" # append ;
-    Push $2
-    Push "$1;"
-    Call un.StrStr ; Find `$1;` in $2
-    Pop $3 ; pos of our dir
-    StrCmp $3 "" unRemoveFromEnvVar_done
-      ; else, it is in path
-      # $1 - path to add
-      # $2 - path var
-      StrLen $4 "$1;"
-      StrLen $5 $3
-      StrCpy $6 $2 -$5 # $6 is now the part before the path to remove
-      StrCpy $7 $3 "" $4 # $7 is now the part after the path to remove
-      StrCpy $4 $6$7
- 
-      StrCpy $6 $4 1 -1 # copy last char
-      StrCmp $6 ";" 0 +2 # if last char == ;
-      StrCpy $4 $4 -1 # remove last char
- 
-      WriteRegExpandStr ${WriteEnvStr_RegKey} $0 $4
- 
-      ; delete reg value if null
-      StrCmp $4 "" 0 +2 # if null delete reg
-      DeleteRegValue ${WriteEnvStr_RegKey} $0
- 
-      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
- 
-  unRemoveFromEnvVar_done:
-    Pop $7
-    Pop $6
-    Pop $5
-    Pop $4
-    Pop $3
-    Pop $2
-    Pop $1
-    Pop $0
-FunctionEnd
- 
- 
- 
- 
-!ifndef IsNT_KiCHiK
-!define IsNT_KiCHiK
- 
-###########################################
-#            Utility Functions            #
-###########################################
- 
-; IsNT
-; no input
-; output, top of the stack = 1 if NT or 0 if not
-;
-; Usage:
-;   Call IsNT
-;   Pop $R0
-;  ($R0 at this point is 1 or 0)
- 
-!macro IsNT un
-Function ${un}IsNT
-  Push $0
-  ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
-  StrCmp $0 "" 0 IsNT_yes
-  ; we are not NT.
-  Pop $0
-  Push 0
-  Return
- 
-  IsNT_yes:
-    ; NT!!!
-    Pop $0
-    Push 1
-FunctionEnd
-!macroend
-!insertmacro IsNT ""
-!insertmacro IsNT "un."
- 
-!endif ; IsNT_KiCHiK
- 
-; StrStr
-; input, top of stack = string to search for
-;        top of stack-1 = string to search in
-; output, top of stack (replaces with the portion of the string remaining)
-; modifies no other variables.
-;
-; Usage:
-;   Push "this is a long ass string"
-;   Push "ass"
-;   Call StrStr
-;   Pop $R0
-;  ($R0 at this point is "ass string")
- 
-!macro StrStr un
-Function ${un}StrStr
-Exch $R1 ; st=haystack,old$R1, $R1=needle
-  Exch    ; st=old$R1,haystack
-  Exch $R2 ; st=old$R1,old$R2, $R2=haystack
-  Push $R3
-  Push $R4
-  Push $R5
-  StrLen $R3 $R1
-  StrCpy $R4 0
-  ; $R1=needle
-  ; $R2=haystack
-  ; $R3=len(needle)
-  ; $R4=cnt
-  ; $R5=tmp
-  loop:
-    StrCpy $R5 $R2 $R3 $R4
-    StrCmp $R5 $R1 done
-    StrCmp $R5 "" done
-    IntOp $R4 $R4 + 1
-    Goto loop
-done:
-  StrCpy $R1 $R2 "" $R4
-  Pop $R5
-  Pop $R4
-  Pop $R3
-  Pop $R2
-  Exch $R1
-FunctionEnd
-!macroend
-!insertmacro StrStr ""
-!insertmacro StrStr "un."
- 
-Function Trim ; Added by Pelaca
-	Exch $R1
-	Push $R2
-Loop:
-	StrCpy $R2 "$R1" 1 -1
-	StrCmp "$R2" " " RTrim
-	StrCmp "$R2" "$\n" RTrim
-	StrCmp "$R2" "$\r" RTrim
-	StrCmp "$R2" ";" RTrim
-	GoTo Done
-RTrim:	
-	StrCpy $R1 "$R1" -1
-	Goto Loop
-Done:
-	Pop $R2
-	Exch $R1
-FunctionEnd
- 
-!endif ; _AddToPath_nsh
-

direct/src/plugin_installer/p3d_installer.nsi

@@ -2,7 +2,6 @@
 !include LogicLib.nsh
 !include FileFunc.nsh
 !include FileAssociation.nsh
-!include AddToPath.nsh
 
 ; Several variables are assumed to be pre-defined by the caller.  See
 ; make_installer.py in this directory.
@@ -117,10 +116,6 @@ Section "MainSection" SEC01
 
   # Make the directory "$INSTDIR" read write accessible by all users
   AccessControl::GrantOnFile "$INSTDIR" "(BU)" "FullAccess"
-  
-  # Add "$INSTDIR" to the system PATH.
-  Push "$INSTDIR"
-  Call AddToPath
 
 ;  File "..\..\..\path\to\file\Example.file"
 SectionEnd
@@ -271,10 +266,6 @@ Mozilla-Uninstall-End:
 !endif
 
   RMDir "$INSTDIR"
-  
-  # Remove "$INSTDIR" fromthe system PATH.
-  Push "$INSTDIR"
-  Call un.RemoveFromPath
 
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
   DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"