imported wininet from wine

svn path=/trunk/; revision=14692

diff --git a/reactos/lib/wininet/.cvsignore b/reactos/lib/wininet/.cvsignore
deleted file mode 100644 (file)
index cfaac75..0000000
--- a/reactos/lib/wininet/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-rsrc.res
-version.res
-wininet.dll.dbg.c
-wininet.spec.def

diff --git a/reactos/lib/wininet/dialogs.c b/reactos/lib/wininet/dialogs.c
index 7fc6207..d4a885f 100644 (file)
--- a/reactos/lib/wininet/dialogs.c
+++ b/reactos/lib/wininet/dialogs.c
@@ -157,6 +157,7 @@ static BOOL WININET_GetSetPassword( HWND hdlg, LPCWSTR szServer,
      */
     if( bSet )
     {
+#ifndef __REACTOS__
         szUserPass[0] = 0;
         GetWindowTextW( hUserItem, szUserPass, 
                         (sizeof szUserPass-1)/sizeof(WCHAR) );
@@ -171,14 +172,17 @@ static BOOL WININET_GetSetPassword( HWND hdlg, LPCWSTR szServer,
                                (CHAR*)szUserPass, u_len, dwMagic, 0 );
 
         return ( r == WN_SUCCESS );
+#else
+       return FALSE;
+#endif
     }
 
     sz = sizeof szUserPass;
     r_len = (strlenW( szResource ) + 1)*sizeof(WCHAR);
-    r = WNetGetCachedPassword( (CHAR*)szResource, r_len,
-                               (CHAR*)szUserPass, &sz, dwMagic );
-    if( r != WN_SUCCESS )
-        return FALSE;
+//    r = WNetGetCachedPassword( (CHAR*)szResource, r_len,
+//                               (CHAR*)szUserPass, &sz, dwMagic );
+//    if( r != WN_SUCCESS )
+//        return FALSE;
 
     p = strchrW( szUserPass, ':' );
     if( p )

diff --git a/reactos/lib/wininet/netconnection.c b/reactos/lib/wininet/netconnection.c
index 4ab94b4..d23177b 100644 (file)
--- a/reactos/lib/wininet/netconnection.c
+++ b/reactos/lib/wininet/netconnection.c
@@ -37,7 +37,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "wine/library.h"
+//#include "wine/library.h"
 #include "windef.h"
 #include "winbase.h"
 #include "wininet.h"

diff --git a/reactos/lib/wininet/tests/.cvsignore b/reactos/lib/wininet/tests/.cvsignore
deleted file mode 100644 (file)
index e54b00b..0000000
--- a/reactos/lib/wininet/tests/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-generated.ok
-http.ok
-testlist.c

diff --git a/reactos/lib/wininet/utility.c b/reactos/lib/wininet/utility.c
index ea7cdf4..adfab16 100644 (file)
--- a/reactos/lib/wininet/utility.c
+++ b/reactos/lib/wininet/utility.c
@@ -42,6 +42,8 @@
 WINE_DEFAULT_DEBUG_CHANNEL(wininet);
 
 #define TIME_STRING_LEN  30
+#define CP_UNIXCP     65010 /* Wine extension */
+
 
 time_t ConvertTimeString(LPCWSTR asctime)
 {