Changeset 2651 for trunk/include/win/wininet.h

Timestamp:

Feb 5, 2000, 3:42:20 AM (26 years ago)

Author:

sandervl

Message:

header updates

File:

• trunk/include/win/wininet.h (modified) (5 diffs)

trunk/include/win/wininet.h

@@ -1 @@
-/* $Id: wininet.h,v 1.1 1999-12-28 13:03:25 sandervl Exp $ */
+/* $Id: wininet.h,v 1.2 2000-02-05 02:42:19 sandervl Exp $ */
 #ifndef __WININET_H__
 #define __WININET_H__
 
 #define INTERNETAPI
+#define BOOLAPI INTERNETAPI BOOL WINAPI
+
 #define URLCACHEAPI 
 
@@ -607 +609 @@
 
 typedef struct {
-    DWORD dwStructSize;
-    LPTSTR lpszScheme;
-    DWORD dwSchemeLength;
+    DWORD   dwStructSize;       
+    LPSTR   lpszScheme;
+    DWORD   dwSchemeLength;
     INTERNET_SCHEME nScheme;
-    LPTSTR lpszHostName;
-    DWORD dwHostNameLength;
+    LPSTR   lpszHostName;
+    DWORD   dwHostNameLength;
     INTERNET_PORT nPort;
-    LPTSTR lpszUserName;
-    DWORD dwUserNameLength;
-    LPTSTR lpszPassword;
-    DWORD dwPasswordLength;
-    LPTSTR lpszUrlPath;
-    DWORD dwUrlPathLength;
-    LPTSTR lpszExtraInfo;
-    DWORD dwExtraInfoLength;
-} URL_COMPONENTS, *LPURL_COMPONENTS;
+    LPSTR   lpszUserName;
+    DWORD   dwUserNameLength;
+    LPSTR   lpszPassword;
+    DWORD   dwPasswordLength;   
+    LPSTR   lpszUrlPath;        
+    DWORD   dwUrlPathLength;    
+    LPSTR   lpszExtraInfo;      
+    DWORD   dwExtraInfoLength;  
+} URL_COMPONENTSA,* LPURL_COMPONENTSA;
+
+typedef struct {
+    DWORD   dwStructSize;       
+    LPWSTR  lpszScheme;         
+    DWORD   dwSchemeLength;     
+    INTERNET_SCHEME nScheme;    
+    LPWSTR  lpszHostName;       
+    DWORD   dwHostNameLength;   
+    INTERNET_PORT nPort;        
+    LPWSTR  lpszUserName;       
+    DWORD   dwUserNameLength;   
+    LPWSTR  lpszPassword;       
+    DWORD   dwPasswordLength;   
+    LPWSTR  lpszUrlPath;        
+    DWORD   dwUrlPathLength;    
+    LPWSTR  lpszExtraInfo;      
+    DWORD   dwExtraInfoLength;  
+} URL_COMPONENTSW,* LPURL_COMPONENTSW;
+
+DECL_WINELIB_TYPE_AW(URL_COMPONENTS)
+DECL_WINELIB_TYPE_AW(LPURL_COMPONENTS)
 
 typedef struct {
@@ -635 +658 @@
 } INTERNET_CERTIFICATE_INFO, *LPINTERNET_CERTIFICATE_INFO;
 
-typedef VOID (CALLBACK * INTERNET_STATUS_CALLBACK)(
+typedef VOID (* CALLBACK  INTERNET_STATUS_CALLBACK)(
     HINTERNET hInternet,
     DWORD dwContext,
@@ -769 +792 @@
 } GOPHER_ATTRIBUTE_TYPE, *LPGOPHER_ATTRIBUTE_TYPE;
 
-typedef BOOL (CALLBACK * GOPHER_ATTRIBUTE_ENUMERATOR)(
+typedef BOOL (* CALLBACK  GOPHER_ATTRIBUTE_ENUMERATOR)(
     LPGOPHER_ATTRIBUTE_TYPE lpAttributeInfo,
     DWORD dwError
@@ -779 +802 @@
 
 BOOL WINAPI InternetCrackUrlA(LPCSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags,
-                              LPURL_COMPONENTS lpUrlComponents);
+                              LPURL_COMPONENTSA lpUrlComponents);
 
 BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags,
-                              LPURL_COMPONENTS lpUrlComponents);
+                              LPURL_COMPONENTSW lpUrlComponents);
 
 #define InternetCrackUrl WINELIB_NAME_AW(InternetCrackUrl)
 
-BOOL WINAPI InternetCreateUrlA(LPURL_COMPONENTS lpUrlComponents, DWORD dwFlags,
+BOOL WINAPI InternetCreateUrlA(LPURL_COMPONENTSA lpUrlComponents, DWORD dwFlags,
                                LPSTR lpszUrl, LPDWORD lpdwUrlLength);
 
-BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTS lpUrlComponents, DWORD dwFlags,
+BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW lpUrlComponents, DWORD dwFlags,
                                LPWSTR lpszUrl, LPDWORD lpdwUrlLength);