- NUF_HTTPGATEWAY: unused option removed;

- NETLIBUSER::szDescriptiveName replaced with MAllStrings;
- code cleaning.

3 files changed, 4 insertions, 11 deletions

diff --git a/include/delphi/m_netlib.inc b/include/delphi/m_netlib.inc
index ab60822163..1ab6c9fa8b 100644
--- a/include/delphi/m_netlib.inc
+++ b/include/delphi/m_netlib.inc
@@ -31,9 +31,6 @@ const
   // for TNETLIBUSER.flags

   NUF_INCOMING      = $01; // bind incoming ports

   NUF_OUTGOING      = $02; // makes outgoing plain connections

-  NUF_HTTPGATEWAY   = $04; // can use HTTP gateway for plain sockets.

-                           // ???HttpGateway* are valid, enables the HTTP

-                           // proxy option, displayed in options

   NUF_NOOPTIONS     = $08; // don't show this as an entry for custom settings to

                            // be defined for, TNETLIB.szDescriptiveName is ignored

   NUF_HTTPCONNS     = $10; // some connections are made for HTTP communication,

diff --git a/include/m_core.h b/include/m_core.h
index 2f5073cf16..e02d594c66 100644
--- a/include/m_core.h
+++ b/include/m_core.h
@@ -124,7 +124,7 @@ MIR_CORE_DLL(bool)    ServiceExists(const char *name);
 MIR_CORE_DLL(INT_PTR) CallService(const char *name, WPARAM wParam = 0, LPARAM lParam = 0);

 MIR_CORE_DLL(INT_PTR) CallServiceSync(const char *name, WPARAM wParam = 0, LPARAM lParam = 0);

 

-MIR_CORE_DLL(INT_PTR) CallFunctionSync(INT_PTR(__stdcall *func)(void *), void *arg);
+MIR_CORE_DLL(INT_PTR) CallFunctionSync(INT_PTR(__stdcall *func)(void *), void *arg);

 MIR_CORE_DLL(int)     CallFunctionAsync(void (__stdcall *func)(void *), void *arg);

 MIR_CORE_DLL(void)    KillModuleServices(HINSTANCE hInst);

 MIR_CORE_DLL(void)    KillObjectServices(void* pObject);

diff --git a/include/m_netlib.h b/include/m_netlib.h
index 7f71da3dd3..e2b15ab90b 100644
--- a/include/m_netlib.h
+++ b/include/m_netlib.h
@@ -64,11 +64,8 @@ typedef PBYTE (*NETLIBHTTPGATEWAYUNWRAPRECVPROC)(NETLIBHTTPREQUEST *nlhr, PBYTE
 

 struct NETLIBUSER

 {

-	char *szSettingsModule;         // used for db settings and log

-	union {

-		char *szDescriptiveName;          // used in options dialog, already translated

-		wchar_t *ptszDescriptiveName;

-	};

+	char *szSettingsModule;          // used for db settings and log

+	MAllStrings szDescriptiveName;   // used in options dialog, already translated

 	DWORD flags;

 	char *szHttpGatewayHello;

 	char *szHttpGatewayUserAgent;		 // can be NULL to send no user-agent, also used by HTTPS proxies

@@ -76,12 +73,11 @@ struct NETLIBUSER
 	NETLIBHTTPGATEWAYBEGINPROC pfnHttpGatewayBegin;		 // can be NULL if no beginning required

 	NETLIBHTTPGATEWAYWRAPSENDPROC pfnHttpGatewayWrapSend;  // can be NULL if no wrapping required

 	NETLIBHTTPGATEWAYUNWRAPRECVPROC pfnHttpGatewayUnwrapRecv;  // can be NULL if no wrapping required

-	int minIncomingPorts;     // only if NUF_INCOMING. Will be used for validation of user input.

+	int minIncomingPorts;            // only if NUF_INCOMING. Will be used for validation of user input.

 };

 

 #define NUF_INCOMING      0x01  // binds incoming ports

 #define NUF_OUTGOING      0x02  // makes outgoing plain connections

-#define NUF_HTTPGATEWAY   0x04  // can use HTTP gateway for plain sockets. ???HttpGateway* are valid.  Enables the HTTP proxy option in options.

 #define NUF_NOOPTIONS     0x08  // don't create an options page for this. szDescriptiveName is never used.

 #define NUF_HTTPCONNS     0x10  // at least some connections are made for HTTP communication. Enables the HTTP proxy option in options.

 #define NUF_NOHTTPSOPTION 0x20  // disable the HTTPS proxy option in options. Use this if all communication is HTTP.