[GEN][ZH] COM related fixes for MinGW

zzambers · zzambers · commit 8439ccf4acca · 2025-04-13T18:36:46.000+02:00
diff --git a/Core/Libraries/Source/EABrowserDispatch/BrowserDispatch.idl b/Core/Libraries/Source/EABrowserDispatch/BrowserDispatch.idl
@@ -25,6 +25,6 @@ library BROWSERDISPATCHLib
 	]
 	interface IBrowserDispatch : IUnknown
 	{
-		[id(1), helpstring("method TestMethod")] HRESULT TestMethod(Int num1);
+		[id(1), helpstring("method TestMethod")] HRESULT TestMethod(int num1);
 	};
 };
diff --git a/Core/Libraries/Source/EABrowserEngine/BrowserEngine.idl b/Core/Libraries/Source/EABrowserEngine/BrowserEngine.idl
@@ -2,6 +2,9 @@
 // 
 // typelib filename: <could not determine filename>
 
+// NOTE: Import of oaidl.idl has been added to fix compilation error with widl:
+// BrowserEngine.idl:31:44: error: type 'IDispatch' not found in global namespace
+import "oaidl.idl";
 [
   uuid(6EE45698-21BA-420D-AD40-1B547699BEFB),
   version(1.0)
diff --git a/Dependencies/Utility/Utility/CppMacros.h b/Dependencies/Utility/Utility/CppMacros.h
@@ -25,6 +25,13 @@
 #define NOEXCEPT_17
 #endif
 
+// noexcept for methods of IUNKNOWN interface
+#if defined(_MSC_VER)
+#define IUNKNOWN_NOEXCEPT NOEXCEPT_17
+#else
+#define IUNKNOWN_NOEXCEPT
+#endif
+
 #if __cplusplus >= 201103L
     #define CPP_11(code) code
 #else
diff --git a/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h b/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h
@@ -113,9 +113,9 @@ class WebBrowser :
 	// IUnknown methods
 	//---------------------------------------------------------------------------
 	protected:
-		HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) NOEXCEPT_17;
-		ULONG STDMETHODCALLTYPE AddRef(void) NOEXCEPT_17;
-		ULONG STDMETHODCALLTYPE Release(void) NOEXCEPT_17;
+		HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) IUNKNOWN_NOEXCEPT;
+		ULONG STDMETHODCALLTYPE AddRef(void) IUNKNOWN_NOEXCEPT;
+		ULONG STDMETHODCALLTYPE Release(void) IUNKNOWN_NOEXCEPT;
 
 	//---------------------------------------------------------------------------
 	// IBrowserDispatch methods
diff --git a/Generals/Code/GameEngine/Source/Common/GameEngine.cpp b/Generals/Code/GameEngine/Source/Common/GameEngine.cpp
@@ -192,7 +192,7 @@ GameEngine::GameEngine( void )
 	m_quitting = FALSE;
 	m_isActive = FALSE;
 
-	_Module.Init(NULL, ApplicationHInstance);
+	_Module.Init(NULL, ApplicationHInstance, NULL);
 }
 
 //-------------------------------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp b/Generals/Code/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp
@@ -237,7 +237,7 @@ WebBrowserURL * WebBrowser::makeNewURL(AsciiString tag)
 *
 ******************************************************************************/
 
-STDMETHODIMP WebBrowser::QueryInterface(REFIID iid, void** ppv) NOEXCEPT_17
+STDMETHODIMP WebBrowser::QueryInterface(REFIID iid, void** ppv) IUNKNOWN_NOEXCEPT
 {
 	*ppv = NULL;
 
@@ -270,7 +270,7 @@ STDMETHODIMP WebBrowser::QueryInterface(REFIID iid, void** ppv) NOEXCEPT_17
 *
 ******************************************************************************/
 
-ULONG STDMETHODCALLTYPE WebBrowser::AddRef(void) NOEXCEPT_17
+ULONG STDMETHODCALLTYPE WebBrowser::AddRef(void) IUNKNOWN_NOEXCEPT
 {
 	return ++mRefCount;
 }
@@ -290,7 +290,7 @@ ULONG STDMETHODCALLTYPE WebBrowser::AddRef(void) NOEXCEPT_17
 *
 ******************************************************************************/
 
-ULONG STDMETHODCALLTYPE WebBrowser::Release(void) NOEXCEPT_17
+ULONG STDMETHODCALLTYPE WebBrowser::Release(void) IUNKNOWN_NOEXCEPT
 {
 	DEBUG_ASSERTCRASH(mRefCount > 0, ("Negative reference count"));
 	--mRefCount;
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DWebBrowser.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DWebBrowser.cpp
@@ -57,7 +57,11 @@ Bool W3DWebBrowser::createBrowserWindow(const char *tag, GameWindow *win)
 		return FALSE;
 	}
 
+#ifdef __GNUC__
+	CComQIIDPtr<I_ID(IDispatch)> idisp(m_dispatch);
+#else
 	CComQIPtr<IDispatch> idisp(m_dispatch);
+#endif
 	if (m_dispatch == NULL)
 	{
 		return FALSE;
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h
@@ -113,9 +113,9 @@ class WebBrowser :
 	// IUnknown methods
 	//---------------------------------------------------------------------------
 	protected:
-		HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) NOEXCEPT_17;
-		ULONG STDMETHODCALLTYPE AddRef(void) NOEXCEPT_17;
-		ULONG STDMETHODCALLTYPE Release(void) NOEXCEPT_17;
+		HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) IUNKNOWN_NOEXCEPT;
+		ULONG STDMETHODCALLTYPE AddRef(void) IUNKNOWN_NOEXCEPT;
+		ULONG STDMETHODCALLTYPE Release(void) IUNKNOWN_NOEXCEPT;
 
 	//---------------------------------------------------------------------------
 	// IBrowserDispatch methods
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp
@@ -190,7 +190,7 @@ GameEngine::GameEngine( void )
 	m_quitting = FALSE;
 	m_isActive = FALSE;
 
-	_Module.Init(NULL, ApplicationHInstance);
+	_Module.Init(NULL, ApplicationHInstance, NULL);
 }
 
 //-------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp
@@ -237,7 +237,7 @@ WebBrowserURL * WebBrowser::makeNewURL(AsciiString tag)
 *
 ******************************************************************************/
 
-STDMETHODIMP WebBrowser::QueryInterface(REFIID iid, void** ppv) NOEXCEPT_17
+STDMETHODIMP WebBrowser::QueryInterface(REFIID iid, void** ppv) IUNKNOWN_NOEXCEPT
 {
 	*ppv = NULL;
 
@@ -270,7 +270,7 @@ STDMETHODIMP WebBrowser::QueryInterface(REFIID iid, void** ppv) NOEXCEPT_17
 *
 ******************************************************************************/
 
-ULONG STDMETHODCALLTYPE WebBrowser::AddRef(void) NOEXCEPT_17
+ULONG STDMETHODCALLTYPE WebBrowser::AddRef(void) IUNKNOWN_NOEXCEPT
 {
 	return ++mRefCount;
 }
@@ -290,7 +290,7 @@ ULONG STDMETHODCALLTYPE WebBrowser::AddRef(void) NOEXCEPT_17
 *
 ******************************************************************************/
 
-ULONG STDMETHODCALLTYPE WebBrowser::Release(void) NOEXCEPT_17
+ULONG STDMETHODCALLTYPE WebBrowser::Release(void) IUNKNOWN_NOEXCEPT
 {
 	DEBUG_ASSERTCRASH(mRefCount > 0, ("Negative reference count"));
 	--mRefCount;
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DWebBrowser.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DWebBrowser.cpp
@@ -57,7 +57,11 @@ Bool W3DWebBrowser::createBrowserWindow(const char *tag, GameWindow *win)
 		return FALSE;
 	}
 
+#ifdef __GNUC__
+	CComQIIDPtr<I_ID(IDispatch)> idisp(m_dispatch);
+#else
 	CComQIPtr<IDispatch> idisp(m_dispatch);
+#endif
 	if (m_dispatch == NULL)
 	{
 		return FALSE;

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,6 @@ library BROWSERDISPATCHLib`
`25`	`25`	`]`
`26`	`26`	`interface IBrowserDispatch : IUnknown`
`27`	`27`	`{`
`28`		`- [id(1), helpstring("method TestMethod")] HRESULT TestMethod(Int num1);`
	`28`	`+ [id(1), helpstring("method TestMethod")] HRESULT TestMethod(int num1);`
`29`	`29`	`};`
`30`	`30`	`};`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,9 @@`
`2`	`2`	`//`
`3`	`3`	`// typelib filename: <could not determine filename>`
`4`	`4`
	`5`	`+// NOTE: Import of oaidl.idl has been added to fix compilation error with widl:`
	`6`	`+// BrowserEngine.idl:31:44: error: type 'IDispatch' not found in global namespace`
	`7`	`+import "oaidl.idl";`
`5`	`8`	`[`
`6`	`9`	`uuid(6EE45698-21BA-420D-AD40-1B547699BEFB),`
`7`	`10`	`version(1.0)`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ GameEngine::GameEngine( void )`
`192`	`192`	`m_quitting = FALSE;`
`193`	`193`	`m_isActive = FALSE;`
`194`	`194`
`195`		`- _Module.Init(NULL, ApplicationHInstance);`
	`195`	`+ _Module.Init(NULL, ApplicationHInstance, NULL);`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`//-------------------------------------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ WebBrowserURL * WebBrowser::makeNewURL(AsciiString tag)`
`237`	`237`	`*`
`238`	`238`	`******************************************************************************/`
`239`	`239`
`240`		`-STDMETHODIMP WebBrowser::QueryInterface(REFIID iid, void** ppv) NOEXCEPT_17`
	`240`	`+STDMETHODIMP WebBrowser::QueryInterface(REFIID iid, void** ppv) IUNKNOWN_NOEXCEPT`
`241`	`241`	`{`
`242`	`242`	`*ppv = NULL;`
`243`	`243`
`@@ -270,7 +270,7 @@ STDMETHODIMP WebBrowser::QueryInterface(REFIID iid, void** ppv) NOEXCEPT_17`
`270`	`270`	`*`
`271`	`271`	`******************************************************************************/`
`272`	`272`
`273`		`-ULONG STDMETHODCALLTYPE WebBrowser::AddRef(void) NOEXCEPT_17`
	`273`	`+ULONG STDMETHODCALLTYPE WebBrowser::AddRef(void) IUNKNOWN_NOEXCEPT`
`274`	`274`	`{`
`275`	`275`	`return ++mRefCount;`
`276`	`276`	`}`
`@@ -290,7 +290,7 @@ ULONG STDMETHODCALLTYPE WebBrowser::AddRef(void) NOEXCEPT_17`
`290`	`290`	`*`
`291`	`291`	`******************************************************************************/`
`292`	`292`
`293`		`-ULONG STDMETHODCALLTYPE WebBrowser::Release(void) NOEXCEPT_17`
	`293`	`+ULONG STDMETHODCALLTYPE WebBrowser::Release(void) IUNKNOWN_NOEXCEPT`
`294`	`294`	`{`
`295`	`295`	`DEBUG_ASSERTCRASH(mRefCount > 0, ("Negative reference count"));`
`296`	`296`	`--mRefCount;`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,11 @@ Bool W3DWebBrowser::createBrowserWindow(const char tag, GameWindow win)`
`57`	`57`	`return FALSE;`
`58`	`58`	`}`
`59`	`59`
	`60`	`+#ifdef __GNUC__`
	`61`	`+ CComQIIDPtr<I_ID(IDispatch)> idisp(m_dispatch);`
	`62`	`+#else`
`60`	`63`	`CComQIPtr<IDispatch> idisp(m_dispatch);`
	`64`	`+#endif`
`61`	`65`	`if (m_dispatch == NULL)`
`62`	`66`	`{`
`63`	`67`	`return FALSE;`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ GameEngine::GameEngine( void )`
`190`	`190`	`m_quitting = FALSE;`
`191`	`191`	`m_isActive = FALSE;`
`192`	`192`
`193`		`- _Module.Init(NULL, ApplicationHInstance);`
	`193`	`+ _Module.Init(NULL, ApplicationHInstance, NULL);`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`//-------------------------------------------------------------------------------------------------`