Adjust more paths for Gpg4win 3.0

build-windows/pEpEngine.vcxproj

@@ -43,12 +43,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <RunCodeAnalysis>false</RunCodeAnalysis>
-	<IncludePath>$(ProjectDir)\..\..\libetpan\build-windows\include;C:\Program Files %28x86%29\Gpg4win\include;$(IncludePath);$(ProjectDir)\asn.1;%ASN1C%\share\asn1c</IncludePath>
+	<IncludePath>$(ProjectDir)\..\..\libetpan\build-windows\include;C:\Program Files %28x86%29\GnuPG\include;$(IncludePath);$(ProjectDir)\asn.1;%ASN1C%\share\asn1c</IncludePath>
     <LibraryPath>$(ProjectDir)\..\..\libetpan\build-windows\Debug;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-	<IncludePath>$(ProjectDir)\..\..\libetpan\build-windows\include;C:\Program Files %28x86%29\Gpg4win\include;$(IncludePath);$(ProjectDir)\asn.1;%ASN1C%\share\asn1c</IncludePath>
+	<IncludePath>$(ProjectDir)\..\..\libetpan\build-windows\include;C:\Program Files %28x86%29\GnuPG\include;$(IncludePath);$(ProjectDir)\asn.1;%ASN1C%\share\asn1c</IncludePath>
     <LibraryPath>$(ProjectDir)\..\..\libetpan\build-windows\Release;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

src/platform_windows.cpp

@@ -141,12 +141,12 @@ void *dlopen(const char *filename, int flag) {
 
 	// Look up GnuPG installation in current user scope
 	bool result = readRegistryString(HKEY_CURRENT_USER,
-		TEXT("SOFTWARE\\GNU\\GnuPG"), TEXT("Install Directory"), path,
+		TEXT("SOFTWARE\\GnuPG"), TEXT("Install Directory"), path,
 		PATH_BUF_SIZE, NULL);
 	// If not found in current user, look up in local machine
 	if (!result)
 		result = readRegistryString(HKEY_LOCAL_MACHINE,
-			TEXT("SOFTWARE\\GNU\\GnuPG"), TEXT("Install Directory"), path,
+			TEXT("SOFTWARE\\GnuPG"), TEXT("Install Directory"), path,
 			PATH_BUF_SIZE, NULL);
 	assert(result);
 	if (!result)