Release 941017

Sun Oct 16 13:29:07 1994  Alexandre Julliard  (julliard@lamisun.epfl.ch)

	* [controls/button.c]
	Implemented WM_GETDLGCODE, WM_SETFONT, BM_SETSTYLE, BM_SETCHECK,
	BM_SETSTATE.
	Implemented default button painting.
	Optimised redrawing.
	Fixed owner-draw buttons.

	* [controls/static.c]
	Implemented WM_SETFONT.
	A few optimisations in painting code.
	Bug fix for SS_SIMPLE controls.

	* [if1632/callback.c]
	Preliminary GetCodeHandle().

	* [if1632/gdi.spec]
	Changed 'pascal' to 'pascal16' everywhere it's needed.

	* [include/windows.h]
	Fixed a few data structures.

	* [memory/heap.c]
	Bug fix in HEAP_ReAlloc().

	* [misc/cursor.c]
	Fixed SetCursor().

	* [objects/bitblt.c]
	Fixed PatBlt() when using BLACKNESS or WHITENESS codes.

	* [objects/font.c]
	Better font mapping code.
	Implemented GetTextFace().

	* [objects/region.c]
	Bug fix in REGION_MakePixmap().
	Faster region copying.

	* [objects/text.c]
	Implemented ExtTextOut().
	Implemented DT_NOCLIP style for DrawText().

	* [windows/dc.c]
	Free the bitmap when deleting a memory DC.

	* [windows/dce.c]
	Added support for windows that have no associated X window.
	Implemented DCX_CLIPSIBLINGS and DCX_PARENTCLIP in GetDCEx().

	* [windows/defdlg.c]
	Implemented default push button handling and DM_SETDEFID.
	Implemented WM_NEXTDLGCTL.

	* [windows/dialog.c]
	Implemented default push button handling.
	Beginning of a keyboard interface in dialogs
	(does not really work yet).
	Fixed dialogs that use a special font.

	* [windows/event.c] [windows/focus.c]
	Added support for non-X windows.

	* [windows/graphics.c]
	Rewritten FloodFill() and implemented ExtFloodFill().

	* [windows/message.c]
	Cleaner hardware messages and X events handling.

	* [windows/defwnd.c] [windows/painting.c]
	Implemented WM_SETREDRAW.

	* [windows/win.c]
	Only create an X window for top-level windows, or for the desktop.
	Child windows now use their parent's drawable.

	* [windows/winpos.c]
	Beginning of support for non-X windows (still somewhat broken).
	Implemented *DeferWindowPos().

	* [*/Imakefile]
	Cleaned up some Imakefiles.
	Moved dc.c from windows/ to objects/.
	Moved cursor.c from misc/ to windows/.

Sun Oct 16 12:21:52 1994  Michael Patra <micky@marie.physik.tu-berlin.d400.de>

	* [include/debug.h]
	  [include/stddebug.h]
	  [*/*.c]
        Rewritten all the calls to printf for displaying debug-information
        (messages like "LoadImage: loading SOL (SOL.EXE)" etc.) 
        Added option "-debugmsg" to Wine. Example: "-debugmsg +all" will turn
        all these messages on, "-debugmsg -dll" will turn all messages 
	concerning DLLs off.

	* [controls/combo.c]
	Added some handling for combo controls with ownerdraw-styles
        (just creating and passing the necessary messages to the 
	corresponding listbox control; the edit-control needs to be
	replaced with something else).

	* [controls/edit.c]
	  [windows/dialog.c]
	Added support for use of global heap memory in dialogs with 
	edit controls.

	* [controls/listbox.c]
	Added support for item data.
	ListBoxInsertString(): Fixed bug for elements which are not inserted
	after the currently last element.
	
	* [misc/dos_fs.c]
	  [miscemu/int21.c]
	DOS_ValidDirectory(): Checks whether a given string is in fact the
	valid name of a directory.

Sat Oct 15 17:35:00 PDT 1994		<martin@cs.csufresno.edu>

	* [Imakefile]
	generate wine.sym after creating wine

	* [debugger/dbg.y]
	load "wine.sym" when entering debugger

	* [debugger/info.c]
	symbolic backtrace for 32-bit stack. Breaks 16-bit bt.

Sun Sep  25 12:00:00 PDT 1994   <martin@osiris.cs.csufresno.edu>

	* [rc/rc.y] [rc/rc.h] [rc/rc.l] [rc/winerc.c]
	Files created

Sun Sep 18 11:04:45 MET DST 1994          Dag Asheim (dash@ifi.uio.no)

	* [misc/spy.c]
	Exclude and Include no longer requires a terminating ';' to
	register the last component.

Thu Sep 15 23:10:09 MET DST 1994          Dag Asheim (dash@ifi.uio.no)

	* [Configure]
	Rewrote much of it.  Added capability to generate a wine.ini
	file.  Commented out the processor emulator options until that
	becomes interesting.  Gives a warning if it sees any *.rej
	files.  I hope I haven't assumed to much about the shell/OS so
	that it breaks under *BSD.

	* [misc/dos_fs.c]
	Removed/changed calls to ToUnix() (which calls tolower()) so
	that the part of the pathname which correspond with the drive
	letter on DOS no longer will be mapped to lowercase.  This
	means that it should be possible to have uppercase letters in
	the [drives] section of wine.ini.

	* [LICENSE]
	Cosmetic changes so that it displays better in the window you
	get from pressing "Credit_License" in the "About WINE" window.

Sun Aug 21 21:12:06 MET DST 1994	<erik@xs4all.nl>

	* [controls/menu.c]
	LoadMenu() moved to loader/resource.c.

	* [misc/main.c]
	Added stub for FileCDR().

	* [include/peexe.h]
	Added, from Eric's pe-test.

	* [include/resource.h]
	Added.

	* [loader/resources.c]
	Removed duplicated code in *Resource() functions.
	Moved NE-program specific functions into ne_image.c.
	Moved NE-fileformat functions to ne_resource.c.

	* [pe_image.c] [pe_resource.c]
	Added. Nothing implemented to run PE-executables, resource
	loading only.

	* [misc/file.c]
	Changed OpenFile() to use macros.

	* [misc/shell.c]
	Added NULL-ptr checks to ShellAbout().

	* [miscemu/int21.c]
	Fixed a few typos.

	* [miscemu/kernel.c]
	Added _DI = _DS, to put the caller's instance in DI. Doesn't
	work properly if caller changed DS :-(
diff --git a/loader/resource.c b/loader/resource.c
index b69c5f2..867c783 100644
--- a/loader/resource.c
+++ b/loader/resource.c
@@ -8,181 +8,262 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
-
 #include "arch.h"
 #include "prototypes.h"
 #include "windows.h"
 #include "gdi.h"
 #include "wine.h"
 #include "icon.h"
+#include "menu.h"
 #include "accel.h"
 #include "dlls.h"
-
-/* #define DEBUG_RESOURCE  */
+#include "resource.h"
+#include "stddebug.h"
+/* #define DEBUG_RESOURCE /* */
+/* #undef  DEBUG_RESOURCE /* */
+/* #define DEBUG_ACCEL    /* */
+/* #undef  DEBUG_ACCEL    /* */
+#include "debug.h"
 
 #define MIN(a,b)	((a) < (b) ? (a) : (b))
 
-typedef struct resource_s
-{
-    struct resource_s *next;
-    HANDLE info_mem;
-    int size_shift;
-    struct resource_nameinfo_s nameinfo;
-    HANDLE rsc_mem;
-} RESOURCE;
-
-static int ResourceFd = -1;
-static HANDLE ResourceInst = 0;
-static struct w_files *ResourceFileInfo = NULL;
-static RESOURCE *Top = NULL;
+RESOURCE *Top = NULL;
 extern HINSTANCE hSysRes;
 
+extern int NE_FindResource(HANDLE, LPSTR, LPSTR, RESOURCE *);
+extern int PE_FindResource(HANDLE, LPSTR, LPSTR, RESOURCE *);
 extern HBITMAP BITMAP_LoadOEMBitmap( WORD id );  /* objects/bitmap.c */
 
-HANDLE RSC_LoadResource(int instance, char *rsc_name, int type, 
-			int *image_size_ret);
-void RSC_LoadNameTable(void);
+#define PrintId(name) \
+	if (HIWORD((DWORD)name)) \
+		printf(", %s", name); \
+	else \
+		printf(", #%d", (int) name); 
 
-extern char *ProgramName;
-
-
 /**********************************************************************
- *					RSC_LoadNameTable
+ *			FindResource	[KERNEL.60]
  */
-#ifndef WINELIB
-void 
-RSC_LoadNameTable()
+HANDLE FindResource(HANDLE instance, LPSTR name, LPSTR type)
 {
-    struct resource_typeinfo_s typeinfo;
-    struct resource_nameinfo_s nameinfo;
-    unsigned short             size_shift;
-    RESNAMTAB                 *top, *new;
-    char                       read_buf[1024];
-    char                      *p;
-    int                        i;
-    unsigned short             len;
-    off_t                      rtoff;
-    off_t		       saved_pos;
-    
-    top = NULL;
+	int status;
+	RESOURCE *r;
+	HANDLE rh;
 
-    /*
-     * Move to beginning of resource table.
-     */
-    rtoff = (ResourceFileInfo->mz_header->ne_offset +
-	     ResourceFileInfo->ne_header->resource_tab_offset);
-    lseek(ResourceFd, rtoff, SEEK_SET);
-    
-    /*
-     * Read block size.
-     */
-    if (read(ResourceFd, &size_shift, sizeof(size_shift)) != 
-	sizeof(size_shift))
-    {
-	return;
-    }
-    size_shift = CONV_SHORT(size_shift);
+#ifdef DEBUG_RESOURCE 
+	printf("FindResource(%04X", instance);
+	PrintId(name);
+	PrintId(type);
+	printf(")\n");
+#endif
 
-    /*
-     * Find resource.
-     */
-    typeinfo.type_id = 0xffff;
-    while (typeinfo.type_id != 0) 
-    {
-	if (!load_typeinfo (ResourceFd, &typeinfo))
-	    break;
+	if (instance == (HANDLE)NULL)
+		instance = hSysRes;
 
-	if (typeinfo.type_id == 0) 
-	    break;
-	if (typeinfo.type_id == 0x800f) 
-	{
-	    for (i = 0; i < typeinfo.count; i++) 
-	    {
-		if (read(ResourceFd, &nameinfo, sizeof(nameinfo)) != 
-		    sizeof(nameinfo))
-		{
-		    break;
-		}
-		
-		saved_pos = lseek(ResourceFd, 0, SEEK_CUR);
-		lseek(ResourceFd, (long) nameinfo.offset << size_shift, 
-		      SEEK_SET);
-		read(ResourceFd, &len, sizeof(len));
-		while (len)
-		{
-		    new = (RESNAMTAB *) GlobalQuickAlloc(sizeof(*new));
-		    new->next = top;
-		    top = new;
+	/* FIXME: did we already find this one ? */
 
-		    read(ResourceFd, &new->type_ord, 2);
-		    read(ResourceFd, &new->id_ord, 2);
-		    read(ResourceFd, read_buf, len - 6);
-		    
-		    p = read_buf + strlen(read_buf) + 1;
-		    strncpy(new->id, p, MAX_NAME_LENGTH);
-		    new->id[MAX_NAME_LENGTH - 1] = '\0';
+	if ((rh = GlobalAlloc(GMEM_MOVEABLE, sizeof(RESOURCE))) == 0)
+		return 0;
 
-		    read(ResourceFd, &len, sizeof(len));
-		}
+	r = (RESOURCE *)GlobalLock(rh);
+	r->next = Top;
+	Top = r;
+	r->info_mem = rh;
+	r->rsc_mem = 0;
+	r->count = 0;
+	if (HIWORD((DWORD)name))
+		r->name = strdup(name);
+	else
+		r->name = name;
 
-		lseek(ResourceFd, saved_pos, SEEK_SET);
-	    }
-	    break;
-	}
-	else 
-	{
-	    lseek(ResourceFd, (typeinfo.count * sizeof(nameinfo)), SEEK_CUR);
-	}
-    }
+	if (HIWORD((DWORD)type))
+		r->type = strdup(type);
+	else
+		r->type = type;
 
-    ResourceFileInfo->resnamtab = top;
+	r->wpnt = GetFileInfo(instance);
+	r->fd = dup(r->wpnt->fd);
+	if (r->wpnt->ne)
+		status = NE_FindResource(instance, name, type, r);
+	else
+		status = PE_FindResource(instance, name, type, r);
+
+	if (!status) {
+		if (HIWORD((DWORD)r->name))
+			free(r->name);
+
+		if (HIWORD((DWORD)r->type))
+			free(r->type);
+		close(r->fd);
+
+		Top = r->next;
+		GlobalUnlock(rh);
+		return 0;
+	} else
+		return rh;
 }
-#endif /* WINELIB */
-
-/**********************************************************************
- *					OpenResourceFile
- */
-int
-OpenResourceFile(HANDLE instance)
-{
-    struct w_files *w;
-    char   *res_file;
-    
-    if (ResourceInst == instance)
-	return ResourceFd;
 
-    w = GetFileInfo(instance);
-    if (w == NULL)
-	return -1;
-    ResourceFileInfo = w;
-    res_file = w->filename;
-    
-    if (ResourceFd >= 0)
-	close(ResourceFd);
-    
-    ResourceInst = instance;
-    ResourceFd   = open (res_file, O_RDONLY);
-#if 1
-#ifndef WINELIB
-    if (w->resnamtab == (RESNAMTAB *) -1)
-    {
-	RSC_LoadNameTable();
-    }
-#endif
-#endif
+/**********************************************************************
+ *			AllocResource	[KERNEL.66]
+ */
+HANDLE AllocResource(HANDLE instance, HANDLE hResInfo, DWORD dwSize)
+{
+	RESOURCE *r;
+	int image_size;
 
 #ifdef DEBUG_RESOURCE
-    printf("OpenResourceFile(%04X) // file='%s' hFile=%04X !\n", 
-		instance, w->filename, ResourceFd);
-#endif
-    return ResourceFd;
+	printf("AllocResource(%04X, %04X, %08X);\n", instance, hResInfo, (int) dwSize);
+#endif 
+
+	if (instance == (HANDLE)NULL)
+		instance = hSysRes;
+
+	if ((r = (RESOURCE *)GlobalLock(hResInfo)) == NULL)
+		return 0;
+    
+	image_size = r->size;
+
+	if (dwSize == 0)
+		r->rsc_mem = GlobalAlloc(GMEM_MOVEABLE, image_size);
+	else
+		r->rsc_mem = GlobalAlloc(GMEM_MOVEABLE, dwSize);
+
+	GlobalUnlock(hResInfo);
+
+	return r->rsc_mem;
 }
 
 /**********************************************************************
- *					ConvertCoreBitmap
+ *				AccessResource	[KERNEL.64]
  */
-HBITMAP
-ConvertCoreBitmap( HDC hdc, BITMAPCOREHEADER * image )
+int AccessResource(HANDLE instance, HANDLE hResInfo)
+{
+	int fd;
+	RESOURCE *r;
+
+#ifdef DEBUG_RESOURCE
+	printf("AccessResource(%04X, %04X);\n", instance, hResInfo);
+#endif
+
+	if (instance == (HANDLE)NULL)
+		instance = hSysRes;
+
+	if ((r = (RESOURCE *)GlobalLock(hResInfo)) == NULL)
+		return -1;
+
+	fd = r->fd;
+	lseek(fd, r->offset, SEEK_SET);
+	GlobalUnlock(hResInfo);
+
+	return fd;
+}
+
+/**********************************************************************
+ *				SizeofResource	[KERNEL.65]
+ */
+WORD SizeofResource(HANDLE instance, HANDLE hResInfo)
+{
+	RESOURCE *r;
+	int size;
+	
+#ifdef DEBUG_RESOURCE
+	printf("SizeofResource(%04X, %04X);\n", instance, hResInfo);
+#endif
+
+	if (instance == (HANDLE)NULL)
+		instance = hSysRes;
+
+	if ((r = (RESOURCE *)GlobalLock(hResInfo)) == NULL)
+		return 0;
+
+	size = r->size;
+	GlobalUnlock(hResInfo);
+
+	return size;
+}
+
+/**********************************************************************
+ *			LoadResource	[KERNEL.61]
+ */
+HANDLE LoadResource(HANDLE instance, HANDLE hResInfo)
+{
+    RESOURCE *r;
+    int image_size, fd;
+    void *image;
+    HANDLE h;
+
+#ifdef DEBUG_RESOURCE
+	printf("LoadResource(%04X, %04X);\n", instance, hResInfo);
+#endif
+
+    if (instance == (HANDLE)NULL)
+	instance = hSysRes;
+
+    if ((r = (RESOURCE *)GlobalLock(hResInfo)) == NULL)
+	return 0;
+    
+    h = r->rsc_mem = AllocResource(instance, hResInfo, 0);
+    image = GlobalLinearLock(h);
+    image_size = r->size;
+    fd = AccessResource(instance, hResInfo);
+
+    if (image == NULL || read(fd, image, image_size) != image_size) {
+	GlobalFree(h);
+	GlobalUnlock(hResInfo);
+	return 0;
+    }
+    r->count++;
+    close(fd);
+    GlobalLinearUnlock(h);
+    GlobalUnlock(hResInfo);
+    return h;
+}
+
+/**********************************************************************
+ *				LockResource	[KERNEL.62]
+ */
+LPSTR LockResource(HANDLE hResData)
+{
+    return GlobalLock(hResData);
+}
+
+/**********************************************************************
+ *				FreeResource	[KERNEL.63]
+ */
+HANDLE FreeResource(HANDLE hResData)
+{
+    RESOURCE *r, *rp;
+
+#ifdef DEBUG_RESOURCE
+    printf("FreeResource: handle %04x\n", hResData);
+#endif
+
+    for (r = rp = Top; r ; r = r->next) {
+	if (r->rsc_mem == hResData) {
+	    if (r->count == 0) {
+		    if (rp != r)
+			rp->next = r->next;
+		    else
+			Top = r->next;
+
+		    if (HIWORD((DWORD)r->name))
+		    	free(r->name);
+                    if (HIWORD((DWORD)r->type))
+			free(r->type);
+		    GlobalFree(r->rsc_mem);
+		    GlobalFree(r->info_mem);
+		    return 0;
+	    } else
+	    	r->count--;
+	}
+	rp = r;
+    }
+    return hResData;
+}
+
+/**********************************************************************
+ *			ConvertCoreBitmap
+ */
+HBITMAP ConvertCoreBitmap( HDC hdc, BITMAPCOREHEADER * image )
 {
     BITMAPINFO * bmpInfo;
     HBITMAP hbitmap;
@@ -235,306 +316,44 @@
 }
 
 /**********************************************************************
- *					ConvertInfoBitmap
+ *			ConvertInfoBitmap
  */
-HBITMAP
-ConvertInfoBitmap( HDC hdc, BITMAPINFO * image )
+HBITMAP	ConvertInfoBitmap( HDC hdc, BITMAPINFO * image )
 {
     char * bits = ((char *)image) + DIB_BitmapInfoSize(image, DIB_RGB_COLORS);
     return CreateDIBitmap( hdc, &image->bmiHeader, CBM_INIT,
 			   bits, image, DIB_RGB_COLORS );
 } 
-
-#ifndef WINELIB
-load_typeinfo (int fd, struct resource_typeinfo_s *typeinfo)
-{
-    return read (fd, typeinfo, sizeof (*typeinfo)) == sizeof (*typeinfo);
-}
-#endif
-
-int
-type_match(int type_id1, int type_id2, int fd, off_t off)
-{
-	off_t old_pos;
-	unsigned char c;
-	size_t nbytes;
-	char name[256];
-
-	if (type_id1 == -1)
-		return 1;
-	if ((type_id1 & 0xffff0000) == 0) {
-		if ((type_id2 & 0x8000) == 0)
-			return 0;
-		return (type_id1 & 0x000f) == (type_id2 & 0x000f);
-	}
-	if ((type_id2 & 0x8000) != 0)
-		return 0;
-#ifdef DEBUG_RESOURCE
-	printf("type_compare: type_id2=%04X !\n", type_id2);
-#endif
-	old_pos = lseek(fd, 0, SEEK_CUR);
-	lseek(fd, off + type_id2, SEEK_SET);
-	read(fd, &c, 1);
-	nbytes = CONV_CHAR_TO_LONG (c);
-#ifdef DEBUG_RESOURCE
-	printf("type_compare: namesize=%d\n", nbytes);
-#endif
-	read(fd, name, nbytes);
-	lseek(fd, old_pos, SEEK_SET);
-	name[nbytes] = '\0';
-#ifdef DEBUG_RESOURCE
-	printf("type_compare: name=`%s'\n", name);
-#endif
-	return strcasecmp((char *) type_id1, name) == 0;
-}
 
 /**********************************************************************
- *					FindResourceByNumber
+ *			RSC_LoadResource
  */
-int
-FindResourceByNumber(struct resource_nameinfo_s *result_p,
-		     int type_id, int resource_id)
+HANDLE
+RSC_LoadResource(int instance, LPSTR rsc_name, LPSTR type, int *image_size_ret)
 {
-    struct resource_typeinfo_s typeinfo;
-    struct resource_nameinfo_s nameinfo;
-    unsigned short size_shift;
-    int i;
-    off_t rtoff;
+	HANDLE hResInfo;
+	RESOURCE *r;
 
-    /*
-     * Move to beginning of resource table.
-     */
-    rtoff = (ResourceFileInfo->mz_header->ne_offset +
-	     ResourceFileInfo->ne_header->resource_tab_offset);
-    lseek(ResourceFd, rtoff, SEEK_SET);
-    
-    /*
-     * Read block size.
-     */
-    if (read(ResourceFd, &size_shift, sizeof(size_shift)) != 
-	sizeof(size_shift))
-    {
-    	printf("FindResourceByNumber (%s) bad block size !\n", resource_id);
-	return -1;
-    }
-    size_shift = CONV_SHORT(size_shift);
-    /*
-     * Find resource.
-     */
-    for (;;) {
-	if (!load_typeinfo (ResourceFd, &typeinfo)){
-	    printf("FindResourceByNumber (%X) bad typeinfo size !\n", resource_id);
-	    return -1;
-	    }
-#ifdef DEBUG_RESOURCE
-	printf("FindResourceByNumber type=%X count=%d searched=%d \n", 
-			typeinfo.type_id, typeinfo.count, type_id);
-#endif
-	if (typeinfo.type_id == 0) break;
-	if (type_match(type_id, typeinfo.type_id, ResourceFd, rtoff)) {
+	if (instance == (HANDLE)NULL)
+		instance = hSysRes;
 
-	    for (i = 0; i < typeinfo.count; i++) {
-#ifndef WINELIB
-		if (read(ResourceFd, &nameinfo, sizeof(nameinfo)) != 
-		    sizeof(nameinfo))
-#else
-		if (!load_nameinfo (ResourceFd, &nameinfo))
-#endif
-		{
-		    printf("FindResourceByNumber (%X) bad nameinfo size !\n", resource_id);
-		    return -1;
-		    }
 #ifdef DEBUG_RESOURCE
-		printf("FindResource: search type=%X id=%X // type=%X id=%X\n",
-			type_id, resource_id, typeinfo.type_id, nameinfo.id);
+	printf("RSC_LoadResource: instance = %04x, name = %08x, type = %08x\n",
+	   instance, (int) rsc_name, (int) type);
 #endif
-		if (nameinfo.id == resource_id) {
-		    memcpy(result_p, &nameinfo, sizeof(nameinfo));
-		    return size_shift;
-		    }
-	        }
-	    }
-	else {
-	    lseek(ResourceFd, (typeinfo.count * sizeof(nameinfo)), SEEK_CUR);
-	    }
-        }
-    return -1;
+
+	if ((hResInfo = FindResource(instance, rsc_name, (LPSTR) type)) == (HANDLE) NULL) {
+		return (HANDLE)NULL;
+	}
+	r = (RESOURCE *)GlobalLock(hResInfo);
+	if (image_size_ret) 
+		*image_size_ret = r->size;
+	r->count++;
+	GlobalUnlock(hResInfo);
+	return LoadResource(instance, hResInfo);
 }
 
 /**********************************************************************
- *					FindResourceByName
- */
-int
-FindResourceByName(struct resource_nameinfo_s *result_p,
-		     int type_id, char *resource_name)
-{
-    struct resource_typeinfo_s typeinfo;
-    struct resource_nameinfo_s nameinfo;
-    unsigned short size_shift;
-    off_t old_pos, new_pos;
-    unsigned char nbytes;
-    char name[256];
-    int i;
-    off_t rtoff;
-
-    /*
-     * Check for loaded name table.
-     */
-    if (ResourceFileInfo->resnamtab != NULL)
-    {
-	RESNAMTAB *e;
-
-	for (e = ResourceFileInfo->resnamtab; e != NULL; e = e->next)
-	{
-	    if (e->type_ord == (type_id & 0x000f) &&
-		strcasecmp(e->id, resource_name) == 0)
-	    {
-		return FindResourceByNumber(result_p, type_id, e->id_ord);
-	    }
-	}
-
-	return -1;
-    }
-
-    /*
-     * Move to beginning of resource table.
-     */
-    rtoff = (ResourceFileInfo->mz_header->ne_offset +
-	     ResourceFileInfo->ne_header->resource_tab_offset);
-    lseek(ResourceFd, rtoff, SEEK_SET);
-    
-    /*
-     * Read block size.
-     */
-    if (read(ResourceFd, &size_shift, sizeof(size_shift)) != 
-	sizeof(size_shift))
-    {
-    	printf("FindResourceByName (%s) bad block size !\n", resource_name);
-	return -1;
-    }
-    size_shift = CONV_SHORT (size_shift);
-    
-    /*
-     * Find resource.
-     */
-    for (;;)
-    {
-	if (!load_typeinfo (ResourceFd, &typeinfo))
-	{
-	    printf("FindResourceByName (%s) bad typeinfo size !\n", resource_name);
-	    return -1;
-	}
-#ifdef DEBUG_RESOURCE
-	printf("FindResourceByName typeinfo.type_id=%X count=%d type_id=%X\n",
-			typeinfo.type_id, typeinfo.count, type_id);
-#endif
-	if (typeinfo.type_id == 0) break;
-	if (type_match(type_id, typeinfo.type_id, ResourceFd, rtoff))
-	{
-	    for (i = 0; i < typeinfo.count; i++)
-	    {
-#ifndef WINELIB
-		if (read(ResourceFd, &nameinfo, sizeof(nameinfo)) != 
-		    sizeof(nameinfo))
-#else
-		if (!load_nameinfo (ResourceFd, &nameinfo))
-#endif
-		{
-		    printf("FindResourceByName (%s) bad nameinfo size !\n", resource_name);
-		    return -1;
-		}
-/*
-		if ((nameinfo.id & 0x8000) != 0) continue;
-*/		
-#ifdef DEBUG_RESOURCE
-		printf("FindResourceByName // nameinfo.id=%04X !\n", nameinfo.id);
-#endif
-		old_pos = lseek(ResourceFd, 0, SEEK_CUR);
-		new_pos = rtoff + nameinfo.id;
-		lseek(ResourceFd, new_pos, SEEK_SET);
-		read(ResourceFd, &nbytes, 1);
-#ifdef DEBUG_RESOURCE
-		printf("FindResourceByName // namesize=%d !\n", nbytes);
-#endif
- 		nbytes = CONV_CHAR_TO_LONG (nbytes);
-		read(ResourceFd, name, nbytes);
-		lseek(ResourceFd, old_pos, SEEK_SET);
-		name[nbytes] = '\0';
-#ifdef DEBUG_RESOURCE
-		printf("FindResourceByName type_id=%X (%d of %d) name='%s' resource_name='%s'\n", 
-			typeinfo.type_id, i + 1, typeinfo.count, 
-			name, resource_name);
-#endif
-		if (strcasecmp(name, resource_name) == 0)
-		{
-		    memcpy(result_p, &nameinfo, sizeof(nameinfo));
-		    return size_shift;
-		}
-	    }
-	}
-	else {
-	    lseek(ResourceFd, (typeinfo.count * sizeof(nameinfo)), SEEK_CUR);
-	    }
-    }
-    return -1;
-}
-
-
-/**********************************************************************
- *					GetRsrcCount		[internal]
- */
-int GetRsrcCount(HINSTANCE hInst, int type_id)
-{
-    struct resource_typeinfo_s typeinfo;
-    struct resource_nameinfo_s nameinfo;
-    unsigned short size_shift;
-/*    off_t old_pos, new_pos;
-    unsigned char nbytes; 
-    char name[256]; */
-    int i;
-    off_t rtoff;
-    if (hInst == 0) return 0;
-#ifdef DEBUG_RESOURCE
-    printf("GetRsrcCount hInst=%04X typename=%08X\n", hInst, type_id);
-#endif
-    if (OpenResourceFile(hInst) < 0)	return 0;
-
-    /*
-     * Move to beginning of resource table.
-     */
-    rtoff = (ResourceFileInfo->mz_header->ne_offset +
-	     ResourceFileInfo->ne_header->resource_tab_offset);
-    lseek(ResourceFd, rtoff, SEEK_SET);
-    /*
-     * Read block size.
-     */
-    if (read(ResourceFd, &size_shift, sizeof(size_shift)) != sizeof(size_shift)) {
-		printf("GetRsrcCount // bad block size !\n");
-		return -1;
-		}
-    size_shift = CONV_SHORT (size_shift);
-    for (;;) {
-		if (!load_typeinfo (ResourceFd, &typeinfo))	{
-			printf("GetRsrcCount // bad typeinfo size !\n");
-			return 0;
-			}
-#ifdef DEBUG_RESOURCE
-		printf("GetRsrcCount // typeinfo.type_id=%X count=%d type_id=%X\n",
-				typeinfo.type_id, typeinfo.count, type_id);
-#endif
-		if (typeinfo.type_id == 0) break;
-		if (type_match(type_id, typeinfo.type_id, ResourceFd, rtoff)) {
-			return typeinfo.count;
-			}
-		else {
-			lseek(ResourceFd, (typeinfo.count * sizeof(nameinfo)), SEEK_CUR);
-			}
-		}
-    return 0;
-}
-
-
-/**********************************************************************
  *			LoadIcon [USER.174]
  */
 HICON LoadIcon(HANDLE instance, LPSTR icon_name)
@@ -548,22 +367,22 @@
     BITMAPINFO 	*bmi;
     BITMAPINFOHEADER 	*bih;
     RGBQUAD	*rgbq;
-    HBITMAP 	hBitMap;
     HDC 	hMemDC;
     HDC 	hMemDC2;
     HDC 	hdc;
-    int 	i, j, image_size;
+    int 	image_size;
+
 #ifdef DEBUG_RESOURCE
-    printf("LoadIcon: instance = %04x, name = %08x\n",
-	   instance, icon_name);
+	printf("LoadIcon(%04X", instance);
+	PrintId(icon_name);
+	printf(")\n");
 #endif
     
     if (!(hdc = GetDC(GetDesktopWindow()))) return 0;
-    if (instance == (HANDLE)NULL)  instance = hSysRes;
-    rsc_mem = RSC_LoadResource(instance, icon_name, NE_RSCTYPE_GROUP_ICON, 
+    rsc_mem = RSC_LoadResource(instance, icon_name, (LPSTR) NE_RSCTYPE_GROUP_ICON, 
 			       &image_size);
     if (rsc_mem == (HANDLE)NULL) {
-	printf("LoadIcon / Icon %04X not Found !\n", icon_name);
+	printf("LoadIcon / Icon %04X not Found !\n", (int) icon_name);
 	ReleaseDC(GetDesktopWindow(), hdc); 
 	return 0;
 	}
@@ -588,9 +407,9 @@
     GlobalFree(rsc_mem);
     rsc_mem = RSC_LoadResource(instance, 
     	MAKEINTRESOURCE(lpicodesc->icoDIBOffset), 
-    	NE_RSCTYPE_ICON, &image_size);
+    	(LPSTR) NE_RSCTYPE_ICON, &image_size);
     if (rsc_mem == (HANDLE)NULL) {
-	printf("LoadIcon / Icon %04X Bitmaps not Found !\n", icon_name);
+	printf("LoadIcon / Icon %04X Bitmaps not Found !\n", (int) icon_name);
 	ReleaseDC(GetDesktopWindow(), hdc); 
 	return 0;
 	}
@@ -624,7 +443,7 @@
     rgbq[1].rgbReserved = 0x00;
     if (bih->biSizeImage == 0) {
 	if (bih->biCompression != BI_RGB) {
-	    printf("Unknown size for compressed Icon bitmap.\n");
+	    fprintf(stderr,"Unknown size for compressed Icon bitmap.\n");
 	    GlobalFree(rsc_mem);
 	    ReleaseDC(GetDesktopWindow(), hdc); 
 	    return 0;
@@ -646,549 +465,9 @@
     DeleteDC(hMemDC2);
     ReleaseDC(GetDesktopWindow(), hdc);
     GlobalUnlock(hIcon);
-#ifdef DEBUG_RESOURCE
-    printf("LoadIcon Alloc hIcon=%X\n", hIcon);
-#endif
+    dprintf_resource(stddeb,"LoadIcon Alloc hIcon=%X\n", hIcon);
     return hIcon;
 }
-
-
-/**********************************************************************
- *			DestroyIcon [USER.457]
- */
-BOOL DestroyIcon(HICON hIcon)
-{
-    ICONALLOC	*lpico;
-    if (hIcon == (HICON)NULL) return FALSE;
-    lpico = (ICONALLOC *)GlobalLock(hIcon);
-    if (lpico->hBitmap != (HBITMAP)NULL) DeleteObject(lpico->hBitmap);
-    GlobalFree(hIcon);
-    return TRUE;
-}
-
-
-/**********************************************************************
- *			LoadAccelerators	[USER.177]
- */
-HANDLE LoadAccelerators(HANDLE instance, LPSTR lpTableName)
-{
-    HANDLE 	hAccel;
-    HANDLE 	rsc_mem;
-    BYTE 	*lp;
-    ACCELHEADER	*lpAccelTbl;
-    int 	i, image_size, n;
-#ifdef DEBUG_ACCEL
-    if (((LONG)lpTableName & 0xFFFF0000L) == 0L)
-	printf("LoadAccelerators: instance = %04X, name = %08X\n",
-			instance, lpTableName);
-    else
-	printf("LoadAccelerators: instance = %04X, name = '%s'\n",
-			instance, lpTableName);
-#endif
-    if (instance == (HANDLE)NULL)  instance = hSysRes;
-    rsc_mem = RSC_LoadResource(instance, lpTableName, NE_RSCTYPE_ACCELERATOR, 
-			       &image_size);
-    if (rsc_mem == (HANDLE)NULL) {
-	printf("LoadAccelerators / AccelTable %04X not Found !\n", lpTableName);
-	return 0;
-	}
-    lp = (BYTE *)GlobalLock(rsc_mem);
-    if (lp == NULL) {
-	GlobalFree(rsc_mem);
-	return 0;
-	}
-#ifdef DEBUG_ACCEL
-    printf("LoadAccelerators / image_size=%d\n", image_size);
-#endif
-    n = image_size/5;
-    hAccel = GlobalAlloc(GMEM_MOVEABLE, 
-    	sizeof(ACCELHEADER) + (n + 1)*sizeof(ACCELENTRY));
-    lpAccelTbl = (LPACCELHEADER)GlobalLock(hAccel);
-    lpAccelTbl->wCount = 0;
-    for (i = 0; i < n; i++) {
-	lpAccelTbl->tbl[i].type = *(lp++);
-	lpAccelTbl->tbl[i].wEvent = *((WORD *)lp);
-	lp += 2;
-	lpAccelTbl->tbl[i].wIDval = *((WORD *)lp);
-	lp += 2;
-    	if (lpAccelTbl->tbl[i].wEvent == 0) break;
-#ifdef DEBUG_ACCEL
-	printf("Accelerator #%u / event=%04X id=%04X type=%02X \n", 
-		i, lpAccelTbl->tbl[i].wEvent, lpAccelTbl->tbl[i].wIDval, 
-		lpAccelTbl->tbl[i].type);
-#endif
-	lpAccelTbl->wCount++;
- 	}
-    GlobalUnlock(hAccel);
-    GlobalUnlock(rsc_mem);
-    GlobalFree(rsc_mem);
-    return hAccel;
-}
-
-/**********************************************************************
- *			TranslateAccelerator 	[USER.178]
- */
-int TranslateAccelerator(HWND hWnd, HANDLE hAccel, LPMSG msg)
-{
-    ACCELHEADER	*lpAccelTbl;
-    int 	i, image_size;
-    if (hAccel == 0 || msg == NULL) return 0;
-    if (msg->message != WM_KEYDOWN &&
-    	msg->message != WM_KEYUP &&
-    	msg->message != WM_CHAR) return 0;
-#ifdef DEBUG_ACCEL
-    printf("TranslateAccelerators hAccel=%04X !\n", hAccel);
-#endif
-    lpAccelTbl = (LPACCELHEADER)GlobalLock(hAccel);
-    for (i = 0; i < lpAccelTbl->wCount; i++) {
-	if (lpAccelTbl->tbl[i].type & VIRTKEY_ACCEL) {
-	    if (msg->wParam == lpAccelTbl->tbl[i].wEvent &&
-		msg->message == WM_KEYDOWN) {
-		if ((lpAccelTbl->tbl[i].type & SHIFT_ACCEL) &&
-		    !(GetKeyState(VK_SHIFT) & 0xf)) {
-		    GlobalUnlock(hAccel);
-		    return 0;
-		}
-		if ((lpAccelTbl->tbl[i].type & CONTROL_ACCEL) &&
-		    !(GetKeyState(VK_CONTROL) & 0xf)) {
-		    GlobalUnlock(hAccel);
-		    return 0;
-		}
-		if ((lpAccelTbl->tbl[i].type & ALT_ACCEL) &&
-		    !(GetKeyState(VK_MENU) & 0xf)) {
-		    GlobalUnlock(hAccel);
-		    return 0;
-		}
-		SendMessage(hWnd, WM_COMMAND, lpAccelTbl->tbl[i].wIDval, 0x00010000L);
-		GlobalUnlock(hAccel);
-		return 1;
-		}
-	    if (msg->message == WM_KEYUP) return 1;
-	    }
-	else {
-	    if (msg->wParam == lpAccelTbl->tbl[i].wEvent &&
-		msg->message == WM_CHAR) {
-		SendMessage(hWnd, WM_COMMAND, lpAccelTbl->tbl[i].wIDval, 0x00010000L);
-		GlobalUnlock(hAccel);
-		return 1;
-		}
-	    }
-	}
-    GlobalUnlock(hAccel);
-    return 0;
-}
-
-/**********************************************************************
- *				FindResource	[KERNEL.60]
- */
-HANDLE FindResource(HANDLE instance, LPSTR resource_name, LPSTR type_name)
-{
-    RESOURCE *r;
-    HANDLE rh;
-    int type;
-
-    if (instance == 0)
-	return 0;
-    
-#ifdef DEBUG_RESOURCE
-    printf("FindResource hInst=%04X typename=%08X resname=%08X\n", 
-		instance, type_name, resource_name);
-#endif
-    if (OpenResourceFile(instance) < 0)
-	return 0;
-    
-    rh = GlobalAlloc(GMEM_MOVEABLE, sizeof(*r));
-    if (rh == 0)
-	return 0;
-    r = (RESOURCE *)GlobalLock(rh);
-
-    r->next = Top;
-    Top = r;
-    r->info_mem = rh;
-    r->rsc_mem = 0;
-
-    if (((int) type_name & 0xffff0000) == 0)
-    {
-	type = (int) type_name;
-    }
-    else if (type_name[0] == '\0')
-    {
-	type = -1;
-    }
-    else if (type_name[0] == '#')
-    {
-	type = atoi(type_name + 1);
-    }
-    else
-    {
-	type = (int) type_name;
-    }
-    if (((int) resource_name & 0xffff0000) == 0)
-    {
-	r->size_shift = FindResourceByNumber(&r->nameinfo, type,
-					     (int) resource_name | 0x8000);
-    }
-    else if (resource_name[0] == '\0')
-    {
-	r->size_shift = FindResourceByNumber(&r->nameinfo, type, -1);
-    }
-    else if (resource_name[0] == '#')
-    {
-	r->size_shift = FindResourceByNumber(&r->nameinfo, type,
-					     atoi(resource_name + 1));
-    }
-    else
-    {
-	r->size_shift = FindResourceByName(&r->nameinfo, type, resource_name);
-    }
-    
-    if (r->size_shift == -1)
-    {
-        printf("FindResource hInst=%04X typename=%08X resname=%08X not found!\n", 
-		instance, type_name, resource_name);
-	GlobalFree(rh);
-	return 0;
-    }
-
-    return rh;
-}
-
-/**********************************************************************
- *			AllocResource	[KERNEL.66]
- */
-HANDLE AllocResource(HANDLE instance, HANDLE hResInfo, DWORD dwSize)
-{
-    RESOURCE *r;
-    int image_size;
-
-    if (instance == 0)
-	return 0;
-    
-    if (OpenResourceFile(instance) < 0)
-	return 0;
-
-    r = (RESOURCE *)GlobalLock(hResInfo);
-    if (r == NULL)
-	return 0;
-    
-    image_size = r->nameinfo.length << r->size_shift;
-
-    if (dwSize == 0)
-	r->rsc_mem = GlobalAlloc(GMEM_MOVEABLE, image_size);
-    else
-	r->rsc_mem = GlobalAlloc(GMEM_MOVEABLE, dwSize);
-
-    GlobalUnlock(hResInfo);
-
-    return r->rsc_mem;
-}
-
-/**********************************************************************
- *				LoadResource	[KERNEL.61]
- */
-HANDLE LoadResource(HANDLE instance, HANDLE hResInfo)
-{
-    RESOURCE *r;
-    int image_size;
-    void *image;
-    HANDLE h;
-
-    if (instance == 0)
-	return 0;
-    
-    if (OpenResourceFile(instance) < 0)
-	return 0;
-
-    r = (RESOURCE *)GlobalLock(hResInfo);
-    if (r == NULL)
-	return 0;
-    
-    image_size = r->nameinfo.length << r->size_shift;
-
-    h = r->rsc_mem = GlobalAlloc(GMEM_MOVEABLE, image_size);
-    image = GlobalLock(h);
-
-    lseek(ResourceFd, ((int) r->nameinfo.offset << r->size_shift), SEEK_SET);
-
-    if (image == NULL || read(ResourceFd, image, image_size) != image_size)
-    {
-	GlobalFree(h);
-	GlobalUnlock(hResInfo);
-	return 0;
-    }
-
-    GlobalUnlock(h);
-    GlobalUnlock(hResInfo);
-    return h;
-}
-
-/**********************************************************************
- *				LockResource	[KERNEL.62]
- */
-LPSTR LockResource(HANDLE hResData)
-{
-    return GlobalLock(hResData);
-}
-
-/**********************************************************************
- *				FreeResource	[KERNEL.63]
- */
-HANDLE FreeResource(HANDLE hResData)
-{
-    RESOURCE *r, *rp;
-    
-    for (r = rp = Top; r != NULL; r = r->next)
-    {
-	if (r->info_mem == hResData)
-	{
-	    if (rp != NULL)
-		rp->next = r->next;
-	    else
-		Top = r->next;
-	    
-	    GlobalFree(r->rsc_mem);
-	    GlobalFree(r->info_mem);
-	    return 0;
-	}
-	rp = r;
-    }
-    
-    return hResData;
-}
-
-/**********************************************************************
- *				AccessResource	[KERNEL.64]
- */
-int AccessResource(HANDLE instance, HANDLE hResInfo)
-{
-    int	resfile, image_size;
-    RESOURCE *r;
-
-/* #ifdef DEBUG_RESOURCE */
-    printf("AccessResource(%04X, %04X);\n", instance, hResInfo);
-/* #endif */
-
-    if (instance == 0)
-	return -1;
-    
-    if ((resfile = OpenResourceFile(instance)) < 0)
-	return -1;
-
-    if ((r = (RESOURCE *)GlobalLock(hResInfo)) == NULL)
-	return -1;
-
-    lseek(resfile, ((int) r->nameinfo.offset << r->size_shift), SEEK_SET);
-    GlobalUnlock(hResInfo);
-
-    return dup(resfile);
-}
-
-/**********************************************************************
- *				SizeofResource	[KERNEL.65]
- */
-WORD SizeofResource(HANDLE instance, HANDLE hResInfo)
-{
-    int	image_size;
-    RESOURCE *r;
-
-/* #ifdef DEBUG_RESOURCE */
-    printf("SizeofResource(%04X, %04X);\n", instance, hResInfo);
-/* #endif */
-
-    if (instance == 0)
-	return 0;
-    
-    if ((r = (RESOURCE *)GlobalLock(hResInfo)) == NULL)
-	return 0;
-    
-    image_size = r->nameinfo.length << r->size_shift;
-
-    GlobalUnlock(hResInfo);
-
-/* #ifdef DEBUG_RESOURCE */
-    printf("SizeofResource return %d\n", image_size);
-/* #endif */
-
-    return image_size;
-}
-
-/**********************************************************************
- *					RSC_LoadResource
- */
-HANDLE
-RSC_LoadResource(int instance, char *rsc_name, int type, int *image_size_ret)
-{
-    struct resource_nameinfo_s nameinfo;
-    HANDLE hmem;
-    void *image;
-    int image_size;
-    int size_shift;
-    
-    /*
-     * Built-in resources
-     */
-    if (instance == 0)
-    {
-	return 0;
-    }
-    else if (OpenResourceFile(instance) < 0)
-	return 0;
-    
-    /*
-     * Get resource by ordinal
-     */
-    if (((int) rsc_name & 0xffff0000) == 0)
-    {
-	size_shift = FindResourceByNumber(&nameinfo, type,
-					  (int) rsc_name | 0x8000);
-    }
-    /*
-     * Get resource by name
-     */
-    else
-    {
-	size_shift = FindResourceByName(&nameinfo, type, rsc_name);
-    }
-    if (size_shift == -1) {
-    	if ((LONG)rsc_name >= 0x00010000L)
-	    printf("RSC_LoadResource inst (%x)/ Resource '%s' not Found !\n", instance, rsc_name);
-	else
-	    printf("RSC_LoadResource inst (%x)/ Resource '0x%X' not Found !\n", instance, rsc_name);
-	return 0;
-	}
-    /*
-     * Read resource.
-     */
-    lseek(ResourceFd, ((int) nameinfo.offset << size_shift), SEEK_SET);
-
-    image_size = nameinfo.length << size_shift;
-    if (image_size_ret != NULL)
-	*image_size_ret = image_size;
-    hmem = GlobalAlloc(GMEM_MOVEABLE, image_size);
-    image = GlobalLinearLock(hmem);
-    if (image == NULL || read(ResourceFd, image, image_size) != image_size)
-    {
-	GlobalFree(hmem);
-	return 0;
-    }
-
-    GlobalLinearUnlock(hmem);
-    return hmem;
-}
-
-/**********************************************************************
- *					LoadString
- */
-int
-LoadString(HANDLE instance, WORD resource_id, LPSTR buffer, int buflen)
-{
-    HANDLE hmem;
-    int rsc_size;
-    unsigned char *p;
-    int string_num;
-    int i;
-
-#ifdef DEBUG_RESOURCE
-    printf("LoadString: instance = %04x, id = %d, "
-	   "buffer = %08x, length = %d\n",
-	   instance, resource_id, buffer, buflen);
-#endif
-
-    hmem = RSC_LoadResource(instance, (char *) ((resource_id >> 4) + 1),
-			    NE_RSCTYPE_STRING, &rsc_size);
-    if (hmem == 0)
-	return 0;
-    
-    p = GlobalLock(hmem);
-    string_num = resource_id & 0x000f;
-    for (i = 0; i < string_num; i++)
-	p += *p + 1;
-    
-    i = MIN(buflen - 1, *p);
-	if (i > 0) {
-		memcpy(buffer, p + 1, i);
-		buffer[i] = '\0';
-		}
-	else {
-		if (buflen > 1) {
-			buffer[0] = '\0';
-			return 0;
-			}
-		printf("LoadString // I dont know why , but caller give buflen=%d *p=%d !\n", buflen, *p);
-		printf("LoadString // and try to obtain string '%s'\n", p + 1);
-		}
-    GlobalFree(hmem);
-
-#ifdef DEBUG_RESOURCE
-    printf("LoadString // '%s' copied !\n", buffer);
-#endif
-    return i;
-}
-
-/**********************************************************************
- *					RSC_LoadMenu
- */
-HANDLE
-RSC_LoadMenu(HANDLE instance, LPSTR menu_name)
-{
-#ifdef DEBUG_RESOURCE
-    printf("RSC_LoadMenu: instance = %04x, name = '%s'\n",
-	   instance, menu_name);
-#endif
-    return RSC_LoadResource(instance, menu_name, NE_RSCTYPE_MENU, NULL);
-}
-
-/**********************************************************************
- *					LoadBitmap
- */
-HBITMAP
-LoadBitmap(HANDLE instance, LPSTR bmp_name)
-{
-    HBITMAP hbitmap;
-    HANDLE rsc_mem;
-    HDC hdc;
-    long *lp;
-    int image_size;
-    int size;
-    
-#ifdef DEBUG_RESOURCE
-    printf("LoadBitmap: instance = %04x, name = %08x\n",
-	   instance, bmp_name);
-#endif
-    if (!instance)
-    {
-	  /* Try to create an OEM bitmap */
-	hbitmap = BITMAP_LoadOEMBitmap( ((int)bmp_name) & 0xffff );
-	if (hbitmap) return hbitmap;
-	  /* Failed -> load it from sysres.dll */
-	instance = hSysRes;
-    }
-
-    rsc_mem = RSC_LoadResource(instance, bmp_name, NE_RSCTYPE_BITMAP, 
-			       &image_size);
-    if (rsc_mem == (HANDLE)NULL) {
-	printf("LoadBitmap / BitMap %04X not Found !\n", bmp_name);
-	return 0;
-	}
-    lp = (long *) GlobalLinearLock(rsc_mem);
-    if (!(hdc = GetDC(0))) lp = NULL;
-    if (lp == NULL)
-    {
-	GlobalFree(rsc_mem);
-	return 0;
-    }
-    size = CONV_LONG (*lp);
-    if (size == sizeof(BITMAPCOREHEADER)){
-	CONV_BITMAPCOREHEADER (lp);
-	hbitmap = ConvertCoreBitmap( hdc, (BITMAPCOREHEADER *) lp );
-    } else if (size == sizeof(BITMAPINFOHEADER)){
-	CONV_BITMAPINFO (lp);
-	hbitmap = ConvertInfoBitmap( hdc, (BITMAPINFO *) lp );
-    } else hbitmap = 0;
-    GlobalFree(rsc_mem);
-    ReleaseDC( 0, hdc );
-    return hbitmap;
-}
 
 /**********************************************************************
  *			CreateIcon [USER.407]
@@ -1204,7 +483,8 @@
     printf("CreateIcon: hInstance = %04x, nWidth = %08x, nHeight = %08x \n",
 	    hInstance, nWidth, nHeight);
     printf("  nPlanes = %04x, nBitsPixel = %04x,",nPlanes, nBitsPixel);
-    printf(" lpANDbits= %04x, lpXORbits = %04x, \n",lpANDbits, lpXORbits);
+    printf(" lpANDbits= %04x, lpXORbits = %04x, \n", (int)lpANDbits,
+    		(int)lpXORbits);
 #endif
 
     if (hInstance == (HANDLE)NULL) { 
@@ -1247,3 +527,254 @@
 #endif
     return hIcon;
 }
+
+/**********************************************************************
+ *			DestroyIcon [USER.457]
+ */
+BOOL DestroyIcon(HICON hIcon)
+{
+    ICONALLOC	*lpico;
+    
+    if (hIcon == (HICON)NULL)
+    	return FALSE;
+    lpico = (ICONALLOC *)GlobalLock(hIcon);
+    if (lpico->hBitmap != (HBITMAP)NULL) 
+    	DeleteObject(lpico->hBitmap);
+    GlobalFree(hIcon);
+    return TRUE;
+}
+
+/**********************************************************************
+ *			LoadAccelerators	[USER.177]
+ */
+HANDLE LoadAccelerators(HANDLE instance, LPSTR lpTableName)
+{
+    HANDLE 	hAccel;
+    HANDLE 	rsc_mem;
+    BYTE 	*lp;
+    ACCELHEADER	*lpAccelTbl;
+    int 	i, image_size, n;
+
+#ifdef DEBUG_ACCEL
+	printf("LoadAccelerators(%04X", instance);
+	PrintId(lpTableName);
+	printf(")\n");
+#endif
+
+    rsc_mem = RSC_LoadResource(instance, lpTableName, (LPSTR) NE_RSCTYPE_ACCELERATOR, 
+			       &image_size);
+    if (rsc_mem == (HANDLE)NULL) {
+	printf("LoadAccelerators(%04X", instance);
+	PrintId(lpTableName);
+	printf(") not found !\n");
+	return 0;
+	}
+    lp = (BYTE *)GlobalLock(rsc_mem);
+    if (lp == NULL) {
+	GlobalFree(rsc_mem);
+	return 0;
+	}
+    dprintf_accel(stddeb,"LoadAccelerators / image_size=%d\n", image_size);
+    n = image_size/5;
+    hAccel = GlobalAlloc(GMEM_MOVEABLE, 
+    	sizeof(ACCELHEADER) + (n + 1)*sizeof(ACCELENTRY));
+    lpAccelTbl = (LPACCELHEADER)GlobalLock(hAccel);
+    lpAccelTbl->wCount = 0;
+    for (i = 0; i < n; i++) {
+	lpAccelTbl->tbl[i].type = *(lp++);
+	lpAccelTbl->tbl[i].wEvent = *((WORD *)lp);
+	lp += 2;
+	lpAccelTbl->tbl[i].wIDval = *((WORD *)lp);
+	lp += 2;
+    	if (lpAccelTbl->tbl[i].wEvent == 0) break;
+	dprintf_accel(stddeb,
+		"Accelerator #%u / event=%04X id=%04X type=%02X \n", 
+		i, lpAccelTbl->tbl[i].wEvent, lpAccelTbl->tbl[i].wIDval, 
+		lpAccelTbl->tbl[i].type);
+	lpAccelTbl->wCount++;
+ 	}
+    GlobalUnlock(hAccel);
+    GlobalUnlock(rsc_mem);
+    GlobalFree(rsc_mem);
+    return hAccel;
+}
+
+/**********************************************************************
+ *			TranslateAccelerator 	[USER.178]
+ */
+int TranslateAccelerator(HWND hWnd, HANDLE hAccel, LPMSG msg)
+{
+    ACCELHEADER	*lpAccelTbl;
+    int 	i;
+    
+    if (hAccel == 0 || msg == NULL) return 0;
+    if (msg->message != WM_KEYDOWN &&
+    	msg->message != WM_KEYUP &&
+    	msg->message != WM_CHAR) return 0;
+
+#ifdef DEBUG_ACCEL
+    printf("TranslateAccelerators hAccel=%04X !\n", hAccel);
+#endif
+
+    lpAccelTbl = (LPACCELHEADER)GlobalLock(hAccel);
+    for (i = 0; i < lpAccelTbl->wCount; i++) {
+	if (lpAccelTbl->tbl[i].type & VIRTKEY_ACCEL) {
+	    if (msg->wParam == lpAccelTbl->tbl[i].wEvent &&
+		msg->message == WM_KEYDOWN) {
+		if ((lpAccelTbl->tbl[i].type & SHIFT_ACCEL) &&
+		    !(GetKeyState(VK_SHIFT) & 0xf)) {
+		    GlobalUnlock(hAccel);
+		    return 0;
+		}
+		if ((lpAccelTbl->tbl[i].type & CONTROL_ACCEL) &&
+		    !(GetKeyState(VK_CONTROL) & 0xf)) {
+		    GlobalUnlock(hAccel);
+		    return 0;
+		}
+		if ((lpAccelTbl->tbl[i].type & ALT_ACCEL) &&
+		    !(GetKeyState(VK_MENU) & 0xf)) {
+		    GlobalUnlock(hAccel);
+		    return 0;
+		}
+		SendMessage(hWnd, WM_COMMAND, lpAccelTbl->tbl[i].wIDval, 0x00010000L);
+		GlobalUnlock(hAccel);
+		return 1;
+		}
+	    if (msg->message == WM_KEYUP) return 1;
+	    }
+	else {
+	    if (msg->wParam == lpAccelTbl->tbl[i].wEvent &&
+		msg->message == WM_CHAR) {
+		SendMessage(hWnd, WM_COMMAND, lpAccelTbl->tbl[i].wIDval, 0x00010000L);
+		GlobalUnlock(hAccel);
+		return 1;
+		}
+	    }
+	}
+    GlobalUnlock(hAccel);
+    return 0;
+}
+
+/**********************************************************************
+ *					LoadString
+ */
+int
+LoadString(HANDLE instance, WORD resource_id, LPSTR buffer, int buflen)
+{
+    HANDLE hmem;
+    int rsc_size;
+    unsigned char *p;
+    int string_num;
+    int i;
+
+#ifdef DEBUG_RESOURCE
+    printf("LoadString: instance = %04x, id = %d, buffer = %08x, "
+	   "length = %d\n", instance, resource_id, (int) buffer, buflen);
+#endif
+
+    hmem = RSC_LoadResource(instance, (char *) ((resource_id >> 4) + 1),
+			    (LPSTR) NE_RSCTYPE_STRING, &rsc_size);
+    if (hmem == 0)
+	return 0;
+    
+    p = GlobalLock(hmem);
+    string_num = resource_id & 0x000f;
+    for (i = 0; i < string_num; i++)
+	p += *p + 1;
+    
+    i = MIN(buflen - 1, *p);
+	if (i > 0) {
+		memcpy(buffer, p + 1, i);
+		buffer[i] = '\0';
+		}
+	else {
+		if (buflen > 1) {
+			buffer[0] = '\0';
+			return 0;
+			}
+		fprintf(stderr,"LoadString // I dont know why , but caller give buflen=%d *p=%d !\n", buflen, *p);
+		fprintf(stderr,"LoadString // and try to obtain string '%s'\n", p + 1);
+		}
+    GlobalFree(hmem);
+
+    dprintf_resource(stddeb,"LoadString // '%s' copied !\n", buffer);
+    return i;
+}
+
+/**********************************************************************
+ *			LoadMenu		[USER.150]
+ */
+HMENU LoadMenu(HINSTANCE instance, char *menu_name)
+{
+	HMENU     		hMenu;
+	HANDLE		hMenu_desc;
+	MENU_HEADER 	*menu_desc;
+
+#ifdef DEBUG_MENU
+	printf("LoadMenu(%04X", instance);
+	PrintId(menu_name);
+	printf(")\n");
+#endif
+	if (menu_name == NULL)
+		return 0;
+
+	if ((hMenu_desc = RSC_LoadResource(instance, menu_name, (LPSTR) NE_RSCTYPE_MENU, NULL)) == (HANDLE) NULL)
+		return 0;
+	
+	menu_desc = (MENU_HEADER *) GlobalLock(hMenu_desc);
+	hMenu = LoadMenuIndirect((LPSTR)menu_desc);
+	return hMenu;
+}
+
+/**********************************************************************
+ *					LoadBitmap
+ */
+HBITMAP 
+LoadBitmap(HANDLE instance, LPSTR bmp_name)
+{
+    HBITMAP hbitmap;
+    HANDLE rsc_mem;
+    HDC hdc;
+    long *lp;
+    int image_size;
+    int size;
+    
+#ifdef DEBUG_RESOURCE
+	printf("LoadBitmap(%04X", instance);
+	PrintId(bmp_name);
+	printf(")\n");
+#endif
+
+    if (!instance) {
+	hbitmap = BITMAP_LoadOEMBitmap(((int) bmp_name) & 0xffff);
+	if (hbitmap)
+		return hbitmap;
+    }
+
+    rsc_mem = RSC_LoadResource(instance, bmp_name, (LPSTR) NE_RSCTYPE_BITMAP, 
+			       &image_size);
+    if (rsc_mem == (HANDLE)NULL) {
+	printf("LoadBitmap(%04X", instance);
+	PrintId(bmp_name);
+	printf(") NOT found!\n");
+	return 0;
+	}
+    lp = (long *) GlobalLinearLock(rsc_mem);
+    if (!(hdc = GetDC(0))) lp == NULL;
+    if (lp == NULL)
+    {
+	GlobalFree(rsc_mem);
+	return 0;
+    }
+    size = CONV_LONG (*lp);
+    if (size == sizeof(BITMAPCOREHEADER)){
+	CONV_BITMAPCOREHEADER (lp);
+	hbitmap = ConvertCoreBitmap( hdc, (BITMAPCOREHEADER *) lp );
+    } else if (size == sizeof(BITMAPINFOHEADER)){
+	CONV_BITMAPINFO (lp);
+	hbitmap = ConvertInfoBitmap( hdc, (BITMAPINFO *) lp );
+    } else hbitmap = 0;
+    GlobalFree(rsc_mem);
+    ReleaseDC( 0, hdc );
+    return hbitmap;
+}