Restore Wine functionality

Author: tpoole

modules/juce_graphics/native/juce_Direct2DImage_windows.cpp

@@ -1015,22 +1015,24 @@ auto Direct2DPixelData::getNativeExtensions() -> NativeExtensions
     return NativeExtensions { Wrapped { this } };
 }
 
+extern bool juce_isRunningInWine();
+
 //==============================================================================
 ImagePixelData::Ptr NativeImageType::create (Image::PixelFormat format, int width, int height, bool clearImage) const
 {
-    SharedResourcePointer<DirectX> directX;
-
-    if (directX->adapters.getFactory() == nullptr)
+    if (! juce_isRunningInWine())
     {
+        SharedResourcePointer<DirectX> directX;
+
         // Make sure the DXGI factory exists
         //
         // The caller may be trying to create an Image from a static variable; if this is a DLL, then this is
-        // probably called from DllMain. You can't create a DXGI factory from DllMain, so fall back to a
-        // software image.
-        return new SoftwarePixelData { format, width, height, clearImage };
+        // probably called from DllMain. You can't create a DXGI factory from DllMain.
+        if (directX->adapters.getFactory() != nullptr)
+            return new Direct2DPixelData (format, width, height, clearImage);
     }
 
-    return new Direct2DPixelData (format, width, height, clearImage);
+    return new SoftwarePixelData { format, width, height, clearImage };
 }
 
 //==============================================================================

modules/juce_graphics/native/juce_DirectWriteTypeface_windows.cpp

@@ -50,8 +50,6 @@ StringArray Font::findAllTypefaceStyles (const String& family)
     return factories->getFonts().findAllTypefaceStyles (family);
 }
 
-extern bool juce_isRunningInWine();
-
 class WindowsDirectWriteTypeface final : public Typeface
 {
 public:
@@ -416,25 +414,10 @@ class WindowsDirectWriteTypeface final : public Typeface
 
 struct DefaultFontNames
 {
-    DefaultFontNames()
-    {
-        if (juce_isRunningInWine())
-        {
-            // If we're running in Wine, then use fonts that might be available on Linux.
-            defaultSans     = "Bitstream Vera Sans";
-            defaultSerif    = "Bitstream Vera Serif";
-            defaultFixed    = "Bitstream Vera Sans Mono";
-        }
-        else
-        {
-            defaultSans     = "Verdana";
-            defaultSerif    = "Times New Roman";
-            defaultFixed    = "Lucida Console";
-            defaultFallback = "Tahoma";  // (contains plenty of unicode characters)
-        }
-    }
-
-    String defaultSans, defaultSerif, defaultFixed, defaultFallback;
+    const String defaultSans     { "Verdana" },
+                 defaultSerif    { "Times New Roman" },
+                 defaultFixed    { "Lucida Console" },
+                 defaultFallback { "Tahoma" };  // (contains plenty of unicode characters)
 };
 
 Typeface::Ptr Font::Native::getDefaultPlatformTypefaceForFont (const Font& font)

modules/juce_gui_basics/native/juce_Windowing_windows.cpp

@@ -4690,9 +4690,12 @@ class HWNDComponentPeer final : public ComponentPeer
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (HWNDComponentPeer)
 };
 
+extern bool juce_isRunningInWine();
+
 ComponentPeer* Component::createNewPeer (int styleFlags, void* parentHWND)
 {
-    return new HWNDComponentPeer { *this, styleFlags, (HWND) parentHWND, false, 1 };
+    const auto renderer = juce_isRunningInWine() ? 0 : 1;
+    return new HWNDComponentPeer { *this, styleFlags, (HWND) parentHWND, false, renderer };
 }
 
 Image createSnapshotOfNativeWindow (void* nativeWindowHandle)