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/Imakefile b/loader/Imakefile
index b778667..488f6e6 100644
--- a/loader/Imakefile
+++ b/loader/Imakefile
@@ -8,6 +8,9 @@
ldtlib.c \
main.c \
ne_image.c \
+ ne_resource.c \
+ pe_image.c \
+ pe_resource.c \
selector.c \
signal.c \
library.c \
@@ -18,7 +21,6 @@
WineRelocatableTarget($(TOP)/$(MODULE),,$(OBJS))
DependTarget()
-CleanTarget()
includes::
diff --git a/loader/ldtlib.c b/loader/ldtlib.c
index 181c4b1..8266c7f 100644
--- a/loader/ldtlib.c
+++ b/loader/ldtlib.c
@@ -6,6 +6,10 @@
#include <stdlib.h>
#include <errno.h>
#include "autoconf.h"
+#include "stddebug.h"
+/* #define DEBUG_LDT /* */
+/* #undef DEBUG_LDT /* */
+#include "debug.h"
#ifdef linux
#include <linux/unistd.h>
@@ -76,12 +80,11 @@
struct segment_descriptor *sd;
int ret;
-#ifdef DEBUG_LDT
- printf("set_ldt_entry: entry=%x base=%x limit=%x%s %s-bit contents=%d %s\n",
- entry, base, limit, limit_in_pages_flag?"-pages":"",
- seg_32bit_flag?"32":"16",
- contents, read_only_flag?"read-only":"");
-#endif
+ dprintf_ldt(stddeb,
+ "set_ldt_entry: entry=%x base=%x limit=%x%s %s-bit contents=%d %s\n",
+ entry, base, limit, limit_in_pages_flag?"-pages":"",
+ seg_32bit_flag?"32":"16",
+ contents, read_only_flag?"read-only":"");
sd = make_sd(base, limit, contents, read_only_flag, seg_32bit_flag, limit_in_pages_flag);
ret = i386_set_ldt(entry, (union descriptor *)sd, 1);
diff --git a/loader/library.c b/loader/library.c
index 2ceb59d..ea6f623 100644
--- a/loader/library.c
+++ b/loader/library.c
@@ -1,11 +1,8 @@
/*
- * Modules & Libraries functions
+ * Module & Library functions
*/
-static char Copyright[] = "Copyright Martin Ayotte, 1994";
+static char Copyright[] = "Copyright 1993, 1994 Martin Ayotte, Robert J. Amstadt, Erik Bos";
-/*
-#define DEBUG_MODULE
-*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -13,18 +10,31 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
+#include "neexe.h"
+#include "segmem.h"
+#include "dlls.h"
#include "wine.h"
+#include "wineopts.h"
+#include "arch.h"
+#include "options.h"
#include "prototypes.h"
#include "windows.h"
-#include "dlls.h"
#include "task.h"
#include "toolhelp.h"
+#include "stddebug.h"
+/* #define DEBUG_MODULE /* */
+/* #undef DEBUG_MODULE /* */
+#include "debug.h"
-extern struct w_files *wine_files;
+extern char WindowsPath[256];
extern struct dll_name_table_entry_s dll_builtin_table[];
+extern char *GetDosFileName(char *);
-struct w_files *GetFileInfo(HANDLE);
-char *GetDosFileName(char *);
+extern HANDLE hSysRes;
+
+struct w_files *wine_files = NULL;
+static char *DLL_Extensions[] = { "dll", NULL };
+static char *EXE_Extensions[] = { "exe", NULL };
#define IS_BUILTIN_DLL(handle) ((handle >> 8) == 0xff)
@@ -48,6 +58,196 @@
}
}
+struct w_files *
+GetFileInfo(unsigned short instance)
+{
+ register struct w_files *w = wine_files;
+
+ while (w && w->hinstance != instance)
+ w = w->next;
+
+ return w;
+}
+
+int IsDLLLoaded(char *name)
+{
+ struct w_files *wpnt;
+
+ if(FindDLLTable(name))
+ return 1;
+
+ for(wpnt = wine_files; wpnt; wpnt = wpnt->next)
+ if(strcmp(wpnt->name, name) == 0)
+ return 1;
+
+ return 0;
+}
+
+void InitDLL(struct w_files *wpnt)
+{
+ if (wpnt->ne)
+ InitNEDLL(wpnt);
+ else
+ InitPEDLL(wpnt);
+}
+
+void InitializeLoadedDLLs(struct w_files *wpnt)
+{
+ static flagReadyToRun = 0;
+ struct w_files *final_wpnt;
+
+ printf("InitializeLoadedDLLs %08X\n", wpnt);
+
+ if (wpnt == NULL)
+ {
+ flagReadyToRun = 1;
+ fprintf(stderr, "Initializing DLLs\n");
+ }
+
+ if (!flagReadyToRun)
+ return;
+
+#if 1
+ if (wpnt != NULL)
+ fprintf(stderr, "Initializing %s\n", wpnt->name);
+#endif
+
+ /*
+ * Initialize libraries
+ */
+ if (!wpnt)
+ {
+ wpnt = wine_files;
+ final_wpnt = NULL;
+ }
+ else
+ {
+ final_wpnt = wpnt->next;
+ }
+
+ for( ; wpnt != final_wpnt; wpnt = wpnt->next)
+ InitDLL(wpnt);
+}
+
+/**********************************************************************
+ * LoadImage
+ * Load one executable into memory
+ */
+HINSTANCE LoadImage(char *module, int filetype, int change_dir)
+{
+ HINSTANCE handle;
+ struct w_files *wpnt, *wpnt1;
+ char buffer[256], header[2], modulename[64], *fullname;
+
+ ExtractDLLName(module, modulename);
+ printf("LoadImage [%s]\n", module);
+ /* built-in one ? */
+ if (FindDLLTable(modulename)) {
+ return GetModuleHandle(modulename);
+ }
+
+ /* already loaded ? */
+ for (wpnt = wine_files ; wpnt ; wpnt = wpnt->next)
+ if (strcasecmp(wpnt->name, modulename) == 0)
+ return wpnt->hinstance;
+
+ /*
+ * search file
+ */
+ fullname = FindFile(buffer, sizeof(buffer), module,
+ (filetype == EXE ? EXE_Extensions : DLL_Extensions),
+ WindowsPath);
+ if (fullname == NULL)
+ {
+ fprintf(stderr, "LoadImage: I can't find %s.dll | %s.exe !\n",
+ module, module);
+ return 2;
+ }
+
+ fullname = GetDosFileName(fullname);
+
+ fprintf(stderr,"LoadImage: loading %s (%s)\n [%s]\n",
+ module, buffer, fullname);
+
+ if (change_dir && fullname)
+ {
+ char dirname[256];
+ char *p;
+
+ strcpy(dirname, fullname);
+ p = strrchr(dirname, '\\');
+ *p = '\0';
+
+ DOS_SetDefaultDrive(dirname[0] - 'A');
+ DOS_ChangeDir(dirname[0] - 'A', dirname + 2);
+ }
+
+ /* First allocate a spot to store the info we collect, and add it to
+ * our linked list if we could load the file.
+ */
+
+ wpnt = (struct w_files *) malloc(sizeof(struct w_files));
+
+ /*
+ * Open file for reading.
+ */
+ wpnt->fd = open(buffer, O_RDONLY);
+ if (wpnt->fd < 0)
+ return 2;
+
+ /*
+ * Establish header pointers.
+ */
+ wpnt->filename = strdup(buffer);
+ wpnt->name = strdup(modulename);
+
+ /* read mz header */
+ wpnt->mz_header = (struct mz_header_s *) malloc(sizeof(struct mz_header_s));;
+ lseek(wpnt->fd, 0, SEEK_SET);
+ if (read(wpnt->fd, wpnt->mz_header, sizeof(struct mz_header_s)) !=
+ sizeof(struct mz_header_s))
+ {
+ myerror("Unable to read MZ header from file");
+ }
+ if (wpnt->mz_header->must_be_0x40 != 0x40)
+ myerror("This is not a Windows program");
+
+ /* read first two bytes to determine filetype */
+ lseek(wpnt->fd, wpnt->mz_header->ne_offset, SEEK_SET);
+ read(wpnt->fd, &header, sizeof(header));
+
+ handle = 0;
+ if (header[0] == 'N' && header[1] == 'E')
+ handle = LoadNEImage(wpnt);
+ if (header[0] == 'P' && header[1] == 'E')
+ handle = LoadPEImage(wpnt);
+ wpnt->hinstance = handle;
+
+ if (handle > 32) {
+ /* ok, loaded, add to the end of the list */
+ if(wine_files == NULL)
+ wine_files = wpnt;
+ else {
+ wpnt1 = wine_files;
+ while(wpnt1->next)
+ wpnt1 = wpnt1->next;
+ wpnt1->next = wpnt;
+ }
+ wpnt->next = NULL;
+
+ return handle;
+ } else {
+ fprintf(stderr, "wine: (%s) unknown fileformat !\n", wpnt->filename);
+
+ close(wpnt->fd);
+ free(wpnt->filename);
+ free(wpnt->name);
+ free(wpnt);
+
+ return 14;
+ }
+}
+
/**********************************************************************
* GetModuleHandle [KERNEL.47]
*/
@@ -174,22 +374,27 @@
return h;
}
-
/**********************************************************************
* FreeLibrary [KERNEL.96]
*/
void FreeLibrary(HANDLE hLib)
{
- printf("FreeLibrary(%04X);\n", hLib);
+ struct w_files *wpnt;
+ printf("FreeLibrary(%04X);\n", hLib);
/* built-in dll ? */
- if (IS_BUILTIN_DLL(hLib))
+ if (IS_BUILTIN_DLL(hLib) || hLib == 0 || hLib == hSysRes)
return;
/*
while (lpMod != NULL) {
if (lpMod->hInst == hLib) {
if (lpMod->Count == 1) {
+ wpnt = GetFileInfo(hLib);
+ if (wpnt->ne)
+ NEunloadImage(wpnt);
+ else
+ PEunloadImage(wpnt);
if (hLib != (HANDLE)NULL) GlobalFree(hLib);
if (lpMod->ModuleName != NULL) free(lpMod->ModuleName);
if (lpMod->FileName != NULL) free(lpMod->FileName);
@@ -215,7 +420,7 @@
#ifdef WINELIB
WINELIB_UNIMP ("GetProcAddress");
#else
- int i, sel, addr, ret;
+ int sel, addr, ret;
register struct w_files *w = wine_files;
int ordinal, len;
char * cpnt;
@@ -275,11 +480,11 @@
{
AnsiUpper(proc_name);
printf("GetProcAddress: %04X, '%s'\n", hModule, proc_name);
- cpnt = w->nrname_table;
+ cpnt = w->ne->nrname_table;
while(TRUE)
{
- if (((int) cpnt) - ((int)w->nrname_table) >
- w->ne_header->nrname_tab_length) return NULL;
+ if (((int) cpnt) - ((int)w->ne->nrname_table) >
+ w->ne->ne_header->nrname_tab_length) return NULL;
len = *cpnt++;
strncpy(C, cpnt, len);
C[len] = '\0';
@@ -343,24 +548,24 @@
}
/**********************************************************************
- * ModuleFirst [TOOHELP.59]
+ * ModuleFirst [TOOLHELP.59]
*/
BOOL ModuleFirst(MODULEENTRY *lpModule)
{
- printf("ModuleFirst(%08X)\n", lpModule);
+ printf("ModuleFirst(%08X)\n", (int) lpModule);
FillModStructBuiltIn(lpModule, &dll_builtin_table[0]);
return TRUE;
}
/**********************************************************************
- * ModuleNext [TOOHELP.60]
+ * ModuleNext [TOOLHELP.60]
*/
BOOL ModuleNext(MODULEENTRY *lpModule)
{
struct w_files *w;
- printf("ModuleNext(%08X)\n", lpModule);
+ printf("ModuleNext(%08X)\n", (int) lpModule);
if (IS_BUILTIN_DLL(lpModule->hModule)) {
/* last built-in ? */
@@ -383,13 +588,13 @@
}
/**********************************************************************
- * ModuleFindHandle [TOOHELP.62]
+ * ModuleFindHandle [TOOLHELP.62]
*/
HMODULE ModuleFindHandle(MODULEENTRY *lpModule, HMODULE hModule)
{
struct w_files *w;
- printf("ModuleFindHandle(%08X, %04X)\n", lpModule, hModule);
+ printf("ModuleFindHandle(%08X, %04X)\n", (int) lpModule, (int)hModule);
/* built-in dll ? */
if (IS_BUILTIN_DLL(hModule)) {
@@ -406,7 +611,7 @@
}
/**********************************************************************
- * ModuleFindName [TOOHELP.61]
+ * ModuleFindName [TOOLHELP.61]
*/
HMODULE ModuleFindName(MODULEENTRY *lpModule, LPCSTR lpstrName)
{
diff --git a/loader/main.c b/loader/main.c
index c1991d0..eefa3c1 100644
--- a/loader/main.c
+++ b/loader/main.c
@@ -9,12 +9,6 @@
#include <unistd.h>
#include <string.h>
#include <errno.h>
-#ifdef linux
-#include <linux/unistd.h>
-#include <linux/head.h>
-#include <linux/ldt.h>
-#include <linux/segment.h>
-#endif
#include "neexe.h"
#include "segmem.h"
#include "prototypes.h"
@@ -23,32 +17,22 @@
#include "windows.h"
#include "wineopts.h"
#include "arch.h"
+#include "task.h"
#include "options.h"
+#include "stddebug.h"
+/* #define DEBUG_DLL /* */
+/* #undef DEBUG_DLL /* */
+#include "debug.h"
-/* #define DEBUG_FIXUP */
-
-extern HANDLE CreateNewTask(HINSTANCE hInst);
-extern int CallToInit16(unsigned long csip, unsigned long sssp,
- unsigned short ds);
-extern void CallTo32();
char *GetDosFileName(char *unixfilename);
-char *GetModuleName(struct w_files * wpnt, int index, char *buffer);
-extern unsigned char ran_out;
extern char WindowsPath[256];
-char *WIN_ProgramName;
-
-unsigned short WIN_StackSize;
-unsigned short WIN_HeapSize;
-
-struct w_files * wine_files = NULL;
char **Argv;
int Argc;
HINSTANCE hSysRes;
-
-static char *DLL_Extensions[] = { "dll", NULL };
-static char *EXE_Extensions[] = { "exe", NULL };
+unsigned short WIN_StackSize;
+unsigned short WIN_HeapSize;
/**********************************************************************
* myerror
@@ -64,195 +48,19 @@
exit(1);
}
-/**********************************************************************
- * GetFilenameFromInstance
- */
-char *
-GetFilenameFromInstance(unsigned short instance)
-{
- register struct w_files *w = wine_files;
-
- while (w && w->hinstance != instance)
- w = w->next;
-
- if (w)
- return w->filename;
- else
- return NULL;
-}
-
-struct w_files *
-GetFileInfo(unsigned short instance)
-{
- register struct w_files *w = wine_files;
-
- while (w && w->hinstance != instance)
- w = w->next;
-
- return w;
-}
-
-#ifndef WINELIB
-/**********************************************************************
- *
- * Load MZ Header
- */
-void load_mz_header(int fd, struct mz_header_s *mz_header)
-{
- if (read(fd, mz_header, sizeof(struct mz_header_s)) !=
- sizeof(struct mz_header_s))
- {
- myerror("Unable to read MZ header from file");
- }
-}
-#endif
-
-int IsDLLLoaded(char *name)
-{
- struct w_files *wpnt;
-
- if(FindDLLTable(name))
- return 1;
-
- for(wpnt = wine_files; wpnt; wpnt = wpnt->next)
- if(strcmp(wpnt->name, name) == 0)
- return 1;
-
- return 0;
-}
-
-/**********************************************************************
- * LoadImage
- * Load one executable into memory
- */
-HINSTANCE LoadImage(char *module, int filetype, int change_dir)
-{
- unsigned int read_size;
- int i;
- struct w_files * wpnt, *wpnt1;
- unsigned int status;
- char buffer[256], header[2], modulename[64], *fullname;
-
- ExtractDLLName(module, modulename);
- printf("%sLoadImage \n", module);
- /* built-in one ? */
- if (FindDLLTable(modulename)) {
- return GetModuleHandle(modulename);
- }
-
- /* already loaded ? */
- for (wpnt = wine_files ; wpnt ; wpnt = wpnt->next)
- if (strcasecmp(wpnt->name, modulename) == 0)
- return wpnt->hinstance;
-
- /*
- * search file
- */
- fullname = FindFile(buffer, sizeof(buffer), module,
- (filetype == EXE ? EXE_Extensions : DLL_Extensions),
- WindowsPath);
- if (fullname == NULL)
- {
- fprintf(stderr, "LoadImage: I can't find %s.dll | %s.exe !\n",
- module, module);
- return 2;
- }
-
- fullname = GetDosFileName(fullname);
- WIN_ProgramName = strdup(fullname);
-
- fprintf(stderr,"LoadImage: loading %s (%s)\n [%s]\n",
- module, buffer, WIN_ProgramName);
-
- if (change_dir && fullname)
- {
- char dirname[256];
- char *p;
-
- strcpy(dirname, fullname);
- p = strrchr(dirname, '\\');
- *p = '\0';
-
- DOS_SetDefaultDrive(dirname[0] - 'A');
- DOS_ChangeDir(dirname[0] - 'A', dirname + 2);
- }
-
- /* First allocate a spot to store the info we collect, and add it to
- * our linked list.
- */
-
- wpnt = (struct w_files *) malloc(sizeof(struct w_files));
- if(wine_files == NULL)
- wine_files = wpnt;
- else {
- wpnt1 = wine_files;
- while(wpnt1->next) wpnt1 = wpnt1->next;
- wpnt1->next = wpnt;
- };
- wpnt->next = NULL;
- wpnt->resnamtab = (RESNAMTAB *) -1;
-
- /*
- * Open file for reading.
- */
- wpnt->fd = open(buffer, O_RDONLY);
- if (wpnt->fd < 0)
- return 2;
-
- /*
- * Establish header pointers.
- */
- wpnt->filename = strdup(buffer);
- wpnt->name = strdup(modulename);
-
-/* if(module) {
- wpnt->name = strdup(module);
- ToDos(wpnt->name);
- }*/
-
- /* read mz header */
- wpnt->mz_header = (struct mz_header_s *) malloc(sizeof(struct mz_header_s));;
- status = lseek(wpnt->fd, 0, SEEK_SET);
- load_mz_header (wpnt->fd, wpnt->mz_header);
- if (wpnt->mz_header->must_be_0x40 != 0x40 &&
- wpnt->mz_header->must_be_0x40 != 0x1e)
- myerror("This is not a Windows program");
-
- /* read first two bytes to determine filetype */
- status = lseek(wpnt->fd, wpnt->mz_header->ne_offset, SEEK_SET);
- read(wpnt->fd, &header, sizeof(header));
-
- if (header[0] == 'N' && header[1] == 'E')
- return (LoadNEImage(wpnt));
-
- if (header[0] == 'P' && header[1] == 'E') {
- printf("win32 applications are not supported");
- return 14;
- }
-
- fprintf(stderr, "wine: (%s) unknown fileformat !\n", wpnt->filename);
-
- return 14;
-}
-
#ifndef WINELIB
/**********************************************************************
* main
*/
int _WinMain(int argc, char **argv)
{
- int segment;
- char *p;
- char *sysresname;
- char filename[256];
+ char *p, filename[256];
HANDLE hTaskMain;
HINSTANCE hInstMain;
+ struct w_files *wpnt;
#ifdef WINESTAT
char * cp;
#endif
- struct w_files * wpnt;
- int cs_reg, ds_reg, ss_reg, ip_reg, sp_reg;
- int rv;
Argc = argc - 1;
Argv = argv + 1;
@@ -274,7 +82,7 @@
fprintf(stderr, "wine: can't load %s!.\n", Argv[0]);
exit(1);
}
- hTaskMain = CreateNewTask(hInstMain);
+ hTaskMain = CreateNewTask(hInstMain, 0);
printf("_WinMain // hTaskMain=%04X hInstMain=%04X !\n", hTaskMain, hInstMain);
GetPrivateProfileString("wine", "SystemResources", "sysres.dll",
@@ -285,18 +93,8 @@
fprintf(stderr, "wine: can't load %s!.\n", filename);
exit(1);
} else
- printf("System Resources Loaded // hSysRes='%04X'\n", hSysRes);
+ dprintf_dll(stddeb,"System Resources Loaded // hSysRes='%04X'\n", hSysRes);
- /*
- * Fixup references.
- */
-/* wpnt = wine_files;
- for(wpnt = wine_files; wpnt; wpnt = wpnt->next)
- for (segment = 0; segment < wpnt->ne_header->n_segment_tab; segment++)
- if (FixupSegment(wpnt, segment) < 0)
- myerror("fixup failed.");
-*/
-
#ifdef WINESTAT
cp = strrchr(argv[0], '/');
if(!cp) cp = argv[0];
@@ -312,96 +110,14 @@
*/
init_wine_signals();
- /*
- * Fixup stack and jump to start.
- */
- WIN_StackSize = wine_files->ne_header->stack_length;
- WIN_HeapSize = wine_files->ne_header->local_heap_length;
+ wpnt = GetFileInfo(hInstMain);
+ if (Options.debug)
+ wine_debug(0, NULL);
- ds_reg = (wine_files->
- selector_table[wine_files->ne_header->auto_data_seg-1].selector);
- cs_reg = wine_files->selector_table[wine_files->ne_header->cs-1].selector;
- ip_reg = wine_files->ne_header->ip;
- ss_reg = wine_files->selector_table[wine_files->ne_header->ss-1].selector;
- sp_reg = wine_files->ne_header->sp;
-
- if (Options.debug) wine_debug(0, NULL);
-
- rv = CallToInit16(cs_reg << 16 | ip_reg, ss_reg << 16 | sp_reg, ds_reg);
- printf ("rv = %x\n", rv);
-}
-
-void InitDLL(struct w_files *wpnt)
-{
- int cs_reg, ds_reg, ip_reg, rv;
- /*
- * Is this a library?
- */
- if (wpnt->ne_header->format_flags & 0x8000)
- {
- if (!(wpnt->ne_header->format_flags & 0x0001))
- {
- /* Not SINGLEDATA */
- fprintf(stderr, "Library is not marked SINGLEDATA\n");
- exit(1);
- }
-
- ds_reg = wpnt->selector_table[wpnt->
- ne_header->auto_data_seg-1].selector;
- cs_reg = wpnt->selector_table[wpnt->ne_header->cs-1].selector;
- ip_reg = wpnt->ne_header->ip;
-
- if (cs_reg) {
- fprintf(stderr, "Initializing %s, cs:ip %04x:%04x, ds %04x\n",
- wpnt->name, cs_reg, ip_reg, ds_reg);
-
- rv = CallTo16(cs_reg << 16 | ip_reg, ds_reg);
- printf ("rv = %x\n", rv);
- } else
- printf("%s skipped\n", wpnt->name);
- }
-}
-
-void InitializeLoadedDLLs(struct w_files *wpnt)
-{
- static flagReadyToRun = 0;
- struct w_files *final_wpnt;
-
- printf("InitializeLoadedDLLs %08X\n", wpnt);
-
- if (wpnt == NULL)
- {
- flagReadyToRun = 1;
- fprintf(stderr, "Initializing DLLs\n");
- }
-
- if (!flagReadyToRun)
- return;
-
-#if 1
- if (wpnt != NULL)
- fprintf(stderr, "Initializing %s\n", wpnt->name);
-#endif
-
- /*
- * Initialize libraries
- */
- if (!wpnt)
- {
- wpnt = wine_files;
- final_wpnt = NULL;
- }
+ if (wpnt->ne)
+ StartNEprogram(wpnt);
else
- {
- final_wpnt = wpnt->next;
- }
-
- for( ; wpnt != final_wpnt; wpnt = wpnt->next)
- InitDLL(wpnt);
-}
-#else /* #ifndef WINELIB */
-void InitDLL(struct w_files *wpnt)
-{
+ StartPEprogram(wpnt);
}
#endif /* #ifndef WINELIB */
diff --git a/loader/ne_image.c b/loader/ne_image.c
index 4247e6a..03d3b86 100644
--- a/loader/ne_image.c
+++ b/loader/ne_image.c
@@ -7,8 +7,8 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
+#include <ctype.h>
#ifdef linux
-#include <linux/unistd.h>
#include <linux/head.h>
#include <linux/ldt.h>
#include <linux/segment.h>
@@ -24,20 +24,23 @@
#include "wineopts.h"
#include "arch.h"
#include "options.h"
-
+#include "stddebug.h"
/* #define DEBUG_FIXUP /* */
+/* #undef DEBUG_FIXUP /* */
+#include "debug.h"
extern HANDLE CreateNewTask(HINSTANCE hInst);
+extern void InitializeLoadedDLLs(struct w_files *wpnt);
extern int CallToInit16(unsigned long csip, unsigned long sssp,
unsigned short ds);
-extern void InitializeLoadedDLLs(struct w_files *wpnt);
-extern void FixupFunctionPrologs(struct w_files * wpnt);
-
-char * GetModuleName(struct w_files * wpnt, int index, char *buffer);
+extern void CallTo32();
extern char WindowsPath[256];
-char *WIN_ProgramName;
+extern unsigned short WIN_StackSize;
+extern unsigned short WIN_HeapSize;
-HINSTANCE hSysRes;
+int FixupSegment(struct w_files *, int);
+void FixupFunctionPrologs(struct w_files *);
+char *GetModuleName(struct w_files * wpnt, int index, char *buffer);
#ifndef WINELIB
@@ -61,71 +64,61 @@
{
unsigned int read_size, status, segment;
int i;
- char buffer[256];
- char *fullname;
- HANDLE t;
- wpnt->ne_header = (struct ne_header_s *) malloc(sizeof(struct ne_header_s));
- status = lseek(wpnt->fd, wpnt->mz_header->ne_offset, SEEK_SET);
- load_ne_header (wpnt->fd, wpnt->ne_header);
+ wpnt->ne = malloc(sizeof(struct ne_data));
+ wpnt->ne->resnamtab = NULL;
+ wpnt->ne->ne_header = malloc(sizeof(struct ne_header_s));
+ lseek(wpnt->fd, wpnt->mz_header->ne_offset, SEEK_SET);
+ load_ne_header(wpnt->fd, wpnt->ne->ne_header);
#ifndef WINELIB
/*
* Create segment selectors.
*/
status = lseek(wpnt->fd, wpnt->mz_header->ne_offset +
- wpnt->ne_header->segment_tab_offset,
+ wpnt->ne->ne_header->segment_tab_offset,
SEEK_SET);
- read_size = wpnt->ne_header->n_segment_tab *
+ read_size = wpnt->ne->ne_header->n_segment_tab *
sizeof(struct ne_segment_table_entry_s);
- wpnt->seg_table = (struct ne_segment_table_entry_s *) malloc(read_size);
- if (read(wpnt->fd, wpnt->seg_table, read_size) != read_size)
+ wpnt->ne->seg_table = (struct ne_segment_table_entry_s *) malloc(read_size);
+ if (read(wpnt->fd, wpnt->ne->seg_table, read_size) != read_size)
myerror("Unable to read segment table header from file");
- wpnt->selector_table = CreateSelectors(wpnt);
- wpnt->hinstance = (wpnt->
- selector_table[wpnt->ne_header->auto_data_seg-1].
+ wpnt->ne->selector_table = CreateSelectors(wpnt);
+ wpnt->hinstance = (wpnt->ne->
+ selector_table[wpnt->ne->ne_header->auto_data_seg-1].
selector);
#endif
/* Get the lookup table. This is used for looking up the addresses
of functions that are exported */
- read_size = wpnt->ne_header->entry_tab_length;
- wpnt->lookup_table = (char *) malloc(read_size);
+ read_size = wpnt->ne->ne_header->entry_tab_length;
+ wpnt->ne->lookup_table = (char *) malloc(read_size);
lseek(wpnt->fd, wpnt->mz_header->ne_offset +
- wpnt->ne_header->entry_tab_offset, SEEK_SET);
- if (read(wpnt->fd, wpnt->lookup_table, read_size) != read_size)
+ wpnt->ne->ne_header->entry_tab_offset, SEEK_SET);
+ if (read(wpnt->fd, wpnt->ne->lookup_table, read_size) != read_size)
myerror("Unable to read lookup table header from file");
/* Get the iname table. This is used for looking up the names
of functions that are exported */
- status = lseek(wpnt->fd, wpnt->ne_header->nrname_tab_offset, SEEK_SET);
- read_size = wpnt->ne_header->nrname_tab_length;
- wpnt->nrname_table = (char *) malloc(read_size);
- if (read(wpnt->fd, wpnt->nrname_table, read_size) != read_size)
+ status = lseek(wpnt->fd, wpnt->ne->ne_header->nrname_tab_offset, SEEK_SET);
+ read_size = wpnt->ne->ne_header->nrname_tab_length;
+ wpnt->ne->nrname_table = (char *) malloc(read_size);
+ if (read(wpnt->fd, wpnt->ne->nrname_table, read_size) != read_size)
myerror("Unable to read nrname table header from file");
status = lseek(wpnt->fd, wpnt->mz_header->ne_offset +
- wpnt->ne_header->rname_tab_offset, SEEK_SET);
- read_size = wpnt->ne_header->moduleref_tab_offset -
- wpnt->ne_header->rname_tab_offset;
- wpnt->rname_table = (char *) malloc(read_size);
- if (read(wpnt->fd, wpnt->rname_table, read_size) != read_size)
+ wpnt->ne->ne_header->rname_tab_offset, SEEK_SET);
+ read_size = wpnt->ne->ne_header->moduleref_tab_offset -
+ wpnt->ne->ne_header->rname_tab_offset;
+ wpnt->ne->rname_table = (char *) malloc(read_size);
+ if (read(wpnt->fd, wpnt->ne->rname_table, read_size) != read_size)
myerror("Unable to read rname table header from file");
- /* Now get the module name, if the current one is a filename */
-/* nope, name by which dll is loaded is used !
-
- if (strchr(wpnt->name, '\\') || strchr(wpnt->name, '/') ) {
- wpnt->name = (char*) malloc(*wpnt->rname_table + 1);
- memcpy(wpnt->name, wpnt->rname_table+1, *wpnt->rname_table);
- }
- wpnt->name[*wpnt->rname_table] = 0;
-*/
/*
* Now load any DLLs that this module refers to.
*/
- for(i=0; i<wpnt->ne_header->n_mod_ref_tab; i++)
+ for(i=0; i<wpnt->ne->ne_header->n_mod_ref_tab; i++)
{
char buff[14];
GetModuleName(wpnt, i + 1, buff);
@@ -136,7 +129,7 @@
#ifndef WINELIB
/* fixup references */
- for (segment = 0; segment < wpnt->ne_header->n_segment_tab; segment++)
+ for (segment = 0; segment < wpnt->ne->ne_header->n_segment_tab; segment++)
if (FixupSegment(wpnt, segment) < 0)
myerror("fixup failed.");
@@ -174,7 +167,7 @@
{
int fd = wpnt->fd;
struct mz_header_s *mz_header = wpnt->mz_header;
- struct ne_header_s *ne_header = wpnt->ne_header;
+ struct ne_header_s *ne_header = wpnt->ne->ne_header;
int length;
WORD name_offset, status;
int i;
@@ -194,7 +187,8 @@
/* Module names are always upper case */
for(i=0; i<length; i++)
- if(buffer[i] >= 'a' && buffer[i] <= 'z') buffer[i] &= ~0x20;
+ if (islower(buffer[i]))
+ buffer[i] = toupper(buffer[i]);
return buffer;
}
@@ -208,14 +202,13 @@
FixupSegment(struct w_files * wpnt, int segment_num)
{
int fd = wpnt->fd;
- struct mz_header_s * mz_header = wpnt->mz_header;
- struct ne_header_s *ne_header = wpnt->ne_header;
- struct ne_segment_table_entry_s *seg_table = wpnt->seg_table;
- struct segment_descriptor_s *selector_table = wpnt->selector_table;
+ struct mz_header_s *mz_header = wpnt->mz_header;
+ struct ne_header_s *ne_header = wpnt->ne->ne_header;
+ struct ne_segment_table_entry_s *seg_table = wpnt->ne->seg_table;
+ struct segment_descriptor_s *selector_table = wpnt->ne->selector_table;
struct relocation_entry_s *rep, *rep1;
struct ne_segment_table_entry_s *seg;
struct segment_descriptor_s *sel;
- struct dll_table_entry_s *dll_table;
int status;
unsigned short *sp;
unsigned int selector, address;
@@ -229,10 +222,8 @@
seg = &seg_table[segment_num];
sel = &selector_table[segment_num];
-#ifdef DEBUG_FIXUP
- printf("Segment fixups for %s, segment %d, selector %x\n",
- wpnt->name, segment_num, (int) sel->base_addr >> 16);
-#endif
+ dprintf_fixup(stddeb, "Segment fixups for %s, segment %d, selector %x\n",
+ wpnt->name, segment_num, (int) sel->base_addr >> 16);
if ((seg->seg_data_offset == 0) ||
!(seg->seg_flags & NE_SEGFLAGS_RELOC_DATA))
@@ -293,10 +284,8 @@
return -1;
}
-#ifdef DEBUG_FIXUP
- printf("%d: %s.%d: %04.4x:%04.4x\n", i + 1, dll_name, ordinal,
- selector, address);
-#endif
+ dprintf_fixup(stddeb,"%d: %s.%d: %04.4x:%04.4x\n", i + 1,
+ dll_name, ordinal, selector, address);
break;
case NE_RELTYPE_NAMEADD:
@@ -328,10 +317,8 @@
return -1;
}
-#ifdef DEBUG_FIXUP
- printf("%d: %s %s.%d: %04.4x:%04.4x\n", i + 1, func_name,
- dll_name, ordinal, selector, address);
-#endif
+ dprintf_fixup(stddeb,"%d: %s %s.%d: %04.4x:%04.4x\n", i + 1,
+ func_name, dll_name, ordinal, selector, address);
break;
case NE_RELTYPE_INTERNAL:
@@ -348,9 +335,8 @@
address = rep->target2;
}
-#ifdef DEBUG_FIXUP
- printf("%d: %04.4x:%04.4x\n", i + 1, selector, address);
-#endif
+ dprintf_fixup(stddeb,"%d: %04.4x:%04.4x\n",
+ i + 1, selector, address);
break;
case 7:
@@ -362,19 +348,20 @@
* successfully emulate the coprocessor if it doesn't
* exist.
*/
-#ifdef DEBUG_FIXUP
- printf("%d: ADDR TYPE %d, TYPE %d, OFFSET %04.4x, ",
+ dprintf_fixup(stddeb,
+ "%d: ADDR TYPE %d, TYPE %d, OFFSET %04.4x, ",
i + 1, rep->address_type, rep->relocation_type,
rep->offset);
- printf("TARGET %04.4x %04.4x\n", rep->target1, rep->target2);
-#endif
+ dprintf_fixup(stddeb,"TARGET %04.4x %04.4x\n",
+ rep->target1, rep->target2);
continue;
default:
- fprintf(stderr,"%d: ADDR TYPE %d, TYPE %d, OFFSET %04.4x, ",
+ dprintf_fixup(stddeb,
+ "%d: ADDR TYPE %d, TYPE %d, OFFSET %04.4x, ",
i + 1, rep->address_type, rep->relocation_type,
rep->offset);
- fprintf(stderr,"TARGET %04.4x %04.4x\n",
+ dprintf_fixup(stddeb,"TARGET %04.4x %04.4x\n",
rep->target1, rep->target2);
free(rep1);
return -1;
@@ -388,23 +375,21 @@
{
if (FindDLLTable(dll_name) == NULL)
additive = 2;
-
- fprintf(stderr,"%d: ADDR TYPE %d, TYPE %d, OFFSET %04.4x, ",
+ dprintf_fixup(stddeb,
+ "%d: ADDR TYPE %d, TYPE %d, OFFSET %04.4x, ",
i + 1, rep->address_type, rep->relocation_type,
rep->offset);
- fprintf(stderr,"TARGET %04.4x %04.4x\n",
+ dprintf_fixup(stddeb,"TARGET %04.4x %04.4x\n",
rep->target1, rep->target2);
- fprintf(stderr, " Additive = %d\n", additive);
+ dprintf_fixup(stddeb, " Additive = %d\n", additive);
}
switch (rep->address_type)
{
case NE_RADDR_OFFSET16:
do {
-#ifdef DEBUG_FIXUP
- printf(" %04.4x:%04.4x:%04.4x OFFSET16\n",
+ dprintf_fixup(stddeb," %04.4x:%04.4x:%04.4x OFFSET16\n",
(unsigned long) sp >> 16, (int) sp & 0xFFFF, *sp);
-#endif
next_addr = *sp;
*sp = (unsigned short) address;
if (additive == 2)
@@ -417,10 +402,8 @@
case NE_RADDR_POINTER32:
do {
-#ifdef DEBUG_FIXUP
- printf(" %04.4x:%04.4x:%04.4x POINTER32\n",
+ dprintf_fixup(stddeb," %04.4x:%04.4x:%04.4x POINTER32\n",
(unsigned long) sp >> 16, (int) sp & 0xFFFF, *sp);
-#endif
next_addr = *sp;
*sp = (unsigned short) address;
if (additive == 2)
@@ -434,10 +417,8 @@
case NE_RADDR_SELECTOR:
do {
-#ifdef DEBUG_FIXUP
- printf(" %04.4x:%04.4x:%04.4x SELECTOR\n",
+ dprintf_fixup(stddeb," %04.4x:%04.4x:%04.4x SELECTOR\n",
(unsigned long) sp >> 16, (int) sp & 0xFFFF, *sp);
-#endif
next_addr = *sp;
*sp = (unsigned short) selector;
sp = (unsigned short *) ((char *) sel->base_addr + next_addr);
@@ -449,10 +430,12 @@
break;
default:
- printf("%d: ADDR TYPE %d, TYPE %d, OFFSET %04.4x, ",
+ dprintf_fixup(stddeb,
+ "%d: ADDR TYPE %d, TYPE %d, OFFSET %04.4x, ",
i + 1, rep->address_type, rep->relocation_type,
rep->offset);
- printf("TARGET %04.4x %04.4x\n", rep->target1, rep->target2);
+ dprintf_fixup(stddeb,
+ "TARGET %04.4x %04.4x\n", rep->target1, rep->target2);
free(rep1);
return -1;
}
@@ -462,4 +445,60 @@
return 0;
}
+int NEunloadImage(struct w_files *wpnt)
+{
+ printf("NEunloadImage() called!\n");
+ /* free resources, image */
+ return 1;
+}
+
+int StartNEprogram(struct w_files *wpnt)
+{
+ int cs_reg, ds_reg, ss_reg, ip_reg, sp_reg;
+ /*
+ * Fixup stack and jump to start.
+ */
+ WIN_StackSize = wpnt->ne->ne_header->stack_length;
+ WIN_HeapSize = wpnt->ne->ne_header->local_heap_length;
+
+ ds_reg = wpnt->ne->selector_table[wpnt->ne->ne_header->auto_data_seg-1].selector;
+ cs_reg = wpnt->ne->selector_table[wpnt->ne->ne_header->cs-1].selector;
+ ip_reg = wpnt->ne->ne_header->ip;
+ ss_reg = wpnt->ne->selector_table[wpnt->ne->ne_header->ss-1].selector;
+ sp_reg = wpnt->ne->ne_header->sp;
+
+ return CallToInit16(cs_reg << 16 | ip_reg, ss_reg << 16 | sp_reg, ds_reg);
+}
+
+void InitNEDLL(struct w_files *wpnt)
+{
+ int cs_reg, ds_reg, ip_reg, rv;
+ /*
+ * Is this a library?
+ */
+ if (wpnt->ne->ne_header->format_flags & 0x8000)
+ {
+ if (!(wpnt->ne->ne_header->format_flags & 0x0001))
+ {
+ /* Not SINGLEDATA */
+ fprintf(stderr, "Library is not marked SINGLEDATA\n");
+ exit(1);
+ }
+
+ ds_reg = wpnt->ne->selector_table[wpnt->ne->
+ ne_header->auto_data_seg-1].selector;
+ cs_reg = wpnt->ne->selector_table[wpnt->ne->ne_header->cs-1].selector;
+ ip_reg = wpnt->ne->ne_header->ip;
+
+ if (cs_reg) {
+ fprintf(stderr, "Initializing %s, cs:ip %04x:%04x, ds %04x\n",
+ wpnt->name, cs_reg, ip_reg, ds_reg);
+
+ rv = CallTo16(cs_reg << 16 | ip_reg, ds_reg);
+ printf ("rv = %x\n", rv);
+ } else
+ printf("%s skipped\n", wpnt->name);
+ }
+}
+
#endif /* !WINELIB */
diff --git a/loader/ne_resource.c b/loader/ne_resource.c
new file mode 100644
index 0000000..25e0b4c
--- /dev/null
+++ b/loader/ne_resource.c
@@ -0,0 +1,499 @@
+static char RCSId[] = "$Id: ne_resource.c,v 1.4 1993/07/04 04:04:21 root Exp root $";
+static char Copyright[] = "Copyright Robert J. Amstadt, 1993";
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include "windows.h"
+#include "neexe.h"
+#include "peexe.h"
+#include "arch.h"
+#include "dlls.h"
+#include "resource.h"
+
+/* #define DEBUG_RESOURCE */
+
+static int ResourceFd = -1;
+static HANDLE ResourceInst = 0;
+static struct w_files *ResourceFileInfo;
+
+/**********************************************************************
+ * RSC_LoadNameTable
+ */
+void RSC_LoadNameTable(void)
+{
+ 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;
+
+ /*
+ * Move to beginning of resource table.
+ */
+ rtoff = (ResourceFileInfo->mz_header->ne_offset +
+ ResourceFileInfo->ne->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);
+
+ /*
+ * Find resource.
+ */
+ typeinfo.type_id = 0xffff;
+ while (typeinfo.type_id != 0)
+ {
+ if (!load_typeinfo (ResourceFd, &typeinfo))
+ break;
+
+ 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;
+
+ 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';
+
+ read(ResourceFd, &len, sizeof(len));
+ }
+
+ lseek(ResourceFd, saved_pos, SEEK_SET);
+ }
+ break;
+ }
+ else
+ {
+ lseek(ResourceFd, (typeinfo.count * sizeof(nameinfo)), SEEK_CUR);
+ }
+ }
+ ResourceFileInfo->ne->resnamtab = top;
+}
+
+/**********************************************************************
+ * 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->ne->resnamtab == (RESNAMTAB *) -1)
+ {
+ RSC_LoadNameTable();
+ }
+#endif
+#endif
+
+#ifdef DEBUG_RESOURCE
+ printf("OpenResourceFile(%04X) // file='%s' hFile=%04X !\n",
+ instance, w->filename, ResourceFd);
+#endif
+ return ResourceFd;
+}
+
+int load_typeinfo (int fd, struct resource_typeinfo_s *typeinfo)
+{
+ return read (fd, typeinfo, sizeof (*typeinfo)) == sizeof (*typeinfo);
+}
+
+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
+ */
+int
+FindResourceByNumber(struct resource_nameinfo_s *result_p,
+ int type_id, int resource_id)
+{
+ struct resource_typeinfo_s typeinfo;
+ struct resource_nameinfo_s nameinfo;
+ unsigned short size_shift;
+ int i;
+ off_t rtoff;
+
+ /*
+ * Move to beginning of resource table.
+ */
+ rtoff = (ResourceFileInfo->mz_header->ne_offset +
+ ResourceFileInfo->ne->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 (%d) bad block size !\n",(int) 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 ?=%d searched=%08X\n",
+ typeinfo.type_id, typeinfo.count, typeinfo.reserved, 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("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);
+#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;
+}
+
+/**********************************************************************
+ * 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->ne->resnamtab != NULL)
+ {
+ RESNAMTAB *e;
+
+ for (e = ResourceFileInfo->ne->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->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 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->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;
+}
+
+/**********************************************************************
+ * NE_FindResource [KERNEL.60]
+ */
+int
+NE_FindResource(HANDLE instance, LPSTR resource_name, LPSTR type_name,
+ RESOURCE *r)
+{
+ int type;
+
+#ifdef DEBUG_RESOURCE
+ printf("NE_FindResource hInst=%04X typename=%08X resname=%08X\n",
+ instance, type_name, resource_name);
+#endif
+
+ ResourceFd = r->fd;
+ ResourceFileInfo = r->wpnt;
+
+ /* nametable loaded ? */
+ if (r->wpnt->ne->resnamtab == NULL)
+ RSC_LoadNameTable();
+
+ 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("NE_FindResource hInst=%04X typename=%08X resname=%08X not found!\n",
+ instance, (int) type_name, (int) resource_name);
+ return 0;
+ }
+ r->size = r->nameinfo.length << r->size_shift;
+ r->offset = r->nameinfo.offset << r->size_shift;
+ return 1;
+}
diff --git a/loader/pe_image.c b/loader/pe_image.c
new file mode 100644
index 0000000..948e8e6
--- /dev/null
+++ b/loader/pe_image.c
@@ -0,0 +1,213 @@
+/*
+ * Copyright 1994 Eric Youndale & Erik Bos
+ *
+ * based on Eric Youndale's pe-test and:
+ *
+ * ftp.microsoft.com:/pub/developer/MSDN/CD8/PEFILE.ZIP
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+#include "windows.h"
+#include "dlls.h"
+#include "neexe.h"
+#include "peexe.h"
+
+#define MAP_ANONYMOUS 0x20
+
+unsigned int load_addr;
+
+void my_wcstombs(char * result, u_short * source, int len)
+{
+ while(len--) {
+ if(isascii(*source)) *result++ = *source++;
+ else {
+ printf("Unable to handle unicode right now\n");
+ exit(0);
+ }
+ };
+}
+
+char * xmmap(char * vaddr, unsigned int v_size, int prot, int flags,
+ int fd, unsigned int file_offset)
+{
+ char * result;
+ result = mmap(vaddr, v_size, prot, flags, fd, file_offset);
+ if((unsigned int) result != 0xffffffff) return result;
+
+ /* Sigh. Alignment must be wrong for mmap. Do this the hard way. */
+ if(!(flags & MAP_FIXED)) {
+ vaddr = 0x40000000;
+ flags |= MAP_FIXED;
+ };
+
+ mmap(vaddr, v_size, prot, MAP_ANONYMOUS | flags, 0, 0);
+ lseek(fd, file_offset, SEEK_SET);
+ read(fd, vaddr, v_size);
+ return vaddr;
+};
+
+dump_exports(struct PE_Export_Directory * pe_exports)
+{
+ char * Module;
+ int i;
+ u_short * ordinal;
+ u_long * function;
+ u_char ** name, *ename;
+
+ Module = ((char *) load_addr) + pe_exports->Name;
+ printf("\n*******EXPORT DATA*******\nModule name is %s, %d functions, %d names\n",
+ Module,
+ pe_exports->Number_Of_Functions,
+ pe_exports->Number_Of_Names);
+
+ ordinal = (u_short *) (((char *) load_addr) + (int) pe_exports->Address_Of_Name_Ordinals);
+ function = (u_long *) (((char *) load_addr) + (int) pe_exports->AddressOfFunctions);
+ name = (u_char **) (((char *) load_addr) + (int) pe_exports->AddressOfNames);
+
+ printf("%-32s Ordinal Virt Addr\n", "Function Name");
+ for(i=0; i< pe_exports->Number_Of_Functions; i++)
+ {
+ ename = (char *) (((char *) load_addr) + (int) *name++);
+ printf("%-32s %4d %8.8x\n", ename, *ordinal++, *function++);
+ }
+
+ return;
+}
+
+dump_imports(struct PE_Import_Directory *pe_imports)
+{
+ struct PE_Import_Directory * pe_imp;
+
+ /* OK, now dump the import list */
+ printf("\nDumping imports list\n");
+ pe_imp = pe_imports;
+ while (pe_imp->ModuleName)
+ {
+ char * Module, *Function;
+ struct pe_import_name * pe_name;
+ unsigned int * import_list;
+ char * c;
+
+ Module = ((char *) load_addr) + pe_imp->ModuleName;
+ printf("%s\n", Module);
+ c = strchr(Module, '.');
+ if (c) *c = 0;
+
+ import_list = (unsigned int *)
+ (((unsigned int) load_addr) + pe_imp->Import_List);
+
+ while(*import_list)
+ {
+ pe_name = (struct pe_import_name *) ((int) load_addr + *import_list);
+ printf("--- %s %s.%d\n", pe_name->Name, Module, pe_name->Hint);
+ import_list++;
+ }
+ pe_imp++;
+ };
+}
+
+static void dump_table(struct w_files *wpnt)
+{
+ int i;
+
+ printf("Dump of segment table\n");
+ printf(" Name VSz Vaddr SzRaw Fileadr *Reloc *Lineum #Reloc #Linum Char\n");
+ for(i=0; i< wpnt->pe->pe_header->coff.NumberOfSections; i++)
+ {
+ printf("%8s: %4.4x %8.8x %8.8x %8.8x %8.8x %8.8x %4.4x %4.4x %8.8x\n",
+ wpnt->pe->pe_seg[i].Name,
+ wpnt->pe->pe_seg[i].Virtual_Size,
+ wpnt->pe->pe_seg[i].Virtual_Address,
+ wpnt->pe->pe_seg[i].Size_Of_Raw_Data,
+ wpnt->pe->pe_seg[i].PointerToRawData,
+ wpnt->pe->pe_seg[i].PointerToRelocations,
+ wpnt->pe->pe_seg[i].PointerToLinenumbers,
+ wpnt->pe->pe_seg[i].NumberOfRelocations,
+ wpnt->pe->pe_seg[i].NumberOfLinenumbers,
+ wpnt->pe->pe_seg[i].Characteristics);
+ }
+}
+
+/**********************************************************************
+ * LoadPEImage
+ * Load one PE format executable into memory
+ */
+HINSTANCE LoadPEImage(struct w_files *wpnt)
+{
+ int i, result;
+
+ wpnt->pe = malloc(sizeof(struct pe_data));
+ wpnt->pe->pe_header = malloc(sizeof(struct pe_header_s));
+
+ /* read PE header */
+ lseek(wpnt->fd, wpnt->mz_header->ne_offset, SEEK_SET);
+ read(wpnt->fd, wpnt->pe->pe_header, sizeof(struct pe_header_s));
+
+ /* read sections */
+ wpnt->pe->pe_seg = malloc(sizeof(struct pe_segment_table) *
+ wpnt->pe->pe_header->coff.NumberOfSections);
+ read(wpnt->fd, wpnt->pe->pe_seg, sizeof(struct pe_segment_table) *
+ wpnt->pe->pe_header->coff.NumberOfSections);
+
+ load_addr = wpnt->pe->pe_header->opt_coff.BaseOfImage;
+ dump_table(wpnt);
+
+ for(i=0; i < wpnt->pe->pe_header->coff.NumberOfSections; i++)
+ {
+ if(!load_addr) {
+ result = xmmap(0, wpnt->pe->pe_seg[i].Size_Of_Raw_Data, 7, MAP_PRIVATE,
+ wpnt->fd, wpnt->pe->pe_seg[i].PointerToRawData);
+ load_addr = (unsigned int) result - wpnt->pe->pe_seg[i].Virtual_Address;
+ } else {
+ result = xmmap((char *) load_addr + wpnt->pe->pe_seg[i].Virtual_Address,
+ wpnt->pe->pe_seg[i].Size_Of_Raw_Data, 7, MAP_PRIVATE | MAP_FIXED,
+ wpnt->fd, wpnt->pe->pe_seg[i].PointerToRawData);
+ }
+
+ if(strcmp(wpnt->pe->pe_seg[i].Name, ".idata") == 0)
+ wpnt->pe->pe_import = (struct PE_Import_Directory *) result;
+
+ if(strcmp(wpnt->pe->pe_seg[i].Name, ".edata") == 0)
+ wpnt->pe->pe_export = (struct PE_Export_Directory *) result;
+
+ if(strcmp(wpnt->pe->pe_seg[i].Name, ".rsrc") == 0) {
+ wpnt->pe->pe_resource = (struct PE_Resource_Directory *) result;
+
+ /* save offset for PE_FindResource */
+ wpnt->pe->resource_offset = wpnt->pe->pe_seg[i].Virtual_Address -
+ wpnt->pe->pe_seg[i].PointerToRawData;
+ }
+ }
+
+ if(wpnt->pe->pe_import) dump_imports(wpnt->pe->pe_import);
+ if(wpnt->pe->pe_export) dump_exports(wpnt->pe->pe_export);
+
+ wpnt->hinstance = 0x8000;
+ return (wpnt->hinstance);
+}
+
+int PEunloadImage(struct w_files *wpnt)
+{
+ printf("PEunloadImage() called!\n");
+ /* free resources, image, unmap */
+ return 1;
+}
+
+int StartPEprogram(struct w_files *wpnt)
+{
+ printf("StartPEprogram() called!\n");
+ return 0;
+}
+
+void InitPEDLL(struct w_files *wpnt)
+{
+ /* Is this a library? */
+ if (wpnt->pe->pe_header->coff.Characteristics & IMAGE_FILE_DLL) {
+ printf("InitPEDLL() called!\n");
+ }
+}
diff --git a/loader/pe_resource.c b/loader/pe_resource.c
new file mode 100644
index 0000000..d82789c
--- /dev/null
+++ b/loader/pe_resource.c
@@ -0,0 +1,151 @@
+/*
+ * (c) 1994 Erik Bos <erik@hacktic.nl>
+ *
+ * based on Eric Youndale's pe-test and:
+ *
+ * ftp.microsoft.com:/pub/developer/MSDN/CD8/PEFILE.ZIP
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include "windows.h"
+#include "neexe.h"
+#include "peexe.h"
+#include "dlls.h"
+#include "resource.h"
+
+#define DEBUG_RESOURCE
+
+static int
+find_lang(char *root, struct PE_Resource_Directory *resource, RESOURCE *r)
+{
+ int i;
+ struct PE_Directory_Entry *type_dir;
+ struct PE_Resource_Leaf_Entry *leaf;
+
+ type_dir = (struct PE_Directory_Entry *)(resource + 1);
+ type_dir += resource->NumberOfNamedEntries;
+
+ /* grab the 1st resource available */
+ leaf = (struct PE_Resource_Leaf_Entry *) (root + type_dir->OffsetToData);
+#ifdef DEBUG_RESOURCE
+ printf("\t\tPE_findlang: id %8x\n", (int) type_dir->Name);
+ printf("\t\taddress %d, size %d, language id %d\n", leaf->OffsetToData, leaf->Size, leaf->CodePage);
+#endif
+ r->offset = leaf->OffsetToData - r->wpnt->pe->resource_offset;
+ r->size = leaf->Size;
+ printf("\t\toffset %d, size %d\n", r->offset, r->size);
+ return 1;
+
+/* for(i=0; i< resource->NumberOfIdEntries; i++) {
+ leaf = (root + (type_dir->OffsetToData & ~IMAGE_RESOURCE_DATA_IS_DIRECTORY));
+#ifdef DEBUG_RESOURCE
+ printf("\t\tPE_findlang: id %8x\n", (int) type_dir->Name);
+ printf("\t\t%x %x %x\n", leaf->OffsetToData, leaf->Size,
+ leaf->CodePage);
+#endif
+ type_dir++;
+ } */
+}
+
+static int
+find_resource(char *root, struct PE_Resource_Directory *resource,
+ LPSTR resource_name, RESOURCE *r)
+{
+ int i;
+ char res_name[256];
+ struct PE_Directory_Entry *type_dir;
+ struct PE_Directory_Name_String_U *name;
+
+ type_dir = (struct PE_Directory_Entry *)(resource + 1);
+
+ if (HIWORD((DWORD)resource_name)) {
+ for(i=0; i< resource->NumberOfNamedEntries; i++) {
+ name = (struct PE_Directory_Name_String_U *)(root + (type_dir->Name & ~IMAGE_RESOURCE_NAME_IS_STRING));
+ memset(res_name, 0, sizeof(res_name));
+ my_wcstombs(res_name, name->NameString, name->Length);
+#ifdef DEBUG_RESOURCE
+ printf("\tPE_findresource: name %s\n", res_name);
+#endif
+ if (strcasecmp(res_name, resource_name) == 0)
+ return find_lang(root, (struct PE_Resource_Directory *) (root + (type_dir->OffsetToData & ~IMAGE_RESOURCE_DATA_IS_DIRECTORY)), r);
+ type_dir++;
+ }
+ } else {
+ type_dir += resource->NumberOfNamedEntries;
+ for(i=0; i< resource->NumberOfIdEntries; i++) {
+#ifdef DEBUG_RESOURCE
+ printf("\tPE_findresource: name %8x\n", (int) type_dir->Name);
+#endif
+ if (type_dir->Name == ((int) resource_name & 0xff))
+ return find_lang(root, (struct PE_Resource_Directory *) (root + (type_dir->OffsetToData & ~IMAGE_RESOURCE_DATA_IS_DIRECTORY)), r);
+ type_dir++;
+ }
+ }
+ return 0;
+}
+
+static int
+find_type(struct PE_Resource_Directory *resource, LPSTR resource_name,
+ LPSTR type_name, RESOURCE *r)
+{
+ int i;
+ char *root, res_name[256];
+ struct PE_Directory_Entry *type_dir;
+ struct PE_Directory_Name_String_U *name;
+
+ root = (char *) resource;
+ type_dir = (struct PE_Directory_Entry *)(resource + 1);
+
+ if (HIWORD((DWORD)type_name)) {
+ for(i=0; i< resource->NumberOfNamedEntries; i++) {
+ name = (struct PE_Directory_Name_String_U *)(root + (type_dir->Name & ~IMAGE_RESOURCE_NAME_IS_STRING));
+ memset(res_name, 0, sizeof(res_name));
+ my_wcstombs(res_name, name->NameString, name->Length);
+#ifdef DEBUG_RESOURCE
+ printf("PE_findtype: type %s\n", res_name);
+#endif
+ if (strcasecmp(res_name, type_name) == 0)
+ return find_resource(root, (struct PE_Resource_Directory *) (root + (type_dir->OffsetToData & ~IMAGE_RESOURCE_DATA_IS_DIRECTORY)), resource_name, r);
+ type_dir++;
+ }
+ } else {
+ type_dir += resource->NumberOfNamedEntries;
+ for(i=0; i< resource->NumberOfIdEntries; i++) {
+#ifdef DEBUG_RESOURCE
+ printf("PE_findtype: type %8x\n", (int) type_dir->Name);
+#endif
+ if (type_dir->Name == ((int) type_name & 0xff))
+ return find_resource(root, (struct PE_Resource_Directory *) (root + (type_dir->OffsetToData & ~IMAGE_RESOURCE_DATA_IS_DIRECTORY)), resource_name, r);
+ type_dir++;
+ }
+ }
+ return 0;
+}
+
+/**********************************************************************
+ * PE_FindResource [KERNEL.60]
+ */
+int
+PE_FindResource(HANDLE instance, LPSTR resource_name, LPSTR type_name,
+ RESOURCE *r)
+{
+#ifdef DEBUG_RESOURCE
+ printf("PE_FindResource hInst=%04X typename=%08X resname=%08X\n",
+ instance, (int) type_name, (int) resource_name);
+#endif
+ if (HIWORD((DWORD)resource_name))
+ if (resource_name[0] == '#')
+ resource_name = (LPSTR) atoi(resource_name + 1);
+
+ if (HIWORD((DWORD)type_name))
+ if (type_name[0] == '#')
+ type_name = (LPSTR) atoi(type_name + 1);
+
+ return find_type(r->wpnt->pe->pe_resource, resource_name, type_name,r);
+}
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;
+}
diff --git a/loader/selector.c b/loader/selector.c
index 03711aa..b38feeb 100644
--- a/loader/selector.c
+++ b/loader/selector.c
@@ -12,6 +12,7 @@
#include <errno.h>
#ifdef __linux__
+#include <sys/mman.h>
#include <linux/unistd.h>
#include <linux/head.h>
#include <linux/mman.h>
@@ -28,8 +29,10 @@
#include "wine.h"
#include "windows.h"
#include "prototypes.h"
+#include "debug.h"
/* #define DEBUG_SELECTORS /* */
+/* #undef DEBUG_SELECTORS /* */
#ifdef linux
#define DEV_ZERO
@@ -60,7 +63,6 @@
extern void KERNEL_Ordinal_102();
extern void UNIXLIB_Ordinal_0();
-extern char *WIN_ProgramName;
extern char WindowsPath[256];
extern char **Argv;
@@ -505,8 +507,7 @@
i = FindUnusedSelectors(n_segments);
#ifdef DEBUG_SELECTORS
- fprintf(stderr,
- "Using %d segments starting at index %d.\n", n_segments, i);
+ fprintf(stddeb, "Using %d segments starting at index %d.\n", n_segments, i);
#endif
/*
@@ -609,10 +610,10 @@
/* Not a builtin symbol, look to see what the file has for us */
for(wpnt = wine_files; wpnt; wpnt = wpnt->next){
if(strcasecmp(wpnt->name, dll_name)) continue;
- cpnt = wpnt->nrname_table;
+ cpnt = wpnt->ne->nrname_table;
while(1==1){
- if( ((int) cpnt) - ((int)wpnt->nrname_table) >
- wpnt->ne_header->nrname_tab_length) return 1;
+ if( ((int) cpnt) - ((int)wpnt->ne->nrname_table) >
+ wpnt->ne->ne_header->nrname_tab_length) return 1;
len = *cpnt++;
if(strncmp(cpnt, function, len) == 0) break;
cpnt += len + 2;
@@ -662,9 +663,8 @@
{
int fd = wpnt->fd;
struct mz_header_s *mz_header = wpnt->mz_header;
- struct ne_header_s *ne_header = wpnt->ne_header;
+ struct ne_header_s *ne_header = wpnt->ne->ne_header;
-
union lookup entry_tab_pointer;
struct entry_tab_header_s *eth;
struct entry_tab_movable_s *etm;
@@ -672,8 +672,7 @@
int current_ordinal;
int i;
-
- entry_tab_pointer.cpnt = wpnt->lookup_table;
+ entry_tab_pointer.cpnt = wpnt->ne->lookup_table;
/*
* Let's walk through the table until we get to our entry.
*/
@@ -707,7 +706,7 @@
if (current_ordinal == ordinal)
{
return ((unsigned int)
- (wpnt->selector_table[etm->seg_number - 1].base_addr +
+ (wpnt->ne->selector_table[etm->seg_number - 1].base_addr +
etm->offset));
}
}
@@ -718,7 +717,7 @@
if (current_ordinal == ordinal)
{
return ((unsigned int)
- (wpnt->selector_table[eth->seg_number - 1].base_addr +
+ (wpnt->ne->selector_table[eth->seg_number - 1].base_addr +
(int) etf->offset[0] +
((int) etf->offset[1] << 8)));
}
@@ -728,73 +727,6 @@
}
/**********************************************************************
- */
-void
-FixupFunctionPrologs(struct w_files * wpnt)
-{
- struct mz_header_s *mz_header = wpnt->mz_header;
- struct ne_header_s *ne_header = wpnt->ne_header;
- union lookup entry_tab_pointer;
- struct entry_tab_header_s *eth;
- struct entry_tab_movable_s *etm;
- struct entry_tab_fixed_s *etf;
- unsigned char *fixup_ptr;
- int i;
-
- if (!(ne_header->format_flags & 0x0001))
- return;
-
- entry_tab_pointer.cpnt = wpnt->lookup_table;
- /*
- * Let's walk through the table and fixup prologs as we go.
- */
- while (1)
- {
- /* Get bundle header */
- eth = entry_tab_pointer.eth++;
-
- /* Check for end of table */
- if (eth->n_entries == 0)
- return;
-
- /* Check for empty bundle */
- if (eth->seg_number == 0)
- continue;
-
- /* Examine each bundle */
- for (i = 0; i < eth->n_entries; i++)
- {
- /* Moveable segment */
- if (eth->seg_number >= 0xfe)
- {
- etm = entry_tab_pointer.etm++;
- fixup_ptr = (wpnt->selector_table[etm->seg_number-1].base_addr
- + etm->offset);
- }
- else
- {
- etf = entry_tab_pointer.etf++;
- fixup_ptr = (wpnt->selector_table[eth->seg_number-1].base_addr
- + (int) etf->offset[0]
- + ((int) etf->offset[1] << 8));
-
- }
-
- /* Verify the signature */
- if (((fixup_ptr[0] == 0x1e && fixup_ptr[1] == 0x58)
- || (fixup_ptr[0] == 0x8c && fixup_ptr[1] == 0xd8))
- && fixup_ptr[2] == 0x90)
- {
- fixup_ptr[0] = 0xb8; /* MOV AX, */
- fixup_ptr[1] = wpnt->hinstance;
- fixup_ptr[2] = (wpnt->hinstance >> 8);
- }
- }
- }
-}
-
-
-/**********************************************************************
* GetDOSEnvironment
*/
LPSTR GetDOSEnvironment(void)
@@ -810,7 +742,6 @@
{
char **e;
char *p;
- unsigned short *w;
SEGDESC * s;
s = CreateNewSegments(0, 0, PAGE_SIZE, 1);
@@ -836,18 +767,15 @@
}
*p++ = '\0';
- w = (unsigned short *) p;
- *w = strlen(WIN_ProgramName);
- strcpy(p + 2, WIN_ProgramName);
/*
* Display environment
*/
- fprintf(stderr, "Environment at %08.8x\n", s->base_addr);
+#ifdef DEBUG_SELECTORS
+ fprintf(stddeb, "Environment at %08.8x\n", s->base_addr);
for (p = s->base_addr; *p; p += strlen(p) + 1)
- fprintf(stderr, " %s\n", p);
- p += 3;
- fprintf(stderr, " Program: %s\n", p);
+ fprintf(stddeb, " %s\n", p);
+#endif
return s;
}
@@ -918,8 +846,8 @@
CreateSelectors(struct w_files * wpnt)
{
int fd = wpnt->fd;
- struct ne_segment_table_entry_s *seg_table = wpnt->seg_table;
- struct ne_header_s *ne_header = wpnt->ne_header;
+ struct ne_segment_table_entry_s *seg_table = wpnt->ne->seg_table;
+ struct ne_header_s *ne_header = wpnt->ne->ne_header;
SEGDESC *selectors, *s, *stmp;
unsigned short auto_data_sel;
int contents, read_only;
@@ -1059,13 +987,78 @@
return selectors;
}
+/**********************************************************************
+ */
+void
+FixupFunctionPrologs(struct w_files * wpnt)
+{
+ struct mz_header_s *mz_header = wpnt->mz_header;
+ struct ne_header_s *ne_header = wpnt->ne->ne_header;
+ union lookup entry_tab_pointer;
+ struct entry_tab_header_s *eth;
+ struct entry_tab_movable_s *etm;
+ struct entry_tab_fixed_s *etf;
+ unsigned char *fixup_ptr;
+ int i;
+
+ if (!(ne_header->format_flags & 0x0001))
+ return;
+
+ entry_tab_pointer.cpnt = wpnt->ne->lookup_table;
+ /*
+ * Let's walk through the table and fixup prologs as we go.
+ */
+ while (1)
+ {
+ /* Get bundle header */
+ eth = entry_tab_pointer.eth++;
+
+ /* Check for end of table */
+ if (eth->n_entries == 0)
+ return;
+
+ /* Check for empty bundle */
+ if (eth->seg_number == 0)
+ continue;
+
+ /* Examine each bundle */
+ for (i = 0; i < eth->n_entries; i++)
+ {
+ /* Moveable segment */
+ if (eth->seg_number >= 0xfe)
+ {
+ etm = entry_tab_pointer.etm++;
+ fixup_ptr = (wpnt->ne->selector_table[etm->seg_number-1].base_addr
+ + etm->offset);
+ }
+ else
+ {
+ etf = entry_tab_pointer.etf++;
+ fixup_ptr = (wpnt->ne->selector_table[eth->seg_number-1].base_addr
+ + (int) etf->offset[0]
+ + ((int) etf->offset[1] << 8));
+
+ }
+
+ /* Verify the signature */
+ if (((fixup_ptr[0] == 0x1e && fixup_ptr[1] == 0x58)
+ || (fixup_ptr[0] == 0x8c && fixup_ptr[1] == 0xd8))
+ && fixup_ptr[2] == 0x90)
+ {
+ fixup_ptr[0] = 0xb8; /* MOV AX, */
+ fixup_ptr[1] = wpnt->hinstance;
+ fixup_ptr[2] = (wpnt->hinstance >> 8);
+ }
+ }
+ }
+}
/***********************************************************************
* GetSelectorBase (KERNEL.186)
*/
DWORD GetSelectorBase(WORD wSelector)
{
- fprintf(stderr, "GetSelectorBase(selector %4X) stub!\n", wSelector);
+ fprintf(stdnimp, "GetSelectorBase(selector %4X) stub!\n", wSelector);
}
/***********************************************************************
@@ -1073,7 +1066,7 @@
*/
void SetSelectorBase(WORD wSelector, DWORD dwBase)
{
- fprintf(stderr, "SetSelectorBase(selector %4X, base %8X) stub!\n",
+ fprintf(stdnimp, "SetSelectorBase(selector %4X, base %8X) stub!\n",
wSelector, dwBase);
}
@@ -1082,7 +1075,7 @@
*/
DWORD GetSelectorLimit(WORD wSelector)
{
- fprintf(stderr, "GetSelectorLimit(selector %4X) stub!\n", wSelector);
+ fprintf(stdnimp, "GetSelectorLimit(selector %4X) stub!\n", wSelector);
return 0xffff;
}
@@ -1092,7 +1085,7 @@
*/
void SetSelectorLimit(WORD wSelector, DWORD dwLimit)
{
- fprintf(stderr, "SetSelectorLimit(selector %4X, base %8X) stub!\n",
+ fprintf(stdnimp, "SetSelectorLimit(selector %4X, base %8X) stub!\n",
wSelector, dwLimit);
}
diff --git a/loader/signal.c b/loader/signal.c
index d9eb717..24256e4 100644
--- a/loader/signal.c
+++ b/loader/signal.c
@@ -12,14 +12,26 @@
#include <syscall.h>
#endif
#ifdef linux
+#define inline __inline__ /* So we can compile with -ansi */
#include <linux/sched.h>
#include <asm/system.h>
+#undef inline
#endif
#include "wine.h"
#include "segmem.h"
#include "prototypes.h"
#include "win.h"
+
+extern int do_int10(struct sigcontext_struct *);
+extern int do_int13(struct sigcontext_struct *);
+extern int do_int15(struct sigcontext_struct *);
+extern int do_int16(struct sigcontext_struct *);
+extern int do_int25(struct sigcontext_struct *);
+extern int do_int26(struct sigcontext_struct *);
+extern int do_int2a(struct sigcontext_struct *);
+extern int do_int2f(struct sigcontext_struct *);
+extern int do_int31(struct sigcontext_struct *);
#if !defined(BSD4_4) || defined(linux)
char * cstack[4096];
@@ -90,8 +102,6 @@
{
#endif
unsigned char * instr;
- unsigned int * dump;
- int i;
/* First take care of a few preliminaries */
#ifdef linux
diff --git a/loader/task.c b/loader/task.c
index d227640..d43e404 100644
--- a/loader/task.c
+++ b/loader/task.c
@@ -3,9 +3,6 @@
*/
static char Copyright[] = "Copyright Martin Ayotte, 1994";
-/*
-#define DEBUG_TASK
-*/
#include <stdio.h>
#include <stdlib.h>
@@ -15,6 +12,12 @@
#include "windows.h"
#include "wine.h"
#include "task.h"
+#include "debug.h"
+
+
+/* #define DEBUG_TASK /* */
+/* #undef DEBUG_TASK /* */
+
static LPWINETASKENTRY lpTaskList = NULL;
static int nTaskCount = 0;
@@ -27,7 +30,7 @@
LPWINETASKENTRY lpTask = lpTaskList;
int pid = getpid();
#ifdef DEBUG_TASK
- printf("GetCurrentTask() // unix_pid=%08X !\n", pid);
+ fprintf(stddeb,"GetCurrentTask() // unix_pid=%08X !\n", pid);
#endif
if (lpTask == NULL) return 0;
while (TRUE) {
@@ -36,7 +39,7 @@
lpTask = lpTask->lpNextTask;
}
#ifdef DEBUG_TASK
- printf("GetCurrentTask() returned hTask=%04X !\n", lpTask->te.hTask);
+ fprintf(stddeb,"GetCurrentTask() returned hTask=%04X !\n", lpTask->te.hTask);
#endif
return lpTask->te.hTask;
}
@@ -47,7 +50,9 @@
*/
WORD GetNumTasks()
{
- printf("GetNumTasks() returned %d !\n", nTaskCount);
+#ifdef DEBUG_TASK
+ fprintf(stddeb,"GetNumTasks() returned %d !\n", nTaskCount);
+#endif
return nTaskCount;
}
@@ -60,17 +65,23 @@
HWND *wptr;
int count;
LPWINETASKENTRY lpTask = lpTaskList;
- printf("GetWindowTask(%04X) !\n", hWnd);
+#ifdef DEBUG_TASK
+ fprintf(stddeb,"GetWindowTask(%04X) !\n", hWnd);
+#endif
while (lpTask != NULL) {
wptr = lpTask->lpWndList;
if (wptr != NULL) {
count = 0;
while (++count < MAXWIN_PER_TASK) {
- printf("GetWindowTask // searching %04X %04X !\n",
+#ifdef DEBUG_TASK
+ fprintf(stddeb,"GetWindowTask // searching %04X %04X !\n",
lpTask->te.hTask, *(wptr));
+#endif
if (*(wptr) == hWnd) {
- printf("GetWindowTask(%04X) found hTask=%04X !\n",
+#ifdef DEBUG_TASK
+ fprintf(stddeb,"GetWindowTask(%04X) found hTask=%04X !\n",
hWnd, lpTask->te.hTask);
+#endif
return lpTask->te.hTask;
}
wptr++;
@@ -91,22 +102,30 @@
BOOL bRet;
int count = 0;
LPWINETASKENTRY lpTask = lpTaskList;
- printf("EnumTaskWindows(%04X, %08X, %08X) !\n", hTask, lpEnumFunc, lParam);
+#ifdef DEBUG_TASK
+ fprintf(stddeb,"EnumTaskWindows(%04X, %08X, %08X) !\n", hTask, lpEnumFunc, lParam);
+#endif
while (TRUE) {
if (lpTask->te.hTask == hTask) break;
if (lpTask == NULL) {
- printf("EnumTaskWindows // hTask=%04X not found !\n", hTask);
+#ifdef DEBUG_TASK
+ fprintf(stddeb,"EnumTaskWindows // hTask=%04X not found !\n", hTask);
+#endif
return FALSE;
}
lpTask = lpTask->lpNextTask;
}
- printf("EnumTaskWindows // found hTask=%04X !\n", hTask);
+#ifdef DEBUG_TASK
+ fprintf(stddeb,"EnumTaskWindows // found hTask=%04X !\n", hTask);
+#endif
wptr = lpTask->lpWndList;
if (wptr == NULL) return FALSE;
if (lpEnumFunc == NULL) return FALSE;
while ((hWnd = *(wptr++)) != 0) {
if (++count >= MAXWIN_PER_TASK) return FALSE;
- printf("EnumTaskWindows // hWnd=%04X count=%d !\n", hWnd, count);
+#ifdef DEBUG_TASK
+ fprintf(stddeb,"EnumTaskWindows // hWnd=%04X count=%d !\n", hWnd, count);
+#endif
#ifdef WINELIB
bRet = (*lpEnumFunc)(hWnd, lParam);
#else
@@ -140,7 +159,7 @@
hTask = GlobalAlloc(GMEM_MOVEABLE, sizeof(WINETASKENTRY));
lpNewTask = (LPWINETASKENTRY) GlobalLock(hTask);
#ifdef DEBUG_TASK
- printf("CreateNewTask entry allocated %08X\n", lpNewTask);
+ fprintf(stddeb,"CreateNewTask entry allocated %08X\n", lpNewTask);
#endif
if (lpNewTask == NULL) return 0;
if (lpTaskList == NULL) {
@@ -173,7 +192,7 @@
if (lpNewTask->lpWndList != NULL)
memset((LPSTR)lpNewTask->lpWndList, 0, MAXWIN_PER_TASK * sizeof(HWND));
#ifdef DEBUG_TASK
- printf("CreateNewTask // unix_pid=%08X return hTask=%04X\n",
+ fprintf(stddeb,"CreateNewTask // unix_pid=%08X return hTask=%04X\n",
lpNewTask->unix_pid, hTask);
#endif
GlobalUnlock(hTask);
@@ -191,12 +210,12 @@
int count = 0;
LPWINETASKENTRY lpTask = lpTaskList;
#ifdef DEBUG_TASK
- printf("AddWindowToTask(%04X, %04X); !\n", hTask, hWnd);
+ fprintf(stddeb,"AddWindowToTask(%04X, %04X); !\n", hTask, hWnd);
#endif
while (TRUE) {
if (lpTask->te.hTask == hTask) break;
if (lpTask == NULL) {
- printf("AddWindowToTask // hTask=%04X not found !\n", hTask);
+ fprintf(stderr,"AddWindowToTask // hTask=%04X not found !\n", hTask);
return FALSE;
}
lpTask = lpTask->lpNextTask;
@@ -209,7 +228,7 @@
}
*wptr = hWnd;
#ifdef DEBUG_TASK
- printf("AddWindowToTask // window added, count=%d !\n", count);
+ fprintf(stddeb,"AddWindowToTask // window added, count=%d !\n", count);
#endif
return TRUE;
}
@@ -224,12 +243,12 @@
int count = 0;
LPWINETASKENTRY lpTask = lpTaskList;
#ifdef DEBUG_TASK
- printf("RemoveWindowToTask(%04X, %04X); !\n", hTask, hWnd);
+ fprintf(stddeb,"RemoveWindowToTask(%04X, %04X); !\n", hTask, hWnd);
#endif
while (TRUE) {
if (lpTask->te.hTask == hTask) break;
if (lpTask == NULL) {
- printf("RemoveWindowFromTask // hTask=%04X not found !\n", hTask);
+ fprintf(stderr,"RemoveWindowFromTask // hTask=%04X not found !\n", hTask);
return FALSE;
}
lpTask = lpTask->lpNextTask;
@@ -246,15 +265,16 @@
wptr++;
}
#ifdef DEBUG_TASK
- printf("RemoveWindowFromTask // window removed, count=%d !\n", --count);
+ fprintf(stddeb,"RemoveWindowFromTask // window removed, count=%d !\n", --count);
#endif
return TRUE;
}
BOOL TaskFirst(LPTASKENTRY lpTask)
{
- printf("TaskFirst(%8x)\n", (int) lpTask);
-
+#ifdef DEBUG_TASK
+ fprintf(stddeb,"TaskFirst(%8x)\n", (int) lpTask);
+#endif
if (lpTaskList) {
memcpy(lpTask, &lpTaskList->te, lpTask->dwSize);
return TRUE;
@@ -265,9 +285,9 @@
BOOL TaskNext(LPTASKENTRY lpTask)
{
LPWINETASKENTRY list;
-
- printf("TaskNext(%8x)\n", (int) lpTask);
-
+#ifdef DEBUG_TASK
+ fprintf(stddeb,"TaskNext(%8x)\n", (int) lpTask);
+#endif
list = lpTaskList;
while (list) {
if (list->te.hTask == lpTask->hTask) {
@@ -286,9 +306,9 @@
BOOL TaskFindHandle(LPTASKENTRY lpTask, HTASK hTask)
{
static LPWINETASKENTRY list;
-
- printf("TaskFindHandle(%8x,%4x)\n", (int) lpTask, hTask);
-
+#ifdef DEBUG_TASK
+ fprintf(stddeb,"TaskFindHandle(%8x,%4x)\n", (int) lpTask, hTask);
+#endif
list = lpTaskList;
while (list) {
if (list->te.hTask == hTask) {
