Charles Davis : winemac.drv: Move create_bitmap_from_dib() above the import/export functions.

Alexandre Julliard julliard at wine.codeweavers.com
Wed May 4 11:38:21 CDT 2016


Module: wine
Branch: master
Commit: 1dcf51f0fc7ca1a0da3569d41c706fb983f9d579
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1dcf51f0fc7ca1a0da3569d41c706fb983f9d579

Author: Charles Davis <cdavis5x at gmail.com>
Date:   Tue May  3 12:03:24 2016 -0700

winemac.drv: Move create_bitmap_from_dib() above the import/export functions.

Signed-off-by: Charles Davis <cdavis5x at gmail.com>
Signed-off-by: Ken Thomases <ken at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/winemac.drv/clipboard.c | 60 ++++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c
index 188d4e2..2082cad 100644
--- a/dlls/winemac.drv/clipboard.c
+++ b/dlls/winemac.drv/clipboard.c
@@ -616,6 +616,36 @@ static HGLOBAL create_dib_from_bitmap(HBITMAP hBmp)
 
 
 /**************************************************************************
+ *              create_bitmap_from_dib
+ *
+ *  Given a packed DIB, creates a bitmap object from it.
+ */
+static HANDLE create_bitmap_from_dib(HANDLE dib)
+{
+    HANDLE ret = 0;
+    BITMAPINFO *bmi;
+
+    if (dib && (bmi = GlobalLock(dib)))
+    {
+        HDC hdc;
+        unsigned int offset;
+
+        hdc = GetDC(NULL);
+
+        offset = bitmap_info_size(bmi, DIB_RGB_COLORS);
+
+        ret = CreateDIBitmap(hdc, &bmi->bmiHeader, CBM_INIT, (LPBYTE)bmi + offset,
+                             bmi, DIB_RGB_COLORS);
+
+        GlobalUnlock(dib);
+        ReleaseDC(NULL, hdc);
+    }
+
+    return ret;
+}
+
+
+/**************************************************************************
  *              import_clipboard_data
  *
  *  Generic import clipboard data routine.
@@ -651,36 +681,6 @@ static HANDLE import_clipboard_data(CFDataRef data)
 
 
 /**************************************************************************
- *              create_bitmap_from_dib
- *
- *  Given a packed DIB, creates a bitmap object from it.
- */
-static HANDLE create_bitmap_from_dib(HANDLE dib)
-{
-    HANDLE ret = 0;
-    BITMAPINFO *bmi;
-
-    if (dib && (bmi = GlobalLock(dib)))
-    {
-        HDC hdc;
-        unsigned int offset;
-
-        hdc = GetDC(NULL);
-
-        offset = bitmap_info_size(bmi, DIB_RGB_COLORS);
-
-        ret = CreateDIBitmap(hdc, &bmi->bmiHeader, CBM_INIT, (LPBYTE)bmi + offset,
-                             bmi, DIB_RGB_COLORS);
-
-        GlobalUnlock(dib);
-        ReleaseDC(NULL, hdc);
-    }
-
-    return ret;
-}
-
-
-/**************************************************************************
  *              import_bmp_to_bitmap
  *
  *  Import BMP data, converting to CF_BITMAP format.




More information about the wine-cvs mailing list