Release 980614
Sun Jun 15 10:30:35 1998 Andreas Mohr <100.30936@germany.net>
* [files/dos_fs.c] [files/file.c] [if1632/wprocs.spec]
[misc/aspi.c]
Added support for scanners that need Adaptec's ASPI2DOS.
* [graphics/env.c] [misc/printerdrv.c] [graphics/win16drv/init.c]
[if1632/gdi.spec] [include/gdi.h]
Enhanced printer support (especially Win95):
Drv[GS]etPrinterData, [GS]etEnvironment; added AbortProc handling.
* [misc/tapi32.c] [relay32/tapi32.spec]
Added some stubs.
* [configure.in] [graphics/fontengine.c] [include/windows.h]
[misc/comm.c] [misc/w32skrnl.c] [misc/win32s16.c]
Made Wine compile on HP-UX (just for fun ;)
* [controls/menu.c] [include/windows.h]
Complete rewrite of EnableMenuItem32.
Free Agent 32 still doesn't work :(
* [misc/version.c] [if1632/kernel.spec] [include/winbase.h]
Implemented GetVersionEx16.
* [misc/network.c] [if1632/user.spec]
Fixed arguments of WNetGetPropertyText.
* [misc/version.c] [relay32/comctl32.spec] [relay32/oleaut32.spec]
Implemented COMCTL32_DllGetVersion, OaBuildVersion.
* [win32/file.c]
Fixed UNC handling of CreateFile32.
Sat Jun 13 22:35:12 1998 Douglas Ridgway <ridgway@winehq.com>
* [Makefile.in] [Make.rules.in]
Added pattern for CVS merge files to 'make clean'
* [ole/olecli.c] [windows/scroll.c] [windows/grahics.c]
Add some DC handle unlocking. (When hdc's are always unlocked,
they can be made moveable.)
* [documentation/wine.texinfo]
Started a Wine Design chapter with discussion of
graphics driver model.
Sat Jun 13 11:19:25 1998 David Luyer <luyer@ucs.uwa.edu.au>
* [misc/main.c] [relay32/relay386.c]
Added new option -debugmsg +relay=.... or -debugmsg -relay=...
Fri Jun 12 22:56:09 1998 Marcus Meissner <marcus@jet.franken.de>
* [relay32/snoop.c][relay32/builtin.c][loader/pe_image.c]
Added inter win32 dll snooping. Use -debugmsg +snoop.
Number of arguments and string references are autodetected.
Some small bugfixes in the PE loader.
* [misc/system.c]
Disabled SystemTimers. They do not work with the current
%fs handling in the 32->16 relaycode. (helps labview)
* [msdos/dpmi.c][msdos/int2f.c][files/drive.c]
Added a monoton linear increasing memory allocator for DPMI (required
for LabView, HAFAS, ...)
mscdex handling in emulated realmode interrupts (for mcicda.drv)
allocate logical drives only once. (helps Myst)
* [files/profile.c]
Handle ^Z as space. Found on CDROMS (helps Myst Installer).
* [multimedia/mmio.c]
mmio* partially updated to win32. No funny additions.
* [windows/driver.c]
Added win32 driver handling (will be used for win32 multimedia/
msvideo drivers).
* [win32/device.c]
Added device handling (K32OBJ_DEVICE_IOCTL). Implemented
VTDAPI.5 (used by win95' WINMM.timeGetTime())
Fri Jun 12 18:01:18 1998 Rein Klazes <rklazes@casema.net>
* [ole/compobj.c relay32/ole32.spec]
Add a stub for CoLockObjectExternal32.
* [objects/clipping.c]
Fix in IntersectClipRect(), when there is no initial clipping
region.
* [graphics/x11drv/graphics.c]
Corrected several "one-off" errors for the Ellipse, Rectangle
and RoundRectangle (especially small ones) draw routines.
Arc and friends still have to be done.
Fri Jun 12 06:23:19 1998 Matthew Becker <mbecker@glasscity.net>
* [misc/ntdll.c]
Fixed some of the parameter counts.
* [misc/registry.c]
General cleanup, documentation.
Standard keys are allowed to be 'closed' and succeed.
* [misc/shell.c]
Check for correct return values from Reg* functions.
* [win32/newfns.c]
Added stubs for OpenDesktopA, SetThreadDesktop, and
SetUserObjectInformationA.
Wed Jun 10 20:28:08 1998 James Juran <jrj120@psu.edu>
* [debugger/break.c]
Fixed bug introduced in 980503 that broke the -debug command
line option for PE executable files.
* [configure.in] [include/acconfig.h] [include/debugtools.h]
[documentation/debug-msgs]
Added 'configure' options to compile out debugging messages.
Use --disable-debug to disable all debugging messages, and
--disable-trace to just disable TRACE messages. This results
in a stripped executable that is 15-20% smaller. This option
is very much untested--don't expect it to work.
* [documentation/debug-msgs] [documentation/debugging]
Minor updates.
* [*/*.c]
Fixed some compile warnings. This also includes the
compile_warnings_trivial patch from WineHQ.
Tue Jun 10 22:00:18 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de>
* [windows/sysmetrics.c][include/sysmetrics.h]
Fixed some Win95 values.
* [windows/nonclient.c][include/windows.h]
Fixed some Win95 drawing bugs.
Added extended window style flags (WS_EX_xxx).
* [misc/printdrv.c][relay32/winspool.spec]
Added stubs for DeletePrinterDriver32A, DeleteMonitor32A
and DeletePort32A.
* [windows/mdi.c][include/windows.h][relay32/user32.spec]
Added stubs for CascadeWindows and TileWindows.
* [controls/toolbar.c][include/toolbar.h]
Fixed a few bugs and implemented new features.
* [misc/shellord.c][relay32/shell32.spec]
Added stubs for SHELL32_60, SHELL32_61 and SHELL32_184.
* [controls/comctl32undoc.c][relay32/comctl32.spec]
New file comctl32undoc.c. Contains undocumented functions
of COMCTL32.DLL. These functions are needed to run EXPLORER.EXE
IEXPLORE.EXE and TASKMAN.EXE.
* [controls/status.c]
Added text alignment.
Tue Jun 8 22:00:00 1998 Bertho Stultiens <bertho@akhphd.au.dk>
* [programs/*/Makefile.in]
Changed the rules to use wrc as resource compiler but
passing the source through gcc first for macro expansion.
* [programs/*/*.rc]
Added #include "windows.h" for the resource compiler in the
appropriate files.
* [tools/wrc/wrc.[ch]] [tools/wrc/writeres.c]
Added commandline option -A for autoregister code.
Corrected the underscore problem by checking the proper define
from config.h.
Sun Jun 7 22:09:29 1998 Pascal Cuoq <pcuoq@ens-lyon.fr>
* [ole/ole2nls.c] [memory/string.c]
Improved LCMapString32A, and changed CompareString32A,
lstrcmp, lstrcmpi to use it.
Sat Jun 6 19:00:50 1998 Martin Strömberg <ams@ludd.luth.se>
* [include/winnt.h]
Added typedefs for security and tokens.
Sat Jun 6 12:26:31 1998 Morten Welinder <terra@diku.dk>
* [objects/text.c]
Use debugstr_an in DrawText16.
* [loader/resource.c]
Use debugres_w in FindResourceEx32W. Avoid crashing during
debug when wm is NULL.
* [if1632/relay.c]
In RELAY_DebugCallTo16, send output to the right place and
avoid side effects in macro arguments.
Wed Jun 3 20:56:03 1998 Huw D M Davies <daviesh@abacus.physics.ox.ac.uk>
* [controls/scroll.c] [windows/nonclient.c]
Fix several off by one errors in scrollbar painting.
Tue Jun 2 23:58:59 1998 Insomnia (Stea Greene) <insomnia@core.binghamton.edu>
* [graphics/dsound.c]
Rewrote mixer code to handle panning and volume for 16->16, 16->8,
8->16, and 8->8 bit mixes. Conforms to DirectX's "logarithmic
hearing scale" as specified in M$VC docs. Still does not handle
mixing of different frequencies (I am still working on that).
Tested 16->16 extensively with StarCraft. Other mixing combinations
untested but should work fine. Still kind of a work in progress,
so be warned.
Tue Jun 2 03:31:33 1998 Alexander V. Lukyanov <lav@long.yar.ru>
* [tools/wrc/utils.c]
dup_basename: fix to strip directory.
Mon Jun 1 20:00:00 1998 Juergen Schmied <juergen.schmied@metronet.de>
* [include/windows.h] [objects/cursoricon.c] [relay32/user32.spec]
Added stubs LoadCursorFromFileW and LoadCursorFromFileA.
diff --git a/relay32/snoop.c b/relay32/snoop.c
new file mode 100644
index 0000000..061fad2
--- /dev/null
+++ b/relay32/snoop.c
@@ -0,0 +1,338 @@
+/*
+ * 386-specific Win32 dll<->dll snooping functions
+ *
+ * Copyright 1998 Marcus Meissner
+ */
+
+#ifdef __i386__
+
+#include <assert.h>
+#include "windows.h"
+#include "winbase.h"
+#include "winnt.h"
+#include "heap.h"
+#include "builtin32.h"
+#include "snoop.h"
+#include "peexe.h"
+#include "selectors.h"
+#include "stackframe.h"
+#include "debugstr.h"
+#include "debug.h"
+
+#ifdef NEED_UNDERSCORE_PREFIX
+# define PREFIX "_"
+#else
+# define PREFIX
+#endif
+
+/* Well ,not exactly extern since they are in the same file (in the lines
+ * below). But the C Compiler doesn't see them there, so we have to help a bit.
+ */
+extern void SNOOP_Return();
+extern void SNOOP_Entry();
+__asm__(".align 4\n\t"
+ ".globl "PREFIX"SNOOP_Entry\n\t"
+ ".type "PREFIX"SNOOP_Entry,@function\n\t"
+ PREFIX"SNOOP_Entry:\n\t"
+ "pushl $"PREFIX"__regs_SNOOP_Entry\n\t"
+ "pushl $"PREFIX"CALL32_Regs\n\t"
+ "ret\n\t"
+ ".align 4\n\t"
+ ".globl "PREFIX"SNOOP_Return\n\t"
+ ".type "PREFIX"SNOOP_Return,@function\n\t"
+ PREFIX"SNOOP_Return:\n\t"
+ "pushl $"PREFIX"__regs_SNOOP_Return\n\t"
+ "pushl $"PREFIX"CALL32_Regs\n\t"
+ "ret"
+);
+
+#pragma pack(1)
+
+typedef struct tagSNOOP_FUN {
+ /* code part */
+ BYTE lcall; /* 0xe8 call snoopentry (relative) */
+ /* NOTE: If you move snoopentry OR nrofargs fix the relative offset
+ * calculation!
+ */
+ DWORD snoopentry; /* SNOOP_Entry relative */
+ /* unreached */
+ int nrofargs;
+ FARPROC32 origfun;
+ char *name;
+} SNOOP_FUN;
+
+typedef struct tagSNOOP_DLL {
+ HMODULE32 hmod;
+ SNOOP_FUN *funs;
+ LPCSTR name;
+ int nrofordinals;
+ struct tagSNOOP_DLL *next;
+} SNOOP_DLL;
+typedef struct tagSNOOP_RETURNENTRY {
+ /* code part */
+ BYTE lcall; /* 0xe8 call snoopret relative*/
+ /* NOTE: If you move snoopret OR origreturn fix the relative offset
+ * calculation!
+ */
+ DWORD snoopret; /* SNOOP_Ret relative */
+ /* unreached */
+ FARPROC32 origreturn;
+ SNOOP_DLL *dll;
+ DWORD ordinal;
+ DWORD origESP;
+ DWORD *args; /* saved args across a stdcall */
+} SNOOP_RETURNENTRY;
+
+typedef struct tagSNOOP_RETURNENTRIES {
+ SNOOP_RETURNENTRY entry[4092/sizeof(SNOOP_RETURNENTRY)];
+ struct tagSNOOP_RETURNENTRIES *next;
+} SNOOP_RETURNENTRIES;
+
+#pragma pack(4)
+
+static SNOOP_DLL *firstdll = NULL;
+static SNOOP_RETURNENTRIES *firstrets = NULL;
+
+void
+SNOOP_RegisterDLL(HMODULE32 hmod,LPCSTR name,DWORD nrofordinals) {
+ SNOOP_DLL **dll = &(firstdll);
+ char *s;
+
+ if (!TRACE_ON(snoop)) return;
+ while (*dll) {
+ if ((*dll)->hmod == hmod)
+ return; /* already registered */
+ dll = &((*dll)->next);
+ }
+ *dll = (SNOOP_DLL*)HeapAlloc(SystemHeap,HEAP_ZERO_MEMORY,sizeof(SNOOP_DLL));
+ (*dll)->next = NULL;
+ (*dll)->hmod = hmod;
+ (*dll)->nrofordinals = nrofordinals;
+ (*dll)->name = HEAP_strdupA(SystemHeap,0,name);
+ if ((s=strrchr((*dll)->name,'.')))
+ *s='\0';
+ (*dll)->funs = VirtualAlloc(NULL,nrofordinals*sizeof(SNOOP_FUN),MEM_COMMIT|MEM_RESERVE,PAGE_EXECUTE_READWRITE);
+ memset((*dll)->funs,0,nrofordinals*sizeof(SNOOP_FUN));
+ if (!(*dll)->funs) {
+ HeapFree(SystemHeap,0,*dll);
+ FIXME(snoop,"out of memory\n");
+ return;
+ }
+}
+
+FARPROC32
+SNOOP_GetProcAddress32(HMODULE32 hmod,LPCSTR name,DWORD ordinal,FARPROC32 origfun) {
+ SNOOP_DLL *dll = firstdll;
+ SNOOP_FUN *fun;
+ int j;
+ IMAGE_SECTION_HEADER *pe_seg = PE_SECTIONS(hmod);
+
+ if (!TRACE_ON(snoop)) return origfun;
+ if (!*(LPBYTE)origfun) /* 0x00 is an imposs. opcode, poss. dataref. */
+ return origfun;
+ for (j=0;j<PE_HEADER(hmod)->FileHeader.NumberOfSections;j++)
+ if (((DWORD)origfun-hmod>=pe_seg[j].VirtualAddress)&&
+ ((DWORD)origfun-hmod <pe_seg[j].VirtualAddress+
+ pe_seg[j].SizeOfRawData)
+ )
+ break;
+ /* If we looked through all sections (and didn't find one)
+ * or if the sectionname contains "data", we return the
+ * original function since it is most likely a datareference.
+ */
+ if ( (j==PE_HEADER(hmod)->FileHeader.NumberOfSections) ||
+ (strstr(pe_seg[j].Name,"data")) ||
+ !(pe_seg[j].Characteristics & IMAGE_SCN_CNT_CODE)
+ )
+ return origfun;
+
+ while (dll) {
+ if (hmod == dll->hmod)
+ break;
+ dll=dll->next;
+ }
+ if (!dll) /* probably internal */
+ return origfun;
+ assert(ordinal<dll->nrofordinals);
+ fun = dll->funs+ordinal;
+ if (!fun->name) fun->name = HEAP_strdupA(SystemHeap,0,name);
+ fun->lcall = 0xe8;
+ /* NOTE: origreturn struct member MUST come directly after snoopentry */
+ fun->snoopentry = (char*)SNOOP_Entry-((char*)(&fun->nrofargs));
+ fun->origfun = origfun;
+ fun->nrofargs = -1;
+ return (FARPROC32)&(fun->lcall);
+}
+
+static char*
+SNOOP_PrintArg(DWORD x) {
+ static char buf[200];
+ int i,nostring;
+ MEMORY_BASIC_INFORMATION mbi;
+
+ if ( !HIWORD(x) ||
+ !VirtualQuery((LPVOID)x,&mbi,sizeof(mbi)) ||
+ !mbi.Type
+ ) {
+ sprintf(buf,"%08lx",x);
+ return buf;
+ }
+ i=0;nostring=0;
+ if (!IsBadStringPtr32A((LPSTR)x,80)) {
+ while (i<80) {
+ LPBYTE s=(LPBYTE)x;
+
+ if (s[i]==0) break;
+ if (s[i]<0x20) {nostring=1;break;}
+ if (s[i]>=0x80) {nostring=1;break;}
+ i++;
+ }
+ if (!nostring) {
+ if (i>5) {
+ sprintf(buf,"%08lx \"",x);
+ strncat(buf,(LPSTR)x,198-strlen(buf)-2);
+ strcat(buf,"\"");
+ return buf;
+ }
+ }
+ }
+ i=0;nostring=0;
+ if (!IsBadStringPtr32W((LPWSTR)x,80)) {
+ while (i<80) {
+ LPWSTR s=(LPWSTR)x;
+
+ if (s[i]==0) break;
+ if (s[i]<0x20) {nostring=1;break;}
+ if (s[i]>0x100) {nostring=1;break;}
+ i++;
+ }
+ if (!nostring) {
+ if (i>5) {
+ sprintf(buf,"%08lx L",x);
+ strcat(buf,debugstr_wn((LPWSTR)x,198-strlen(buf)-2));
+ return buf;
+ }
+ }
+ }
+ sprintf(buf,"%08lx",x);
+ return buf;
+}
+
+#define CALLER1REF (*(DWORD*)(ESP_reg(context)+4))
+REGS_ENTRYPOINT(SNOOP_Entry) {
+ DWORD ordinal=0,entry = EIP_reg(context)-5;
+ SNOOP_DLL *dll = firstdll;
+ SNOOP_FUN *fun = NULL;
+ SNOOP_RETURNENTRIES **rets = &firstrets;
+ SNOOP_RETURNENTRY *ret;
+ int i,max;
+
+ while (dll) {
+ if ( ((char*)entry>=(char*)dll->funs) &&
+ ((char*)entry<=(char*)(dll->funs+dll->nrofordinals))
+ ) {
+ fun = (SNOOP_FUN*)entry;
+ ordinal = fun-dll->funs;
+ break;
+ }
+ dll=dll->next;
+ }
+ if (!dll) {
+ FIXME(snoop,"entrypoint 0x%08lx not found\n",entry);
+ return; /* oops */
+ }
+ /* guess cdecl ... */
+ if (fun->nrofargs<0) {
+ /* Typical cdecl return frame is:
+ * add esp, xxxxxxxx
+ * which has (for xxxxxxxx up to 255 the opcode "83 C4 xx".
+ */
+ LPBYTE reteip = (LPBYTE)CALLER1REF;
+
+ if ((reteip[0]==0x83)&&(reteip[1]==0xc4))
+ fun->nrofargs=reteip[2]/4;
+ }
+
+ while (*rets) {
+ for (i=0;i<sizeof((*rets)->entry)/sizeof((*rets)->entry[0]);i++)
+ if (!(*rets)->entry[i].origreturn)
+ break;
+ if (i!=sizeof((*rets)->entry)/sizeof((*rets)->entry[0]))
+ break;
+ rets = &((*rets)->next);
+ }
+ if (!*rets) {
+ *rets = VirtualAlloc(NULL,4096,MEM_COMMIT|MEM_RESERVE,PAGE_EXECUTE_READWRITE);
+ memset(*rets,0,4096);
+ i = 0; /* entry 0 is free */
+ }
+ ret = &((*rets)->entry[i]);
+ ret->lcall = 0xe8;
+ /* NOTE: origreturn struct member MUST come directly after snoopret */
+ ret->snoopret = ((char*)SNOOP_Return)-(char*)(&ret->origreturn);
+ ret->origreturn = (FARPROC32)CALLER1REF;
+ CALLER1REF = (DWORD)&ret->lcall;
+ ret->dll = dll;
+ ret->args = NULL;
+ ret->ordinal = ordinal;
+ ret->origESP = ESP_reg(context);
+
+ EIP_reg(context)= (DWORD)fun->origfun;
+
+ DPRINTF("Call %s.%ld: %s(",dll->name,ordinal,fun->name);
+ if (fun->nrofargs>0) {
+ max = fun->nrofargs; if (max>16) max=16;
+ for (i=0;i<max;i++)
+ DPRINTF("%s%s",SNOOP_PrintArg(*(DWORD*)(ESP_reg(context)+8+sizeof(DWORD)*i)),(i<fun->nrofargs-1)?",":"");
+ if (max!=fun->nrofargs)
+ DPRINTF(" ...");
+ } else if (fun->nrofargs<0) {
+ DPRINTF("<unknown, check return>");
+ ret->args = HeapAlloc(SystemHeap,0,16*sizeof(DWORD));
+ memcpy(ret->args,(LPBYTE)(ESP_reg(context)+8),sizeof(DWORD)*16);
+ }
+ DPRINTF(") ret=%08lx fs=%04lx\n",(DWORD)(*rets)->entry[i].origreturn,FS_reg(context));
+}
+
+REGS_ENTRYPOINT(SNOOP_Return) {
+ SNOOP_RETURNENTRY *ret = (SNOOP_RETURNENTRY*)(EIP_reg(context)-5);
+
+ /* We haven't found out the nrofargs yet. If we called a cdecl
+ * function it is too late anyway and we can just set '0' (which
+ * will be the difference between orig and current ESP
+ * If stdcall -> everything ok.
+ */
+ if (ret->dll->funs[ret->ordinal].nrofargs<0)
+ ret->dll->funs[ret->ordinal].nrofargs=(ESP_reg(context)-ret->origESP-4)/4;
+ EIP_reg(context) = (DWORD)ret->origreturn;
+ if (ret->args) {
+ int i,max;
+
+ DPRINTF("Ret %s.%ld: %s(",ret->dll->name,ret->ordinal,ret->dll->funs[ret->ordinal].name);
+ max = ret->dll->funs[ret->ordinal].nrofargs;
+ if (max>16) max=16;
+
+ for (i=0;i<max;i++)
+ DPRINTF("%s%s",SNOOP_PrintArg(ret->args[i]),(i<max-1)?",":"");
+ DPRINTF(") retval = %08lx ret=%08lx fs=%04lx\n",
+ EAX_reg(context),(DWORD)ret->origreturn,FS_reg(context)
+ );
+ HeapFree(SystemHeap,0,ret->args);
+ ret->args = NULL;
+ } else
+ DPRINTF("Ret %s.%ld: %s() retval = %08lx ret=%08lx fs=%04lx\n",
+ ret->dll->name,ret->ordinal,ret->dll->funs[ret->ordinal].name,
+ EAX_reg(context),(DWORD)ret->origreturn,FS_reg(context)
+ );
+ ret->origreturn = NULL; /* mark as empty */
+}
+#else /* !__i386__ */
+void SNOOP_RegisterDLL(HMODULE32 hmod,LPCSTR name,DWORD nrofordinals) {
+ FIXME(snoop,"snooping works only on i386 for now.\n");
+ return;
+}
+
+FARPROC32 SNOOP_GetProcAddress32(HMODULE32 hmod,LPCSTR name,DWORD ordinal,FARPROC32 origfun) {
+ return origfun;
+}
+#endif /* !__i386__ */
