diff --git a/include/global.h b/include/global.h
index 6933b98fb2f..73f80116927 100644
--- a/include/global.h
+++ b/include/global.h
@@ -35,9 +35,9 @@ extern DWORD VIRTUAL_GetPageSize(void);
 extern DWORD VIRTUAL_GetGranularity(void);
 extern LPVOID VIRTUAL_MapFileW( LPCWSTR name );
 
-typedef BOOL32 (*HANDLERPROC)(LPVOID, LPVOID);
-extern BOOL32 VIRTUAL_SetFaultHandler(LPVOID addr, HANDLERPROC proc, LPVOID arg);
-extern BOOL32 VIRTUAL_HandleFault(LPVOID addr);
+typedef BOOL32 (*HANDLERPROC)(LPVOID, LPCVOID);
+extern BOOL32 VIRTUAL_SetFaultHandler(LPCVOID addr, HANDLERPROC proc, LPVOID arg);
+extern BOOL32 VIRTUAL_HandleFault(LPCVOID addr);
 
 /* memory/atom.c */
 extern BOOL32 ATOM_Init( WORD globalTableSel );
diff --git a/memory/virtual.c b/memory/virtual.c
index 2190d367a78..817189830cb 100644
--- a/memory/virtual.c
+++ b/memory/virtual.c
@@ -504,7 +504,7 @@ DWORD VIRTUAL_GetGranularity(void)
 /***********************************************************************
  *           VIRTUAL_SetFaultHandler
  */
-BOOL32 VIRTUAL_SetFaultHandler( LPVOID addr, HANDLERPROC proc, LPVOID arg )
+BOOL32 VIRTUAL_SetFaultHandler( LPCVOID addr, HANDLERPROC proc, LPVOID arg )
 {
     FILE_VIEW *view;
 
@@ -517,7 +517,7 @@ BOOL32 VIRTUAL_SetFaultHandler( LPVOID addr, HANDLERPROC proc, LPVOID arg )
 /***********************************************************************
  *           VIRTUAL_HandleFault
  */
-BOOL32 VIRTUAL_HandleFault(LPVOID addr)
+BOOL32 VIRTUAL_HandleFault( LPCVOID addr )
 {
     FILE_VIEW *view = VIRTUAL_FindView((UINT32)addr);
 
diff --git a/objects/dib.c b/objects/dib.c
index a62f2bdd3bc..62c16e4162c 100644
--- a/objects/dib.c
+++ b/objects/dib.c
@@ -15,6 +15,7 @@
 #include "callback.h"
 #include "palette.h"
 #include "global.h"
+#include "selectors.h"
 #include "debug.h"
 #include "local.h"
 #include "xmalloc.h" /* for XCREATEIMAGE macro */
@@ -776,7 +777,7 @@ static void DIB_DoUpdateDIBSection( BITMAPOBJ *bmp, BOOL32 toDIB )
 /***********************************************************************
  *           DIB_FaultHandler
  */
-static BOOL32 DIB_FaultHandler( LPVOID res, LPVOID addr )
+static BOOL32 DIB_FaultHandler( LPVOID res, LPCVOID addr )
 {
     BOOL32 handled = FALSE;
     BITMAPOBJ *bmp;
@@ -906,17 +907,46 @@ void DIB_UpdateDIBSection( DC *dc, BOOL32 toDIB )
  *           CreateDIBSection16    (GDI.489)
  */
 HBITMAP16 WINAPI CreateDIBSection16 (HDC16 hdc, BITMAPINFO *bmi, UINT16 usage,
-				     LPVOID **bits, HANDLE32 section,
+				     SEGPTR *bits, HANDLE32 section,
 				     DWORD offset)
 {
-    return CreateDIBSection32(hdc, bmi, usage, bits, section, offset);
+    HBITMAP32 res = CreateDIBSection32(hdc, bmi, usage, NULL, section,
+				       offset);
+
+    if ( res )
+    {
+	BITMAPOBJ *bmp = (BITMAPOBJ *) GDI_GetObjPtr(res, BITMAP_MAGIC);
+	if ( bmp && bmp->dib )
+	{
+	    DIBSECTION *dib = &bmp->dib->dibSection;
+	    INT32 height = dib->dsBm.bmHeight >= 0 ?
+		dib->dsBm.bmHeight : -dib->dsBm.bmHeight;
+	    INT32 size = dib->dsBmih.biSizeImage ?
+		dib->dsBmih.biSizeImage : dib->dsBm.bmWidthBytes * height;
+	    if ( dib->dsBm.bmBits )
+	    {
+		bmp->dib->selector = 
+		    SELECTOR_AllocBlock( dib->dsBm.bmBits, size, 
+					 SEGMENT_DATA, FALSE, FALSE );
+	    }
+	    printf("ptr = %p, size =%d, selector = %04x, segptr = %ld\n",
+		   dib->dsBm.bmBits, size, bmp->dib->selector,
+		   PTR_SEG_OFF_TO_SEGPTR(bmp->dib->selector, 0));
+}
+	GDI_HEAP_UNLOCK( res );
+
+	if ( bits ) 
+	    *bits = PTR_SEG_OFF_TO_SEGPTR( bmp->dib->selector, 0 );
+    }
+
+    return res;
 }
 
 /***********************************************************************
  *           CreateDIBSection32    (GDI32.36)
  */
 HBITMAP32 WINAPI CreateDIBSection32 (HDC32 hdc, BITMAPINFO *bmi, UINT32 usage,
-				     LPVOID **bits,HANDLE32 section,
+				     LPVOID *bits,HANDLE32 section,
 				     DWORD offset)
 {
     HBITMAP32 res = 0;
@@ -977,6 +1007,7 @@ HBITMAP32 WINAPI CreateDIBSection32 (HDC32 hdc, BITMAPINFO *bmi, UINT32 usage,
 	dib->dibSection.dsOffset = offset;
 
         dib->status    = DIB_NoHandler;
+	dib->selector  = 0;
         
 	dib->nColorMap = nColorMap;
         dib->colorMap  = colorMap;
@@ -1061,6 +1092,12 @@ void DIB_DeleteDIBSection( BITMAPOBJ *bmp )
         if (dib->colorMap)
             HeapFree(GetProcessHeap(), 0, dib->colorMap);
 
+        if (dib->selector)
+        {
+            WORD count = (GET_SEL_LIMIT( dib->selector ) >> 16) + 1;
+            SELECTOR_FreeBlock( dib->selector, count );
+        }
+
         HeapFree(GetProcessHeap(), 0, dib);
         bmp->dib = NULL;
     }