Add support for Cygwin

BtbN · lu-zero · commit a0a966d1451c · 2018-06-16T23:14:25.000+02:00
diff --git a/configure.ac b/configure.ac
@@ -17,6 +17,12 @@ AS_CASE([${host_os}],
         AM_CONDITIONAL([WINDOWS], [true])
         DLLIB=""
     ],
+    [*cygwin*], [
+        AC_DEFINE([MFX_HAVE_WINDOWS])
+        AC_DEFINE([_MAX_PATH], [MAX_PATH])
+        AM_CONDITIONAL([WINDOWS], [true])
+        DLLIB=""
+    ],
     [AC_MSG_ERROR([${host_os} not supported.])]
 )
 
diff --git a/src/main.cpp b/src/main.cpp
@@ -718,7 +718,7 @@ mfxStatus DISPATCHER_EXPOSED_PREFIX(MFXVideoUSER_LoadByPath)(mfxSession session,
     PluginDescriptionRecord record;
     record.sName[0] = 0;
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__CYGWIN__)
     msdk_disp_char wPath[MAX_PLUGIN_PATH];
     int res = ::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, path, len, wPath, MAX_PLUGIN_PATH);
     if (!res)
diff --git a/src/mfx_critical_section.cpp b/src/mfx_critical_section.cpp
@@ -30,7 +30,7 @@ File Name: mfx_critical_section.cpp
 
 #include "mfx_critical_section.h"
 
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
 
 #include <windows.h>
 // SDK re-declares the following functions with different call declarator.
@@ -85,4 +85,4 @@ void mfxLeaveCriticalSection(mfxCriticalSection *pCSection)
 
 } // namespace MFX
 
-#endif // #if defined(_WIN32) || defined(_WIN64)
+#endif // #if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
diff --git a/src/mfx_critical_section_linux.cpp b/src/mfx_critical_section_linux.cpp
@@ -28,7 +28,7 @@ File Name: mfx_critical_section_linux.cpp
 
 \* ****************************************************************************** */
 
-#if !defined(_WIN32) && !defined(_WIN64)
+#if !defined(_WIN32) && !defined(_WIN64) && !defined(__CYGWIN__)
 
 #include "mfx_critical_section.h"
 #include <sched.h>
@@ -88,4 +88,4 @@ void mfxLeaveCriticalSection(mfxCriticalSection *pCSection)
 
 } // namespace MFX
 
-#endif // #if !defined(_WIN32) && !defined(_WIN64)
+#endif // #if !defined(_WIN32) && !defined(_WIN64) && !defined(__CYGWIN__)
diff --git a/src/mfx_dispatcher.cpp b/src/mfx_dispatcher.cpp
@@ -33,15 +33,15 @@ File Name: mfx_dispatcher.cpp
 #include "mfx_load_dll.h"
 
 #include <string.h>
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
     #include <windows.h>
     #pragma warning(disable:4355)
 #else
 
 #include <dlfcn.h>
 #include <iostream>
 
-#endif // defined(_WIN32) || defined(_WIN64)
+#endif // defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
 
 MFX_DISP_HANDLE::MFX_DISP_HANDLE(const mfxVersion requiredVersion) :
     apiVersion(requiredVersion),
@@ -227,7 +227,7 @@ mfxStatus MFX_DISP_HANDLE::LoadSelectedDLL(const msdk_disp_char *pPath, eMfxImpl
         }
         else
         {
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
             DISPATCHER_LOG_WRN((("can't find DLL: GetLastErr()=0x%x\n"), GetLastError()))
 #else
             DISPATCHER_LOG_WRN((("can't find DLL: dlerror() = \"%s\"\n"), dlerror()));
diff --git a/src/mfx_dispatcher_defs.h b/src/mfx_dispatcher_defs.h
@@ -37,7 +37,7 @@ File Name: mfx_dispatcher_defs.h
 #include <string.h>
 #endif
 
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
 typedef wchar_t  msdk_disp_char;
 #define MSDK2WIDE(x) x
 
diff --git a/src/mfx_dispatcher_log.cpp b/src/mfx_dispatcher_log.cpp
@@ -32,13 +32,13 @@ File Name: mfx_dispatcher_log.h
 
 #include "mfx_dispatcher_log.h"
 #include "mfxstructures.h"
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
 #include <windows.h>
 #if defined(DISPATCHER_LOG_REGISTER_EVENT_PROVIDER)
 #include <evntprov.h>
 #include <winmeta.h>
 #endif
-#endif // #if defined(_WIN32) || defined(_WIN64)
+#endif // #if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
 #include <stdarg.h>
 #include <algorithm>
 #include <string>
diff --git a/src/mfx_dispatcher_log.h b/src/mfx_dispatcher_log.h
@@ -91,7 +91,7 @@ enum
 //is a vital if mediasdk wont use
 #define DISPATCHER_LOG_HEAP_SINGLETONES
 
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
 // guid for all dispatcher events
 #define DISPATCHER_LOG_EVENT_GUID L"{EB0538CC-4FEE-484d-ACEE-1182E9F37A57}"
 
@@ -102,7 +102,7 @@ enum
 //#define DISPATCHER_LOG_REGISTER_FILE_WRITER
 #define DISPACTHER_LOG_FW_PATH "c:\\dispatcher.log"
 
-#endif // #if defined(_WIN32) || defined(_WIN64)
+#endif // #if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -115,7 +115,7 @@ class IMsgHandler
     virtual void Write(int level, int opcode, const char * msg, va_list argptr) = 0;
 };
 
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
 #if  DISPATCHER_LOG_USE_FORMATING
 
     #define DISPATCHER_LOG(lvl, opcode, str)\
@@ -237,7 +237,7 @@ struct DispatchLogBlockHelper
 };
 
 //----utility sinks-----
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
 #if defined(DISPATCHER_LOG_REGISTER_EVENT_PROVIDER)
 class ETWHandlerFactory
     : public DSSingleTone<ETWHandlerFactory>
@@ -254,7 +254,7 @@ class ETWHandlerFactory
     ETWHandlerFactory(){}
 };
 #endif
-#endif // #if defined(_WIN32) || defined(_WIN64)
+#endif // #if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
 
 #if defined(DISPATCHER_LOG_REGISTER_FILE_WRITER)
 class FileSink 
@@ -273,7 +273,7 @@ class FileSink
     FILE * m_hdl;
     FileSink(const std::string & log_file)
     {
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
         fopen_s(&m_hdl, log_file.c_str(), "a");
 #else
         m_hdl = fopen(log_file.c_str(), "a");
diff --git a/src/mfx_dxva2_device.cpp b/src/mfx_dxva2_device.cpp
@@ -28,7 +28,7 @@ File Name: mfx_dxva2_device.cpp
 
 \* ****************************************************************************** */
 
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
 
 #define INITGUID
 #include <d3d9.h>
diff --git a/src/mfx_dxva2_device.h b/src/mfx_dxva2_device.h
@@ -31,14 +31,14 @@ File Name: mfx_dxva2_device.h
 #if !defined(__MFX_DXVA2_DEVICE_H)
 #define __MFX_DXVA2_DEVICE_H
 
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
 #include <windows.h>
 
 #if !defined( WIN_TRESHOLD_MOBILE )
 #define MFX_D3D9_ENABLED
 #endif // !defined( WIN_TRESHOLD_MOBILE )
 
-#endif // #if defined(_WIN32) || defined(_WIN64)
+#endif // #if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
 
 #include "mfx/mfxdefs.h"
 
@@ -88,10 +88,10 @@ class DXDevice
     // Free DLL module
     void UnloadDLLModule(void);
 
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
     // Handle to the DLL library
     HMODULE m_hModule;
-#endif // #if defined(_WIN32) || defined(_WIN64)
+#endif // #if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
 
     // Number of adapters available
     mfxU32 m_numAdapters;
@@ -112,7 +112,7 @@ class DXDevice
 };
 
 
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
 
 #ifdef MFX_D3D9_ENABLED
 class D3D9Device : public DXDevice
@@ -167,7 +167,7 @@ class DXGI1Device : public DXDevice
     void *m_pDXGIAdapter1;
 
 };
-#endif // #if defined(_WIN32) || defined(_WIN64)
+#endif // #if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
 
 class DXVA2Device
 {
diff --git a/src/mfx_library_iterator.cpp b/src/mfx_library_iterator.cpp
@@ -28,7 +28,7 @@ File Name: mfx_library_iterator.cpp
 
 \* ****************************************************************************** */
 
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
 
 #include "mfx_library_iterator.h"
 
@@ -471,5 +471,5 @@ bool MFXLibraryIterator::GetSubKeyName(msdk_disp_char *subKeyName, size_t length
     return m_bIsSubKeyValid;
 }
 } // namespace MFX
-#endif // #if defined(_WIN32) || defined(_WIN64)
+#endif // #if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
 
diff --git a/src/mfx_library_iterator.h b/src/mfx_library_iterator.h
@@ -36,7 +36,7 @@ File Name: mfx_library_iterator.h
 #include "mfx_win_reg_key.h"
 #include "mfx_dispatcher.h"
 
-#if !defined(_WIN32) && !defined(_WIN64)
+#if !defined(_WIN32) && !defined(_WIN64) && !defined(__CYGWIN__)
 struct mfx_disp_adapters
 {
     mfxU32 vendor_id;
@@ -64,7 +64,7 @@ namespace MFX
 {
 
 // declare desired storage ID
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
 enum
 {
     MFX_UNKNOWN_KEY             = -1,
@@ -133,7 +133,7 @@ class MFXLibraryIterator
     wchar_t m_SubKeyName[MFX_MAX_REGISTRY_KEY_NAME];            // registry subkey for selected module loaded
     int    m_StorageID;
 
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
     WinRegKey m_baseRegKey;                                     // (WinRegKey) main registry key
 
     mfxU32 m_lastLibIndex;                                      // (mfxU32) index of previously returned library
@@ -146,7 +146,7 @@ class MFXLibraryIterator
     int                       m_selected_adapter;
     mfxU32                    m_libs_num;
     struct mfx_libs*          m_libs;
-#endif // #if defined(_WIN32) || defined(_WIN64)
+#endif // #if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
 
     msdk_disp_char  m_path[260];
 
diff --git a/src/mfx_library_iterator_linux.cpp b/src/mfx_library_iterator_linux.cpp
@@ -29,7 +29,7 @@ File Name: mfx_library_iterator_linux.cpp
 \* ****************************************************************************** */
 
 
-#if !defined(_WIN32) && !defined(_WIN64)
+#if !defined(_WIN32) && !defined(_WIN64) && !defined(__CYGWIN__)
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -393,4 +393,4 @@ bool MFXLibraryIterator::GetSubKeyName(msdk_disp_char *subKeyName, size_t length
 
 } // namespace MFX
 
-#endif // #if !defined(_WIN32) && !defined(_WIN64)
+#endif // #if !defined(_WIN32) && !defined(_WIN64) && !defined(__CYGWIN__)
diff --git a/src/mfx_load_dll.cpp b/src/mfx_load_dll.cpp
@@ -28,7 +28,7 @@ File Name: mfx_load_dll.cpp
 
 \* ****************************************************************************** */
 
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
 
 #include "mfx_dispatcher.h"
 #include "mfx_load_dll.h"
@@ -39,7 +39,7 @@ File Name: mfx_load_dll.cpp
 
 #if !defined(_DEBUG)
 
-#if defined(_WIN64)
+#if defined(_WIN64) || defined(__CYGWIN64__)
 const
 wchar_t * const defaultDLLName[2] = {L"libmfxhw64.dll",
                                      L"libmfxsw64.dll"};
@@ -51,7 +51,7 @@ const
 wchar_t  * const defaultPluginDLLName[2] = {L"mfxplugin64_hw.dll",
                                             L"mfxplugin64_sw.dll"};
 
-#elif defined(_WIN32)
+#elif defined(_WIN32) || defined(__CYGWIN__)
 const
 wchar_t * const defaultDLLName[2] = {L"libmfxhw32.dll",
                                      L"libmfxsw32.dll"};
@@ -68,7 +68,7 @@ wchar_t  * const defaultPluginDLLName[2] = {L"mfxplugin32_hw.dll",
 
 #else // defined(_DEBUG)
 
-#if defined(_WIN64)
+#if defined(_WIN64) || defined(__CYGWIN64__)
 const
 wchar_t * const defaultDLLName[2] = {L"libmfxhw64_d.dll",
                                      L"libmfxsw64_d.dll"};
@@ -80,7 +80,7 @@ const
 wchar_t  * const defaultPluginDLLName[2] = {L"mfxplugin64_hw_d.dll",
                                             L"mfxplugin64_sw_d.dll"};
 
-#elif defined(WIN32)
+#elif defined(WIN32) || defined(__CYGWIN__)
 const
 wchar_t * const defaultDLLName[2] = {L"libmfxhw32_d.dll",
                                      L"libmfxsw32_d.dll"};
@@ -238,4 +238,4 @@ mfxModuleHandle mfx_get_dll_handle(const msdk_disp_char *pFileName)
 
 } // namespace MFX
 
-#endif // #if defined(_WIN32) || defined(_WIN64)
+#endif // #if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
diff --git a/src/mfx_load_dll_linux.cpp b/src/mfx_load_dll_linux.cpp
@@ -28,7 +28,7 @@ File Name: mfx_load_dll_linux.cpp
 
 \* ****************************************************************************** */
 
-#if !defined(_WIN32) && !defined(_WIN64)
+#if !defined(_WIN32) && !defined(_WIN64) && !defined(__CYGWIN__)
 
 #include "mfx_dispatcher.h"
 #include <dlfcn.h>
@@ -194,4 +194,4 @@ mfxModuleHandle mfx_get_dll_handle(const msdk_disp_char *pFileName) {
 
 } // namespace MFX
 
-#endif // #if !defined(_WIN32) && !defined(_WIN64)
+#endif // #if !defined(_WIN32) && !defined(_WIN64) && !defined(__CYGWIN__)
diff --git a/src/mfx_plugin_cfg_parser.cpp b/src/mfx_plugin_cfg_parser.cpp
@@ -28,7 +28,7 @@ File Name: mfx_plugin_cfg_parser.cpp
 
 \* ****************************************************************************** */
 
-#if !defined(_WIN32) && !defined(_WIN64)
+#if !defined(_WIN32) && !defined(_WIN64) && !defined(__CYGWIN__)
 
 #include "mfx_plugin_cfg_parser.h"
 #include "mfx_dispatcher_log.h"
@@ -383,4 +383,4 @@ bool PluginConfigParser::ParsePluginParams(PluginDescriptionRecord & dst, mfxU32
 
 } // namespace MFX
 
-#endif // !defined(_WIN32) && !defined(_WIN64)
+#endif // !defined(_WIN32) && !defined(_WIN64) && !defined(__CYGWIN__)
diff --git a/src/mfx_plugin_hive.cpp b/src/mfx_plugin_hive.cpp
diff --git a/src/mfx_plugin_hive.h b/src/mfx_plugin_hive.h
diff --git a/src/mfx_plugin_hive_linux.cpp b/src/mfx_plugin_hive_linux.cpp
diff --git a/src/mfx_win_reg_key.cpp b/src/mfx_win_reg_key.cpp
diff --git a/src/mfx_win_reg_key.h b/src/mfx_win_reg_key.h
