Skip to content

refactor(network): Remove obsolete HTTP Proxy option #3009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
githubawn wants to merge 2 commits into
base: main
Choose a base branch
from
Open

refactor(network): Remove obsolete HTTP Proxy option #3009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29f538f
refactor(network): Remove obsolete HTTP Proxy option
githubawn Jul 23, 2026
d23a40e
refactor(network): Put HTTP Proxy option hiding behind ENABLE_GUI_HACKS
githubawn Jul 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions Core/GameEngine/Source/GameNetwork/GameSpy/MainMenuUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,15 +854,6 @@ static void reallyStartPatchCheck()

FormatURLFromRegistry(gameURL, mapURL, configURL, motdURL);

std::string proxy;
if (GetStringFromRegistry("", "Proxy", proxy))
{
if (!proxy.empty())
{
ghttpSetProxy(proxy.c_str());
}
}

// check for a patch first
DEBUG_LOG(("Game patch check: [%s]", gameURL.c_str()));
DEBUG_LOG(("Map patch check: [%s]", mapURL.c_str()));
Expand Down
9 changes: 0 additions & 9 deletions Core/Tools/PATCHGET/CHATAPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,15 +451,6 @@ static void StartPatchCheck( void )

FormatURLFromRegistry(gameURL, mapURL, configURL, motdURL);

std::string proxy;
if (GetStringFromRegistry("", "Proxy", proxy))
{
if (!proxy.empty())
{
ghttpSetProxy(proxy.c_str());
}
}

// check for a patch first
checksLeft = 2;
cantConnect = false;
Expand Down
35 changes: 11 additions & 24 deletions Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,18 +501,6 @@ static void saveOptions()
}
}

//-------------------------------------------------------------------------------------------------
// HTTP Proxy
GameWindow *textEntryHTTPProxy = TheWindowManager->winGetWindowFromId(nullptr, NAMEKEY("OptionsMenu.wnd:TextEntryHTTPProxy"));
if (textEntryHTTPProxy && textEntryHTTPProxy->winGetEnabled())
{
UnicodeString uStr = GadgetTextEntryGetText(textEntryHTTPProxy);
AsciiString aStr;
aStr.translate(uStr);
SetStringInRegistry("", "Proxy", aStr.str());
ghttpSetProxy(aStr.str());
}

//-------------------------------------------------------------------------------------------------
// Firewall Port Override
GameWindow *textEntryFirewallPortOverride = TheWindowManager->winGetWindowFromId(nullptr, NAMEKEY("OptionsMenu.wnd:TextEntryFirewallPortOverride"));
Expand Down Expand Up @@ -1125,16 +1113,18 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
}
}

// HTTP Proxy
GameWindow *textEntryHTTPProxy = TheWindowManager->winGetWindowFromId(nullptr, NAMEKEY("OptionsMenu.wnd:TextEntryHTTPProxy"));
#if ENABLE_GUI_HACKS
// TheSuperHackers @tweak 26/07/2026 Hide the obsolete HTTP Proxy entry and its label
NameKeyType textEntryHTTPProxyID = TheNameKeyGenerator->nameToKey("OptionsMenu.wnd:TextEntryHTTPProxy");
Comment thread
githubawn marked this conversation as resolved.
GameWindow *textEntryHTTPProxy = TheWindowManager->winGetWindowFromId(nullptr, textEntryHTTPProxyID);
if (textEntryHTTPProxy)
{
UnicodeString uStr;
std::string proxy;
GetStringFromRegistry("", "Proxy", proxy);
uStr.translate(proxy.c_str());
GadgetTextEntrySetText(textEntryHTTPProxy, uStr);
}
textEntryHTTPProxy->winHide(TRUE);
Comment thread
githubawn marked this conversation as resolved.

NameKeyType staticTextHTTPProxyID = TheNameKeyGenerator->nameToKey("OptionsMenu.wnd:StaticTextHTTPProxy");
GameWindow *staticTextHTTPProxy = TheWindowManager->winGetWindowFromId(nullptr, staticTextHTTPProxyID);
if (staticTextHTTPProxy)
staticTextHTTPProxy->winHide(TRUE);
#endif

// Firewall Port Override
GameWindow *textEntryFirewallPortOverride = TheWindowManager->winGetWindowFromId(nullptr, NAMEKEY("OptionsMenu.wnd:TextEntryFirewallPortOverride"));
Expand Down Expand Up @@ -1402,9 +1392,6 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
if (textEntryFirewallPortOverride)
textEntryFirewallPortOverride->winEnable(FALSE);

if (textEntryHTTPProxy)
textEntryHTTPProxy->winEnable(FALSE);

// if (checkAudioSurround)
// checkAudioSurround->winEnable(FALSE);
//
Expand Down
35 changes: 11 additions & 24 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,18 +520,6 @@ static void saveOptions()
}
}

//-------------------------------------------------------------------------------------------------
// HTTP Proxy
GameWindow *textEntryHTTPProxy = TheWindowManager->winGetWindowFromId(nullptr, NAMEKEY("OptionsMenu.wnd:TextEntryHTTPProxy"));
if (textEntryHTTPProxy && textEntryHTTPProxy->winGetEnabled())
{
UnicodeString uStr = GadgetTextEntryGetText(textEntryHTTPProxy);
AsciiString aStr;
aStr.translate(uStr);
SetStringInRegistry("", "Proxy", aStr.str());
ghttpSetProxy(aStr.str());
}

//-------------------------------------------------------------------------------------------------
// Firewall Port Override
GameWindow *textEntryFirewallPortOverride = TheWindowManager->winGetWindowFromId(nullptr, NAMEKEY("OptionsMenu.wnd:TextEntryFirewallPortOverride"));
Expand Down Expand Up @@ -1157,16 +1145,18 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
}
}

// HTTP Proxy
GameWindow *textEntryHTTPProxy = TheWindowManager->winGetWindowFromId(nullptr, NAMEKEY("OptionsMenu.wnd:TextEntryHTTPProxy"));
#if ENABLE_GUI_HACKS
// TheSuperHackers @tweak 26/07/2026 Hide the obsolete HTTP Proxy entry and its label

@xezon xezon Jul 27, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can also explain why this was obsoleted.

NameKeyType textEntryHTTPProxyID = TheNameKeyGenerator->nameToKey("OptionsMenu.wnd:TextEntryHTTPProxy");
GameWindow *textEntryHTTPProxy = TheWindowManager->winGetWindowFromId(nullptr, textEntryHTTPProxyID);
if (textEntryHTTPProxy)
{
UnicodeString uStr;
std::string proxy;
GetStringFromRegistry("", "Proxy", proxy);
uStr.translate(proxy.c_str());
GadgetTextEntrySetText(textEntryHTTPProxy, uStr);
}
textEntryHTTPProxy->winHide(TRUE);

NameKeyType staticTextHTTPProxyID = TheNameKeyGenerator->nameToKey("OptionsMenu.wnd:StaticTextHTTPProxy");
GameWindow *staticTextHTTPProxy = TheWindowManager->winGetWindowFromId(nullptr, staticTextHTTPProxyID);
if (staticTextHTTPProxy)
staticTextHTTPProxy->winHide(TRUE);
#endif

// Firewall Port Override
GameWindow *textEntryFirewallPortOverride = TheWindowManager->winGetWindowFromId(nullptr, NAMEKEY("OptionsMenu.wnd:TextEntryFirewallPortOverride"));
Expand Down Expand Up @@ -1438,9 +1428,6 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
if (textEntryFirewallPortOverride)
textEntryFirewallPortOverride->winEnable(FALSE);

if (textEntryHTTPProxy)
textEntryHTTPProxy->winEnable(FALSE);

// if (checkAudioSurround)
// checkAudioSurround->winEnable(FALSE);
//
Expand Down
Loading