[ros-diffs] [gvg] 20023: Merge from trunk:

[gvg at svn.reactos.com]

Merge from trunk:
Remove Wine-ism
Modified: branches/ros-branch-0_2_9/reactos/lib/wininet/http.c
Modified: branches/ros-branch-0_2_9/reactos/lib/wininet/utility.c
  _____  

Modified: branches/ros-branch-0_2_9/reactos/lib/wininet/http.c
--- branches/ros-branch-0_2_9/reactos/lib/wininet/http.c
2005-12-09 21:50:10 UTC (rev 20022)
+++ branches/ros-branch-0_2_9/reactos/lib/wininet/http.c
2005-12-09 21:50:59 UTC (rev 20023)
@@ -2024,7 +2024,11 @@

     /*
      * HACK peek at the buffer
      */
+#if 0
+    /* This is Wine code, we don't support MSG_PEEK yet so we have to
do it
+       a bit different */
     NETCON_recv(&lpwhr->netConnection, buffer, buflen, MSG_PEEK, &rc);
+#endif
 
     /*
      * We should first receive 'HTTP/1.x nnn OK' where nnn is the
status code.
@@ -2033,6 +2037,9 @@
     memset(buffer, 0, MAX_REPLY_LEN);
     if (!NETCON_getNextLine(&lpwhr->netConnection, bufferA, &buflen))
         goto lend;
+#if 1
+    rc = buflen;
+#endif
     MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer,
MAX_REPLY_LEN );
 
     /* regenerate raw headers */
@@ -2073,6 +2080,9 @@
         {
             LPWSTR * pFieldAndValue;
 
+#if 1
+            rc += buflen;
+#endif
             TRACE("got line %s, now interpreting\n",
debugstr_a(bufferA));
             MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer,
MAX_REPLY_LEN );
 
  _____  

Modified: branches/ros-branch-0_2_9/reactos/lib/wininet/utility.c
--- branches/ros-branch-0_2_9/reactos/lib/wininet/utility.c
2005-12-09 21:50:10 UTC (rev 20022)
+++ branches/ros-branch-0_2_9/reactos/lib/wininet/utility.c
2005-12-09 21:50:59 UTC (rev 20023)
@@ -42,7 +42,6 @@

 WINE_DEFAULT_DEBUG_CHANNEL(wininet);
 
 #define TIME_STRING_LEN  30
-#define CP_UNIXCP     65010 /* Wine extension */
 
 
 time_t ConvertTimeString(LPCWSTR asctime)
@@ -151,9 +150,9 @@
     else
         len = strlenW(lpszServerName);
 
-    sz = WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, len, NULL,
0, NULL, NULL );
+    sz = WideCharToMultiByte( CP_THREAD_ACP, 0, lpszServerName, len,
NULL, 0, NULL, NULL );
     name = HeapAlloc(GetProcessHeap(), 0, sz+1);
-    WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, len, name, sz,
NULL, NULL );
+    WideCharToMultiByte( CP_THREAD_ACP, 0, lpszServerName, len, name,
sz, NULL, NULL );
     name[sz] = 0;
     *phe = gethostbyname(name);
     HeapFree( GetProcessHeap(), 0, name );
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20051209/f6eed027/attachment.html