Alexandre Julliard : d2d1: Build with msvcrt.

Alexandre Julliard julliard at winehq.org
Thu May 30 16:27:11 CDT 2019


Module: wine
Branch: master
Commit: 239499a56df7d656de6833ba107337e130269e20
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=239499a56df7d656de6833ba107337e130269e20

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu May 30 09:11:23 2019 +0200

d2d1: Build with msvcrt.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/d2d1/Makefile.in            | 2 ++
 dlls/d2d1/bitmap.c               | 3 ---
 dlls/d2d1/bitmap_render_target.c | 3 ---
 dlls/d2d1/brush.c                | 3 ---
 dlls/d2d1/d2d1_private.h         | 1 +
 dlls/d2d1/dc_render_target.c     | 3 ---
 dlls/d2d1/device.c               | 3 ---
 dlls/d2d1/effect.c               | 3 ---
 dlls/d2d1/factory.c              | 3 ---
 dlls/d2d1/geometry.c             | 5 -----
 dlls/d2d1/hwnd_render_target.c   | 3 ---
 dlls/d2d1/layer.c                | 3 ---
 dlls/d2d1/mesh.c                 | 3 ---
 dlls/d2d1/state_block.c          | 3 ---
 dlls/d2d1/stroke.c               | 3 ---
 dlls/d2d1/wic_render_target.c    | 3 ---
 16 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in
index 4135713..c3af08a 100644
--- a/dlls/d2d1/Makefile.in
+++ b/dlls/d2d1/Makefile.in
@@ -3,6 +3,8 @@ IMPORTLIB = d2d1
 IMPORTS   = d3d10_1 dxguid uuid gdi32 user32 advapi32
 DELAYIMPORTS = dwrite
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	bitmap.c \
 	bitmap_render_target.c \
diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c
index c0aef3c..39e8119 100644
--- a/dlls/d2d1/bitmap.c
+++ b/dlls/d2d1/bitmap.c
@@ -16,9 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "d2d1_private.h"
 #include "wincodec.h"
 
diff --git a/dlls/d2d1/bitmap_render_target.c b/dlls/d2d1/bitmap_render_target.c
index 11c3788..373c373 100644
--- a/dlls/d2d1/bitmap_render_target.c
+++ b/dlls/d2d1/bitmap_render_target.c
@@ -17,9 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "d2d1_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d2d);
diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c
index dd3da32..21abf14 100644
--- a/dlls/d2d1/brush.c
+++ b/dlls/d2d1/brush.c
@@ -16,9 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "d2d1_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d2d);
diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
index 70b841d..b07893a 100644
--- a/dlls/d2d1/d2d1_private.h
+++ b/dlls/d2d1/d2d1_private.h
@@ -24,6 +24,7 @@
 
 #include <assert.h>
 #include <limits.h>
+#include <math.h>
 #define COBJMACROS
 #include "d2d1_2.h"
 #ifdef D2D1_INIT_GUID
diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c
index b095008..310c541 100644
--- a/dlls/d2d1/dc_render_target.c
+++ b/dlls/d2d1/dc_render_target.c
@@ -17,9 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "d2d1_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d2d);
diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c
index 7c39896..9e4acb6 100644
--- a/dlls/d2d1/device.c
+++ b/dlls/d2d1/device.c
@@ -16,9 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "d2d1_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d2d);
diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c
index cfb8255..fb1e66a 100644
--- a/dlls/d2d1/effect.c
+++ b/dlls/d2d1/effect.c
@@ -16,9 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "d2d1_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d2d);
diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c
index c2a0405..48a2efb 100644
--- a/dlls/d2d1/factory.c
+++ b/dlls/d2d1/factory.c
@@ -16,9 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #define D2D1_INIT_GUID
 #include "d2d1_private.h"
 
diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
index 2728124..91ce32c 100644
--- a/dlls/d2d1/geometry.c
+++ b/dlls/d2d1/geometry.c
@@ -16,13 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "d2d1_private.h"
-#ifdef HAVE_FLOAT_H
 #include <float.h>
-#endif
 
 WINE_DEFAULT_DEBUG_CHANNEL(d2d);
 
diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c
index d0b9695..625f101 100644
--- a/dlls/d2d1/hwnd_render_target.c
+++ b/dlls/d2d1/hwnd_render_target.c
@@ -17,9 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "d2d1_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d2d);
diff --git a/dlls/d2d1/layer.c b/dlls/d2d1/layer.c
index 0f7ade2..3eb2f36 100644
--- a/dlls/d2d1/layer.c
+++ b/dlls/d2d1/layer.c
@@ -16,9 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "d2d1_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d2d);
diff --git a/dlls/d2d1/mesh.c b/dlls/d2d1/mesh.c
index ee53c69..1e64a0e 100644
--- a/dlls/d2d1/mesh.c
+++ b/dlls/d2d1/mesh.c
@@ -16,9 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "d2d1_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d2d);
diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c
index b15384e..e317514 100644
--- a/dlls/d2d1/state_block.c
+++ b/dlls/d2d1/state_block.c
@@ -16,9 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "d2d1_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d2d);
diff --git a/dlls/d2d1/stroke.c b/dlls/d2d1/stroke.c
index 511c134..0ba44e0 100644
--- a/dlls/d2d1/stroke.c
+++ b/dlls/d2d1/stroke.c
@@ -16,9 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "d2d1_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d2d);
diff --git a/dlls/d2d1/wic_render_target.c b/dlls/d2d1/wic_render_target.c
index 21a1fa1..9b57a5d 100644
--- a/dlls/d2d1/wic_render_target.c
+++ b/dlls/d2d1/wic_render_target.c
@@ -16,9 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "d2d1_private.h"
 #include "initguid.h"
 #include "wincodec.h"




More information about the wine-cvs mailing list