Compare commits

..
5 Commits
8 changed files with 17 additions and 7 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+9 -4
View File
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension"> xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Product Id="*" Name="Moonlight Internet Streaming Helper" Language="1033" Version="!(bind.fileVersion.MistExe)" <Product Id="*" Name="Moonlight Internet Streaming Helper" Language="1033" Version="!(bind.fileVersion.MistExe)"
Manufacturer="Moonlight Game Streaming Project" UpgradeCode="cfc2fb53-88e2-4867-851d-9ed9fe7ab2a3"> Manufacturer="Moonlight Game Streaming Project" UpgradeCode="cfc2fb53-88e2-4867-851d-9ed9fe7ab2a3">
<Package InstallerVersion="500" Compressed="yes" InstallScope="perMachine" /> <Package InstallerVersion="500" Compressed="yes" InstallScope="perMachine" />
@@ -38,16 +39,20 @@
Scope="any" Scope="any"
Name="Moonlight Internet Streaming Service"/> Name="Moonlight Internet Streaming Service"/>
</File> </File>
<CreateFolder Directory="MISSLogFolder" /> <CreateFolder Directory="MISSLogFolder">
<util:PermissionEx User="NT SERVICE\MISS" GenericAll="yes" />
</CreateFolder>
<ServiceInstall Type="ownProcess" <ServiceInstall Type="ownProcess"
Name="MISS" Name="MISS"
DisplayName="Moonlight Internet Streaming Service" DisplayName="Moonlight Internet Streaming Service"
Description="Automatically manages router port forwarding rules required to use Moonlight over the Internet" Description="Automatically manages router port forwarding rules required to use Moonlight over the Internet"
Start="auto" Start="auto"
Account="LocalSystem" Account="NT AUTHORITY\LocalService"
ErrorControl="ignore" ErrorControl="ignore"
Interactive="no"> Interactive="no">
<ServiceConfig DelayedAutoStart="no" OnInstall="yes" OnReinstall="yes" /> <ServiceConfig DelayedAutoStart="no" OnInstall="yes" OnReinstall="yes" ServiceSid="restricted">
<RequiredPrivilege>SeChangeNotifyPrivilege</RequiredPrivilege>
</ServiceConfig>
</ServiceInstall> </ServiceInstall>
<ServiceControl Id="StartService" Start="install" Stop="both" Remove="uninstall" Name="MISS" Wait="yes" /> <ServiceControl Id="StartService" Start="install" Stop="both" Remove="uninstall" Name="MISS" Wait="yes" />
</Component> </Component>
+4
View File
@@ -48,6 +48,10 @@
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath> <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
<Name>WixUIExtension</Name> <Name>WixUIExtension</Name>
</WixExtension> </WixExtension>
<WixExtension Include="WixUtilExtension">
<HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
<Name>WixUtilExtension</Name>
</WixExtension>
</ItemGroup> </ItemGroup>
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " /> <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
+2 -1
View File
@@ -179,7 +179,8 @@ bool getExternalAddressPortIP4(int proto, unsigned short localPort, PSOCKADDR_IN
printf("STUN attribute out of bounds: %d\n", htons(attribute->length)); printf("STUN attribute out of bounds: %d\n", htons(attribute->length));
return false; return false;
} }
else if (htons(attribute->type) != STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS) { // Mask off the comprehension bit
else if ((htons(attribute->type) & 0x7FFF) != STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS) {
// Continue searching if this wasn't our address // Continue searching if this wasn't our address
bytesRead -= sizeof(*attribute) + htons(attribute->length); bytesRead -= sizeof(*attribute) + htons(attribute->length);
attribute = (PSTUN_ATTRIBUTE_HEADER)(((char*)attribute) + sizeof(*attribute) + htons(attribute->length)); attribute = (PSTUN_ATTRIBUTE_HEADER)(((char*)attribute) + sizeof(*attribute) + htons(attribute->length));
+2 -2
View File
@@ -1,7 +1,7 @@
#pragma once #pragma once
#define VER_VERSION 2,2,0,0 #define VER_VERSION 2,3,0,0
#define VER_VERSION_STR "2.2.0.0" #define VER_VERSION_STR "2.3.0.0"
#define VER_COMPANYNAME_STR "Moonlight Game Streaming Project" #define VER_COMPANYNAME_STR "Moonlight Game Streaming Project"
#define VER_PRODUCTNAME_STR "Moonlight Internet Streaming Helper" #define VER_PRODUCTNAME_STR "Moonlight Internet Streaming Helper"