Sun Nov 16 07:42:44 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu> * [windows/dce.c] [windows/clipboard.c] [windows/nonclient.c] Bug fixes. * [misc/shell.c] [resources/*] New "About" dialog. Sat Nov 15 17:30:18 1997 Alexandre Julliard <julliard@lrc.epfl.ch> * [configure.in] [Makefile.in] Replaced --with-library option by --disable-emulator. The default is now to build both the library and the emulator. Renamed --with options to --enable to follow autoconf guidelines. * [loader/main.c] [miscemu/main.c] (New file) Split initialization in WinelibInit/EmulatorInit. * [loader/*.c] Removed all remaining #ifdef's WINELIB. * [controls/widgets.c] [windows/mdi.c] Converted MDIClientWndProc to 32-bit. * [debugger/break.c] [if1632/signal.c] [include/selectors.h] [scheduler/thread.c] Code and data selector values are now computed at run-time. * [library/libres.c] Moved to loader/ directory. * [misc/main.c] [misc/version.c] (New file) Moved all version stuff to version.c. Cleaned up a bit. * [msdos/dpmi.c] Update the REALMODECALL structure on return from real-mode interrupt. * [windows/event.c] [windows/keyboard.c] Changed the way event coordinates are determined. Don't rely on the ConfigureNotify event values. This should fix all problems with cursor position in -desktop and -managed modes. Sat Nov 15 16:09:36 1997 Slaven Rezic <eserte@cs.tu-berlin.de> * [controls/button.c] (BUTTON_CheckAutoRadioButton): Prevent possible endless loop. Wed Nov 12 03:42:45 1997 Chris Faherty <chrisf@america.com> * [misc/ver.c] Changed VerInstall32A to assume srcdir as destination if destdir is blank. This was causing alot of DLL installation into SYSTEM directory to fail. * [loader/ne_image.c] NE_LoadSegment buffer[100] was too small and getting overruns. Changed it to buffer[200]. Sat Nov 8 06:09:57 1997 Len White <phreak@cgocable.net> * [misc/ddeml.c] [include/ddeml.h] [if1632/ddeml.spec] Added stub functions DdeConnectList(), DdeQueryNextServer(), DdeDisconnectList(), DdeSetUserHandle(), DdeAbandonTransaction(), DdePostAdvise(), DdeCreateDataHandle(), DdeAddData(), DdeGetData(), DdeAccessData(), DdeUnaccessData(), DdeEnableCallback(), DdeCmpStringHandles(). Fri Nov 7 19:44:26 1997 Olaf Flebbe <o.flebbe@science-computing.de> * [files/directory.c] Fix typo in directory.c [broke loading of cdplayer on nt40] * [misc/main.c] Implemented -winver nt40. * [loader/resource.c] [user32.spec] Stubs for CopyAcceleratorTable, Destroy AcceleratorTable. Thu Nov 6 22:37:04 1997 Morten Welinder <welinder@rentec.com> * [files/drive.c] (GetDiskFreeSpace32A): Cap at 2GB. * [include/windows.h] Prototype DrawIconEx and CreateDIBSection32. Define OBM_RADIOCHECK. Add DI_* macros. * [objects/dib.c] [if1632/gdi.spec] CreateDIBSection is a WINAPI. Renamed to CreateDIBSection32. Implement CreateDIBSection16. * [if1632/user.spec] [if1632/user32.spec] Add DrawIconEx. * [objects/cursoricon.c] (CopyIcon32): Fix bogus implementation. * [objects/bitmap.c] (CopyBitmap32): New function. (CopyImage32): Do bitmaps. * [graphics/x11drv/text.c] (X11DRV_ExtTextOut): Change ascent and descent default to avoid zero-thinkness overstrike line. * [include/debugstr.h] [misc/debugstr.c] New files. * [msdos/dpmi.c] Don't prototype do_mscdex. In INT_Int31Handler, handle real-mode int 0x21, ah=0x52. * [msdos/int2f.c] Add dummys for 0x1681 and 0x1682. * [misc/registry.c] Fix memory leaks in RegDeleteKey32W. * [objects/text.c] In TEXT_NextLine, fix another off-by-one bug. * [include/bitmaps/obm_radiocheck] New file. (It a small circle used to radio-button menu items when selected.) * [objects/oembitmap.c] Add obm_radiocheck. * [include/windows.h] [if1632/user32.spec] [controls/menu.c] [if1632/user.spec] Define CheckMenuRadioItem{16,32}. Define GetMenuItemRect{16,32}. Wed Nov 5 11:30:14 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de> * [misc/main.c] Auto adjust versions depending on binary. Tue Nov 4 15:21:00 1997 Kristian Nielsen <kristian.nielsen@risoe.dk> * [controls/listbox.c] Paint full background in listbox items with tab stops enabled. * [if1632/thunk.c] Copy some more message parameter structures (DRAWITEMSTRUCT16, COMPAREITEMSTRUCT16) to the stack segment to fix broken programs that need this. * [windows/dce.c] Only clip sibling windows when the parent has the WS_CLIPSIBLINGS style set. * [windows/focus.c] Make order of events in FOCUS_SwitchFocus() reflect API docs. * [windows/defdlg.c] Fix problem with loss of focus in some dialogs. * [win32/code_page.c] Fix return value for MultiByteToWideChar(). * [BUGS] BCW now works.
190 lines
4.1 KiB
C
190 lines
4.1 KiB
C
/*
|
|
* WINElib-Resources
|
|
*
|
|
* Copied and modified heavily from loader/resource.c
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include "libres.h"
|
|
#include "heap.h"
|
|
#include "windows.h"
|
|
#include "xmalloc.h"
|
|
|
|
typedef struct RLE
|
|
{
|
|
const struct resource* const * Resources; /* NULL-terminated array of pointers */
|
|
struct RLE* next;
|
|
} ResListE;
|
|
|
|
static ResListE* ResourceList=NULL;
|
|
|
|
void LIBRES_RegisterResources(const struct resource* const * Res)
|
|
{
|
|
ResListE** Curr;
|
|
ResListE* n;
|
|
for(Curr=&ResourceList; *Curr; Curr=&((*Curr)->next)) { }
|
|
n=xmalloc(sizeof(ResListE));
|
|
n->Resources=Res;
|
|
n->next=NULL;
|
|
*Curr=n;
|
|
}
|
|
|
|
/**********************************************************************
|
|
* LIBRES_FindResource16
|
|
*/
|
|
HRSRC32 LIBRES_FindResource16( HINSTANCE32 hModule, LPCSTR name, LPCSTR type )
|
|
{
|
|
int nameid=0,typeid;
|
|
ResListE* ResBlock;
|
|
const struct resource* const * Res;
|
|
|
|
if(HIWORD(name))
|
|
{
|
|
if(*name=='#')
|
|
{
|
|
nameid=atoi(name+1);
|
|
name=NULL;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
nameid=LOWORD(name);
|
|
name=NULL;
|
|
}
|
|
if(HIWORD(type))
|
|
{
|
|
if(*type=='#')
|
|
typeid=atoi(type+1);
|
|
else
|
|
{
|
|
fprintf(stderr,"LIBRES_FindResource16(*,*,type=string)");
|
|
return 0;
|
|
}
|
|
}
|
|
else
|
|
typeid=LOWORD(type);
|
|
|
|
for(ResBlock=ResourceList; ResBlock; ResBlock=ResBlock->next)
|
|
for(Res=ResBlock->Resources; *Res; Res++)
|
|
if(name)
|
|
{
|
|
if((*Res)->type==typeid && !lstrcmpi32A((*Res)->name,name))
|
|
return (HRSRC32)*Res;
|
|
}
|
|
else
|
|
if((*Res)->type==typeid && (*Res)->id==nameid)
|
|
return (HRSRC32)*Res;
|
|
return 0;
|
|
}
|
|
|
|
/**********************************************************************
|
|
* LIBRES_FindResource32
|
|
*/
|
|
HRSRC32 LIBRES_FindResource32( HINSTANCE32 hModule, LPCWSTR name, LPCWSTR type )
|
|
{
|
|
int nameid=0,typeid;
|
|
ResListE* ResBlock;
|
|
const struct resource* const * Res;
|
|
|
|
if(HIWORD(name))
|
|
{
|
|
if(*name=='#')
|
|
{
|
|
LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, name );
|
|
nameid = atoi(nameA+1);
|
|
HeapFree( GetProcessHeap(), 0, nameA );
|
|
name=NULL;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
nameid=LOWORD(name);
|
|
name=NULL;
|
|
}
|
|
if(HIWORD(type))
|
|
{
|
|
if(*type=='#')
|
|
{
|
|
LPSTR typeA = HEAP_strdupWtoA( GetProcessHeap(), 0, type );
|
|
typeid=atoi(typeA+1);
|
|
HeapFree( GetProcessHeap(), 0, typeA );
|
|
}
|
|
else
|
|
{
|
|
fprintf(stderr,"LIBRES_FindResource32(*,*,type=string)");
|
|
return 0;
|
|
}
|
|
}
|
|
else
|
|
typeid=LOWORD(type);
|
|
|
|
for(ResBlock=ResourceList; ResBlock; ResBlock=ResBlock->next)
|
|
for(Res=ResBlock->Resources; *Res; Res++)
|
|
if(name)
|
|
{
|
|
if((*Res)->type==typeid && !lstrcmpi32W((*Res)->name,name))
|
|
return (HRSRC32)*Res;
|
|
}
|
|
else
|
|
if((*Res)->type==typeid && (*Res)->id==nameid)
|
|
return (HRSRC32)*Res;
|
|
return 0;
|
|
}
|
|
|
|
|
|
/**********************************************************************
|
|
* LIBRES_LoadResource
|
|
*/
|
|
HGLOBAL32 LIBRES_LoadResource( HINSTANCE32 hModule, HRSRC32 hRsrc )
|
|
{
|
|
return (HGLOBAL32)(((struct resource*)hRsrc)->bytes);
|
|
}
|
|
|
|
|
|
/**********************************************************************
|
|
* LIBRES_LockResource
|
|
*/
|
|
LPVOID LIBRES_LockResource( HGLOBAL32 handle )
|
|
{
|
|
return (LPVOID)handle;
|
|
}
|
|
|
|
|
|
/**********************************************************************
|
|
* LIBRES_FreeResource
|
|
*/
|
|
BOOL32 LIBRES_FreeResource( HGLOBAL32 handle )
|
|
{
|
|
return 0; /* Obsolete in Win32 */
|
|
}
|
|
|
|
|
|
/**********************************************************************
|
|
* LIBRES_AccessResource
|
|
*/
|
|
INT32 LIBRES_AccessResource( HINSTANCE32 hModule, HRSRC32 hRsrc )
|
|
{
|
|
fprintf(stderr,"LIBRES_AccessResource()");
|
|
return -1; /* Obsolete in Win32 */
|
|
}
|
|
|
|
|
|
/**********************************************************************
|
|
* LIBRES_SizeofResource
|
|
*/
|
|
DWORD LIBRES_SizeofResource( HINSTANCE32 hModule, HRSRC32 hRsrc )
|
|
{
|
|
return (DWORD)(((struct resource*)hRsrc)->size);
|
|
}
|
|
|
|
|
|
/**********************************************************************
|
|
* LIBRES_AllocResource
|
|
*/
|
|
HGLOBAL32 LIBRES_AllocResource( HINSTANCE32 hModule, HRSRC32 hRsrc, DWORD size)
|
|
{
|
|
fprintf(stderr,"LIBRES_AllocResource()");
|
|
return 0; /* Obsolete in Win32 */
|
|
}
|
|
|