[INETCOMM]

* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=62895

diff --git a/reactos/dll/win32/inetcomm/inetcomm.idl b/reactos/dll/win32/inetcomm/inetcomm.idl
index 1fba558..03cd20a 100644 (file)
--- a/reactos/dll/win32/inetcomm/inetcomm.idl
+++ b/reactos/dll/win32/inetcomm/inetcomm.idl
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#pragma makedep register
+
 [
     helpstring("CLSID_IMimeBody"),
     threading(both),

diff --git a/reactos/dll/win32/inetcomm/mimeole.c b/reactos/dll/win32/inetcomm/mimeole.c
index 101df0e..9e25ed5 100644 (file)
--- a/reactos/dll/win32/inetcomm/mimeole.c
+++ b/reactos/dll/win32/inetcomm/mimeole.c
@@ -119,7 +119,7 @@ static HRESULT copy_headers_to_buf(IStream *stm, char **ptr)
     char *buf = NULL;
     DWORD size = PARSER_BUF_SIZE, offset = 0, last_end = 0;
     HRESULT hr;
-    int done = 0;
+    BOOL done = FALSE;
 
     *ptr = NULL;
 
@@ -147,7 +147,7 @@ static HRESULT copy_headers_to_buf(IStream *stm, char **ptr)
         offset += read;
         buf[offset] = '\0';
 
-        if(read == 0) done = 1;
+        if(read == 0) done = TRUE;
 
         while(!done && (end = strstr(buf + last_end, "\r\n")))
         {
@@ -158,7 +158,7 @@ static HRESULT copy_headers_to_buf(IStream *stm, char **ptr)
                 off.QuadPart = new_end;
                 IStream_Seek(stm, off, STREAM_SEEK_SET, NULL);
                 buf[new_end] = '\0';
-                done = 1;
+                done = TRUE;
             }
             else
                 last_end = new_end;
@@ -253,14 +253,14 @@ static void unfold_header(char *header, int len)
 
 static char *unquote_string(const char *str)
 {
-    int quoted = 0;
+    BOOL quoted = FALSE;
     char *ret, *cp;
 
     while(*str == ' ' || *str == '\t') str++;
 
     if(*str == '"')
     {
-        quoted = 1;
+        quoted = TRUE;
         str++;
     }
     ret = strdupA(str);
@@ -316,20 +316,19 @@ static void add_param(header_t *header, const char *p)
 static void split_params(header_t *header, char *value)
 {
     char *cp = value, *start = value;
-    int in_quote = 0;
-    int done_value = 0;
+    BOOL in_quotes = FALSE, done_value = FALSE;
 
     while(*cp)
     {
-        if(!in_quote && *cp == ';')
+        if(!in_quotes && *cp == ';')
         {
             *cp = '\0';
             if(done_value) add_param(header, start);
-            done_value = 1;
+            done_value = TRUE;
             start = cp + 1;
         }
         else if(*cp == '"')
-            in_quote = !in_quote;
+            in_quotes = !in_quotes;
         cp++;
     }
     if(done_value) add_param(header, start);

diff --git a/reactos/dll/win32/inetcomm/pop3transport.c b/reactos/dll/win32/inetcomm/pop3transport.c
index 153d552..22f2be6 100644 (file)
--- a/reactos/dll/win32/inetcomm/pop3transport.c
+++ b/reactos/dll/win32/inetcomm/pop3transport.c
@@ -617,7 +617,7 @@ static void POP3Transport_CallbackRecvPASSResp(IInternetTransport *iface, char *
 
 static void POP3Transport_CallbackProcessUSERResp(IInternetTransport *iface, char *pBuffer, int cbBuffer)
 {
-    static char pass[] = "PASS ";
+    static const char pass[] = "PASS ";
     POP3Transport *This = (POP3Transport *)iface;
     POP3RESPONSE response;
     char *command;
@@ -658,7 +658,7 @@ static void POP3Transport_CallbackRecvUSERResp(IInternetTransport *iface, char *
 
 static void POP3Transport_CallbackSendUSERCmd(IInternetTransport *iface, char *pBuffer, int cbBuffer)
 {
-    static char user[] = "USER ";
+    static const char user[] = "USER ";
     POP3Transport *This = (POP3Transport *)iface;
     char *command;
     int len;
@@ -854,7 +854,7 @@ static HRESULT WINAPI POP3Transport_CommandAUTH(IPOP3Transport *iface, LPSTR psz
 
 static HRESULT WINAPI POP3Transport_CommandUSER(IPOP3Transport *iface, LPSTR username)
 {
-    static char user[] = "USER ";
+    static const char user[] = "USER ";
     POP3Transport *This = (POP3Transport *)iface;
     char *command;
     int len;
@@ -877,7 +877,7 @@ static HRESULT WINAPI POP3Transport_CommandUSER(IPOP3Transport *iface, LPSTR use
 
 static HRESULT WINAPI POP3Transport_CommandPASS(IPOP3Transport *iface, LPSTR password)
 {
-    static char pass[] = "PASS ";
+    static const char pass[] = "PASS ";
     POP3Transport *This = (POP3Transport *)iface;
     char *command;
     int len;
@@ -901,7 +901,7 @@ static HRESULT WINAPI POP3Transport_CommandPASS(IPOP3Transport *iface, LPSTR pas
 static HRESULT WINAPI POP3Transport_CommandLIST(
     IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId)
 {
-    static char list[] = "LIST %u\r\n";
+    static const char list[] = "LIST %u\r\n";
     static char list_all[] = "LIST\r\n";
     POP3Transport *This = (POP3Transport *)iface;
     char *command;
@@ -928,7 +928,7 @@ static HRESULT WINAPI POP3Transport_CommandLIST(
 static HRESULT WINAPI POP3Transport_CommandTOP(
     IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId, DWORD cPreviewLines)
 {
-    static char top[] = "TOP %u %u\r\n";
+    static const char top[] = "TOP %u %u\r\n";
     POP3Transport *This = (POP3Transport *)iface;
     char *command;
     int len;
@@ -950,7 +950,7 @@ static HRESULT WINAPI POP3Transport_CommandTOP(
 
 static HRESULT WINAPI POP3Transport_CommandQUIT(IPOP3Transport *iface)
 {
-    static char command[] = "QUIT\r\n";
+    static const char command[] = "QUIT\r\n";
     POP3Transport *This = (POP3Transport *)iface;
 
     TRACE("()\n");
@@ -963,7 +963,7 @@ static HRESULT WINAPI POP3Transport_CommandQUIT(IPOP3Transport *iface)
 
 static HRESULT WINAPI POP3Transport_CommandSTAT(IPOP3Transport *iface)
 {
-    static char stat[] = "STAT\r\n";
+    static const char stat[] = "STAT\r\n";
     POP3Transport *This = (POP3Transport *)iface;
 
     TRACE("\n");
@@ -975,7 +975,7 @@ static HRESULT WINAPI POP3Transport_CommandSTAT(IPOP3Transport *iface)
 
 static HRESULT WINAPI POP3Transport_CommandNOOP(IPOP3Transport *iface)
 {
-    static char noop[] = "NOOP\r\n";
+    static const char noop[] = "NOOP\r\n";
     POP3Transport *This = (POP3Transport *)iface;
 
     TRACE("\n");
@@ -987,7 +987,7 @@ static HRESULT WINAPI POP3Transport_CommandNOOP(IPOP3Transport *iface)
 
 static HRESULT WINAPI POP3Transport_CommandRSET(IPOP3Transport *iface)
 {
-    static char rset[] = "RSET\r\n";
+    static const char rset[] = "RSET\r\n";
     POP3Transport *This = (POP3Transport *)iface;
 
     TRACE("\n");
@@ -1000,7 +1000,7 @@ static HRESULT WINAPI POP3Transport_CommandRSET(IPOP3Transport *iface)
 static HRESULT WINAPI POP3Transport_CommandUIDL(
     IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId)
 {
-    static char uidl[] = "UIDL %u\r\n";
+    static const char uidl[] = "UIDL %u\r\n";
     static char uidl_all[] = "UIDL\r\n";
     POP3Transport *This = (POP3Transport *)iface;
     char *command;
@@ -1027,7 +1027,7 @@ static HRESULT WINAPI POP3Transport_CommandUIDL(
 static HRESULT WINAPI POP3Transport_CommandDELE(
     IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId)
 {
-    static char dele[] = "DELE %u\r\n";
+    static const char dele[] = "DELE %u\r\n";
     POP3Transport *This = (POP3Transport *)iface;
     char *command;
     int len;
@@ -1049,7 +1049,7 @@ static HRESULT WINAPI POP3Transport_CommandDELE(
 static HRESULT WINAPI POP3Transport_CommandRETR(
     IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId)
 {
-    static char retr[] = "RETR %u\r\n";
+    static const char retr[] = "RETR %u\r\n";
     POP3Transport *This = (POP3Transport *)iface;
     char *command;
     int len;

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 1459bad..ab9e8fa 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -85,7 +85,7 @@ reactos/dll/win32/ieframe          # Synced to Wine-1.7.1
 reactos/dll/win32/imaadp32.acm     # Synced to Wine-1.7.1
 reactos/dll/win32/imagehlp         # Synced to Wine-1.7.1
 reactos/dll/win32/imm32            # Synced to Wine-1.7.1
-reactos/dll/win32/inetcomm         # Synced to Wine-1.7.1
+reactos/dll/win32/inetcomm         # Synced to Wine-1.7.17
 reactos/dll/win32/inetmib1         # Synced to Wine-1.7.1
 reactos/dll/win32/initpki          # Synced to Wine-1.7.1
 reactos/dll/win32/inseng           # Synced to Wine-1.7.1