]> git.saurik.com Git - wxWidgets.git/commitdiff
Remove unused wxDisplay implementation using DirectDraw from wxMSW.
authorVadim Zeitlin <vadim@wxwidgets.org>
Tue, 24 Aug 2010 11:36:43 +0000 (11:36 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Tue, 24 Aug 2010 11:36:43 +0000 (11:36 +0000)
Remove commented out version of DirectDraw-based wxDisplayFactory
implementation. It doesn't seem to have any advantages compared to the
currently used version and nobody uses it anyhow.

Closes #12387.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/msw/display.cpp

index b8b49cacdd6fc793b6a9a5727904ffc2f1a3f1c5..69285f9f044786cca73db4f586ec6a3409996193 100644 (file)
 #include "wx/msw/missing.h"
 #include "wx/msw/private.h"
 
-// define this to use DirectDraw for display mode switching: this is disabled
-// by default because ddraw.h is now always available and also it's not really
-// clear what are the benefits of using DirectDraw compared to the standard API
-
-#if !defined(wxUSE_DIRECTDRAW)
-    #define wxUSE_DIRECTDRAW 0
-#endif
-
 #ifndef __WXWINCE__
     // Older versions of windef.h don't define HMONITOR.  Unfortunately, we
     // can't directly test whether HMONITOR is defined or not in windef.h as
     #endif
 #endif // !__WXWINCE__
 
-#if wxUSE_DIRECTDRAW
-    #include <ddraw.h>
-
-    // we don't want to link with ddraw.lib which contains the real
-    // IID_IDirectDraw2 definition
-    const GUID wxIID_IDirectDraw2 =
-     { 0xB3A6F3E0, 0x2B43, 0x11CF, { 0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 } };
-#endif // wxUSE_DIRECTDRAW
-
 // display functions are found in different DLLs under WinCE and normal Win32
 #ifdef __WXWINCE__
 static const wxChar displayDllName[] = wxT("coredll.dll");
@@ -104,22 +87,6 @@ typedef LONG (WINAPI *ChangeDisplaySettingsEx_t)(LPCTSTR lpszDeviceName,
                                                  DWORD dwFlags,
                                                  LPVOID lParam);
 
-#if wxUSE_DIRECTDRAW
-typedef BOOL (PASCAL *DDEnumExCallback_t)(GUID *pGuid,
-                                          LPTSTR driverDescription,
-                                          LPTSTR driverName,
-                                          LPVOID lpContext,
-                                          HMONITOR hmon);
-
-typedef HRESULT (WINAPI *DirectDrawEnumerateEx_t)(DDEnumExCallback_t lpCallback,
-                                                  LPVOID lpContext,
-                                                  DWORD dwFlags);
-
-typedef HRESULT (WINAPI *DirectDrawCreate_t)(GUID *lpGUID,
-                                             LPDIRECTDRAW *lplpDD,
-                                             IUnknown *pUnkOuter);
-#endif // wxUSE_DIRECTDRAW
-
 typedef BOOL (WINAPI *EnumDisplayMonitors_t)(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
 typedef HMONITOR (WINAPI *MonitorFromPoint_t)(POINT,DWORD);
 typedef HMONITOR (WINAPI *MonitorFromWindow_t)(HWND,DWORD);
@@ -240,8 +207,8 @@ protected:
     wxDisplayFactoryWin32Base();
 
     // delete all m_displays elements: can be called from the derived class
-    // dtor if it is important to do this before destroying it (as in
-    // wxDisplayFactoryDirectDraw case), otherwise will be done by our dtor
+    // dtor if it is important to do this before destroying it,
+    // otherwise will be done by our dtor
     void Clear();
 
     // find the monitor corresponding to the given handle, return wxNOT_FOUND
@@ -293,99 +260,10 @@ private:
                                           LPRECT lprcMonitor,
                                           LPARAM dwData);
 
-
     // add a monitor description to m_displays array
     void AddDisplay(HMONITOR hMonitor, LPRECT lprcMonitor);
 };
 
-// ----------------------------------------------------------------------------
-// wxDisplay implementation using DirectDraw
-// ----------------------------------------------------------------------------
-
-#if wxUSE_DIRECTDRAW
-
-struct wxDisplayInfoDirectDraw : wxDisplayInfo
-{
-    wxDisplayInfoDirectDraw(const GUID& guid, HMONITOR hmon, LPTSTR name)
-        : wxDisplayInfo(hmon),
-          m_guid(guid)
-    {
-        m_pDD2 = NULL;
-        m_devName = name;
-    }
-
-    virtual ~wxDisplayInfoDirectDraw()
-    {
-        if ( m_pDD2 )
-            m_pDD2->Release();
-    }
-
-
-    // IDirectDraw object used to control this display, may be NULL
-    IDirectDraw2 *m_pDD2;
-
-    // DirectDraw GUID for this display, only valid when using DirectDraw
-    const GUID m_guid;
-
-
-    wxDECLARE_NO_COPY_CLASS(wxDisplayInfoDirectDraw);
-};
-
-class wxDisplayImplDirectDraw : public wxDisplayImplWin32Base
-{
-public:
-    wxDisplayImplDirectDraw(unsigned n, wxDisplayInfo& info, IDirectDraw2 *pDD2)
-        : wxDisplayImplWin32Base(n, info),
-          m_pDD2(pDD2)
-    {
-        m_pDD2->AddRef();
-    }
-
-    virtual ~wxDisplayImplDirectDraw()
-    {
-        m_pDD2->Release();
-    }
-
-    virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const;
-    virtual bool ChangeMode(const wxVideoMode& mode);
-
-private:
-    IDirectDraw2 *m_pDD2;
-
-    wxDECLARE_NO_COPY_CLASS(wxDisplayImplDirectDraw);
-};
-
-class wxDisplayFactoryDirectDraw : public wxDisplayFactoryWin32Base
-{
-public:
-    wxDisplayFactoryDirectDraw();
-    virtual ~wxDisplayFactoryDirectDraw();
-
-    virtual wxDisplayImpl *CreateDisplay(unsigned n);
-
-private:
-    // callback used with DirectDrawEnumerateEx()
-    static BOOL WINAPI DDEnumExCallback(GUID *pGuid,
-                                        LPTSTR driverDescription,
-                                        LPTSTR driverName,
-                                        LPVOID lpContext,
-                                        HMONITOR hmon);
-
-    // add a monitor description to m_displays array
-    void AddDisplay(const GUID& guid, HMONITOR hmon, LPTSTR name);
-
-
-    // ddraw.dll
-    wxDynamicLibrary m_dllDDraw;
-
-    // dynamically resolved DirectDrawCreate()
-    DirectDrawCreate_t m_pfnDirectDrawCreate;
-
-    wxDECLARE_NO_COPY_CLASS(wxDisplayFactoryDirectDraw);
-};
-
-#endif // wxUSE_DIRECTDRAW
-
 
 // ============================================================================
 // common classes implementation
@@ -397,32 +275,18 @@ private:
 
 /* static */ wxDisplayFactory *wxDisplay::CreateFactory()
 {
-    // we have 2 implementations for modern Windows: one using standard Win32
-    // and another using DirectDraw, the choice between them is done using a
-    // system option
-
-#if wxUSE_DIRECTDRAW
-    if ( wxSystemOptions::GetOptionInt(wxT("msw.display.directdraw")) )
-    {
-        wxDisplayFactoryDirectDraw *factoryDD = new wxDisplayFactoryDirectDraw;
-        if ( factoryDD->IsOk() )
-            return factoryDD;
-
-        delete factoryDD;
-    }
-#endif // wxUSE_DIRECTDRAW
-
     wxDisplayFactoryMultimon *factoryMM = new wxDisplayFactoryMultimon;
+
     if ( factoryMM->IsOk() )
         return factoryMM;
 
     delete factoryMM;
 
-
     // finally fall back to a stub implementation if all else failed (Win95?)
     return new wxDisplayFactorySingle;
 }
 
+
 // ----------------------------------------------------------------------------
 // wxDisplayInfo
 // ----------------------------------------------------------------------------
@@ -590,8 +454,7 @@ wxDisplayFactoryMultimon::wxDisplayFactoryMultimon()
     if ( !ms_supportsMultimon )
         return;
 
-    // look up EnumDisplayMonitors() which we don't need with DirectDraw
-    // implementation
+    // look up EnumDisplayMonitors()
     EnumDisplayMonitors_t pfnEnumDisplayMonitors;
     {
         wxDynamicLibrary dllDisplay(displayDllName, wxDL_VERBATIM | wxDL_QUIET);
@@ -793,235 +656,4 @@ bool wxDisplayImplMultimon::ChangeMode(const wxVideoMode& mode)
     return false;
 }
 
-
-// ============================================================================
-// DirectDraw-based wxDisplay implementation
-// ============================================================================
-
-#if wxUSE_DIRECTDRAW
-
-// ----------------------------------------------------------------------------
-// wxDisplayFactoryDirectDraw initialization
-// ----------------------------------------------------------------------------
-
-wxDisplayFactoryDirectDraw::wxDisplayFactoryDirectDraw()
-{
-    if ( !ms_supportsMultimon )
-        return;
-
-    m_dllDDraw.Load(wxT("ddraw.dll"), wxDL_VERBATIM | wxDL_QUIET);
-
-    if ( !m_dllDDraw.IsLoaded() )
-        return;
-
-    DirectDrawEnumerateEx_t
-        wxDL_INIT_FUNC_AW(pfn, DirectDrawEnumerateEx, m_dllDDraw);
-    if ( !pfnDirectDrawEnumerateEx )
-        return;
-
-    // we can't continue without DirectDrawCreate() later, so resolve it right
-    // now and fail the initialization if it's not available
-    if ( !wxDL_INIT_FUNC(m_pfn, DirectDrawCreate, m_dllDDraw) )
-        return;
-
-    if ( (*pfnDirectDrawEnumerateEx)(DDEnumExCallback,
-                                     this,
-                                     DDENUM_ATTACHEDSECONDARYDEVICES) != DD_OK )
-    {
-        wxLogLastError(wxT("DirectDrawEnumerateEx"));
-    }
-}
-
-wxDisplayFactoryDirectDraw::~wxDisplayFactoryDirectDraw()
-{
-    // we must clear m_displays now, before m_dllDDraw is unloaded as otherwise
-    // calling m_pDD2->Release() later would crash
-    Clear();
-}
-
-// ----------------------------------------------------------------------------
-// callbacks for monitor/modes enumeration stuff
-// ----------------------------------------------------------------------------
-
-BOOL WINAPI
-wxDisplayFactoryDirectDraw::DDEnumExCallback(GUID *pGuid,
-                                             LPTSTR WXUNUSED(driverDescription),
-                                             LPTSTR driverName,
-                                             LPVOID lpContext,
-                                             HMONITOR hmon)
-{
-    if ( pGuid )
-    {
-        wxDisplayFactoryDirectDraw * self =
-            static_cast<wxDisplayFactoryDirectDraw *>(lpContext);
-        self->AddDisplay(*pGuid, hmon, driverName);
-    }
-    //else: we're called for the primary monitor, skip it
-
-    // continue the enumeration
-    return TRUE;
-}
-
-// ----------------------------------------------------------------------------
-// wxDisplayFactoryDirectDraw helpers
-// ----------------------------------------------------------------------------
-
-void wxDisplayFactoryDirectDraw::AddDisplay(const GUID& guid,
-                                            HMONITOR hmon,
-                                            LPTSTR name)
-{
-    m_displays.Add(new wxDisplayInfoDirectDraw(guid, hmon, name));
-}
-
-// ----------------------------------------------------------------------------
-// wxDisplayFactoryDirectDraw inherited pure virtuals implementation
-// ----------------------------------------------------------------------------
-
-wxDisplayImpl *wxDisplayFactoryDirectDraw::CreateDisplay(unsigned n)
-{
-    wxCHECK_MSG( n < m_displays.size(), NULL, wxT("invalid display index") );
-
-    wxDisplayInfoDirectDraw *
-        info = static_cast<wxDisplayInfoDirectDraw *>(m_displays[n]);
-
-    if ( !info->m_pDD2 )
-    {
-        IDirectDraw *pDD;
-        GUID guid(info->m_guid);
-        HRESULT hr = (*m_pfnDirectDrawCreate)(&guid, &pDD, NULL);
-
-        if ( FAILED(hr) || !pDD )
-        {
-            // what to do??
-            wxLogApiError(wxT("DirectDrawCreate"), hr);
-            return NULL;
-        }
-
-        // we got IDirectDraw, but we need IDirectDraw2
-        hr = pDD->QueryInterface(wxIID_IDirectDraw2, (void **)&info->m_pDD2);
-        pDD->Release();
-
-        if ( FAILED(hr) || !info->m_pDD2 )
-        {
-            wxLogApiError(wxT("IDirectDraw::QueryInterface(IDD2)"), hr);
-            return NULL;
-        }
-
-        // NB: m_pDD2 will now be only destroyed when m_displays is destroyed
-        //     which is ok as we don't want to recreate DD objects all the time
-    }
-    //else: DirectDraw object corresponding to our display already exists
-
-    return new wxDisplayImplDirectDraw(n, *info, info->m_pDD2);
-}
-
-// ============================================================================
-// wxDisplayImplDirectDraw
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// video modes enumeration
-// ----------------------------------------------------------------------------
-
-// tiny helper class used to pass information from GetModes() to
-// wxDDEnumModesCallback
-class wxDDVideoModesAdder
-{
-public:
-    // our Add() method will add modes matching modeMatch to modes array
-    wxDDVideoModesAdder(wxArrayVideoModes& modes, const wxVideoMode& modeMatch)
-        : m_modes(modes),
-          m_modeMatch(modeMatch)
-    {
-    }
-
-    void Add(const wxVideoMode& mode)
-    {
-        if ( mode.Matches(m_modeMatch) )
-            m_modes.Add(mode);
-    }
-
-private:
-    wxArrayVideoModes& m_modes;
-    const wxVideoMode& m_modeMatch;
-
-    wxDECLARE_NO_COPY_CLASS(wxDDVideoModesAdder);
-};
-
-HRESULT WINAPI wxDDEnumModesCallback(LPDDSURFACEDESC lpDDSurfaceDesc,
-                                     LPVOID lpContext)
-{
-    // we need at least the mode size
-    static const DWORD FLAGS_REQUIRED = DDSD_HEIGHT | DDSD_WIDTH;
-    if ( (lpDDSurfaceDesc->dwFlags & FLAGS_REQUIRED) == FLAGS_REQUIRED )
-    {
-        wxDDVideoModesAdder * const vmodes =
-            static_cast<wxDDVideoModesAdder *>(lpContext);
-
-        vmodes->Add(wxVideoMode(lpDDSurfaceDesc->dwWidth,
-                                lpDDSurfaceDesc->dwHeight,
-                                lpDDSurfaceDesc->ddpfPixelFormat.dwRGBBitCount,
-                                lpDDSurfaceDesc->dwRefreshRate));
-    }
-
-    // continue the enumeration
-    return DDENUMRET_OK;
-}
-
-wxArrayVideoModes
-wxDisplayImplDirectDraw::GetModes(const wxVideoMode& modeMatch) const
-{
-    wxArrayVideoModes modes;
-    wxDDVideoModesAdder modesAdder(modes, modeMatch);
-
-    HRESULT hr = m_pDD2->EnumDisplayModes
-                         (
-                            DDEDM_REFRESHRATES,
-                            NULL,                   // all modes
-                            &modesAdder,            // callback parameter
-                            wxDDEnumModesCallback
-                         );
-
-    if ( FAILED(hr) )
-    {
-        wxLogApiError(wxT("IDirectDraw::EnumDisplayModes"), hr);
-    }
-
-    return modes;
-}
-
-// ----------------------------------------------------------------------------
-// video mode switching
-// ----------------------------------------------------------------------------
-
-bool wxDisplayImplDirectDraw::ChangeMode(const wxVideoMode& mode)
-{
-    wxWindow *winTop = wxTheApp->GetTopWindow();
-    wxCHECK_MSG( winTop, false, wxT("top level window required for DirectX") );
-
-    HRESULT hr = m_pDD2->SetCooperativeLevel
-                         (
-                            GetHwndOf(winTop),
-                            DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN
-                         );
-    if ( FAILED(hr) )
-    {
-        wxLogApiError(wxT("IDirectDraw2::SetCooperativeLevel"), hr);
-
-        return false;
-    }
-
-    hr = m_pDD2->SetDisplayMode(mode.w, mode.h, mode.bpp, mode.refresh, 0);
-    if ( FAILED(hr) )
-    {
-        wxLogApiError(wxT("IDirectDraw2::SetDisplayMode"), hr);
-
-        return false;
-    }
-
-    return true;
-}
-
-#endif // wxUSE_DIRECTDRAW
-
 #endif // wxUSE_DISPLAY