SendASPI32Command32 has to be __cdecl.
Updated documentation/aspi and reverted an ERR back to WARN.
diff --git a/dlls/winaspi/winaspi16.c b/dlls/winaspi/winaspi16.c
index 8c4a70a..a9eb055 100644
--- a/dlls/winaspi/winaspi16.c
+++ b/dlls/winaspi/winaspi16.c
@@ -221,7 +221,7 @@
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 1037ada..8eec3c5 100644
--- a/dlls/wnaspi32/winaspi32.c
+++ b/dlls/wnaspi32/winaspi32.c
@@ -333,7 +333,7 @@
/***********************************************************************
* 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 a0b9d43..544d0b6 100644
--- a/documentation/aspi
+++ b/documentation/aspi
@@ -14,6 +14,9 @@
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 @@
============================================================
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 @@
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 3f4e847..0f7cdb5 100644
--- a/relay32/wnaspi32.spec
+++ b/relay32/wnaspi32.spec
@@ -2,5 +2,5 @@
type win32
0 stdcall GetASPI32SupportInfo() GetASPI32SupportInfo32
-1 stdcall SendASPI32Command(ptr) SendASPI32Command32
+1 cdecl SendASPI32Command(ptr) SendASPI32Command32
3 stub GetASPI32DLLVersion
