Removed hard coded port 9999

Author: Molanda

BrowserProxy/BrowserProxy.rc

@@ -126,6 +126,7 @@ FlashProxyModule::FlashProxyModule():
     m_encodeBuffer(),
     m_identity(Identity::Unknown),
     m_visibilityMask(0),
+    m_port(9999),
     m_url(),
     m_userDataFolder(),
     m_aboutQuery(),
@@ -703,6 +704,27 @@ HRESULT STDMETHODCALLTYPE FlashProxyModule::put_Movie(BSTR pVal)
     if (FAILED(burl.Append(pVal, length)))
         return E_FAIL;
 
+    WCHAR scheme[10] = {0};
+    WCHAR host[40] = {0};
+    WCHAR path[1000] = {0};
+    URL_COMPONENTS components;
+    ZeroMemory(&components, sizeof(components));
+    components.dwStructSize = sizeof(components);
+    components.lpszScheme = scheme;
+    components.dwSchemeLength = _countof(scheme);
+    components.lpszHostName = host;
+    components.dwHostNameLength = _countof(host);
+    components.lpszUrlPath = path;
+    components.dwUrlPathLength = _countof(path);
+
+    if (!InternetCrackUrl(burl, 0, ICU_DECODE, &components))
+        return E_FAIL;
+
+    if (_wcsicmp(scheme, L"http") != 0 || components.nPort < 1024)
+        return E_FAIL;
+
+    m_port = components.nPort;
+
     WCHAR *name = wcsrchr(burl, L'/');
     if (name != nullptr)
     {
@@ -719,16 +741,19 @@ HRESULT STDMETHODCALLTYPE FlashProxyModule::put_Movie(BSTR pVal)
             m_identity = Identity::MessageBar;
     }
 
-    if (_wcsnicmp(burl, L"http://127.0.0.1:9999/", 22) == 0 || _wcsnicmp(burl, L"http://localhost:9999/", 22) == 0)
+    if (_wcsicmp(host, L"127.0.0.1") == 0 || _wcsicmp(host, L"localhost") == 0)
     {
-        CComBSTR burl2 = burl + 22;
-        if (FAILED(burl2.Append(L"2.html")))
-            return E_FAIL;
-
-        if (GetFileAttributes(burl2) != INVALID_FILE_ATTRIBUTES)
+        if (path[0] == L'/')
         {
-            if (FAILED(burl.Append(L"2")))
+            CComBSTR bpath = path + 1;
+            if (FAILED(bpath.Append(L"2.html")))
                 return E_FAIL;
+
+            if (GetFileAttributes(bpath) != INVALID_FILE_ATTRIBUTES)
+            {
+                if (FAILED(burl.Append(L"2")))
+                    return E_FAIL;
+            }
         }
     }
 
@@ -827,8 +852,11 @@ HRESULT STDMETHODCALLTYPE FlashProxyModule::Invoke(HRESULT errorCode, ICoreWebVi
     hostObject.pdispVal = static_cast<IDispatch*>(this);
     m_view->AddHostObjectToScript(L"client", &hostObject);
 
-    m_view->AddWebResourceRequestedFilter(L"http://127.0.0.1:9999/*", COREWEBVIEW2_WEB_RESOURCE_CONTEXT_ALL);
-    m_view->AddWebResourceRequestedFilter(L"http://localhost:9999/*", COREWEBVIEW2_WEB_RESOURCE_CONTEXT_ALL);
+    WCHAR filterHost[40] = {0};
+    _snwprintf_s(filterHost, _countof(filterHost), L"http://127.0.0.1:%u/*", m_port);
+    m_view->AddWebResourceRequestedFilter(filterHost, COREWEBVIEW2_WEB_RESOURCE_CONTEXT_ALL);
+    _snwprintf_s(filterHost, _countof(filterHost), L"http://localhost:%u/*", m_port);
+    m_view->AddWebResourceRequestedFilter(filterHost, COREWEBVIEW2_WEB_RESOURCE_CONTEXT_ALL);
 
     m_view->add_WebMessageReceived(Callback<ICoreWebView2WebMessageReceivedEventHandler>(
         [this](ICoreWebView2 *sender, ICoreWebView2WebMessageReceivedEventArgs *args) -> HRESULT
@@ -955,10 +983,29 @@ HRESULT FlashProxyModule::OnWebResourceRequested(ICoreWebView2 *sender, ICoreWeb
         CoTaskMemFree(url);
     }
 
-    if (_wcsnicmp(burl, L"http://127.0.0.1:9999/", 22) != 0 && _wcsnicmp(burl, L"http://localhost:9999/", 22) != 0)
+    WCHAR scheme[10] = {0};
+    WCHAR host[40] = {0};
+    WCHAR path[1000] = {0};
+    URL_COMPONENTS components;
+    ZeroMemory(&components, sizeof(components));
+    components.dwStructSize = sizeof(components);
+    components.lpszScheme = scheme;
+    components.dwSchemeLength = _countof(scheme);
+    components.lpszHostName = host;
+    components.dwHostNameLength = _countof(host);
+    components.lpszUrlPath = path;
+    components.dwUrlPathLength = _countof(path);
+
+    if (!InternetCrackUrl(burl, 0, ICU_DECODE, &components))
+        return E_FAIL;
+
+    if (_wcsicmp(scheme, L"http") != 0 || components.nPort != m_port)
+        return S_FALSE;
+
+    if (_wcsicmp(host, L"127.0.0.1") != 0 && _wcsicmp(host, L"localhost") != 0)
         return S_FALSE;
 
-    if (wcscmp(burl + 22, L"favicon.ico") == 0)
+    if (wcscmp(path, L"/favicon.ico") == 0)
     {
         CComPtr<ICoreWebView2WebResourceResponse> response;
         if (FAILED(m_environment->CreateWebResourceResponse(nullptr, 404, L"Not Found", L"", &response)) || response == nullptr)

Extras

@@ -240,6 +240,7 @@ class FlashProxyModule: public ATL::CAtlDllModuleT<FlashProxyModule>,
     WCHAR                                    m_encodeBuffer[10000];
     Identity                                 m_identity;
     UINT32                                   m_visibilityMask;
+    INTERNET_PORT                            m_port;
     CComBSTR                                 m_url;
     CComBSTR                                 m_userDataFolder;
     CComBSTR                                 m_aboutQuery;

FlashProxy/FlashProxy.cpp

@@ -103,7 +103,7 @@
       <SubSystem>Windows</SubSystem>
       <ModuleDefinitionFile>.\FlashProxy.def</ModuleDefinitionFile>
       <RegisterOutput>false</RegisterOutput>
-      <AdditionalDependencies>version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>version.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -139,7 +139,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <RegisterOutput>false</RegisterOutput>
-      <AdditionalDependencies>version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>version.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">
@@ -176,7 +176,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <RegisterOutput>false</RegisterOutput>
-      <AdditionalDependencies>version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>version.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

FlashProxy/FlashProxy.h

@@ -2855,15 +2855,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:ThereEdge"
-        "ProductCode" = "8:{F61D955D-21C1-4019-A2C2-12769EE4BDBB}"
-        "PackageCode" = "8:{C2DD93F1-8D6C-4E16-A716-BC95F4905F7B}"
+        "ProductCode" = "8:{CD853BBC-AA41-4EFC-9BCE-9CEE50E59180}"
+        "PackageCode" = "8:{3172D96B-34FA-4A03-915A-61760D6A8879}"
         "UpgradeCode" = "8:{887059E3-E645-44A2-AE95-E602E27BD74F}"
         "AspNetVersion" = "8:2.0.50727.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:1.0.7"
+        "ProductVersion" = "8:1.0.8"
         "Manufacturer" = "8:Hmph!"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"

FlashProxy/FlashProxy.rc

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-VERSION = '1.0.7'
+VERSION = '1.0.8'

FlashProxy/FlashProxy.vcxproj

@@ -2,8 +2,8 @@
 #
 VSVersionInfo(
     ffi=FixedFileInfo(
-        filevers=(1, 0, 7, 0),
-        prodvers=(1, 0, 7, 0),
+        filevers=(1, 0, 8, 0),
+        prodvers=(1, 0, 8, 0),
         mask=0x3f,
         flags=0x0,
         OS=0x40004,
@@ -16,12 +16,12 @@ VSVersionInfo(
             StringTable(u'040904b0', [
                 StringStruct(u'CompanyName', u'Hmph!'),
                 StringStruct(u'FileDescription', u'Setup helper for There Edge'),
-                StringStruct(u'FileVersion', u'1.0.7.0'),
+                StringStruct(u'FileVersion', u'1.0.8.0'),
                 StringStruct(u'InternalName', u'SetupThereEdge.exe'),
                 StringStruct(u'LegalCopyright', u'(c) Hmph!'),
                 StringStruct(u'OriginalFilename', u'SetupThereEdge.exe'),
                 StringStruct(u'ProductName', u'There Edge Setup Helper'),
-                StringStruct(u'ProductVersion', u'1.0.7.0')
+                StringStruct(u'ProductVersion', u'1.0.8.0')
             ])
         ]),
         VarFileInfo([