commit eb38129297f6eb850560b3623f785cd8a29d279a
author Andreas Mohr <amohr@student.ei.uni-stuttgart.de> Mon Aug 07 17:09:58 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Aug 07 17:09:58 2000 +0000
tree 8dcccbda65742ad2af2af7eb4b2a25b292a3759e
parent 9bc9f5e6df8e52f153af4b5c8e22a67e8ff8a35a

Prevent endless looping in linebreak handling.

dlls/kernel/format_msg.c

diff --git a/dlls/kernel/format_msg.c b/dlls/kernel/format_msg.c
index 53a4733..208decc 100644
--- a/dlls/kernel/format_msg.c
+++ b/dlls/kernel/format_msg.c
@@ -147,6 +147,7 @@
 	BOOL    eos = FALSE;
 	INT	bufsize;
 	HMODULE	hmodule = (HMODULE)lpSource;
+	CHAR	ch;
 
 	TRACE("(0x%lx,%p,%ld,0x%lx,%p,%ld,%p)\n",
 		     dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args);
@@ -290,17 +291,23 @@
 				        ADD_TO_T(*f++);
 					break;
 				}
-			} else { /* '\n' or '\r' gets mapped to "\r\n" */
-			    if(*f == '\n' || *f == '\r') {
-			        if (width == 0) {
-				    ADD_TO_T('\r');
-				    ADD_TO_T('\n');
-				    if(*f++ == '\r' && *f == '\n')
-				        f++;
-				}
-			    } else {
-			        ADD_TO_T(*f++);
+			} else {
+			    ch = *f;
+			    f++;
+			    if (ch == '\r')
+			    {
+				if (*f == '\n')
+				    f++;
+				ADD_TO_T(' ');
 			    }
+			    else
+			    if (ch == '\n')
+			    {
+				ADD_TO_T('\r');
+				ADD_TO_T('\n');
+			    }
+			    else
+				ADD_TO_T(ch);
 			}
 		}
 		*t='\0';
@@ -350,6 +357,7 @@
 	BOOL	eos = FALSE;
 	INT	bufsize;
 	HMODULE	hmodule = (HMODULE)lpSource;
+	CHAR	ch;
 
 	TRACE("(0x%lx,%p,%ld,0x%lx,%p,%ld,%p)\n",
 		     dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args);
@@ -496,17 +504,23 @@
 				        ADD_TO_T(*f++);
 					break;
 				}
-			} else { /* '\n' or '\r' gets mapped to "\r\n" */
-			    if(*f == '\n' || *f == '\r') {
-			        if (width == 0) {
-				    ADD_TO_T('\r');
-				    ADD_TO_T('\n');
-				    if(*f++ == '\r' && *f == '\n')
-				       f++;
-				}
-			    } else {
-				ADD_TO_T(*f++);
+			} else {
+			    ch = *f;
+			    f++;
+			    if (ch == '\r')
+			    {
+				if (*f == '\n')
+				    f++;
+				ADD_TO_T(' ');
 			    }
+			    else
+			    if (ch == '\n')
+			    {
+				ADD_TO_T('\r');
+				ADD_TO_T('\n');
+			    }
+			    else
+				ADD_TO_T(ch);
 			}
 		}
 		*t='\0';