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/win32/kernel32.c b/win32/kernel32.c
index a22c775..b1dd942 100644
--- a/win32/kernel32.c
+++ b/win32/kernel32.c
@@ -1,7 +1,7 @@
/*
* KERNEL32 thunks and other undocumented stuff
*
- * Copyright 1997 Marcus Meissner
+ * Copyright 1997-1998 Marcus Meissner
*/
#include <stdio.h>
@@ -14,10 +14,10 @@
#include "module.h"
#include "process.h"
#include "stackframe.h"
+#include "heap.h"
#include "selectors.h"
#include "task.h"
#include "win.h"
-#include "stddebug.h"
#include "debug.h"
/***********************************************************************
@@ -103,16 +103,16 @@
SEGPTR thkbuf;
struct thunkstruct *ths16;
- dprintf_thunk(stddeb,"ThunkConnect32(<struct>,%s,%s,%s,%x,%lx)\n",
+ dprintf_info(thunk,"ThunkConnect32(<struct>,%s,%s,%s,%x,%lx)\n",
thunkfun16,module32,module16,hmod32,dllinitarg1
);
- dprintf_thunk(stddeb," magic = %c%c%c%c\n",
+ dprintf_info(thunk," magic = %c%c%c%c\n",
ths->magic[0],
ths->magic[1],
ths->magic[2],
ths->magic[3]
);
- dprintf_thunk(stddeb," length = %lx\n",ths->length);
+ dprintf_info(thunk," length = %lx\n",ths->length);
if (lstrncmp32A(ths->magic,"SL01",4)&&lstrncmp32A(ths->magic,"LS01",4))
return 0;
hmm=LoadModule16(module16,NULL);
@@ -130,7 +130,7 @@
return 0;
ths->x0C = (DWORD)ths16;
- dprintf_thunk(stddeb," ths16 magic is 0x%08lx\n",*(DWORD*)ths16->magic);
+ dprintf_info(thunk," ths16 magic is 0x%08lx\n",*(DWORD*)ths16->magic);
if (*((DWORD*)ths16->magic) != 0x0000304C)
return 0;
if (!*(WORD*)(((LPBYTE)ths16)+0x12))
@@ -187,9 +187,9 @@
DWORD WINAPI WOWCallback16(FARPROC16 fproc,DWORD arg)
{
DWORD ret;
- dprintf_thunk(stddeb,"WOWCallback16(%p,0x%08lx) ",fproc,arg);
+ dprintf_info(thunk,"WOWCallback16(%p,0x%08lx)...\n",fproc,arg);
ret = Callbacks->CallWOWCallbackProc(fproc,arg);
- dprintf_thunk(stddeb,"... returns %ld\n",ret);
+ dprintf_info(thunk,"... returns %ld\n",ret);
return ret;
}
@@ -212,7 +212,7 @@
{
HMODULE32 hmod = LoadLibrary16("systhunk.dll");
- dprintf_thunk(stddeb, "_KERNEL32_52: systhunk.dll module %d\n", hmod);
+ dprintf_info(thunk, "_KERNEL32_52: systhunk.dll module %d\n", hmod);
if (hmod<=32)
return 0;
@@ -256,7 +256,7 @@
return 0;
*(DWORD*)thunk = addr[1];
- dprintf_thunk(stddeb, "_KERNEL32_43: loaded module %d, func %s (%d) @ %p (%p), returning %p\n",
+ dprintf_info(thunk, "_KERNEL32_43: loaded module %d, func %s (%d) @ %p (%p), returning %p\n",
hmod, HIWORD(thkbuf)==0 ? "<ordinal>" : thkbuf, (int)thkbuf, (void*)segaddr, addr, (void*)addr[1]);
return addr[1];
@@ -277,11 +277,11 @@
DWORD ret,stacksize;
THDB *thdb = THREAD_Current();
- dprintf_thunk(stddeb,"KERNEL32_45(%%eax=0x%08lx(%%cx=0x%04lx,%%edx=0x%08lx))\n",
+ dprintf_info(thunk,"KERNEL32_45(%%eax=0x%08lx(%%cx=0x%04lx,%%edx=0x%08lx))\n",
(DWORD)EAX_reg(context),(DWORD)CX_reg(context),(DWORD)EDX_reg(context)
);
stacksize = EBP_reg(context)-ESP_reg(context);
- dprintf_thunk(stddeb," stacksize = %ld\n",stacksize);
+ dprintf_info(thunk," stacksize = %ld\n",stacksize);
memcpy(&context16,context,sizeof(context16));
@@ -294,7 +294,7 @@
ret = Callbacks->CallRegisterLongProc(&context16,0);
STACK16_POP( thdb, stacksize );
- dprintf_thunk(stddeb,". returned %08lx\n",ret);
+ dprintf_info(thunk,". returned %08lx\n",ret);
EAX_reg(context) = ret;
}
@@ -312,12 +312,12 @@
DWORD ret,stacksize;
THDB *thdb = THREAD_Current();
- dprintf_thunk(stddeb,"_KERNEL32_40(EDX=0x%08lx)\n",
+ dprintf_info(thunk,"_KERNEL32_40(EDX=0x%08lx)\n",
EDX_reg(context)
);
stacksize = EBP_reg(context)-ESP_reg(context);
- dprintf_thunk(stddeb," stacksize = %ld\n",stacksize);
- dprintf_thunk(stddeb,"on top of stack: 0x%04x\n",*(WORD*)ESP_reg(context));
+ dprintf_info(thunk," stacksize = %ld\n",stacksize);
+ dprintf_info(thunk,"on top of stack: 0x%04x\n",*(WORD*)ESP_reg(context));
memcpy(&context16,context,sizeof(context16));
@@ -329,7 +329,7 @@
ret = Callbacks->CallRegisterShortProc(&context16,0);
STACK16_POP( thdb, stacksize );
- dprintf_thunk(stddeb,". returned %08lx\n",ret);
+ dprintf_info(thunk,". returned %08lx\n",ret);
EAX_reg(context) = ret;
}
@@ -404,7 +404,7 @@
if (HIWORD(addr2))
*(DWORD*)thunk = (DWORD)addr2;
- dprintf_thunk(stddeb, "_KERNEL32_41: loaded module %d, func %s(%d) @ %p (%p), returning %p\n",
+ dprintf_info(thunk, "_KERNEL32_41: loaded module %d, func %s(%d) @ %p (%p), returning %p\n",
hmod, HIWORD(thkbuf)==0 ? "<ordinal>" : thkbuf, (int)thkbuf, (void*)segaddr, addr, addr2);
return addr2;
@@ -419,7 +419,7 @@
*/
VOID WINAPI _KERNEL32_90(CONTEXT *context)
{
- dprintf_thunk(stddeb, "_KERNEL32_90: QT Thunk priming; context %p\n", context);
+ dprintf_info(thunk, "_KERNEL32_90: QT Thunk priming; context %p\n", context);
_write_qtthunk((LPBYTE)EAX_reg(context),*(DWORD*)(EAX_reg(context)+EDX_reg(context)));
/* we just call the real QT_Thunk right now
@@ -461,7 +461,7 @@
}
*(DWORD*)PTR_SEG_TO_LIN(addr[1]) = (DWORD)thunk;
- dprintf_thunk(stddeb, "_KERNEL32_46: loaded module %d, func %s(%d) @ %p (%p)\n",
+ dprintf_info(thunk, "_KERNEL32_46: loaded module %d, func %s(%d) @ %p (%p)\n",
hmod, HIWORD(thkbuf)==0 ? "<ordinal>" : thkbuf, (int)thkbuf, (void*)segaddr, addr);
}
@@ -473,7 +473,7 @@
*/
BOOL32 WINAPI _KERNEL32_87()
{
- dprintf_thunk(stddeb, "_KERNEL32_87: Yes, thunking is initialized\n");
+ dprintf_info(thunk, "_KERNEL32_87: Yes, thunking is initialized\n");
return TRUE;
}
@@ -490,9 +490,13 @@
DWORD i,ret;
DWORD *args = ((DWORD *)&fun) + 1;
- dprintf_thunk(stddeb,"KERNEL32_88(%ld,0x%08lx,%p,[ ",nr,flags,fun);
- for (i=0;i<nr/4;i++) { dprintf_thunk(stddeb,"0x%08lx,",args[i]); }
- dprintf_thunk(stddeb,"])\n");
+ if(debugging_info(thunk)){
+ dbg_decl_str(thunk, 256);
+ for (i=0;i<nr/4;i++)
+ dsprintf(thunk,"0x%08lx,",args[i]);
+ dprintf_info(thunk,"KERNEL32_88(%ld,0x%08lx,%p,[%s])\n",
+ nr,flags,fun,dbg_str(thunk));
+ }
switch (nr) {
case 0: ret = fun();
break;
@@ -526,7 +530,7 @@
break;
}
- dprintf_thunk(stddeb," returning %ld ...\n",ret);
+ dprintf_info(thunk," returning %ld ...\n",ret);
return ret;
}
@@ -624,6 +628,15 @@
}
/**********************************************************************
+ * KERNEL_471 (KERNEL)
+ * Seems to return the uncrypted current process pointer. [Not 100% sure].
+ */
+LPVOID WINAPI
+_KERNEL_471() {
+ return PROCESS_Current();
+}
+
+/**********************************************************************
* KERNEL_472 (KERNEL)
* something like GetCurrenthInstance.
*/
