Alexandre Julliard : gphoto2.ds: CreateDIBSection doesn' t need a DC for the DIB_RGB_COLORS case.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Wed May  2 12:02:28 2012 +0200

gphoto2.ds: CreateDIBSection doesn't need a DC for the DIB_RGB_COLORS case.

---

dlls/gphoto2.ds/ds_image.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/dlls/gphoto2.ds/ds_image.c b/dlls/gphoto2.ds/ds_image.c
index c870ec4..632ff66 100644
--- a/dlls/gphoto2.ds/ds_image.c
+++ b/dlls/gphoto2.ds/ds_image.c
@@ -383,7 +383,6 @@ TW_UINT16 GPHOTO2_ImageNativeXferGet (pTW_IDENTITY pOrigin,
     BITMAPINFO bmpInfo;
     LPBYTE bits;
     JSAMPROW samprow, oldsamprow;
-    HDC dc;

FIXME("DG_IMAGE/DAT_IMAGENATIVEXFER/MSG_GET: implemented, but expect program crash due to DIB.\n");

@@ -425,8 +424,7 @@ TW_UINT16 GPHOTO2_ImageNativeXferGet (pTW_IDENTITY pOrigin,
     bmpInfo.bmiHeader.biYPelsPerMeter = 0;
     bmpInfo.bmiHeader.biClrUsed = 0;
     bmpInfo.bmiHeader.biClrImportant = 0;
-    hDIB = CreateDIBSection ((dc = GetDC(activeDS.hwndOwner)), &bmpInfo,
-			     DIB_RGB_COLORS, (LPVOID)&bits, 0, 0);
+    hDIB = CreateDIBSection (0, &bmpInfo, DIB_RGB_COLORS, (LPVOID)&bits, 0, 0);
     if (!hDIB) {
    FIXME("Failed creating DIB.\n");
    gp_file_unref (activeDS.file);
@@ -454,7 +452,6 @@ TW_UINT16 GPHOTO2_ImageNativeXferGet (pTW_IDENTITY pOrigin,
     HeapFree (GetProcessHeap(), 0, samprow);
     gp_file_unref (activeDS.file);
     activeDS.file = NULL;
-    ReleaseDC (activeDS.hwndOwner, dc);
     *pHandle = (UINT_PTR)hDIB;
     activeDS.twCC = TWCC_SUCCESS;
     activeDS.currentState = 7;
@@ -568,7 +565,6 @@ _get_gphoto2_file_as_DIB(
     struct jpeg_source_mgr		xjsm;
     struct jpeg_decompress_struct	jd;
     struct jpeg_error_mgr		jerr;
-    HDC 		dc;
     BITMAPINFO 		bmpInfo;
     LPBYTE		bits;
     JSAMPROW		samprow, oldsamprow;
@@ -636,7 +632,7 @@ _get_gphoto2_file_as_DIB(
     bmpInfo.bmiHeader.biYPelsPerMeter = 0;
     bmpInfo.bmiHeader.biClrUsed = 0;
     bmpInfo.bmiHeader.biClrImportant = 0;
-    *hDIB = CreateDIBSection ((dc = GetDC(hwnd)), &bmpInfo, DIB_RGB_COLORS, (LPVOID)&bits, 0, 0);
+    *hDIB = CreateDIBSection(0, &bmpInfo, DIB_RGB_COLORS, (LPVOID)&bits, 0, 0);
     if (!*hDIB) {
    FIXME("Failed creating DIB.\n");
    gp_file_unref (file);
@@ -659,7 +655,6 @@ _get_gphoto2_file_as_DIB(
    bits = (LPBYTE)(((UINT_PTR)bits + 3) & ~3);
    samprow = oldsamprow;
     }
-    if (hwnd) ReleaseDC (hwnd, dc);
     HeapFree (GetProcessHeap(), 0, samprow);
     gp_file_unref (file);
     return TWRC_SUCCESS;