Changeset 7291

Timestamp:

Nov 7, 2001, 12:08:51 PM (24 years ago)

Author:

phaller

Message:

.

Location:

trunk

Files:

• changelog (modified) (1 diff)
• include/win/wininet.h (modified) (2 diffs)
• src/wininet/internet.c (modified) (4 diffs)
• src/wininet/wininet.def (modified) (2 diffs)

trunk/changelog

@@ -1 @@
-/* $Id: changelog,v 1.1816 2001-11-06 21:03:54 sandervl Exp $ */
+/* $Id: changelog,v 1.1817 2001-11-07 11:08:51 phaller Exp $ */
+
+ 2001-11-07: Patrick Haller <patrick.haller@innotek.de>
+    - WININET:  o http, internet: WINE sync
 
  2001-11-05: Sander van Leeuwen <sandervl@xs4all.nl>

trunk/include/win/wininet.h

@@ -1 @@
-/* $Id: wininet.h,v 1.3 2000-12-27 23:16:07 sandervl Exp $ */
+/* $Id: wininet.h,v 1.4 2001-11-07 11:07:51 phaller Exp $ */
 #ifndef __WININET_H__
 #define __WININET_H__
+
+#ifdef __cplusplus
+  extern "C" {
+#endif
+
 
 #define INTERNETAPI
@@ -1224 +1229 @@
 BOOL WINAPI DeleteUrlCacheEntry(LPCSTR lpszUrlName);
 
+
+INTERNETAPI DWORD WINAPI InternetDialA(HWND ,LPSTR ,DWORD ,LPDWORD ,DWORD);
+INTERNETAPI DWORD WINAPI InternetDialW(HWND ,LPWSTR ,DWORD ,LPDWORD ,DWORD);
+#define InternetDial WINELIB_NAME_AW(InternetDial)
+
+
+#define INTERNET_DIAL_UNATTENDED       0x8000
+
+INTERNETAPI DWORD WINAPI InternetHangUp(DWORD ,DWORD);
+
+#define INTERENT_GOONLINE_REFRESH 0x00000001
+#define INTERENT_GOONLINE_MASK 0x00000001
+INTERNETAPI BOOL WINAPI InternetGoOnlineA(LPSTR ,HWND ,DWORD);
+INTERNETAPI BOOL WINAPI InternetGoOnlineW(LPWSTR ,HWND ,DWORD);
+#define InternetGoOnline  WINELIB_NAME_AW(InternetGoOnline)
+INTERNETAPI BOOL WINAPI InternetAutodial(DWORD ,DWORD);
+
+#define INTERNET_AUTODIAL_FORCE_ONLINE          1
+#define INTERNET_AUTODIAL_FORCE_UNATTENDED      2
+#define INTERNET_AUTODIAL_FAILIFSECURITYCHECK   4
+
+#define INTERNET_AUTODIAL_FLAGS_MASK (INTERNET_AUTODIAL_FORCE_ONLINE | INTERNET_AUTODIAL_FORCE_UNATTENDED | INTERNET_AUTODIAL_FAILIFSECURITYCHECK)
+INTERNETAPI BOOL WINAPI InternetAutodialHangup(DWORD);
+INTERNETAPI BOOL WINAPI InternetGetConnectedState(LPDWORD ,DWORD);
+
+#define INTERNET_CONNECTION_MODEM           1
+#define INTERNET_CONNECTION_LAN             2
+#define INTERNET_CONNECTION_PROXY           4
+#define INTERNET_CONNECTION_MODEM_BUSY      8
+
+typedef DWORD (* CALLBACK PFN_DIAL_HANDLER) (HWND,LPCSTR,DWORD,LPDWORD);
+
+#define INTERNET_CUSTOMDIAL_CONNECT         0
+#define INTERNET_CUSTOMDIAL_UNATTENDED      1
+#define INTERNET_CUSTOMDIAL_DISCONNECT      2
+#define INTERNET_CUSTOMDIAL_SHOWOFFLINE     4
+#define INTERNET_CUSTOMDIAL_SAFE_FOR_UNATTENDED 1
+#define INTERNET_CUSTOMDIAL_WILL_SUPPLY_STATE   2
+#define INTERNET_CUSTOMDIAL_CAN_HANGUP          4
+
+INTERNETAPI BOOL WINAPI InternetSetDialStateA(LPCSTR ,DWORD ,DWORD);
+INTERNETAPI BOOL WINAPI InternetSetDialStateW(LPCWSTR ,DWORD ,DWORD);
+#define InternetSetDialState WINELIB_NAME_AW(InternetSetDialState)
+#define INTERNET_DIALSTATE_DISCONNECTED     1
+
+BOOLAPI InternetCheckConnectionA(LPCSTR lpszUrl,DWORD dwFlags,DWORD dwReserved);
+BOOLAPI InternetCheckConnectionW(LPCWSTR lpszUrl,DWORD dwFlags,DWORD dwReserved); 
+#define InternetCheckConnection WINELIB_NAME_AW(InternetCheckConnection)
+
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif // !__WININET_H__

trunk/src/wininet/internet.c

@@ -1 @@
-/* $Id: internet.c,v 1.5 2001-04-01 10:30:32 sandervl Exp $
+/* $Id: internet.c,v 1.6 2001-11-07 11:08:13 phaller Exp $
  *
  * Wininet
@@ -13 +13 @@
 #include <debugtools.h>
 #include <winerror.h>
+#include <shlwapi.h>
 #include <tchar.h>
 #include <winsock.h>
@@ -217 +218 @@
 BOOL WINAPI InternetGetConnectedState(LPDWORD lpdwStatus, DWORD dwReserved)
 {
-  FIXME("Stub\n");
-  return FALSE;
+  if (lpdwStatus) {
+    FIXME("always returning LAN connection.\n");
+    *lpdwStatus = INTERNET_CONNECTION_LAN;
+  }
+  return TRUE;
 }
 
@@ -704 +708 @@
         LPDWORD lpdwBufferLength, DWORD dwFlags)
 {
-  BOOL bSuccess = FALSE;
-
-  FIXME("Stub\n");
-
-  if(lpszUrl)
-  {
-    strncpy(lpszBuffer, lpszUrl, *lpdwBufferLength);
-    *lpdwBufferLength = strlen(lpszUrl);
-    bSuccess = TRUE;
-  }
-
-  return bSuccess;
+  HRESULT hr;
+  TRACE("%s %p %p %08lx\n",debugstr_a(lpszUrl), lpszBuffer,
+        lpdwBufferLength, dwFlags);
+  
+  /* Flip this bit to correspond to URL_ESCAPE_UNSAFE */
+  dwFlags ^= ICU_NO_ENCODE;
+  
+  dwFlags |= 0x80000000; /* Don't know what this means */
+  
+  hr = UrlCanonicalizeA(lpszUrl, lpszBuffer, lpdwBufferLength, dwFlags);
+  
+  return (hr == S_OK) ? TRUE : FALSE;
 }
 

trunk/src/wininet/wininet.def

@@ -1 @@
-; $Id: wininet.def,v 1.4 2001-11-07 10:56:15 phaller Exp $
+; $Id: wininet.def,v 1.5 2001-11-07 11:08:14 phaller Exp $
 
 ;
@@ -10 +10 @@
 IMPORTS
    _UrlEscapeA@16                    = SHLWAPI.691
+   _UrlCanonicalizeA@16              = SHLWAPI.683
 
 EXPORTS