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/windows/driver.c b/windows/driver.c
index 79333fa..f62b3f1 100644
--- a/windows/driver.c
+++ b/windows/driver.c
@@ -1,10 +1,12 @@
/*
- * Wine Drivers functions
+ * WINE Drivers functions
*
* Copyright 1994 Martin Ayotte
-*/
+ * Copyright 1998 Marcus Meissner
+ */
#include "windows.h"
+#include "heap.h"
#include "win.h"
#include "callback.h"
#include "driver.h"
@@ -12,6 +14,7 @@
#include "debug.h"
LPDRIVERITEM lpDrvItemList = NULL;
+LPDRIVERITEM32A lpDrvItemList32 = NULL;
/**************************************************************************
* LoadStartupDrivers
@@ -33,20 +36,19 @@
while (lstrlen32A( ptr ) != 0)
{
TRACE(driver, "str='%s'\n", ptr );
- hDrv = OpenDriver( ptr, "drivers", 0L );
+ hDrv = OpenDriver16( ptr, "drivers", 0L );
TRACE(driver, "hDrv=%04x\n", hDrv );
ptr += lstrlen32A(ptr) + 1;
}
TRACE(driver, "end of list !\n" );
-
return;
}
/**************************************************************************
* SendDriverMessage [USER.251]
*/
-LRESULT WINAPI SendDriverMessage(HDRVR16 hDriver, UINT16 msg, LPARAM lParam1,
- LPARAM lParam2)
+LRESULT WINAPI SendDriverMessage16(HDRVR16 hDriver, UINT16 msg, LPARAM lParam1,
+ LPARAM lParam2)
{
LPDRIVERITEM lpdrv;
LRESULT retval;
@@ -71,21 +73,48 @@
}
/**************************************************************************
+ * SendDriverMessage [WINMM.19]
+ */
+LRESULT WINAPI SendDriverMessage32(HDRVR32 hDriver, UINT32 msg, LPARAM lParam1,
+ LPARAM lParam2)
+{
+ LPDRIVERITEM32A lpdrv;
+ LRESULT retval;
+
+ TRACE(driver, "(%04x, %04X, %08lX, %08lX)\n",
+ hDriver, msg, lParam1, lParam2 );
+
+ lpdrv = (LPDRIVERITEM32A)hDriver;
+ if (!lpdrv)
+ return 0;
+
+ retval = lpdrv->driverproc(lpdrv->dis.hDriver,hDriver,msg,lParam1,lParam2);
+
+ TRACE(driver, "retval = %ld\n", retval );
+
+ return retval;
+}
+
+/**************************************************************************
* OpenDriver [USER.252]
*/
-HDRVR16 WINAPI OpenDriver(LPSTR lpDriverName, LPSTR lpSectionName, LPARAM lParam)
-{
+HDRVR16 WINAPI OpenDriver16(
+ LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lParam
+) {
HDRVR16 hDrvr;
LPDRIVERITEM lpdrv, lpnewdrv;
char DrvName[128];
- WORD ordinal;
TRACE(driver,"('%s', '%s', %08lX);\n",
lpDriverName, lpSectionName, lParam );
- if (lpSectionName == NULL) lpSectionName = "drivers";
- GetPrivateProfileString32A( lpSectionName, lpDriverName, "", DrvName,
- sizeof(DrvName), "SYSTEM.INI" );
+ if (lpSectionName == NULL) {
+ lstrcpyn32A(DrvName,lpDriverName,sizeof(DrvName));
+ FIXME(driver,"sectionname NULL, assuming directfilename (%s)\n",lpDriverName);
+ } else {
+ GetPrivateProfileString32A( lpSectionName, lpDriverName, "", DrvName,
+ sizeof(DrvName), "SYSTEM.INI" );
+ }
TRACE(driver,"DrvName='%s'\n", DrvName );
if (lstrlen32A(DrvName) < 1) return 0;
@@ -95,7 +124,7 @@
if (!lstrcmpi32A( lpDriverName, lpdrv->dis.szAliasName ))
{
lpdrv->count++;
- SendDriverMessage( lpdrv->dis.hDriver, DRV_OPEN, 0L, lParam );
+ SendDriverMessage16( lpdrv->dis.hDriver, DRV_OPEN, 0L, lParam );
return lpdrv->dis.hDriver;
}
lpdrv = lpdrv->lpNextItem;
@@ -120,10 +149,7 @@
lpnewdrv->dis.hDriver = hDrvr;
lstrcpy32A( lpnewdrv->dis.szAliasName, lpDriverName );
lpnewdrv->count = 1;
- ordinal = NE_GetOrdinal( lpnewdrv->dis.hModule, "DRIVERPROC" );
- if (!ordinal ||
- !(lpnewdrv->lpDrvProc = (DRIVERPROC16)NE_GetEntryPoint(
- lpnewdrv->dis.hModule, ordinal )))
+ if (!(lpnewdrv->lpDrvProc = (DRIVERPROC16)WIN32_GetProcAddress16(lpnewdrv->dis.hModule, "DRIVERPROC" )))
{
FreeModule16( lpnewdrv->dis.hModule );
GlobalUnlock16( hDrvr );
@@ -143,18 +169,104 @@
lpnewdrv->lpPrevItem = lpdrv;
}
- SendDriverMessage( hDrvr, DRV_LOAD, 0L, lParam );
- SendDriverMessage( hDrvr, DRV_ENABLE, 0L, lParam );
- SendDriverMessage( hDrvr, DRV_OPEN, 0L, lParam );
+ SendDriverMessage16( hDrvr, DRV_LOAD, 0L, lParam );
+ SendDriverMessage16( hDrvr, DRV_ENABLE, 0L, lParam );
+ SendDriverMessage16( hDrvr, DRV_OPEN, 0L, lParam );
TRACE(driver, "hDrvr=%04x loaded !\n", hDrvr );
return hDrvr;
}
/**************************************************************************
- * CloseDriver [USER.253]
+ * OpenDriver [WINMM.15]
+ * (0,1,DRV_LOAD ,0 ,0)
+ * (0,1,DRV_ENABLE,0 ,0)
+ * (0,1,DRV_OPEN ,buf[256],0)
*/
-LRESULT WINAPI CloseDriver(HDRVR16 hDrvr, LPARAM lParam1, LPARAM lParam2)
+HDRVR32 WINAPI OpenDriver32A(
+ LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lParam
+) {
+ HDRVR32 hDrvr;
+ LPDRIVERITEM32A lpdrv, lpnewdrv;
+ char DrvName[128],*tmpbuf;
+
+ TRACE(driver,"('%s', '%s', %08lX);\n",
+ lpDriverName,lpSectionName,lParam );
+
+ if (lpSectionName == NULL) {
+ lstrcpyn32A(DrvName,lpDriverName,sizeof(DrvName));
+ FIXME(driver,"sectionname NULL, assuming directfilename (%s)\n",lpDriverName);
+ } else {
+ GetPrivateProfileString32A( lpSectionName, lpDriverName, "", DrvName,
+ sizeof(DrvName), "system.ini" );
+ }
+ TRACE(driver,"DrvName='%s'\n", DrvName );
+ if (lstrlen32A(DrvName) < 1) return 0;
+
+ lpdrv = lpDrvItemList32;
+ while (lpdrv) {
+ if (!lstrcmpi32A( lpDriverName, lpdrv->dis.szAliasName )) {
+ lpdrv->count++;
+ lpdrv->dis.hDriver = SendDriverMessage32( lpdrv->dis.hDriver, DRV_OPEN, ""/*FIXME*/, 0L );
+ return (HDRVR32)lpdrv;
+ }
+ lpdrv = lpdrv->next;
+ }
+
+ hDrvr = (HDRVR32)HeapAlloc(SystemHeap,0, sizeof(DRIVERITEM32A) );
+ if (!hDrvr) {
+ ERR(driver,"out of memory");
+ return 0;
+ }
+ lpnewdrv = (DRIVERITEM32A*)hDrvr;
+ lpnewdrv->dis.length = sizeof( DRIVERINFOSTRUCT32A );
+ lpnewdrv->dis.hModule = LoadLibrary32A( DrvName );
+ if (!lpnewdrv->dis.hModule) {
+ FIXME(driver,"could not load library %s\n",DrvName);
+ HeapFree( SystemHeap,0,(LPVOID)hDrvr );
+ return 0;
+ }
+ lstrcpy32A( lpnewdrv->dis.szAliasName, lpDriverName );
+ lpnewdrv->count = 1;
+ if (!(lpnewdrv->driverproc = (DRIVERPROC32)GetProcAddress32(lpnewdrv->dis.hModule, "DriverProc" )))
+ {
+ FIXME(driver,"no 'DriverProc' found in %s\n",DrvName);
+ FreeModule32( lpnewdrv->dis.hModule );
+ HeapFree( SystemHeap,0, (LPVOID)hDrvr );
+ return 0;
+ }
+
+ lpnewdrv->next = lpDrvItemList32;
+ lpDrvItemList32 = lpnewdrv;
+
+ SendDriverMessage32( hDrvr, DRV_LOAD, 0L, lParam );
+ SendDriverMessage32( hDrvr, DRV_ENABLE, 0L, lParam );
+ tmpbuf = HeapAlloc(SystemHeap,0,256);
+ lpnewdrv->dis.hDriver=SendDriverMessage32(hDrvr,DRV_OPEN,tmpbuf,lParam);
+ HeapFree(SystemHeap,0,tmpbuf);
+ TRACE(driver, "hDrvr=%04x loaded !\n", hDrvr );
+ return hDrvr;
+}
+
+/**************************************************************************
+ * OpenDriver [WINMM.15]
+ */
+HDRVR32 WINAPI OpenDriver32W(
+ LPCWSTR lpDriverName, LPCWSTR lpSectionName, LPARAM lParam
+) {
+ LPSTR dn = HEAP_strdupWtoA(GetProcessHeap(),0,lpDriverName);
+ LPSTR sn = HEAP_strdupWtoA(GetProcessHeap(),0,lpSectionName);
+ HDRVR32 ret = OpenDriver32A(dn,sn,lParam);
+
+ if (dn) HeapFree(GetProcessHeap(),0,dn);
+ if (sn) HeapFree(GetProcessHeap(),0,sn);
+ return ret;
+}
+
+/**************************************************************************
+ * CloseDriver [USER.253]
+ */
+LRESULT WINAPI CloseDriver16(HDRVR16 hDrvr, LPARAM lParam1, LPARAM lParam2)
{
LPDRIVERITEM lpdrv;
@@ -164,11 +276,11 @@
lpdrv = (LPDRIVERITEM)GlobalLock16( hDrvr );
if (lpdrv != NULL && lpdrv->dis.hDriver == hDrvr)
{
- SendDriverMessage( hDrvr, DRV_CLOSE, lParam1, lParam2 );
+ SendDriverMessage16( hDrvr, DRV_CLOSE, lParam1, lParam2 );
if (--lpdrv->count == 0)
{
- SendDriverMessage( hDrvr, DRV_DISABLE, lParam1, lParam2 );
- SendDriverMessage( hDrvr, DRV_FREE, lParam1, lParam2 );
+ SendDriverMessage16( hDrvr, DRV_DISABLE, lParam1, lParam2 );
+ SendDriverMessage16( hDrvr, DRV_FREE, lParam1, lParam2 );
if (lpdrv->lpPrevItem)
lpdrv->lpPrevItem->lpNextItem = lpdrv->lpNextItem;
@@ -192,7 +304,7 @@
/**************************************************************************
* GetDriverModuleHandle [USER.254]
*/
-HMODULE16 WINAPI GetDriverModuleHandle(HDRVR16 hDrvr)
+HMODULE16 WINAPI GetDriverModuleHandle16(HDRVR16 hDrvr)
{
LPDRIVERITEM lpdrv;
HMODULE16 hModule = 0;
@@ -209,6 +321,19 @@
}
/**************************************************************************
+ * GetDriverModuleHandle [USER.254]
+ */
+HMODULE32 WINAPI GetDriverModuleHandle32(HDRVR32 hDrvr)
+{
+ LPDRIVERITEM32A lpdrv = (LPDRIVERITEM32A)hDrvr;
+
+ TRACE(driver, "(%04x);\n", hDrvr);
+ if (!lpdrv)
+ return 0;
+ return lpdrv->dis.hModule;
+}
+
+/**************************************************************************
* DefDriverProc [USER.255]
*/
LRESULT WINAPI DefDriverProc(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg,
