Sat Jan 3 17:15:56 1998 Alexandre Julliard <julliard@lrc.epfl.ch> * [debugger/db_disasm.c] Added cpuid and cmpxchg instructions. * [if1632/builtin.c] [relay32/builtin32.c] Fixed broken -dll option with Win32 DLLs. * [include/heap.h] Added SYSTEM_LOCK/SYSTEM_UNLOCK macros. * [configure.in] [misc/lstr.c] Added check for wctype.h. Commented out --enable-ipc option (IPC code has been broken for a long time anyway). * [scheduler/critsection.c] [scheduler/event.c] [scheduler/mutex.c] [scheduler/semaphore.c] Implemented Win32 synchronization objects. * [scheduler/synchro.c] Implemented WaitForMultipleObjects and related functions. * [scheduler/thread.c] If possible, use clone() in CreateThread(). * [scheduler/thread.c] [scheduler/process.c] Made thread and process waitable objects. Thread and process id values are now different from the pointers they represent. * [win32/k32obj.c] Moved to scheduler directory. Added function table for waiting operations on objects. * [files/file.c] [memory/virtual.c] Added new K32OBJ function table. Sun Jan 1 16:48:23 1997 Andreas Mohr <100.30936@germany.net> * [files/file.c] Fixed my patch for GetTempFileName16() as needed. It was ...Name32A() that didn't work properly, not ...Name16(). * [graphics/x11drv/brush.c] Fixed a BadMatch error. * [msdos/int21.c] Fixed INT21_FindNextFCB() to get correct volume labels e.g. in "file open" dialog. * [multimedia/joystick.c] [relay32/winmm.spec] Stub JoyGetPosEx(). * [scheduler/process.c] [relay32/kernel32.spec] Implemented RegisterServiceProcess(). Wed Dec 31 11:14:43 1997 Lawson Whitney <lawson_whitney@juno.com> * [if1632/kernel.spec] [if1632/relay.c] Define CallProcEx32w - Thanks to Marcus Meissner for his excellent CallProc32W. * [loader/module.c] Take a shot at defining FreeLibrary32W. Sun Dec 28 12:44:04 1997 Kai Morich <kai.morich@rhein-neckar.netsurf.de> * [controls/menu.c] Menu modification from WM_INITMENUPOPUP message fixed. Menu items now can have different wID and hSubMenu (Win95 behavior). * [misc/cpu.c] Improved IsProcessorFeaturePresent. Sun Dec 28 03:21:08 1997 Ove Kaaven <ovek@main.arcticnet.no> * [include/winsock.h] [misc/winsock.c] Fixed WS_SOL_SOCKET for setsockopt(), and made select() return empty fd_sets if timeout. * [objects/palette.c] AnimatePalette() bailed out if entire palette is animated. Fixed. * [objects/dib.c] Added some code to SetDIBitsToDevice() and its helpers to fix some offseting problems. * [objects/cursoricon.c] Made CreateCursor32() convert the instance handle properly. Made DestroyCursor() return correct success status. Wed Dec 24 17:56:34 1997 Dimitrie O. Paun <dimi@cs.toronto.edu> * [windows/syscolor.c] Added definition of GetSysColorPen16/32. This function does not exist in the Win32 API but is a very close (and natural) relative to GetSysColorBrush function. Moreover, it is *very* much used within Wine since there are a lot of places where we need to draw lines with the standard colors. * [controls/button.c] [controls/combo.c] [controls/icontitle.c] [controls/menu.c] [controls/progress.c] [controls/scroll.c] [controls/updown.c] [graphics/painting.c] [misc/tweak.c] [windows/defwnd.c] [windows/graphics.c] [windows/nonclient.c] Replaced references to sysColorObjects with the appropriate call to GetSysColorBrush32/GetSysColorPen32. There is no need to expose the implementation of these functions, even within Wine. This makes the code easier to understand, debug, maintain. * [controls/uitools.c] Modified most of the functions in this file to use the now standard pens (i.e. GetSysColorPen32). These functions made *heavy* use of standard pens so I expect a lot less CreatePen/DeleteObject calls can do only good...:) Plus some minor modifications (*no* functional changes though). * [controls/updown.c] Used the new DrawFrameControl32 function to paint the control. I also deleted UDDOWN_DrawArrow since it was no longer required. Tue Dec 23 00:03:33 1997 Steinar Hamre <steinarh@stud.fim.ntnu.no> * [configure.in] Added check for -lw. * [include/wintypes.h] [tools/build.c] Changes to make the assembly understandable for even sun as. ".ascii" -> ".string", "call %foo" -> "call *%foo", "pushw/popw %[cdes]s" written out to ".byte 0x66\npushl/popl %[cdes]s". * [memory/ldt.c] #ifdef added so <sys/seg.h> will not be included on Solaris. Mon Dec 22 18:55:19 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de> * [configure.in] Added XF86DGA check. * [multimedia/dsound.c][relay32/dsound.spec][include/dsound.h] Started DirectSound. Only stubs for now. * [graphics/ddraw.c][include/ddraw.h][relay32/ddraw.spec] Started to implement DirectDraw. Mostly stubs, some testcases work. Requires the XF86DGA extension to XFree86. (check demo/blizdemo.exe from the Diablo CD-ROM). * [files/drive.c] Return correct "CDFS" fsname so Diablo is a bit happier. Sun Dec 21 21:45:48 1997 Kevin Cozens <kcozens@interlog.com> * [misc/registry.c] Fixed bugs in the routines which read the Windows '95 registry files. Added extra information regarding the format of the Windows '95 registry files.
385 lines
11 KiB
C
385 lines
11 KiB
C
/*
|
|
* PE (Portable Execute) File Resources
|
|
*
|
|
* Copyright 1995 Thomas Sandford
|
|
* Copyright 1996 Martin von Loewis
|
|
*
|
|
* Based on the Win16 resource handling code in loader/resource.c
|
|
* Copyright 1993 Robert J. Amstadt
|
|
* Copyright 1995 Alexandre Julliard
|
|
* Copyright 1997 Marcus Meissner
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include <sys/types.h>
|
|
#include "wintypes.h"
|
|
#include "windows.h"
|
|
#include "pe_image.h"
|
|
#include "module.h"
|
|
#include "heap.h"
|
|
#include "task.h"
|
|
#include "process.h"
|
|
#include "libres.h"
|
|
#include "stackframe.h"
|
|
#include "neexe.h"
|
|
#include "stddebug.h"
|
|
#include "debug.h"
|
|
|
|
/**********************************************************************
|
|
* HMODULE32toPE_MODREF
|
|
*
|
|
* small helper function to get a PE_MODREF from a passed HMODULE32
|
|
*/
|
|
static PE_MODREF*
|
|
HMODULE32toPE_MODREF(HMODULE32 hmod) {
|
|
NE_MODULE *pModule;
|
|
PDB32 *pdb = pCurrentProcess;
|
|
PE_MODREF *pem;
|
|
|
|
if (!hmod) hmod = GetTaskDS(); /* FIXME: correct? */
|
|
hmod = MODULE_HANDLEtoHMODULE32( hmod );
|
|
if (!hmod) return NULL;
|
|
if (!(pModule = MODULE_GetPtr( hmod ))) return 0;
|
|
pem = pdb->modref_list;
|
|
while (pem && pem->module != hmod)
|
|
pem=pem->next;
|
|
return pem;
|
|
}
|
|
|
|
/**********************************************************************
|
|
* GetResDirEntryW
|
|
*
|
|
* Helper function - goes down one level of PE resource tree
|
|
*
|
|
*/
|
|
LPIMAGE_RESOURCE_DIRECTORY GetResDirEntryW(LPIMAGE_RESOURCE_DIRECTORY resdirptr,
|
|
LPCWSTR name,DWORD root,
|
|
BOOL32 allowdefault)
|
|
{
|
|
int entrynum;
|
|
LPIMAGE_RESOURCE_DIRECTORY_ENTRY entryTable;
|
|
int namelen;
|
|
|
|
if (HIWORD(name)) {
|
|
if (name[0]=='#') {
|
|
char buf[10];
|
|
|
|
lstrcpynWtoA(buf,name+1,10);
|
|
return GetResDirEntryW(resdirptr,(LPCWSTR)atoi(buf),root,allowdefault);
|
|
}
|
|
entryTable = (LPIMAGE_RESOURCE_DIRECTORY_ENTRY) (
|
|
(BYTE *) resdirptr +
|
|
sizeof(IMAGE_RESOURCE_DIRECTORY));
|
|
namelen = lstrlen32W(name);
|
|
for (entrynum = 0; entrynum < resdirptr->NumberOfNamedEntries; entrynum++)
|
|
{
|
|
LPIMAGE_RESOURCE_DIR_STRING_U str =
|
|
(LPIMAGE_RESOURCE_DIR_STRING_U) (root +
|
|
entryTable[entrynum].u1.s.NameOffset);
|
|
if(namelen != str->Length)
|
|
continue;
|
|
if(lstrncmpi32W(name,str->NameString,str->Length)==0)
|
|
return (LPIMAGE_RESOURCE_DIRECTORY) (
|
|
root +
|
|
entryTable[entrynum].u2.s.OffsetToDirectory);
|
|
}
|
|
return NULL;
|
|
} else {
|
|
entryTable = (LPIMAGE_RESOURCE_DIRECTORY_ENTRY) (
|
|
(BYTE *) resdirptr +
|
|
sizeof(IMAGE_RESOURCE_DIRECTORY) +
|
|
resdirptr->NumberOfNamedEntries * sizeof(IMAGE_RESOURCE_DIRECTORY_ENTRY));
|
|
for (entrynum = 0; entrynum < resdirptr->NumberOfIdEntries; entrynum++)
|
|
if ((DWORD)entryTable[entrynum].u1.Name == (DWORD)name)
|
|
return (LPIMAGE_RESOURCE_DIRECTORY) (
|
|
root +
|
|
entryTable[entrynum].u2.s.OffsetToDirectory);
|
|
/* just use first entry if no default can be found */
|
|
if (allowdefault && !name && resdirptr->NumberOfIdEntries)
|
|
return (LPIMAGE_RESOURCE_DIRECTORY) (
|
|
root +
|
|
entryTable[0].u2.s.OffsetToDirectory);
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
/**********************************************************************
|
|
* PE_FindResourceEx32W
|
|
*/
|
|
HANDLE32 PE_FindResourceEx32W(
|
|
HINSTANCE32 hModule,LPCWSTR name,LPCWSTR type,WORD lang
|
|
) {
|
|
LPIMAGE_RESOURCE_DIRECTORY resdirptr;
|
|
DWORD root;
|
|
HANDLE32 result;
|
|
PE_MODREF *pem = HMODULE32toPE_MODREF(hModule);
|
|
|
|
if (!pem || !pem->pe_resource)
|
|
return 0;
|
|
|
|
resdirptr = pem->pe_resource;
|
|
root = (DWORD) resdirptr;
|
|
if ((resdirptr = GetResDirEntryW(resdirptr, type, root, FALSE)) == NULL)
|
|
return 0;
|
|
if ((resdirptr = GetResDirEntryW(resdirptr, name, root, FALSE)) == NULL)
|
|
return 0;
|
|
result = (HANDLE32)GetResDirEntryW(resdirptr, (LPCWSTR)(UINT32)lang, root, FALSE);
|
|
/* Try LANG_NEUTRAL, too */
|
|
if(!result)
|
|
return (HANDLE32)GetResDirEntryW(resdirptr, (LPCWSTR)0, root, TRUE);
|
|
return result;
|
|
}
|
|
|
|
|
|
/**********************************************************************
|
|
* PE_LoadResource32
|
|
*/
|
|
HANDLE32 PE_LoadResource32( HINSTANCE32 hModule, HANDLE32 hRsrc )
|
|
{
|
|
PE_MODREF *pem = HMODULE32toPE_MODREF(hModule);
|
|
|
|
if (!pem || !pem->pe_resource)
|
|
return 0;
|
|
if (!hRsrc)
|
|
return 0;
|
|
return (HANDLE32) (pem->module + ((LPIMAGE_RESOURCE_DATA_ENTRY)hRsrc)->OffsetToData);
|
|
}
|
|
|
|
|
|
/**********************************************************************
|
|
* PE_SizeofResource32
|
|
*/
|
|
DWORD PE_SizeofResource32( HINSTANCE32 hModule, HANDLE32 hRsrc )
|
|
{
|
|
/* we don't need hModule */
|
|
if (!hRsrc)
|
|
return 0;
|
|
return ((LPIMAGE_RESOURCE_DATA_ENTRY)hRsrc)->Size;
|
|
}
|
|
|
|
/**********************************************************************
|
|
* PE_EnumResourceTypes32A
|
|
*/
|
|
BOOL32
|
|
PE_EnumResourceTypes32A(HMODULE32 hmod,ENUMRESTYPEPROC32A lpfun,LONG lparam) {
|
|
PE_MODREF *pem = HMODULE32toPE_MODREF(hmod);
|
|
int i;
|
|
LPIMAGE_RESOURCE_DIRECTORY resdir;
|
|
LPIMAGE_RESOURCE_DIRECTORY_ENTRY et;
|
|
BOOL32 ret;
|
|
HANDLE32 heap = GetProcessHeap();
|
|
|
|
if (!pem || !pem->pe_resource)
|
|
return FALSE;
|
|
|
|
resdir = (LPIMAGE_RESOURCE_DIRECTORY)pem->pe_resource;
|
|
et =(LPIMAGE_RESOURCE_DIRECTORY_ENTRY)((LPBYTE)resdir+sizeof(IMAGE_RESOURCE_DIRECTORY));
|
|
ret = FALSE;
|
|
for (i=0;i<resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries;i++) {
|
|
LPSTR name;
|
|
|
|
if (HIWORD(et[i].u1.Name))
|
|
name = HEAP_strdupWtoA(heap,0,(LPWSTR)((LPBYTE)pem->pe_resource+et[i].u1.Name));
|
|
else
|
|
name = (LPSTR)et[i].u1.Name;
|
|
ret = lpfun(hmod,name,lparam);
|
|
if (HIWORD(name))
|
|
HeapFree(heap,0,name);
|
|
if (!ret)
|
|
break;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
/**********************************************************************
|
|
* PE_EnumResourceTypes32W
|
|
*/
|
|
BOOL32
|
|
PE_EnumResourceTypes32W(HMODULE32 hmod,ENUMRESTYPEPROC32W lpfun,LONG lparam) {
|
|
PE_MODREF *pem = HMODULE32toPE_MODREF(hmod);
|
|
int i;
|
|
LPIMAGE_RESOURCE_DIRECTORY resdir;
|
|
LPIMAGE_RESOURCE_DIRECTORY_ENTRY et;
|
|
BOOL32 ret;
|
|
|
|
if (!pem || !pem->pe_resource)
|
|
return FALSE;
|
|
|
|
resdir = (LPIMAGE_RESOURCE_DIRECTORY)pem->pe_resource;
|
|
et =(LPIMAGE_RESOURCE_DIRECTORY_ENTRY)((LPBYTE)resdir+sizeof(IMAGE_RESOURCE_DIRECTORY));
|
|
ret = FALSE;
|
|
for (i=0;i<resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries;i++) {
|
|
LPWSTR type;
|
|
if (HIWORD(et[i].u1.Name))
|
|
type = (LPWSTR)((LPBYTE)pem->pe_resource+et[i].u1.Name);
|
|
else
|
|
type = (LPWSTR)et[i].u1.Name;
|
|
|
|
ret = lpfun(hmod,type,lparam);
|
|
if (!ret)
|
|
break;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
/**********************************************************************
|
|
* PE_EnumResourceNames32A
|
|
*/
|
|
BOOL32
|
|
PE_EnumResourceNames32A(
|
|
HMODULE32 hmod,LPCSTR type,ENUMRESNAMEPROC32A lpfun,LONG lparam
|
|
) {
|
|
PE_MODREF *pem = HMODULE32toPE_MODREF(hmod);
|
|
int i;
|
|
LPIMAGE_RESOURCE_DIRECTORY resdir;
|
|
LPIMAGE_RESOURCE_DIRECTORY_ENTRY et;
|
|
BOOL32 ret;
|
|
HANDLE32 heap = GetProcessHeap();
|
|
LPWSTR typeW;
|
|
|
|
if (!pem || !pem->pe_resource)
|
|
return FALSE;
|
|
resdir = (LPIMAGE_RESOURCE_DIRECTORY)pem->pe_resource;
|
|
if (HIWORD(type))
|
|
typeW = HEAP_strdupAtoW(heap,0,type);
|
|
else
|
|
typeW = (LPWSTR)type;
|
|
resdir = GetResDirEntryW(resdir,typeW,(DWORD)pem->pe_resource,FALSE);
|
|
if (HIWORD(typeW))
|
|
HeapFree(heap,0,typeW);
|
|
if (!resdir)
|
|
return FALSE;
|
|
et =(LPIMAGE_RESOURCE_DIRECTORY_ENTRY)((LPBYTE)resdir+sizeof(IMAGE_RESOURCE_DIRECTORY));
|
|
ret = FALSE;
|
|
for (i=0;i<resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries;i++) {
|
|
LPSTR name;
|
|
|
|
if (HIWORD(et[i].u1.Name))
|
|
name = HEAP_strdupWtoA(heap,0,(LPWSTR)((LPBYTE)pem->pe_resource+et[i].u1.Name));
|
|
else
|
|
name = (LPSTR)et[i].u1.Name;
|
|
ret = lpfun(hmod,type,name,lparam);
|
|
if (HIWORD(name)) HeapFree(heap,0,name);
|
|
if (!ret)
|
|
break;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
/**********************************************************************
|
|
* PE_EnumResourceNames32W
|
|
*/
|
|
BOOL32
|
|
PE_EnumResourceNames32W(
|
|
HMODULE32 hmod,LPCWSTR type,ENUMRESNAMEPROC32W lpfun,LONG lparam
|
|
) {
|
|
PE_MODREF *pem = HMODULE32toPE_MODREF(hmod);
|
|
int i;
|
|
LPIMAGE_RESOURCE_DIRECTORY resdir;
|
|
LPIMAGE_RESOURCE_DIRECTORY_ENTRY et;
|
|
BOOL32 ret;
|
|
|
|
if (!pem || !pem->pe_resource)
|
|
return FALSE;
|
|
|
|
resdir = (LPIMAGE_RESOURCE_DIRECTORY)pem->pe_resource;
|
|
resdir = GetResDirEntryW(resdir,type,(DWORD)pem->pe_resource,FALSE);
|
|
if (!resdir)
|
|
return FALSE;
|
|
et =(LPIMAGE_RESOURCE_DIRECTORY_ENTRY)((LPBYTE)resdir+sizeof(IMAGE_RESOURCE_DIRECTORY));
|
|
ret = FALSE;
|
|
for (i=0;i<resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries;i++) {
|
|
LPWSTR name;
|
|
if (HIWORD(et[i].u1.Name))
|
|
name = (LPWSTR)((LPBYTE)pem->pe_resource+et[i].u1.Name);
|
|
else
|
|
name = (LPWSTR)et[i].u1.Name;
|
|
ret = lpfun(hmod,type,name,lparam);
|
|
if (!ret)
|
|
break;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
/**********************************************************************
|
|
* PE_EnumResourceNames32A
|
|
*/
|
|
BOOL32
|
|
PE_EnumResourceLanguages32A(
|
|
HMODULE32 hmod,LPCSTR name,LPCSTR type,ENUMRESLANGPROC32A lpfun,
|
|
LONG lparam
|
|
) {
|
|
PE_MODREF *pem = HMODULE32toPE_MODREF(hmod);
|
|
int i;
|
|
LPIMAGE_RESOURCE_DIRECTORY resdir;
|
|
LPIMAGE_RESOURCE_DIRECTORY_ENTRY et;
|
|
BOOL32 ret;
|
|
HANDLE32 heap = GetProcessHeap();
|
|
LPWSTR nameW,typeW;
|
|
|
|
if (!pem || !pem->pe_resource)
|
|
return FALSE;
|
|
|
|
resdir = (LPIMAGE_RESOURCE_DIRECTORY)pem->pe_resource;
|
|
if (HIWORD(name))
|
|
nameW = HEAP_strdupAtoW(heap,0,name);
|
|
else
|
|
nameW = (LPWSTR)name;
|
|
resdir = GetResDirEntryW(resdir,nameW,(DWORD)pem->pe_resource,FALSE);
|
|
if (HIWORD(nameW))
|
|
HeapFree(heap,0,nameW);
|
|
if (!resdir)
|
|
return FALSE;
|
|
if (HIWORD(type))
|
|
typeW = HEAP_strdupAtoW(heap,0,type);
|
|
else
|
|
typeW = (LPWSTR)type;
|
|
resdir = GetResDirEntryW(resdir,typeW,(DWORD)pem->pe_resource,FALSE);
|
|
if (HIWORD(typeW))
|
|
HeapFree(heap,0,typeW);
|
|
if (!resdir)
|
|
return FALSE;
|
|
et =(LPIMAGE_RESOURCE_DIRECTORY_ENTRY)((LPBYTE)resdir+sizeof(IMAGE_RESOURCE_DIRECTORY));
|
|
ret = FALSE;
|
|
for (i=0;i<resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries;i++) {
|
|
/* languages are just ids... I hopem */
|
|
ret = lpfun(hmod,name,type,et[i].u1.Id,lparam);
|
|
if (!ret)
|
|
break;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
/**********************************************************************
|
|
* PE_EnumResourceLanguages32W
|
|
*/
|
|
BOOL32
|
|
PE_EnumResourceLanguages32W(
|
|
HMODULE32 hmod,LPCWSTR name,LPCWSTR type,ENUMRESLANGPROC32W lpfun,
|
|
LONG lparam
|
|
) {
|
|
PE_MODREF *pem = HMODULE32toPE_MODREF(hmod);
|
|
int i;
|
|
LPIMAGE_RESOURCE_DIRECTORY resdir;
|
|
LPIMAGE_RESOURCE_DIRECTORY_ENTRY et;
|
|
BOOL32 ret;
|
|
|
|
if (!pem || !pem->pe_resource)
|
|
return FALSE;
|
|
|
|
resdir = (LPIMAGE_RESOURCE_DIRECTORY)pem->pe_resource;
|
|
resdir = GetResDirEntryW(resdir,name,(DWORD)pem->pe_resource,FALSE);
|
|
if (!resdir)
|
|
return FALSE;
|
|
resdir = GetResDirEntryW(resdir,type,(DWORD)pem->pe_resource,FALSE);
|
|
if (!resdir)
|
|
return FALSE;
|
|
et =(LPIMAGE_RESOURCE_DIRECTORY_ENTRY)((LPBYTE)resdir+sizeof(IMAGE_RESOURCE_DIRECTORY));
|
|
ret = FALSE;
|
|
for (i=0;i<resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries;i++) {
|
|
ret = lpfun(hmod,name,type,et[i].u1.Id,lparam);
|
|
if (!ret)
|
|
break;
|
|
}
|
|
return ret;
|
|
}
|