Developer installation from within Visual Studio

Makefile.DevInstall

 #
 # NMAKE is a 32-bit application, which makes it problematic to make 64-bit registry entries with the standard command-line tools such as "reg.exe".
 # As a 32-bit application, when it loads "reg.exe" from the ordinary directory, %WINDIR%\System32, the WOW64 system redirects it load from %WINDIR%\SysWOW64.
 # So even if you explicitly put in the 64-bit path, because NMAKE is 32-bit it will load the 32-bit version anyway.
 # To get around this, we check for the existence of %WINDIR%\sysnative\reg.exe, which if present means a few things.
 # -- 1. We're running on Windows Vista or later, because 64-bit XP doesn't have "sysnative."
 # -- 2. We're running on a 64-bit version of Windows.
 # -- 3. We're running from a 32-bit process, which should always be true about NMAKE.
 #
 # See http://ovidiupl.wordpress.com/2008/07/11/useful-wow64-file-system-trick/ for more details.
 #
 !if [cmd /c if exist %WINDIR%\sysnative\reg.exe exit /b 1]
 REG=$(WINDIR)\sysnative\reg.exe
 X64=1
 !else
 REG=$(WINDIR)\reg.exe
 !message Warning: Developer installation not tested on XP or 32-bit Windows.
 !endif
 
 !message DLL=$(DLL)
 
 #
 # Default (first) target is a help message, in case anybody runs it outside Visual Studio.
 #
 help:
         @echo This Makefile is intended to be run from within Visual Studio to provide developer installations of Adblock Plus for IE.
 
-build64: register64 check_BHO copy
+build64: register64 check_BHO64 copy
 
 rebuild64: clean64 build64
 
-build32: register32 check_BHO copy
+build32: register32 check_BHO32 copy
 
 rebuild32: clean32 build32
 
 #
 # We're using "reg.exe" for the HKCU keys because the one with the DLL path name would need to be backslash-quoted to go into a .REG file.
 #
 # Note that the CLSID is register in HKCU, which avoids the need to elevate with UAC to high integrity in order to write.
 # Also note that the "Browser Helper Object" key is in HKLM, which is required because of IE.
 # IE only scans in HKLM for BHO entries.
 # IE does not scan HKCU for BHO entries, contrary to some sources online.
@@ skipping 20 matching lines @@
         @echo Start 'register' action.
         reg add HKCU\Software\Classes\CLSID\{FFCB3198-32F3-4E8B-9539-4324694ED664} /ve /d "Adblock Plus for IE Browser Helper Object" /f >nul
         reg add HKCU\Software\Classes\CLSID\{FFCB3198-32F3-4E8B-9539-4324694ED664}\InprocServer32 /ve /d "$(DLL)" /f >nul
         reg add HKCU\Software\Classes\CLSID\{FFCB3198-32F3-4E8B-9539-4324694ED664}\InprocServer32 /v ThreadingModel /d "Both" /f >nul
         @date /t >"$(OutDir)registered.timestamp.txt"
         @time /t >>"$(OutDir)registered.timestamp.txt"
 
 #
 # Fortuitously, the warning message below is actually parsed by Visual Studio and show up with a yellow flag in the error list.
 #
-check_BHO:
+check_BHO64:
 !if [$(REG) query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Browser Helper Objects\{FFCB3198-32F3-4E8B-9539-4324694ED664}" 2>&1 >nul]
         @echo Warning: BHO key not registered. IE cannot find the plugin unless the BHO key is present in the registry. Use "BHO_add.reg" to add the key.
 !endif
 
+check_BHO32:
+!if [reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Browser Helper Objects\{FFCB3198-32F3-4E8B-9539-4324694ED664}" 2>&1 >nul]
+        @echo Warning: BHO key not registered. IE cannot find the plugin unless the BHO key is present in the registry. Use "BHO_add.reg" to add the key.
+!endif
+
 copy:
         @echo Copying files
         copy "$(ProjectDir)files\settings.ini" "$(OutDir)settings.ini"
         xcopy /s /I /y /D "$(ProjectDir)html\*" "$(OutDir)html"
         xcopy /s /I /y /D "$(ProjectDir)locales\*" "$(OutDir)locales"
         @date /t >"$(OutDir)copied.timestamp.txt"
         @time /t >>"$(OutDir)copied.timestamp.txt"
 
 #
 # N.B. We don't delete the CLSID in HKLM for clean. That wouldn't be our key, but the installer's.
@@ skipping 17 matching lines @@
         -@$(REG) query HKLM\Software\Classes\CLSID\{FFCB3198-32F3-4E8B-9539-4324694ED664}\InprocServer32 2>nul
         -@$(REG) query HKCU\Software\Classes\CLSID\{FFCB3198-32F3-4E8B-9539-4324694ED664} /ve 2>nul
         -@$(REG) query HKCU\Software\Classes\CLSID\{FFCB3198-32F3-4E8B-9539-4324694ED664}\InprocServer32 2>nul
 !ifdef X64
 # WoW64 keys
         -@$(REG) query HKLM\Software\Wow6432Node\Classes\CLSID\{FFCB3198-32F3-4E8B-9539-4324694ED664} /ve 2>nul
         -@$(REG) query HKLM\Software\Wow6432Node\Classes\CLSID\{FFCB3198-32F3-4E8B-9539-4324694ED664}\InprocServer32 2>nul
         -@$(REG) query HKCU\Software\Wow6432Node\Classes\CLSID\{FFCB3198-32F3-4E8B-9539-4324694ED664} /ve 2>nul
         -@$(REG) query HKCU\Software\Wow6432Node\Classes\CLSID\{FFCB3198-32F3-4E8B-9539-4324694ED664}\InprocServer32 2>nul
 !endif