You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against b70f0d723a768b9fdc89cd835b23718f6cd61f31
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 9eee499bc9b042041d32d0350b02f7ada9b89548 Mon Sep 17 00:00:00 2001
|
||||
From 2401cee08c5c55115552da35daab7d68a7bde1e0 Mon Sep 17 00:00:00 2001
|
||||
From: Lucian Poston <lucian.poston@gmail.com>
|
||||
Date: Wed, 2 May 2018 22:38:33 -0700
|
||||
Subject: [PATCH] d2d1: Add d2d1_1.idl for drawing ID2D1Bitmap1
|
||||
@@ -7,12 +7,12 @@ https://bugs.winehq.org/show_bug.cgi?id=44052
|
||||
|
||||
Signed-off-by: Lucian Poston <lucian.poston@gmail.com>
|
||||
---
|
||||
include/d2d1_1.idl | 436 ++++++++++++++++++++++++++++++++++++++++++++++++++--
|
||||
include/d2d1_1.idl | 416 ++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
include/dcommon.idl | 15 ++
|
||||
2 files changed, 441 insertions(+), 10 deletions(-)
|
||||
2 files changed, 431 insertions(+)
|
||||
|
||||
diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl
|
||||
index 4b6224a..26c6e70 100644
|
||||
index 4b6224a..24b997e 100644
|
||||
--- a/include/d2d1_1.idl
|
||||
+++ b/include/d2d1_1.idl
|
||||
@@ -18,6 +18,11 @@
|
||||
@@ -27,37 +27,10 @@ index 4b6224a..26c6e70 100644
|
||||
interface ID2D1DeviceContext;
|
||||
interface ID2D1StrokeStyle1;
|
||||
interface ID2D1PathGeometry1;
|
||||
@@ -77,16 +82,6 @@ typedef enum D2D1_COLOR_SPACE
|
||||
D2D1_COLOR_SPACE_FORCE_DWORD = 0xffffffff,
|
||||
} D2D1_COLOR_SPACE;
|
||||
|
||||
-typedef enum D2D1_BITMAP_OPTIONS
|
||||
-{
|
||||
- D2D1_BITMAP_OPTIONS_NONE = 0x0,
|
||||
- D2D1_BITMAP_OPTIONS_TARGET = 0x1,
|
||||
- D2D1_BITMAP_OPTIONS_CANNOT_DRAW = 0x2,
|
||||
- D2D1_BITMAP_OPTIONS_CPU_READ = 0x4,
|
||||
- D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE = 0x8,
|
||||
- D2D1_BITMAP_OPTIONS_FORCE_DWORD = 0xffffffff,
|
||||
-} D2D1_BITMAP_OPTIONS;
|
||||
-
|
||||
typedef enum D2D1_MAP_OPTIONS
|
||||
{
|
||||
D2D1_MAP_OPTIONS_NONE = 0x0,
|
||||
@@ -96,6 +91,73 @@ typedef enum D2D1_MAP_OPTIONS
|
||||
@@ -96,6 +101,63 @@ typedef enum D2D1_MAP_OPTIONS
|
||||
D2D1_MAP_OPTIONS_FORCE_DWORD = 0xffffffff,
|
||||
} D2D1_MAP_OPTIONS;
|
||||
|
||||
+typedef enum D2D1_BITMAP_OPTIONS
|
||||
+{
|
||||
+ D2D1_BITMAP_OPTIONS_NONE = 0,
|
||||
+ D2D1_BITMAP_OPTIONS_TARGET = 1,
|
||||
+ D2D1_BITMAP_OPTIONS_CANNOT_DRAW = 2,
|
||||
+ D2D1_BITMAP_OPTIONS_CPU_READ = 4,
|
||||
+ D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE = 8,
|
||||
+ D2D1_BITMAP_OPTIONS_FORCE_DWORD = 0xffffffff,
|
||||
+} D2D1_BITMAP_OPTIONS;
|
||||
+
|
||||
+typedef enum D2D1_INTERPOLATION_MODE
|
||||
+{
|
||||
+ D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR = D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR,
|
||||
|
Reference in New Issue
Block a user