Alexandre Julliard : wnaspi32: Build with msvcrt.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b089dc16bfdd0b1832b470c34bfb5658ef9f4f2e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=b089dc16bfdd0b1832b470c34bfb5658ef9f4f2e

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Nov 24 17:23:14 2021 +0100

wnaspi32: Build with msvcrt.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wnaspi32/Makefile.in | 2 --
 dlls/wnaspi32/aspi.c      | 8 ++------
 dlls/wnaspi32/aspi.h      | 8 --------
 dlls/wnaspi32/winaspi32.c | 2 --
 4 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/dlls/wnaspi32/Makefile.in b/dlls/wnaspi32/Makefile.in
index 7b19b1bd1e4..5c3fa66e9d0 100644
--- a/dlls/wnaspi32/Makefile.in
+++ b/dlls/wnaspi32/Makefile.in
@@ -2,8 +2,6 @@ MODULE    = wnaspi32.dll
 IMPORTLIB = wnaspi32
 IMPORTS   = advapi32
 
-EXTRADLLFLAGS = -mcygwin
-
 C_SRCS = \
 	aspi.c \
 	winaspi32.c
diff --git a/dlls/wnaspi32/aspi.c b/dlls/wnaspi32/aspi.c
index 73ef6f59950..903c618f9ba 100644
--- a/dlls/wnaspi32/aspi.c
+++ b/dlls/wnaspi32/aspi.c
@@ -29,14 +29,11 @@
  *   aspi controllers, e-mail me if you need help.
  */
 
-
-#include "config.h"
-#include "wine/port.h"
-
 #include <stdio.h>
 #include <stdarg.h>
 #include <sys/types.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "windef.h"
 #include "winbase.h"
@@ -45,7 +42,6 @@
 #include "winescsi.h"
 
 #include "wine/debug.h"
-#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(aspi);
 
@@ -132,5 +128,5 @@ DWORD ASPI_GetHCforController( int controller )
     }
     RegCloseKey(hkeyPort);
 
-    return (atoiW(&wPortName[9]) << 16) + atoiW(&wBusName[9]);
+    return (wcstol(&wPortName[9], NULL, 10) << 16) + wcstol(&wBusName[9], NULL, 10);
 }
diff --git a/dlls/wnaspi32/aspi.h b/dlls/wnaspi32/aspi.h
index a9912ffc9e4..617dd00faf0 100644
--- a/dlls/wnaspi32/aspi.h
+++ b/dlls/wnaspi32/aspi.h
@@ -26,11 +26,6 @@
 #include "winbase.h"
 
 #include "pshpack1.h"
-#ifdef __cplusplus
-extern "C" {
-#endif /* #ifdef __cplusplus */
-
-/*********** OLD ****************/
 
 /* Target status codes */
 #define STATUS_GOOD             0x00
@@ -76,9 +71,6 @@ extern "C" {
 
 #define SENSE_BUFFER(prb) (&prb->CDBByte[prb->SRB_CDBLen])
 
-#ifdef __cplusplus
-}
-#endif /* #ifdef __cplusplus */
 #include "poppack.h"
 
 #endif
diff --git a/dlls/wnaspi32/winaspi32.c b/dlls/wnaspi32/winaspi32.c
index ea6d6d82e9a..d8dfd1a2e3f 100644
--- a/dlls/wnaspi32/winaspi32.c
+++ b/dlls/wnaspi32/winaspi32.c
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-
 #include <assert.h>
 #include <stdlib.h>
 #include <stdarg.h>