From 69dd0a9467b99d82e58283f1907b1514fcd6ea82 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Sun, 26 Nov 2000 22:40:49 +0000
Subject: [PATCH] Removed dependency on 16-bit file I/O functions.

---
 dlls/setupapi/Makefile.in | 1 -
 dlls/setupapi/infparse.c  | 8 ++++----
 dlls/setupapi/setupx16.h  | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in
index 9d00e8d4704..d9623535136 100644
--- a/dlls/setupapi/Makefile.in
+++ b/dlls/setupapi/Makefile.in
@@ -5,7 +5,6 @@ VPATH     = @srcdir@
 MODULE    = setupapi
 SOVERSION = 1.0
 ALTNAMES  = setupx
-IMPORTS   = ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/setupapi/infparse.c b/dlls/setupapi/infparse.c
index 4bde7e17136..e0958348068 100644
--- a/dlls/setupapi/infparse.c
+++ b/dlls/setupapi/infparse.c
@@ -19,7 +19,7 @@ HINF16 IP_curr_handle = 0;
 
 RETERR16 IP_OpenInf(LPCSTR lpInfFileName, HINF16 *lphInf)
 {
-    HFILE16 hFile = _lopen16(lpInfFileName, OF_READ);
+    HFILE hFile = _lopen(lpInfFileName, OF_READ);
 
     if (!lphInf)
 	return IP_ERROR;
@@ -28,7 +28,7 @@ RETERR16 IP_OpenInf(LPCSTR lpInfFileName, HINF16 *lphInf)
     if (IP_curr_handle == 0xffff) 
 	return ERR_IP_OUT_OF_HANDLES; 
 
-    if (hFile != HFILE_ERROR16)
+    if (hFile != HFILE_ERROR)
     {
 	InfList = HeapReAlloc(GetProcessHeap(), 0, InfList, InfNumEntries+1);
 	InfList[InfNumEntries].hInf = IP_curr_handle++;
@@ -73,11 +73,11 @@ RETERR16 IP_CloseInf(HINF16 hInf)
 {
     int i;
     WORD n;
-    HFILE16 res = ERR_IP_INVALID_HINF;
+    RETERR16 res = ERR_IP_INVALID_HINF;
 
     if (IP_FindInf(hInf, &n))
     {
-	_lclose16(InfList[n].hInfFile);
+	_lclose(InfList[n].hInfFile);
 	HeapFree(GetProcessHeap(), 0, InfList[n].lpInfFileName);
 	for (i=n; i < InfNumEntries-1; i++)
 	    InfList[i] = InfList[i+1];
diff --git a/dlls/setupapi/setupx16.h b/dlls/setupapi/setupx16.h
index 8858e9d220b..fa25cb09d52 100644
--- a/dlls/setupapi/setupx16.h
+++ b/dlls/setupapi/setupx16.h
@@ -65,7 +65,7 @@ enum _IP_ERR {
 
 typedef struct {
     HINF16 hInf;
-    HFILE16 hInfFile;
+    HFILE hInfFile;
     LPSTR lpInfFileName;
 } INF_FILE;