Mon May 23 15:07:36 1994 Bob Amstadt (bob@pooh) * [loader/selector.c] Allocate heap and stack segments as 64k. Sat May 21 01:15:49 1994 Rick Sladkey (jrs@world.std.com) * [loader/selector.c] Correct typos where memcpy is used instead of memset. * [loader/resource.c] Allow for legitimate cases where biSizeImage is 0 in LoadIcon by calculating the value when the bitmap is not compressed. * [miscemu/int21.c] Fix NULL dereference caused by superfluous DOS_closedir in FindNext. * [loader/resource.c] New function type_match to handle string resource types as well as IDs. In addition, compare only low 4 bits of type_id when both numbers are IDs so that 0x0002 matches 0x8002. In FindResourceByNumber and FindResourceByName use type_match instead of comparing numbers. In FindResource handle the "#number" syntax and empty strings in both the resource and type names. Mon May 23 00:48:25 1994 Rick Sladkey (jrs@world.std.com) * [windows/dialog.c] Fix inadvertent printing of string IDs as strings. May 23, 94 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte) * [controls/menu.c] New functions GetMenuItemCount(), GetMenuItemID(). GetMenuString() & HiliteMenuItem(). Bug fix in CheckMenuItem(). Function SetMenu() now make client area recalc if menu removed. * [windows/winpos.c] Bug fix in SetWindowPos(), no more XMapping or XConfiguring of windows with initial width or height equal zero. * [objects/gdiobj.c] New function EnumObjects(), using new lpPenBrushList buildup from calls to new function GDI_AppendToPenBrushList(). ('pbrush.exe' don't show its face yet ! ... :-( ) New EMPTY STUB for function SetObjectOwner(), ('mplayer.exe' call it via GetProcAddress() ...) * [objects/font.c] New internal functions ParseFontParms() & InitFontsList(). EnumFonts() & EnumFontFamilies() enumerates fonts (no more dummies). FONT_MatchFont now make retries to find closest-smallest font. ('charmap.exe' can now show the differents fonts available) * [windows/nonclient.c] Use small dos OBM_OLD_CLOSE button for MDI windows. * [windows/graphics.c] [objects/bitmap.c] Start to remove obsolete globals such XT_screen ... * [loader/library.c] Make function GetProcAddress() working also with builtin DLLs. Tue May 24 20:18:02 1994 Erik Bos (erik@hacktic.nl) * [if1632/system.spec] [if1632/toolhelp.spec] system.dll & toolhelp.dll added. * [loader/library.c] Modified GetModuleFileName() to return the full filename. Added a check to LoadLibrary() to prevent loading built in dlls. (eg. user.exe) Added a check to FreeLibrary() to prevent built-in dlls from being freed. Modified GetProcAddress() to support builtin dlls. * [loader/signal.c] [miscemu/int2f.c] Added => pifedit runs. * [misc/dos_fs.c] Added a NULL-ptr check to DOS_closedir().
343 lines
8.5 KiB
C
343 lines
8.5 KiB
C
/*
|
|
* Modules & Libraries functions
|
|
*/
|
|
static char Copyright[] = "Copyright Martin Ayotte, 1994";
|
|
|
|
/*
|
|
#define DEBUG_MODULE
|
|
*/
|
|
|
|
#ifndef WINELIB
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <fcntl.h>
|
|
#include <unistd.h>
|
|
#include "prototypes.h"
|
|
#include "windows.h"
|
|
#include "wine.h"
|
|
#include "dlls.h"
|
|
#include "task.h"
|
|
|
|
typedef struct {
|
|
LPSTR ModuleName;
|
|
LPSTR FileName;
|
|
WORD Count;
|
|
HANDLE hModule;
|
|
HINSTANCE hInst;
|
|
void *lpPrevModule;
|
|
void *lpNextModule;
|
|
} MODULEENTRY;
|
|
typedef MODULEENTRY *LPMODULEENTRY;
|
|
|
|
static LPMODULEENTRY lpModList = NULL;
|
|
|
|
extern struct w_files * wine_files;
|
|
extern struct dll_name_table_entry_s dll_builtin_table[];
|
|
|
|
#define IS_BUILTIN_DLL(handle) ((handle >> 16) == 0xff)
|
|
|
|
/**********************************************************************
|
|
* GetModuleHandle [KERNEL.47]
|
|
*/
|
|
HANDLE GetModuleHandle(LPSTR lpModuleName)
|
|
{
|
|
register struct w_files *w = wine_files;
|
|
int i;
|
|
printf("GetModuleHandle('%s');\n", lpModuleName);
|
|
printf("GetModuleHandle // searching in loaded modules\n");
|
|
while (w) {
|
|
/* printf("GetModuleHandle // '%s' \n", w->name); */
|
|
if (strcasecmp(w->name, lpModuleName) == 0) {
|
|
printf("GetModuleHandle('%s') return %04X \n",
|
|
lpModuleName, w->hinstance);
|
|
return w->hinstance;
|
|
}
|
|
w = w->next;
|
|
}
|
|
printf("GetModuleHandle // searching in builtin libraries\n");
|
|
for (i = 0; i < N_BUILTINS; i++) {
|
|
if (dll_builtin_table[i].dll_name == NULL) break;
|
|
if (strcasecmp(dll_builtin_table[i].dll_name, lpModuleName) == 0) {
|
|
printf("GetModuleHandle('%s') return %04X \n",
|
|
lpModuleName, 0xFF00 + i);
|
|
return (0xFF00 + i);
|
|
}
|
|
}
|
|
printf("GetModuleHandle('%s') not found !\n", lpModuleName);
|
|
return 0;
|
|
}
|
|
|
|
|
|
/**********************************************************************
|
|
* GetModuleUsage [KERNEL.48]
|
|
*/
|
|
int GetModuleUsage(HANDLE hModule)
|
|
{
|
|
struct w_files *w;
|
|
printf("GetModuleUsage(%04X);\n", hModule);
|
|
w = GetFileInfo(hModule);
|
|
/* return w->Usage; */
|
|
return 1;
|
|
}
|
|
|
|
|
|
/**********************************************************************
|
|
* GetModuleFilename [KERNEL.49]
|
|
*/
|
|
int GetModuleFileName(HANDLE hModule, LPSTR lpFileName, short nSize)
|
|
{
|
|
struct w_files *w;
|
|
LPSTR str;
|
|
char windir[256], temp[256];
|
|
|
|
printf("GetModuleFileName(%04X, %08X, %d);\n", hModule, lpFileName, nSize);
|
|
|
|
if (lpFileName == NULL) return 0;
|
|
if (nSize < 1) return 0;
|
|
|
|
/* built-in dll ? */
|
|
if (IS_BUILTIN_DLL(hModule)) {
|
|
GetWindowsDirectory(windir, sizeof(windir));
|
|
sprintf(temp, "%s\\%s.DLL", windir, dll_builtin_table[hModule & 0x00ff].dll_name);
|
|
ToDos(temp);
|
|
strncpy(lpFileName, temp, nSize);
|
|
printf("GetModuleFileName copied '%s' (internal dll) return %d \n", lpFileName, nSize);
|
|
return strlen(lpFileName);
|
|
}
|
|
|
|
/* check loaded dlls */
|
|
if ((w = GetFileInfo(hModule)) == NULL)
|
|
return 0;
|
|
str = GetDosFileName(w->filename);
|
|
if (nSize > strlen(str)) nSize = strlen(str) + 1;
|
|
strncpy(lpFileName, str, nSize);
|
|
printf("GetModuleFileName copied '%s' return %d \n", lpFileName, nSize);
|
|
return nSize - 1;
|
|
}
|
|
|
|
|
|
/**********************************************************************
|
|
* LoadLibrary [KERNEL.95]
|
|
*/
|
|
HANDLE LoadLibrary(LPSTR libname)
|
|
{
|
|
HANDLE hModule;
|
|
LPMODULEENTRY lpMod = lpModList;
|
|
LPMODULEENTRY lpNewMod;
|
|
int i;
|
|
char temp[64];
|
|
|
|
printf("LoadLibrary '%s'\n", libname);
|
|
|
|
/* extract dllname */
|
|
strcpy(temp, libname);
|
|
if (strchr(temp, '\\') || strchr(temp, '/'))
|
|
for (i = strlen(temp) - 1; i ; i--)
|
|
if (temp[i] == '\\' || temp[i] == '/') {
|
|
strcpy(temp, temp + i + 1);
|
|
break;
|
|
}
|
|
for (i = strlen(temp) - 1; i ; i--)
|
|
if (temp[i] == '.') {
|
|
temp[i] = 0;
|
|
break;
|
|
}
|
|
|
|
if (FindDLLTable(temp))
|
|
{
|
|
printf("Library was a builtin - \n");
|
|
return GetModuleHandle(temp);
|
|
}
|
|
|
|
if (lpMod != NULL)
|
|
{
|
|
while (TRUE)
|
|
{
|
|
if (strcmp(libname, lpMod->FileName) == 0)
|
|
{
|
|
lpMod->Count++;
|
|
printf("LoadLibrary // already loaded hInst=%04X\n",
|
|
lpMod->hInst);
|
|
return lpMod->hInst;
|
|
}
|
|
if (lpMod->lpNextModule == NULL) break;
|
|
lpMod = lpMod->lpNextModule;
|
|
}
|
|
}
|
|
|
|
hModule = GlobalAlloc(GMEM_MOVEABLE, sizeof(MODULEENTRY));
|
|
lpNewMod = (LPMODULEENTRY) GlobalLock(hModule);
|
|
#ifdef DEBUG_LIBRARY
|
|
printf("LoadLibrary // creating new module entry %08X\n", lpNewMod);
|
|
#endif
|
|
if (lpNewMod == NULL)
|
|
return 0;
|
|
if (lpModList == NULL)
|
|
{
|
|
lpModList = lpNewMod;
|
|
lpNewMod->lpPrevModule = NULL;
|
|
}
|
|
else
|
|
{
|
|
lpMod->lpNextModule = lpNewMod;
|
|
lpNewMod->lpPrevModule = lpMod;
|
|
}
|
|
|
|
lpNewMod->lpNextModule = NULL;
|
|
lpNewMod->hModule = hModule;
|
|
lpNewMod->ModuleName = NULL;
|
|
lpNewMod->FileName = (LPSTR) malloc(strlen(libname));
|
|
if (lpNewMod->FileName != NULL)
|
|
strcpy(lpNewMod->FileName, libname);
|
|
lpNewMod->hInst = LoadImage(libname, DLL);
|
|
lpNewMod->Count = 1;
|
|
printf("LoadLibrary returned Library hInst=%04X\n", lpNewMod->hInst);
|
|
GlobalUnlock(hModule);
|
|
return lpNewMod->hInst;
|
|
}
|
|
|
|
|
|
/**********************************************************************
|
|
* FreeLibrary [KERNEL.96]
|
|
*/
|
|
void FreeLibrary(HANDLE hLib)
|
|
{
|
|
LPMODULEENTRY lpMod = lpModList;
|
|
|
|
printf("FreeLibrary(%04X);\n", hLib);
|
|
|
|
/* built-in dll ? */
|
|
if (IS_BUILTIN_DLL(hLib))
|
|
return;
|
|
|
|
while (lpMod != NULL) {
|
|
if (lpMod->hInst == hLib) {
|
|
if (lpMod->Count == 1) {
|
|
if (hLib != (HANDLE)NULL) GlobalFree(hLib);
|
|
if (lpMod->ModuleName != NULL) free(lpMod->ModuleName);
|
|
if (lpMod->FileName != NULL) free(lpMod->FileName);
|
|
GlobalFree(lpMod->hModule);
|
|
printf("FreeLibrary // freed !\n");
|
|
return;
|
|
}
|
|
lpMod->Count--;
|
|
printf("FreeLibrary // Count decremented !\n");
|
|
return;
|
|
}
|
|
lpMod = lpMod->lpNextModule;
|
|
}
|
|
}
|
|
|
|
|
|
/**********************************************************************
|
|
* GetProcAddress [KERNEL.50]
|
|
*/
|
|
FARPROC GetProcAddress(HANDLE hModule, char *proc_name)
|
|
{
|
|
int i, sel, addr, ret;
|
|
register struct w_files *w = wine_files;
|
|
int ordinal, len;
|
|
char * cpnt;
|
|
char C[128];
|
|
HTASK hTask;
|
|
LPTASKENTRY lpTask;
|
|
|
|
/* built-in dll ? */
|
|
if (IS_BUILTIN_DLL(hModule))
|
|
{
|
|
if ((int) proc_name & 0xffff0000)
|
|
{
|
|
printf("GetProcAddress: builtin %#04X, '%s'\n",
|
|
hModule, proc_name);
|
|
if (GetEntryDLLName(dll_builtin_table[hModule - 0xFF00].dll_name,
|
|
proc_name, &sel, &addr))
|
|
{
|
|
printf("Address not found !\n");
|
|
}
|
|
}
|
|
else
|
|
{
|
|
printf("GetProcAddress: builtin %#04X, %d\n",
|
|
hModule, (int)proc_name);
|
|
if (GetEntryDLLOrdinal(dll_builtin_table[hModule-0xFF00].dll_name,
|
|
(int)proc_name & 0x0000FFFF, &sel, &addr))
|
|
{
|
|
printf("Address not found !\n");
|
|
}
|
|
}
|
|
ret = MAKELONG(addr, sel);
|
|
printf("GetProcAddress // ret=%08X sel=%04X addr=%04X\n",
|
|
ret, sel, addr);
|
|
return (FARPROC)ret;
|
|
}
|
|
if (hModule == 0)
|
|
{
|
|
hTask = GetCurrentTask();
|
|
printf("GetProcAddress // GetCurrentTask()=%04X\n", hTask);
|
|
lpTask = (LPTASKENTRY) GlobalLock(hTask);
|
|
if (lpTask == NULL)
|
|
{
|
|
printf("GetProcAddress: can't find current module handle !\n");
|
|
return NULL;
|
|
}
|
|
hModule = lpTask->hInst;
|
|
printf("GetProcAddress: current module=%04X instance=%04X!\n",
|
|
lpTask->hModule, lpTask->hInst);
|
|
GlobalUnlock(hTask);
|
|
}
|
|
while (w && w->hinstance != hModule)
|
|
w = w->next;
|
|
if (w == NULL)
|
|
return NULL;
|
|
printf("GetProcAddress // Module Found ! w->filename='%s'\n", w->filename);
|
|
if ((int)proc_name & 0xFFFF0000)
|
|
{
|
|
AnsiUpper(proc_name);
|
|
printf("GetProcAddress: %04X, '%s'\n", hModule, proc_name);
|
|
cpnt = w->nrname_table;
|
|
while(TRUE)
|
|
{
|
|
if (((int) cpnt) - ((int)w->nrname_table) >
|
|
w->ne_header->nrname_tab_length) return NULL;
|
|
len = *cpnt++;
|
|
strncpy(C, cpnt, len);
|
|
C[len] = '\0';
|
|
#ifdef DEBUG_MODULE
|
|
printf("pointing Function '%s' ordinal=%d !\n",
|
|
C, *((unsigned short *)(cpnt + len)));
|
|
#endif
|
|
if (strncmp(cpnt, proc_name, len) == 0)
|
|
{
|
|
ordinal = *((unsigned short *)(cpnt + len));
|
|
break;
|
|
}
|
|
cpnt += len + 2;
|
|
};
|
|
if (ordinal == 0)
|
|
{
|
|
printf("GetProcAddress // function '%s' not found !\n", proc_name);
|
|
return NULL;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
printf("GetProcAddress: %#04x, %d\n", hModule, (int) proc_name);
|
|
ordinal = (int)proc_name;
|
|
}
|
|
ret = GetEntryPointFromOrdinal(w, ordinal);
|
|
if (ret == -1)
|
|
{
|
|
printf("GetProcAddress // Function #%d not found !\n", ordinal);
|
|
return NULL;
|
|
}
|
|
addr = ret & 0xffff;
|
|
sel = (ret >> 16);
|
|
printf("GetProcAddress // ret=%08X sel=%04X addr=%04X\n", ret, sel, addr);
|
|
return (FARPROC) ret;
|
|
}
|
|
|
|
#endif /* ifndef WINELIB */
|
|
|