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/misc/printdrv.c b/misc/printdrv.c
index 20c2207..37a1748 100644
--- a/misc/printdrv.c
+++ b/misc/printdrv.c
@@ -10,8 +10,17 @@
#include "windows.h"
#include "win.h"
#include "winerror.h"
+#include "winreg.h"
#include "debug.h"
+#define INT_PD_DEFAULT_DEVMODE 1
+#define INT_PD_DEFAULT_MODEL 2
+
+static char PrinterModel[] = "Printer Model";
+static char DefaultDevMode[] = "Default DevMode";
+static char PrinterDriverData[] = "PrinterDriverData";
+static char Printers[] = "System\\CurrentControlSet\\Control\\Print\\Printers\\";
+
INT16 WINAPI StartDoc16( HDC16 hdc, const DOCINFO16 *lpdoc )
{
INT16 retVal;
@@ -32,42 +41,172 @@
return Escape16(hdc, ENDDOC, 0, 0, 0);
}
+WORD DrvGetPrinterDataInternal(LPSTR RegStr_Printer, LPBYTE lpPrinterData, int cbData)
+{
+ WORD res = -1;
+ HKEY hkey;
+ DWORD dwType, cbQueryData;
+
+ if (!(RegOpenKey32A(HKEY_LOCAL_MACHINE, RegStr_Printer, &hkey))) {
+ if (cbData > 1) { /* "Default DevMode" */
+ if (!(RegQueryValueEx32A(hkey, DefaultDevMode, 0, &dwType, 0, &cbQueryData))) {
+ if (!lpPrinterData) res = cbQueryData;
+ else
+ if ((cbQueryData) && (cbQueryData <= cbData)) {
+ cbQueryData = cbData;
+ if (RegQueryValueEx32A(hkey, DefaultDevMode, 0,
+ &dwType, lpPrinterData, &cbQueryData))
+ res = cbQueryData;
+ }
+ }
+ else /* "Printer Driver" */
+ {
+ cbQueryData = 32;
+ RegQueryValueEx32A(hkey, "Printer Driver", 0,
+ &dwType, lpPrinterData, &cbQueryData);
+ res = cbQueryData;
+ }
+ }
+ }
+ if (hkey) RegCloseKey(hkey);
+ return res;
+}
DWORD WINAPI DrvGetPrinterData(LPSTR lpPrinter, LPSTR lpProfile,
LPDWORD lpType, LPBYTE lpPrinterData,
int cbData, LPDWORD lpNeeded)
{
- FIXME(print, "stub.\n");
+ LPSTR RegStr_Printer;
+ HKEY hkey = 0, hkey2 = 0;
+ DWORD res = 0;
+ DWORD dwType, PrinterAttr, cbPrinterAttr, SetData, size;
+
if (HIWORD(lpPrinter))
- TRACE(print,"printer %s\n",lpPrinter);
+ TRACE(print,"printer %s\n",lpPrinter);
else
- TRACE(print,"printer %p\n",lpPrinter);
+ TRACE(print,"printer %p\n",lpPrinter);
if (HIWORD(lpProfile))
- TRACE(print,"profile %s\n",lpProfile);
+ TRACE(print,"profile %s\n",lpProfile);
else
- TRACE(print,"profile %p\n",lpProfile);
+ TRACE(print,"profile %p\n",lpProfile);
TRACE(print,"lpType %p\n",lpType);
- return 0;
+
+ if ((!lpPrinter) || (!lpProfile) || (!lpNeeded))
+ return ERROR_INVALID_PARAMETER;
+
+ RegStr_Printer = HeapAlloc(GetProcessHeap(), 0,
+ strlen(Printers) + strlen(lpPrinter) + 2);
+ strcpy(RegStr_Printer, Printers);
+ strcat(RegStr_Printer, lpPrinter);
+
+ if (((DWORD)lpProfile == INT_PD_DEFAULT_DEVMODE) ||
+ (!lstrcmp32A(lpProfile, DefaultDevMode))) {
+ size = DrvGetPrinterDataInternal(RegStr_Printer, lpPrinterData, cbData);
+ if (size+1) {
+ *lpNeeded = size;
+ if ((lpPrinterData) && (*lpNeeded > cbData))
+ res = ERROR_MORE_DATA;
+ }
+ else res = ERROR_INVALID_PRINTER_NAME;
+ }
+ else
+ if (((DWORD)lpProfile == INT_PD_DEFAULT_MODEL) ||
+ (!lstrcmp32A(lpProfile, PrinterModel))) {
+ *lpNeeded = 32;
+ if (!lpPrinterData) goto failed;
+ if (cbData < 32) {
+ res = ERROR_MORE_DATA;
+ goto failed;
+ }
+ size = DrvGetPrinterDataInternal(RegStr_Printer, lpPrinterData, 1);
+ if ((size+1) && (lpType))
+ *lpType = REG_SZ;
+ else
+ res = ERROR_INVALID_PRINTER_NAME;
+ }
+ else
+ {
+ if ((res = RegOpenKey32A(HKEY_LOCAL_MACHINE, RegStr_Printer, &hkey)))
+ goto failed;
+ cbPrinterAttr = 4;
+ if ((res = RegQueryValueEx32A(hkey, "Attributes", 0, &dwType, (LPBYTE)&PrinterAttr, &cbPrinterAttr)))
+ goto failed;
+ if ((res = RegOpenKey32A(hkey, PrinterDriverData, &hkey2)))
+ goto failed;
+ *lpNeeded = cbData;
+ res = RegQueryValueEx32A(hkey2, lpProfile, 0, lpType, lpPrinterData, lpNeeded);
+ if ((res != ERROR_CANTREAD) && ((PrinterAttr & (0x800|0x10)) == 0x10))
+ {
+ if (!(res) && (*lpType == REG_DWORD) && (*(LPDWORD)lpPrinterData == -1))
+ res = ERROR_INVALID_DATA;
+ }
+ else
+ {
+ SetData = -1;
+ RegSetValueEx32A(hkey2, lpProfile, 0, REG_DWORD, (LPBYTE)&SetData, 4); /* no result returned */
+ }
+ }
+
+failed:
+ if (hkey2) RegCloseKey(hkey2);
+ if (hkey) RegCloseKey(hkey);
+ HeapFree(GetProcessHeap(), 0, RegStr_Printer);
+ return res;
}
DWORD WINAPI DrvSetPrinterData(LPSTR lpPrinter, LPSTR lpProfile,
- LPDWORD lpType, LPBYTE lpPrinterData,
+ DWORD lpType, LPBYTE lpPrinterData,
DWORD dwSize)
{
- FIXME(print, "stub.\n");
+ LPSTR RegStr_Printer;
+ HKEY hkey = 0;
+ DWORD res = 0;
+
if (HIWORD(lpPrinter))
- TRACE(print,"printer %s\n",lpPrinter);
+ TRACE(print,"printer %s\n",lpPrinter);
else
- TRACE(print,"printer %p\n",lpPrinter);
+ TRACE(print,"printer %p\n",lpPrinter);
if (HIWORD(lpProfile))
- TRACE(print,"profile %s\n",lpProfile);
+ TRACE(print,"profile %s\n",lpProfile);
else
- TRACE(print,"profile %p\n",lpProfile);
- TRACE(print,"lpType %p\n",lpType);
- return 0;
+ TRACE(print,"profile %p\n",lpProfile);
+ TRACE(print,"lpType %08lx\n",lpType);
+
+ if ((!lpPrinter) || (!lpProfile) ||
+ ((DWORD)lpProfile == INT_PD_DEFAULT_MODEL) ||
+ (!lstrcmp32A(lpProfile, PrinterModel)))
+ return ERROR_INVALID_PARAMETER;
+
+ RegStr_Printer = HeapAlloc(GetProcessHeap(), 0,
+ strlen(Printers) + strlen(lpPrinter) + 2);
+ strcpy(RegStr_Printer, Printers);
+ strcat(RegStr_Printer, lpPrinter);
+
+ if (((DWORD)lpProfile == INT_PD_DEFAULT_DEVMODE) ||
+ (!lstrcmp32A(lpProfile, DefaultDevMode))) {
+ if (!(RegOpenKey32A(HKEY_LOCAL_MACHINE, RegStr_Printer, &hkey)) ||
+ (RegSetValueEx32A(hkey, DefaultDevMode, 0, REG_BINARY, lpPrinterData, dwSize)))
+ res = ERROR_INVALID_PRINTER_NAME;
+ }
+ else
+ {
+ strcat(RegStr_Printer, "\\");
+
+ if (!(res = RegOpenKey32A(HKEY_LOCAL_MACHINE, RegStr_Printer, &hkey))) {
+
+ if (!lpPrinterData)
+ res = RegDeleteValue32A(hkey, lpProfile);
+ else
+ res = RegSetValueEx32A(hkey, lpProfile, 0, lpType, lpPrinterData, dwSize);
+ }
+ }
+
+ if (hkey) RegCloseKey(hkey);
+ HeapFree(GetProcessHeap(), 0, RegStr_Printer);
+ return res;
}
@@ -105,9 +244,39 @@
*lpdwReturned=0;
return TRUE;
}
+
+
BOOL32 WINAPI AddMonitor32A(LPCSTR pName, DWORD Level, LPBYTE pMonitors)
{
FIXME(print, "(%s,%lx,%p):stub!\n", pName, Level, pMonitors);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
+
+
+BOOL32 WINAPI
+DeletePrinterDriver32A (LPSTR pName, LPSTR pEnvironment, LPSTR pDriverName)
+{
+ FIXME(print, "(%s,%s,%s):stub!\n", pName, pEnvironment, pDriverName);
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return FALSE;
+}
+
+
+BOOL32 WINAPI
+DeleteMonitor32A (LPSTR pName, LPSTR pEnvironment, LPSTR pMonitorName)
+{
+ FIXME(print, "(%s,%s,%s):stub!\n", pName, pEnvironment, pMonitorName);
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return FALSE;
+}
+
+
+BOOL32 WINAPI
+DeletePort32A (LPSTR pName, HWND32 hWnd, LPSTR pPortName)
+{
+ FIXME(print, "(%s,0x%08x,%s):stub!\n", pName, hWnd, pPortName);
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return FALSE;
+}
+
