Tue Jun 7 08:41:27 1994 Bob Amstadt (bob@pooh) * loader/selector.c (FixupFunctionPrologs): New function to fixup loaded DLL function prologs. It replaces the do nothing code with code that loads DS with the appropriate data segment for the DLL. * misc/cursor.c (LoadCursor): Disabled cursor loading from .EXE or .DLL. The code needs to handle the possibility of multiple cursors in a single directory. Also, it should check to see if the cursor is the right size. * objects/font.c (EnumFonts): Checked for lpLogFontList[i] == NULL * objects/gdiobj.c (SetObjectOwner): Removed stub. Replaced with simple return in gdi.spec. This function is not defined for the retail version of Windows. * memory/heap.c (WIN16_LocalHandleDelta): New function. This is really a dummy that imitates the proper return values. * loader/library.c (GetProcAddress): Fixed definition of IS_BUILTIN_DLL() macro. Mon Jun 6 18:15:40 1994 Bob Amstadt (bob@pooh) * miscemu/int21.c (SeekFile): Needed to return current position in DX:AX. * windows/utility.c (windows_wsprintf): Added support for '#' in format, and fixed bug with "ptr" being incremented too many times. * miscemu/int21.c (OpenExistingFile): Add code to handle opening files read-only and write-only. * loader/wine.c: Segment fixups now done in LoadImage instead of _WinMain. This is necessary to support LoadLibrary(). Sun Jun 5 17:34:24 1994 Erik Bos (erik@hacktic.nl) * [loader/*] - fixed: GetModuleHandle() sometimes returned a wrong handle. - don't init dlls when cs == 0 (lzexpand, doesn't seem to have a init function) - LoadLibrary & LoadImage now return error instead of stopping wine. - moved most of NE-functions into one file. - LoadLibrary() uses w_files list instead of its own list. - NE exectables are now fixed-up and initialised when loaded instead of only once before calling InitTask. * [miscemu/int15.c] [miscemu/int31.c] Added. * [loader/selector.c] Stubs added for {Get|Set}SelectorLimit(), {Get|Set}SelectorBase(). * [misc/main.c] Stub added for IsRomModule(). * [miscemu/int21.c] Some cleanup, added heap for returning data. Jun 6, 94 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte) * [tools/build.c] Change MAX_ORDINALS define to higher value, 1299 entries. (MMSYSTEM doesn't have succesive numbers, some are around 1200). * [windows/utility.c] Bug fix in windows_wsprintf(), (twice increments ...). * [windows/winpos.c] Bug fix in SetWindowPos(), redraw was done if flag was set to SWP_NOREDRAW while SWP_SHOWWINDOW). * [misc/message.c] [controls/combo.c] Add an InvalidateRect() in WM_SHOWWINDOW to statisfy the new 'saveunder'. * [windows/win.c] In CreateWindowEx(), do SetMenu() calls after window creation, just before sending to WM_NCCALCSIZE. * [controls/menu.c] In function SetMenu(), now use SetWindowPos() with flags SWP_FRAMECHANGED to readjust menu area. Function MenuBarCalcSize() redone. Sun May 29 11:08:24 1994 David B. Thomas (dt@yenta.abq.nm.us) * [objects/text.c] Fixed problems associated with DT_WORDBREAK flag. String length was not being properly decremented when lines were folded, and wrapping was not performed when DT_NOCLIP and DT_NOPREFIX were both on in addition to DT_WORDBREAK. Windows does wrapping in this case, and now so does wine. Sun Jun 5 19:17:49 1994 Olaf Flebbe (olaf@dragon) * [edit.c] cp1 was uninitialized iff lineno == 0 * FindFile tests for existance of file even if a full filename was supplied. What about unix file names? * [controls/listbox ] wndPtr was uninitialized for LB_SETTOPINDEX * [misc/property.c] Do not free lpProp. Is it really allocated by malloc? {edited by Bob Amstadt: changed free() to GlobalFree()}
311 lines
7.7 KiB
C
311 lines
7.7 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"
|
|
|
|
extern struct w_files *wine_files;
|
|
extern struct dll_name_table_entry_s dll_builtin_table[];
|
|
|
|
#define IS_BUILTIN_DLL(handle) ((handle >> 8) == 0xff)
|
|
|
|
/**********************************************************************/
|
|
|
|
void ExtractDLLName(char *libname, char *temp)
|
|
{
|
|
int i;
|
|
|
|
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;
|
|
}
|
|
}
|
|
|
|
/**********************************************************************
|
|
* GetModuleHandle [KERNEL.47]
|
|
*/
|
|
HANDLE GetModuleHandle(LPSTR lpModuleName)
|
|
{
|
|
register struct w_files *w = wine_files;
|
|
int i;
|
|
if ((int) lpModuleName & 0xffff0000)
|
|
printf("GetModuleHandle('%s');\n", lpModuleName);
|
|
else
|
|
printf("GetModuleHandle('%x');\n", lpModuleName);
|
|
|
|
printf("GetModuleHandle // searching in builtin libraries\n");
|
|
for (i = 0; i < N_BUILTINS; i++) {
|
|
if (dll_builtin_table[i].dll_name == NULL) break;
|
|
if (((int) lpModuleName & 0xffff0000) == 0) {
|
|
if (0xFF00 + i == (int) lpModuleName) {
|
|
printf("GetModuleHandle('%s') return %04X \n",
|
|
lpModuleName, 0xff00 + i);
|
|
return 0xFF00 + i;
|
|
}
|
|
}
|
|
else if (strcasecmp(dll_builtin_table[i].dll_name, lpModuleName) == 0) {
|
|
printf("GetModuleHandle('%x') return %04X \n",
|
|
lpModuleName, 0xFF00 + i);
|
|
return (0xFF00 + i);
|
|
}
|
|
}
|
|
|
|
printf("GetModuleHandle // searching in loaded modules\n");
|
|
while (w) {
|
|
/* printf("GetModuleHandle // '%x' \n", w->name); */
|
|
if (((int) lpModuleName & 0xffff0000) == 0) {
|
|
if (w->hinstance == (int) lpModuleName) {
|
|
printf("GetModuleHandle('%x') return %04X \n",
|
|
lpModuleName, w->hinstance);
|
|
return w->hinstance;
|
|
}
|
|
}
|
|
else if (strcasecmp(w->name, lpModuleName) == 0) {
|
|
printf("GetModuleHandle('%s') return %04X \n",
|
|
lpModuleName, w->hinstance);
|
|
return w->hinstance;
|
|
}
|
|
w = w->next;
|
|
}
|
|
printf("GetModuleHandle('%x') not found !\n", lpModuleName);
|
|
return 0;
|
|
}
|
|
|
|
|
|
/**********************************************************************
|
|
* GetModuleUsage [KERNEL.48]
|
|
*/
|
|
int GetModuleUsage(HANDLE hModule)
|
|
{
|
|
struct w_files *w;
|
|
|
|
printf("GetModuleUsage(%04X);\n", hModule);
|
|
|
|
/* built-in dll ? */
|
|
if (IS_BUILTIN_DLL(hModule))
|
|
return 2;
|
|
|
|
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 h;
|
|
|
|
if ((h = LoadImage(libname, DLL, 0)) < 32)
|
|
return h;
|
|
|
|
if (!IS_BUILTIN_DLL(h))
|
|
InitDLL(GetFileInfo(h));
|
|
|
|
return h;
|
|
}
|
|
|
|
|
|
/**********************************************************************
|
|
* FreeLibrary [KERNEL.96]
|
|
*/
|
|
void FreeLibrary(HANDLE hLib)
|
|
{
|
|
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 */
|
|
|