Skip to content

Commit 15b692c

Browse files
committed
update to 2.2.2, change policy argument to ref
1 parent c47a499 commit 15b692c

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

FlashpointSecurePlayer/CustomSecurityManager.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,13 @@ int InternetInterfaces.IInternetSecurityManager.GetSecurityId([MarshalAs(Unmanag
108108
return INET_E_DEFAULT_ACTION;
109109
}
110110

111-
int InternetInterfaces.IInternetSecurityManager.ProcessUrlAction([MarshalAs(UnmanagedType.LPWStr)] string pwszUrl, uint dwAction, out uint pPolicy, uint cbPolicy, IntPtr pContext, uint cbContext, uint dwFlags, uint dwReserved) {
112-
pPolicy = URLPOLICY_DISALLOW;
113-
111+
int InternetInterfaces.IInternetSecurityManager.ProcessUrlAction([MarshalAs(UnmanagedType.LPWStr)] string pwszUrl, uint dwAction, ref uint pPolicy, uint cbPolicy, IntPtr pContext, uint cbContext, uint dwFlags, uint dwReserved) {
114112
if (cbPolicy < Marshal.SizeOf(pPolicy.GetType())) {
115113
return S_FALSE;
116114
}
117115

116+
pPolicy = URLPOLICY_DISALLOW;
117+
118118
// don't process file:// URLS, they are outside the proxy
119119
if ((dwFlags & PUAF_ISFILE) == PUAF_ISFILE) {
120120
return INET_E_DEFAULT_ACTION;
@@ -186,7 +186,7 @@ int InternetInterfaces.IInternetSecurityManager.ProcessUrlAction([MarshalAs(Unma
186186

187187
pPolicy = URLPOLICY_JAVA_LOW;
188188

189-
if (dwAction == URLACTION_JAVA_PERMISSIONS) { // allow Java applets to be as terrible as they need to be to function
189+
if (dwAction == URLACTION_JAVA_PERMISSIONS) { // allow Java applets (in case we ever need Java in IE?)
190190
// for URLACTION_JAVA_PERMISSIONS, should return S_OK if
191191
// the policy is not URLPOLICY_JAVA_PROHIBIT
192192
// (though in practice, return value seems to not matter?)

FlashpointSecurePlayer/InternetInterfaces.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ public interface IInternetSecurityManager {
260260
int GetSecurityId([MarshalAs(UnmanagedType.LPWStr)] string pwszUrl, [MarshalAs(UnmanagedType.LPArray)] byte[] pbSecurityId, ref uint pcbSecurityId, uint dwReserved);
261261

262262
[PreserveSig]
263-
int ProcessUrlAction([MarshalAs(UnmanagedType.LPWStr)] string pwszUrl, uint dwAction, out uint pPolicy, uint cbPolicy, IntPtr pContext, uint cbContext, uint dwFlags, uint dwReserved);
263+
int ProcessUrlAction([MarshalAs(UnmanagedType.LPWStr)] string pwszUrl, uint dwAction, ref uint pPolicy, uint cbPolicy, IntPtr pContext, uint cbContext, uint dwFlags, uint dwReserved);
264264

265265
[PreserveSig]
266266
int QueryCustomPolicy([MarshalAs(UnmanagedType.LPWStr)] string pwszUrl, ref Guid guidKey, ref byte ppPolicy, ref uint pcbPolicy, ref byte pContext, uint cbContext, uint dwReserved);

FlashpointSecurePlayer/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
// You can specify all the values or you can default the Build and Revision Numbers
3434
// by using the '*' as shown below:
3535
// [assembly: AssemblyVersion("1.0.*")]
36-
[assembly: AssemblyVersion("2.2.1.0")]
37-
[assembly: AssemblyFileVersion("2.2.1.0")]
36+
[assembly: AssemblyVersion("2.2.2.0")]
37+
[assembly: AssemblyFileVersion("2.2.2.0")]
3838
[assembly: NeutralResourcesLanguage("en")]
3939

FlashpointSecurePlayer/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Flashpoint Secure Player 2.2.1
1+
# Flashpoint Secure Player 2.2.2
22
This player attempts to solve common compatibility or portability issues posed by browser plugins on Windows for the purpose of playback in BlueMaxima's Flashpoint.
33

44
It is compatible with Windows 7, Windows 8, Windows 8.1 and Windows 10, and requires .NET Framework 4.5. If you are on Windows 8.1 or Windows 10, or if you are on Windows 7/8 and have updates enabled, you already have .NET Framework 4.5. Otherwise, you may [download .NET Framework 4.5.](http://www.microsoft.com/en-us/download/details.aspx?id=30653)

0 commit comments

Comments
 (0)