Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
a2ae7dd0
Commit
a2ae7dd0
authored
Mar 23, 2009
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wnaspi32: Make winaspi.dll into a stand-alone 16-bit module.
parent
d540fa2a
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
143 additions
and
11 deletions
+143
-11
.gitignore
.gitignore
+0
-1
configure
configure
+9
-0
configure.ac
configure.ac
+1
-0
Makefile.in
dlls/Makefile.in
+0
-4
Makefile.in
dlls/winaspi.dll16/Makefile.in
+15
-0
aspi.h
dlls/winaspi.dll16/aspi.h
+84
-0
winaspi.c
dlls/winaspi.dll16/winaspi.c
+34
-1
winaspi.dll16.spec
dlls/winaspi.dll16/winaspi.dll16.spec
+0
-0
Makefile.in
dlls/wnaspi32/Makefile.in
+0
-5
No files found.
.gitignore
View file @
a2ae7dd0
...
...
@@ -97,7 +97,6 @@ dlls/user.exe16
dlls/ver.dll16
dlls/w32sys.dll16
dlls/win32s16.dll16
dlls/winaspi.dll16
dlls/wineps16.drv16
dlls/wing.dll16
dlls/winnls.dll16
...
...
configure
View file @
a2ae7dd0
...
...
@@ -27440,6 +27440,14 @@ dlls/win87em.dll16/Makefile: dlls/win87em.dll16/Makefile.in dlls/Makedll.rules"
ac_config_files
=
"
$ac_config_files
dlls/win87em.dll16/Makefile"
ALL_MAKEFILES
=
"
$ALL_MAKEFILES
\\
dlls/winaspi.dll16/Makefile"
test
"x
$enable_win16
"
!=
xno
&&
ALL_DLL_DIRS
=
"
$ALL_DLL_DIRS
\\
winaspi.dll16"
ALL_MAKEFILE_DEPENDS
=
"
$ALL_MAKEFILE_DEPENDS
dlls/winaspi.dll16/Makefile: dlls/winaspi.dll16/Makefile.in dlls/Makedll.rules"
ac_config_files
=
"
$ac_config_files
dlls/winaspi.dll16/Makefile"
ALL_MAKEFILES
=
"
$ALL_MAKEFILES
\\
dlls/windebug.dll16/Makefile"
test
"x
$enable_win16
"
!=
xno
&&
ALL_DLL_DIRS
=
"
$ALL_DLL_DIRS
\\
windebug.dll16"
...
...
@@ -29389,6 +29397,7 @@ do
"dlls/vwin32.vxd/Makefile") CONFIG_FILES="
$CONFIG_FILES
dlls/vwin32.vxd/Makefile" ;;
"dlls/w32skrnl/Makefile") CONFIG_FILES="
$CONFIG_FILES
dlls/w32skrnl/Makefile" ;;
"dlls/win87em.dll16/Makefile") CONFIG_FILES="
$CONFIG_FILES
dlls/win87em.dll16/Makefile" ;;
"dlls/winaspi.dll16/Makefile") CONFIG_FILES="
$CONFIG_FILES
dlls/winaspi.dll16/Makefile" ;;
"dlls/windebug.dll16/Makefile") CONFIG_FILES="
$CONFIG_FILES
dlls/windebug.dll16/Makefile" ;;
"dlls/winealsa.drv/Makefile") CONFIG_FILES="
$CONFIG_FILES
dlls/winealsa.drv/Makefile" ;;
"dlls/wineaudioio.drv/Makefile") CONFIG_FILES="
$CONFIG_FILES
dlls/wineaudioio.drv/Makefile" ;;
...
...
configure.ac
View file @
a2ae7dd0
...
...
@@ -2244,6 +2244,7 @@ WINE_CONFIG_MAKEFILE([dlls/vtdapi.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL
WINE_CONFIG_MAKEFILE([dlls/vwin32.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
WINE_CONFIG_MAKEFILE([dlls/w32skrnl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/win87em.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
WINE_CONFIG_MAKEFILE([dlls/winaspi.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
WINE_CONFIG_MAKEFILE([dlls/windebug.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
WINE_CONFIG_MAKEFILE([dlls/winealsa.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/wineaudioio.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
...
...
dlls/Makefile.in
View file @
a2ae7dd0
...
...
@@ -36,7 +36,6 @@ WIN16_FILES = \
ver.dll16
\
w32sys.dll16
\
win32s16.dll16
\
winaspi.dll16
\
wineps16.drv16
\
wing.dll16
\
winnls.dll16
\
...
...
@@ -99,9 +98,6 @@ mmsystem.dll16 sound.drv16:
winnls.dll16
:
echo
"winnls32.dll"
>
$@
winaspi.dll16
:
echo
"wnaspi32.dll"
>
$@
winsock.dll16
:
echo
"ws2_32.dll"
>
$@
...
...
dlls/winaspi.dll16/Makefile.in
0 → 100644
View file @
a2ae7dd0
TOPSRCDIR
=
@top_srcdir@
TOPOBJDIR
=
../..
SRCDIR
=
@srcdir@
VPATH
=
@srcdir@
MODULE
=
winaspi.dll16
IMPORTS
=
advapi32 kernel32
EXTRADLLFLAGS
=
-Wb
,--subsystem,win16,--main-module,wnaspi32.dll
SPEC_SRCS
=
winaspi.dll16.spec
C_SRCS
=
winaspi.c
@MAKE_DLL_RULES@
@DEPENDENCIES@
# everything below this line is overwritten by make depend
dlls/winaspi.dll16/aspi.h
0 → 100644
View file @
a2ae7dd0
/* ASPI definitions used for both WINASPI and WNASPI32
*
* Copyright (C) 2000 David Elliott
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __WINE_ASPI_H
#define __WINE_ASPI_H
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "pshpack1.h"
#ifdef __cplusplus
extern
"C"
{
#endif
/* #ifdef __cplusplus */
/*********** OLD ****************/
/* Target status codes */
#define STATUS_GOOD 0x00
#define STATUS_CHKCOND 0x02
#define STATUS_BUSY 0x08
#define STATUS_RESCONF 0x18
#define ASPI_POSTING(prb) (prb->SRB_Flags & 0x1)
/* WNASPI32/WINASPI defs */
#define HOST_TO_TARGET(prb) (((prb->SRB_Flags>>3) & 0x3) == 0x2)
#define TARGET_TO_HOST(prb) (((prb->SRB_Flags>>3) & 0x3) == 0x1)
#define NO_DATA_TRANSFERRED(prb) (((prb->SRB_Flags>>3) & 0x3) == 0x3)
#define INQUIRY_VENDOR 8
#define MUSTEK_SCSI_AREA_AND_WINDOWS 0x04
#define MUSTEK_SCSI_READ_SCANNED_DATA 0x08
#define MUSTEK_SCSI_GET_IMAGE_STATUS 0x0f
#define MUSTEK_SCSI_ADF_AND_BACKTRACE 0x10
#define MUSTEK_SCSI_CCD_DISTANCE 0x11
#define MUSTEK_SCSI_START_STOP 0x1b
#define CMD_TEST_UNIT_READY 0x00
#define CMD_REQUEST_SENSE 0x03
#define CMD_INQUIRY 0x12
/* scanner commands - just for debug */
#define CMD_SCAN_GET_DATA_BUFFER_STATUS 0x34
#define CMD_SCAN_GET_WINDOW 0x25
#define CMD_SCAN_OBJECT_POSITION 0x31
#define CMD_SCAN_READ 0x28
#define CMD_SCAN_RELEASE_UNIT 0x17
#define CMD_SCAN_RESERVE_UNIT 0x16
#define CMD_SCAN_SCAN 0x1b
#define CMD_SCAN_SEND 0x2a
#define CMD_SCAN_CHANGE_DEFINITION 0x40
#define INQURIY_CMDLEN 6
#define INQURIY_REPLY_LEN 96
#define INQUIRY_VENDOR 8
#define SENSE_BUFFER(prb) (&prb->CDBByte[prb->SRB_CDBLen])
#ifdef __cplusplus
}
#endif
/* #ifdef __cplusplus */
#include "poppack.h"
#endif
dlls/w
naspi32/winaspi16
.c
→
dlls/w
inaspi.dll16/winaspi
.c
View file @
a2ae7dd0
...
...
@@ -37,7 +37,6 @@
#include "winreg.h"
#include "wownt32.h"
#include "aspi.h"
#include "winescsi.h"
#include "wine/winaspi.h"
#include "wine/debug.h"
...
...
@@ -50,11 +49,45 @@
#ifdef linux
/* Copy of info from 2.2.x kernel */
#define SG_MAX_SENSE 16
/* too little, unlikely to change in 2.2.x */
struct
sg_header
{
int
pack_len
;
/* [o] reply_len (ie useless), ignored as input */
int
reply_len
;
/* [i] max length of expected reply (inc. sg_header) */
int
pack_id
;
/* [io] id number of packet (use ints >= 0) */
int
result
;
/* [o] 0==ok, else (+ve) Unix errno (best ignored) */
unsigned
int
twelve_byte
:
1
;
/* [i] Force 12 byte command length for group 6 & 7 commands */
unsigned
int
target_status
:
5
;
/* [o] scsi status from target */
unsigned
int
host_status
:
8
;
/* [o] host status (see "DID" codes) */
unsigned
int
driver_status
:
8
;
/* [o] driver status+suggestion */
unsigned
int
other_flags
:
10
;
/* unused */
unsigned
char
sense_buffer
[
SG_MAX_SENSE
];
/* [o] Output in 3 cases:
when target_status is CHECK_CONDITION or
when target_status is COMMAND_TERMINATED or
when (driver_status & DRIVER_SENSE) is true. */
};
/* This structure is 36 bytes long on i386 */
#define SCSI_OFF sizeof(struct sg_header)
#define PTR_TO_LIN(ptr,mode) \
((mode) == ASPI_DOS ? ((void*)(((unsigned int)SELECTOROF(ptr) << 4) + OFFSETOF(ptr))) : MapSL(ptr))
WINE_DEFAULT_DEBUG_CHANNEL
(
aspi
);
/* Just a container for seeing what devices are open */
struct
ASPI_DEVICE_INFO
{
struct
ASPI_DEVICE_INFO
*
next
;
int
fd
;
int
hostId
;
int
target
;
int
lun
;
};
typedef
struct
ASPI_DEVICE_INFO
ASPI_DEVICE_INFO
;
static
ASPI_DEVICE_INFO
*
ASPI_open_devices
=
NULL
;
static
FARPROC16
ASPIChainFunc
=
NULL
;
...
...
dlls/w
naspi32/winaspi
.spec
→
dlls/w
inaspi.dll16/winaspi.dll16
.spec
View file @
a2ae7dd0
File moved
dlls/wnaspi32/Makefile.in
View file @
a2ae7dd0
...
...
@@ -10,11 +10,6 @@ C_SRCS = \
aspi.c
\
winaspi32.c
C_SRCS16
=
\
winaspi16.c
SPEC_SRCS16
=
winaspi.spec
@MAKE_DLL_RULES@
@DEPENDENCIES@
# everything below this line is overwritten by make depend
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment