[vlc-commits] Revert "Revert "mingw-w64 includes objsafe.h macros""

[Rafaël Carré]

npapi-vlc | branch: master | Rafaël Carré <funman at videolan.org> | Mon Nov  7 20:27:28 2011 -0500| [68e89f1eb19a57155d1436becfc270f286c1670e] | committer: Rafaël Carré

Revert "Revert "mingw-w64 includes objsafe.h macros""

This reverts commit 7b2b5337710ca5920704777bb69120daa2ca6433.

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=68e89f1eb19a57155d1436becfc270f286c1670e
---

 activex/main.cpp |   36 ++++++++++++++++++++----------------
 1 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/activex/main.cpp b/activex/main.cpp
index 1772db3..9acf115 100644
--- a/activex/main.cpp
+++ b/activex/main.cpp
@@ -32,9 +32,14 @@
 #include <tchar.h>
 
 #include <_mingw.h>
+
 #ifdef __MINGW64_VERSION_MAJOR
+
 #include <guiddef.h>
+#include <objsafe.h>
+
 #else /* ! __MINGW64_VERSION_MAJOR */
+
 /*
 ** Widl generated code requires guiddef.h,
 ** which is not available under MinGW32
@@ -42,6 +47,15 @@
 #undef GUID_EXT
 #define GUID_EXT
 #include <initguid.h>
+
+/*
+** Mingw32 do not declare those
+*/
+static DEFINE_GUID(CATID_SafeForInitializing, \
+	0x7DD95802, 0x9882, 0x11CF, 0x9F, 0xA9, 0x00,0xAA,0x00,0x6C,0x42,0xC4);
+static DEFINE_GUID(CATID_SafeForScripting, \
+	0x7DD95801, 0x9882, 0x11CF, 0x9F, 0xA9, 0x00,0xAA,0x00,0x6C,0x42,0xC4);
+
 #endif /* __MINGW64_VERSION_MAJOR */
 
 
@@ -58,16 +72,6 @@ using namespace std;
 
 #define GUID_STRLEN 39
 
-/*
-** MingW headers & libs do not declare those
-*/
-static DEFINE_GUID(_CATID_InternetAware, \
-	0x0DE86A58, 0x2BAA, 0x11CF, 0xA2, 0x29, 0x00,0xAA,0x00,0x3D,0x73,0x52);
-static DEFINE_GUID(_CATID_SafeForInitializing, \
-	0x7DD95802, 0x9882, 0x11CF, 0x9F, 0xA9, 0x00,0xAA,0x00,0x6C,0x42,0xC4);
-static DEFINE_GUID(_CATID_SafeForScripting, \
-	0x7DD95801, 0x9882, 0x11CF, 0x9F, 0xA9, 0x00,0xAA,0x00,0x6C,0x42,0xC4);
-
 static LONG i_class_ref= 0;
 static HINSTANCE h_instance= 0;
 
@@ -169,9 +173,9 @@ STDAPI DllUnregisterServer(VOID)
         CATID implCategories[] = {
             CATID_Control,
             CATID_PersistsToPropertyBag,
-            _CATID_InternetAware,
-            _CATID_SafeForInitializing,
-            _CATID_SafeForScripting,
+            CATID_InternetAware,
+            CATID_SafeForInitializing,
+            CATID_SafeForScripting,
         };
 
         pcr->UnRegisterClassImplCategories(CLSID_VLCPlugin,
@@ -330,9 +334,9 @@ STDAPI DllRegisterServer(VOID)
         CATID implCategories[] = {
             CATID_Control,
             CATID_PersistsToPropertyBag,
-            _CATID_InternetAware,
-            _CATID_SafeForInitializing,
-            _CATID_SafeForScripting,
+            CATID_InternetAware,
+            CATID_SafeForInitializing,
+            CATID_SafeForScripting,
         };
 
         pcr->RegisterClassImplCategories(CLSID_VLCPlugin,