Release 980301 Sun Mar 1 10:45:23 1998 Andreas Mohr <100.30936@germany.net> * [loader/ne_image.c] Fixed problem with weird DLLs (NE_FFLAGS_SINGLEDATA && DGROUP = 0). * [msdos/dosmem.c] Export address for __0000H, too. * [msdos/dpmi.c] Changed MemAlloc functions to return less fragmented addresses. Sat Feb 28 18:50:12 1998 Alexandre Julliard <julliard@lrc.epfl.ch> * [scheduler/process.c] [scheduler/sysdeps.c] Don't use %fs register before threading initialization. Sat Feb 28 14:04:56 1998 Kristian Nielsen <kristian.nielsen@risoe.dk> * [configure.in] [include/acconfig.h] Autoconf macro to check for non-reentrant X libraries. * [windows/winpos.c] In SetWindowPos32(), do not cause WM_SIZE messages when the SWP_NOSIZE flag is specified. This fixes the division-by-zero in Borland C++ 4.0 "Open Project" menu item. Sat Feb 28 13:11:26 1998 James Moody <013263m@dragon.acadiau.ca> * [ole/ole2nls.c] Changed "English" values from German to English. * [files/dos_fs.c] Fixed off-by-one month bug. Fri Feb 27 22:12:01 1998 Douglas Ridgway <ridgway@winehq.com> * [windows/win.c] Fix winelib class menu loading bug. * [include/module.h] [loader/module.c] LoadModule32 should be implemented in terms of CreateProcess. * [programs/view/*] Metafile viewer sample program. * [documentation/wine.texinfo] [documentation/Makefile.in] Improvements and additions, HTML target. Fri Feb 27 04:27:48 1998 Dimitrie O. Paun <dimi@cs.toronto.edu> * [*/*] Switched to the new debug messages interface. For more information please refer to documentation/debug-msgs. Because the new scheme introduces a new semantic level, I had to manually do through about 530 dprintf_xxx! The rest of about 2400 where transformed via a script. Because of the large number of changes that I had to do, some may have not come out as nicely as I wanted them. If this is the case, please let me know. There is a lot of work left to do: -- a few hundred printf's to be converted -- about 2300 fprintf's to be converted -- about 600 FIXME's to be transformed The problem is that in the above mentioned cases, a lot of manual intervention is required because a lot of the information is missing. There are also a lot of other things to be done to the interface and so forth. I have now ideas for a at least a month worth of full time work :) I will proceed with many changes in the next few releases, so please do not start modifing things because there will be a hell of a lot of conflicts. If you have ideas that you want to integrate or you want to work on different things, please coordinate with me. Thu Feb 26 13:04:29 1998 David Lee Lambert <lamber45@egr.msu.edu> * [ole/ole2nls.c] [include/windows.h] First try at OLE date- and time-formatting functions. Wed Feb 25 11:20:35 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de> * [files/*.c] Changed dos device handling, added 'CON' devicehandling. * [graphics/ddraw.c] Bug fixes, some additions. * [if1632/builtin.c][loader/module.c][library/winestub.c] Small hack so we don't need a dummy BUILTIN_LoadModule in winestub.c. * [ole/*][relay32/ole32.spec][if1632/storage.spec] storage.dll started. winword loads documents (saving doesn't work yet, dunno why). Several ole additions, some cleanups and bugfixes. IMalloc16 implemented. * [loader/pe_image.c] Added some comments, fixed circular dll references, fixed modref ordering, fixed tls allocation. * [memory/global.c] Added validity checks before every GET_ARENA_PTR. (several functions rely on Global* return values on invalid handles, like IsTask). Implemented GlobalUnlockFree16. * [memory/virtual.c] Replaced dprintf_virtual by fprintf, so we can do 'info map' again in the debugger. Increase read linesize for Linux2.1 cases. * [misc/cpu.c][misc/registry.c] Moved cpu registry initialization to misc/cpu.c. * [multimedia/dsound.c] Enhanced, replaced GETOSPACE bufferingcheck by SETFRAGMENT. * [relay32/crtdll.spec][relay32/ntdll.spec] Replaced some ptr by respective 'str' and 'wstr' arguments for libc functions. * [scheduler/thread.c] Added some sanity checks to stackallocation, tlshandling fixed. * [tools/build.c] Fixed cdecl argumenttype order (was reversed). * [win32/ordinals.c] Implemented KERNEL_449. * [windows/dinput.c] Some fixes, needs much more work. Tomb Raider2 works with keyboard ;) Tue Feb 24 20:46:37 1998 James Juran <jrj120@psu.edu> * [windows/win.c] Fixed USER32 ordinal numbers in documentation. Sat Feb 21 12:30:38 1998 John Richardson <jrichard@zko.dec.com> * [files/file.c] [include/k32obj.h] [memory/virtual.c] [scheduler/critsection.c] [scheduler/event.c] [scheduler/handle.c] [scheduler/k32obj.c] [scheduler/mutex.c] [scheduler/process.c] [scheduler/semaphore.c] [scheduler/thread.c] Added generic k32obj read and write routines for k32objs that support I/O. * [documentation/console] Updated console docs. * [win32/console.c] Make console work like a k32obj that supports I/O. * [include/windows.h] Make WriteFile and ReadFile take HANDLE32 for handle. Sun Feb 15 14:07:07 1998 Dimitrie O. Paun <dimi@mail.cs.toronto.edu> * [controls/menu.c] [misc/ver.c] [multimedia/dsound.c] [multimedia/joystick.c] [windows/dialog.c] Modified some dprintf_xxx's to prepare them for a new dprintf_ scheme. Basically, I changed the dprintf's that outputed a line with many dprintf calls to do just one dprintf call.
diff --git a/ole/ifs.c b/ole/ifs.c index 958a0ae..8e6147b 100644 --- a/ole/ifs.c +++ b/ole/ifs.c
@@ -7,21 +7,28 @@ #include <ctype.h> #include <stdlib.h> #include <string.h> +#include <assert.h> #include "winerror.h" #include "ole.h" #include "ole2.h" +#include "ldt.h" +#include "heap.h" #include "compobj.h" #include "interfaces.h" #include "shlobj.h" -#include "stddebug.h" +#include "local.h" +#include "module.h" #include "debug.h" +/**************************************************************************** + * IUnknown + */ static ULONG WINAPI IUnknown_AddRef(LPUNKNOWN this) { - dprintf_relay(stddeb,"IUnknown(%p)->AddRef()\n",this); + dprintf_info(relay,"IUnknown(%p)->AddRef()\n",this); return ++(this->ref); } static ULONG WINAPI IUnknown_Release(LPUNKNOWN this) { - dprintf_relay(stddeb,"IUnknown(%p)->Release()\n",this); + dprintf_info(relay,"IUnknown(%p)->Release()\n",this); if (!--(this->ref)) { HeapFree(GetProcessHeap(),0,this); return 0; @@ -32,8 +39,8 @@ static HRESULT WINAPI IUnknown_QueryInterface(LPUNKNOWN this,REFIID refiid,LPVOID *obj) { char xrefiid[50]; - StringFromCLSID((LPCLSID)refiid,xrefiid); - dprintf_relay(stddeb,"IUnknown(%p)->QueryInterface(%s,%p)\n",this,xrefiid,obj); + WINE_StringFromCLSID((LPCLSID)refiid,xrefiid); + dprintf_info(relay,"IUnknown(%p)->QueryInterface(%s,%p)\n",this,xrefiid,obj); if (!memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown))) { *obj = this; @@ -53,28 +60,30 @@ IUnknown_Constructor() { LPUNKNOWN unk; - fprintf(stderr,"cloning IUnknown.\n"); unk = (LPUNKNOWN)HeapAlloc(GetProcessHeap(),0,sizeof(IUnknown)); unk->lpvtbl = &uvt; unk->ref = 1; return unk; } -static ULONG WINAPI IMalloc_AddRef(LPMALLOC this) { - dprintf_relay(stddeb,"IMalloc(%p)->AddRef()\n",this); +/**************************************************************************** + * IMalloc16 + */ +ULONG WINAPI IMalloc16_AddRef(LPMALLOC16 this) { + dprintf_info(relay,"IMalloc16(%p)->AddRef()\n",this); return 1; /* cannot be freed */ } -static ULONG WINAPI IMalloc_Release(LPMALLOC this) { - dprintf_relay(stddeb,"IMalloc(%p)->Release()\n",this); +ULONG WINAPI IMalloc16_Release(LPMALLOC16 this) { + dprintf_info(relay,"IMalloc16(%p)->Release()\n",this); return 1; /* cannot be freed */ } -static HRESULT WINAPI IMalloc_QueryInterface(LPMALLOC this,REFIID refiid,LPVOID *obj) { +HRESULT WINAPI IMalloc16_QueryInterface(LPMALLOC16 this,REFIID refiid,LPVOID *obj) { char xrefiid[50]; - StringFromCLSID((LPCLSID)refiid,xrefiid); - dprintf_relay(stddeb,"IMalloc(%p)->QueryInterface(%s,%p)\n",this,xrefiid,obj); + WINE_StringFromCLSID((LPCLSID)refiid,xrefiid); + dprintf_info(relay,"IMalloc16(%p)->QueryInterface(%s,%p)\n",this,xrefiid,obj); if ( !memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown)) || !memcmp(&IID_IMalloc,refiid,sizeof(IID_IMalloc)) ) { @@ -84,53 +93,164 @@ return OLE_E_ENUM_NOMORE; } -static LPVOID WINAPI IMalloc_Alloc(LPMALLOC this,DWORD cb) { - dprintf_relay(stddeb,"IMalloc(%p)->Alloc(%ld)\n",this,cb); - return HeapAlloc(GetProcessHeap(),0,cb); +LPVOID WINAPI IMalloc16_Alloc(LPMALLOC16 this,DWORD cb) { + dprintf_info(relay,"IMalloc16(%p)->Alloc(%ld)\n",this,cb); + return (LPVOID)PTR_SEG_OFF_TO_SEGPTR(this->heap,LOCAL_Alloc(this->heap,0,cb)); } -static LPVOID WINAPI IMalloc_Realloc(LPMALLOC this,LPVOID pv,DWORD cb) { - dprintf_relay(stddeb,"IMalloc(%p)->Realloc(%p,%ld)\n",this,pv,cb); - return HeapReAlloc(GetProcessHeap(),0,pv,cb); +LPVOID WINAPI IMalloc16_Realloc(LPMALLOC16 this,LPVOID pv,DWORD cb) { + dprintf_info(relay,"IMalloc16(%p)->Realloc(%p,%ld)\n",this,pv,cb); + return (LPVOID)PTR_SEG_OFF_TO_SEGPTR(this->heap,LOCAL_ReAlloc(this->heap,0,LOWORD(pv),cb)); } -static VOID WINAPI IMalloc_Free(LPMALLOC this,LPVOID pv) { - dprintf_relay(stddeb,"IMalloc(%p)->Free(%p)\n",this,pv); - HeapFree(GetProcessHeap(),0,pv); +VOID WINAPI IMalloc16_Free(LPMALLOC16 this,LPVOID pv) { + dprintf_info(relay,"IMalloc16(%p)->Free(%p)\n",this,pv); + LOCAL_Free(this->heap,LOWORD(pv)); } -static DWORD WINAPI IMalloc_GetSize(LPMALLOC this,LPVOID pv) { - dprintf_relay(stddeb,"IMalloc(%p)->GetSize(%p)\n",this,pv); - return HeapSize(GetProcessHeap(),0,pv); +DWORD WINAPI IMalloc16_GetSize(LPMALLOC16 this,LPVOID pv) { + dprintf_info(relay,"IMalloc16(%p)->GetSize(%p)\n",this,pv); + return LOCAL_Size(this->heap,LOWORD(pv)); } -static LPINT32 WINAPI IMalloc_DidAlloc(LPMALLOC this,LPVOID pv) { - dprintf_relay(stddeb,"IMalloc(%p)->DidAlloc(%p)\n",this,pv); - return (LPINT32)0xffffffff; +INT16 WINAPI IMalloc16_DidAlloc(LPMALLOC16 this,LPVOID pv) { + dprintf_info(relay,"IMalloc16(%p)->DidAlloc(%p)\n",this,pv); + return (INT16)-1; } -static LPVOID WINAPI IMalloc_HeapMinimize(LPMALLOC this) { - dprintf_relay(stddeb,"IMalloc(%p)->HeapMinimize()\n",this); +LPVOID WINAPI IMalloc16_HeapMinimize(LPMALLOC16 this) { + dprintf_info(relay,"IMalloc16(%p)->HeapMinimize()\n",this); return NULL; } -static IMalloc_VTable VT_IMalloc = { - IMalloc_QueryInterface, - IMalloc_AddRef, - IMalloc_Release, - IMalloc_Alloc, - IMalloc_Realloc, - IMalloc_Free, - IMalloc_GetSize, - IMalloc_DidAlloc, - IMalloc_HeapMinimize, +static IMalloc16_VTable mvt16 = { + IMalloc16_QueryInterface, + IMalloc16_AddRef, + IMalloc16_Release, + IMalloc16_Alloc, + IMalloc16_Realloc, + IMalloc16_Free, + IMalloc16_GetSize, + IMalloc16_DidAlloc, + IMalloc16_HeapMinimize, +}; +static IMalloc16_VTable *msegvt16 = NULL; + +LPMALLOC16 +IMalloc16_Constructor() { + LPMALLOC16 this; + + this = (LPMALLOC16)SEGPTR_NEW(IMalloc16); + if (__winelib) { + this->lpvtbl = &mvt16; + } else { + HMODULE16 hcomp = GetModuleHandle16("COMPOBJ"); + if (!msegvt16) { + msegvt16 = SEGPTR_NEW(IMalloc16_VTable); +#define FN(x) this->lpvtbl->fn##x = (void*)WIN32_GetProcAddress16(hcomp,"IMalloc16_"#x);assert(this->lpvtbl->fn##x); + FN(QueryInterface) + FN(AddRef) + FN(Release) + FN(Alloc) + FN(Realloc) + FN(Free) + FN(GetSize) + FN(DidAlloc) + FN(HeapMinimize) + msegvt16 = (LPMALLOC16_VTABLE)SEGPTR_GET(msegvt16); +#undef FN + } + this->lpvtbl = msegvt16; + } + this->ref = 1; + /* FIXME: implement multiple heaps */ + this->heap = GlobalAlloc16(GMEM_MOVEABLE,64000); + LocalInit(this->heap,0,64000); + return (LPMALLOC16)SEGPTR_GET(this); +} + +/**************************************************************************** + * IMalloc32 + */ +static ULONG WINAPI IMalloc32_AddRef(LPMALLOC32 this) { + dprintf_info(relay,"IMalloc32(%p)->AddRef()\n",this); + return 1; /* cannot be freed */ +} + +static ULONG WINAPI IMalloc32_Release(LPMALLOC32 this) { + dprintf_info(relay,"IMalloc32(%p)->Release()\n",this); + return 1; /* cannot be freed */ +} + +static HRESULT WINAPI IMalloc32_QueryInterface(LPMALLOC32 this,REFIID refiid,LPVOID *obj) { + char xrefiid[50]; + + WINE_StringFromCLSID((LPCLSID)refiid,xrefiid); + dprintf_info(relay,"IMalloc32(%p)->QueryInterface(%s,%p)\n",this,xrefiid,obj); + if ( !memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown)) || + !memcmp(&IID_IMalloc,refiid,sizeof(IID_IMalloc)) + ) { + *obj = this; + return 0; + } + return OLE_E_ENUM_NOMORE; +} + +static LPVOID WINAPI IMalloc32_Alloc(LPMALLOC32 this,DWORD cb) { + dprintf_info(relay,"IMalloc32(%p)->Alloc(%ld)\n",this,cb); + return HeapAlloc(GetProcessHeap(),0,cb); +} + +static LPVOID WINAPI IMalloc32_Realloc(LPMALLOC32 this,LPVOID pv,DWORD cb) { + dprintf_info(relay,"IMalloc32(%p)->Realloc(%p,%ld)\n",this,pv,cb); + return HeapReAlloc(GetProcessHeap(),0,pv,cb); +} +static VOID WINAPI IMalloc32_Free(LPMALLOC32 this,LPVOID pv) { + dprintf_info(relay,"IMalloc32(%p)->Free(%p)\n",this,pv); + HeapFree(GetProcessHeap(),0,pv); +} + +static DWORD WINAPI IMalloc32_GetSize(LPMALLOC32 this,LPVOID pv) { + dprintf_info(relay,"IMalloc32(%p)->GetSize(%p)\n",this,pv); + return HeapSize(GetProcessHeap(),0,pv); +} + +static INT32 WINAPI IMalloc32_DidAlloc(LPMALLOC32 this,LPVOID pv) { + dprintf_info(relay,"IMalloc32(%p)->DidAlloc(%p)\n",this,pv); + return -1; +} +static LPVOID WINAPI IMalloc32_HeapMinimize(LPMALLOC32 this) { + dprintf_info(relay,"IMalloc32(%p)->HeapMinimize()\n",this); + return NULL; +} + +static IMalloc32_VTable VT_IMalloc32 = { + IMalloc32_QueryInterface, + IMalloc32_AddRef, + IMalloc32_Release, + IMalloc32_Alloc, + IMalloc32_Realloc, + IMalloc32_Free, + IMalloc32_GetSize, + IMalloc32_DidAlloc, + IMalloc32_HeapMinimize, }; -LPMALLOC -IMalloc_Constructor() { - LPMALLOC this; +LPMALLOC32 +IMalloc32_Constructor() { + LPMALLOC32 this; - fprintf(stderr,"cloning IMalloc\n"); - this = (LPMALLOC)HeapAlloc(GetProcessHeap(),0,sizeof(IMalloc)); - this->lpvtbl = &VT_IMalloc; + this = (LPMALLOC32)HeapAlloc(GetProcessHeap(),0,sizeof(IMalloc32)); + this->lpvtbl = &VT_IMalloc32; this->ref = 1; return this; } +/**************************************************************************** + * API Functions + */ +BOOL32 WINAPI IsValidInterface32(LPUNKNOWN punk) { + return !( + IsBadReadPtr32(punk,4) || + IsBadReadPtr32(punk->lpvtbl,4) || + IsBadReadPtr32(punk->lpvtbl->fnQueryInterface,9) || + IsBadCodePtr32(punk->lpvtbl->fnQueryInterface) + ); +}