From 17d1e9e5e206f1e813a26f3c01fdc08e3156fa1f Mon Sep 17 00:00:00 2001
From: Patrik Stridvall <ps@leissner.se>
Date: Tue, 23 May 2000 23:38:32 +0000
Subject: [PATCH] Fixed issues found by winapi_check.

---
 dlls/ddraw/main.c         | 4 +++-
 dlls/opengl32/wgl.c       | 4 ++--
 dlls/x11drv/x11drv_main.c | 2 ++
 include/x11drv.h          | 1 -
 server/registry.c         | 4 ++--
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c
index df158c2d5a8..ffc878a3682 100644
--- a/dlls/ddraw/main.c
+++ b/dlls/ddraw/main.c
@@ -324,7 +324,9 @@ HRESULT WINAPI DirectDrawCreate(
     return ret;
 }
 
-
+/***********************************************************************
+ *		DirectDrawCreateEx
+ */
 HRESULT WINAPI DirectDrawCreateEx(
 	LPGUID lpGUID, LPVOID* lplpDD, REFIID iid, LPUNKNOWN pUnkOuter
 ) {
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index 7c41bb91a8a..d9ea81d2585 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -334,7 +334,7 @@ BOOL WINAPI wglSwapLayerBuffers(HDC hdc,
 }
 
 /***********************************************************************
- *		wglUseFontBitmaps
+ *		wglUseFontBitmapsA
  */
 BOOL WINAPI wglUseFontBitmapsA(HDC hdc,
 			       DWORD first,
@@ -356,7 +356,7 @@ BOOL WINAPI wglUseFontBitmapsA(HDC hdc,
 }
  
 /***********************************************************************
- *		wglUseFontOutlines
+ *		wglUseFontOutlinesA
  */
 BOOL WINAPI wglUseFontOutlinesA(HDC hdc,
 				DWORD first,
diff --git a/dlls/x11drv/x11drv_main.c b/dlls/x11drv/x11drv_main.c
index bd80c341e15..89144928a27 100644
--- a/dlls/x11drv/x11drv_main.c
+++ b/dlls/x11drv/x11drv_main.c
@@ -5,6 +5,8 @@
  * Copyright 2000 Alexandre Julliard
  */
 
+#include "config.h"
+
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/include/x11drv.h b/include/x11drv.h
index 4f24a43b2df..ca1deb42cd0 100644
--- a/include/x11drv.h
+++ b/include/x11drv.h
@@ -175,7 +175,6 @@ extern BOOL X11DRV_OBM_Init(void);
 struct tagBITMAPOBJ;
 extern XImage *X11DRV_BITMAP_GetXImage( const struct tagBITMAPOBJ *bmp );
 extern int X11DRV_DIB_GetXImageWidthBytes( int width, int depth );
-extern BOOL X11DRV_DIB_Init(void);
 extern HBITMAP X11DRV_BITMAP_CreateBitmapHeaderFromPixmap(Pixmap pixmap);
 extern HGLOBAL X11DRV_DIB_CreateDIBFromPixmap(Pixmap pixmap, HDC hdc, BOOL bDeletePixmap);
 extern HBITMAP X11DRV_BITMAP_CreateBitmapFromPixmap(Pixmap pixmap, BOOL bDeletePixmap);
diff --git a/server/registry.c b/server/registry.c
index e4bcf217a94..f22ab3c0065 100644
--- a/server/registry.c
+++ b/server/registry.c
@@ -1241,12 +1241,12 @@ static int get_prefix_len( struct key *key, const char *name, struct file_load_i
     WCHAR *p;
     int res;
     int len = strlen(name) * sizeof(WCHAR);
-    if (!get_file_tmp_space( info, len )) return NULL;
+    if (!get_file_tmp_space( info, len )) return 0;
 
     if ((res = parse_strW( (WCHAR *)info->tmp, &len, name, ']' )) == -1)
     {
         file_read_error( "Malformed key", info );
-        return NULL;
+        return 0;
     }
     for (p = (WCHAR *)info->tmp; *p; p++) if (*p == '\\') break;
     *p = 0;
-- 
2.11.4.GIT