From 382e2024b24ae03c00ac94f771db2b63c9a4dab8 Mon Sep 17 00:00:00 2001 From: Andreas Mohr Date: Sun, 3 Jan 1999 12:30:02 +0000 Subject: [PATCH] SendASPI32Command32 has to be __cdecl. Updated documentation/aspi and reverted an ERR back to WARN. --- dlls/winaspi/winaspi16.c | 2 +- dlls/wnaspi32/winaspi32.c | 2 +- documentation/aspi | 14 ++++++++++---- relay32/wnaspi32.spec | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/winaspi/winaspi16.c b/dlls/winaspi/winaspi16.c index 8c4a70a0a8a..a9eb055682b 100644 --- a/dlls/winaspi/winaspi16.c +++ b/dlls/winaspi/winaspi16.c @@ -221,7 +221,7 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode) fd = ASPI_OpenDevice16(lpPRB); if (fd == -1) { - ERR(aspi, "Failed: could not open device. Device permissions !?\n"); + WARN(aspi, "Failed: could not open device. Device permissions !?\n"); lpPRB->SRB_Status = SS_ERR; return SS_ERR; } diff --git a/dlls/wnaspi32/winaspi32.c b/dlls/wnaspi32/winaspi32.c index 1037adabc10..8eec3c56290 100644 --- a/dlls/wnaspi32/winaspi32.c +++ b/dlls/wnaspi32/winaspi32.c @@ -333,7 +333,7 @@ DWORD WINAPI GetASPI32SupportInfo32() /*********************************************************************** * SendASPI32Command32 (WNASPI32.1) */ -DWORD WINAPI SendASPI32Command32(LPSRB32 lpSRB) +DWORD __cdecl SendASPI32Command32(LPSRB32 lpSRB) { #ifdef linux switch (lpSRB->common.SRB_Cmd) { diff --git a/documentation/aspi b/documentation/aspi index a0b9d43ded4..544d0b69547 100644 --- a/documentation/aspi +++ b/documentation/aspi @@ -14,6 +14,9 @@ completely bogus commands to the wrong device - An example would be formatting your hard drives (assuming the device gave you permission - if you're running as root, all bets are off). +So please make sure that **all** SCSI devices that the program won't need +have their permissions set as restricted as possible ! + Cookbook for setting up scanner: (At least how mine is to work) ================================ @@ -33,6 +36,8 @@ LINUX requirements: ============================================================ 0) Your scsi card must be supported under linux. This will not work with an unknown scsi card. +Even for cheap'n crappy "scanner only" controllers some special Linux drivers +exist on the net. 1) Compile generic scsi drivers into your kernel. @@ -70,15 +75,16 @@ ipplus.exe <---> (TWAIN INTERFACE) <---> (TWAIN DATA SOURCE . ASPI) -> WINASPI NOTES/BUGS: =========== The biggest is that it only works under linux at the moment. -The ASPI code was only tested using a Mustek 800SP with a Buslogic -controller under Linux. The ASPI code has only been tested with: - a Mustek 800SP with a Buslogic controller under Linux [BM] - a Siemens Nixdorf 9036 with Adaptec AVA-1505 under Linux accessed via DOSASPI. - Note that I had color problems, though (barely readable result). [AM] + Note that I had color problems, though (barely readable result) [AM] +- a Fujitsu M2513A MO drive (640MB) using generic scsi drivers. + Formatting and ejecting worked perfectly. + Thanks to Uwe Bonnes for access to the hardware ! [AM] -I make no warranty to the aspi code. It makes my scanner work. Your scanner +I make no warranty to the aspi code. It makes my scanner work. Your devices may explode. I have no way of determining this. I take zero responsibility! diff --git a/relay32/wnaspi32.spec b/relay32/wnaspi32.spec index 3f4e8470cbb..0f7cdb51f1a 100644 --- a/relay32/wnaspi32.spec +++ b/relay32/wnaspi32.spec @@ -2,5 +2,5 @@ name wnaspi32 type win32 0 stdcall GetASPI32SupportInfo() GetASPI32SupportInfo32 -1 stdcall SendASPI32Command(ptr) SendASPI32Command32 +1 cdecl SendASPI32Command(ptr) SendASPI32Command32 3 stub GetASPI32DLLVersion