Charles Davis : winemac.drv: Also return the number of pixel formats if the caller didn' t supply a PIXELFORMATDESCRIPTOR.

[Alexandre Julliard]

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

Author: Charles Davis <cdavis5x at gmail.com>
Date:   Tue Jul 23 21:26:29 2013 -0600

winemac.drv: Also return the number of pixel formats if the caller didn't supply a PIXELFORMATDESCRIPTOR.

---

 dlls/winemac.drv/opengl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c
index 0922371..fb294d1 100644
--- a/dlls/winemac.drv/opengl.c
+++ b/dlls/winemac.drv/opengl.c
@@ -3281,7 +3281,7 @@ int macdrv_wglDescribePixelFormat(HDC hdc, int fmt, UINT size, PIXELFORMATDESCRI
 
     TRACE("hdc %p fmt %d size %u descr %p\n", hdc, fmt, size, descr);
 
-    if (fmt <= 0 || fmt > ret) return ret;
+    if (fmt <= 0 || fmt > ret || !descr) return ret;
     if (size < sizeof(*descr)) return 0;
 
     pf = &pixel_formats[fmt - 1];