system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 10:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

regedit: Fix concat handling in unicode import.

Browse source
This commit is contained in:
Alexander Nicolaysen Sørnes 2008-07-13 13:58:40 +02:00 committed by Alexandre Julliard
parent bd2734d9c6
commit 4ef4777630
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
programs/regedit/regproc.c
View file

@ -704,7 +704,7 @@ void processRegLinesW(FILE *in)
{ {
WCHAR* buf = NULL; /* line read from input stream */ WCHAR* buf = NULL; /* line read from input stream */
ULONG lineSize = REG_VAL_BUF_SIZE; ULONG lineSize = REG_VAL_BUF_SIZE;
size_t check = -1; size_t CharsInBuf = -1;
WCHAR* s; /* The pointer into line for where the current fgets should read */ WCHAR* s; /* The pointer into line for where the current fgets should read */
@ -741,10 +741,10 @@ void processRegLinesW(FILE *in)
*/ */
size_to_get = (size_remaining > INT_MAX ? INT_MAX : size_remaining); size_to_get = (size_remaining > INT_MAX ? INT_MAX : size_remaining);
check = fread(s, sizeof(WCHAR), size_to_get - 1, in); CharsInBuf = fread(s, sizeof(WCHAR), size_to_get - 1, in);
s[check] = 0; s[CharsInBuf] = 0;
if (check == 0) { if (CharsInBuf == 0) {
if (ferror(in)) { if (ferror(in)) {
perror ("While reading input"); perror ("While reading input");
exit (IO_ERROR); exit (IO_ERROR);
@ -772,6 +772,25 @@ void processRegLinesW(FILE *in)
continue; continue;
} }
/* If there is a concatenating \\ then go around again */
if ((*(s_eol-1) == '\\') ||
(*(s_eol-1) == '\r' && *(s_eol-2) == '\\')) {
WCHAR* NextLine = s_eol;
while(*(NextLine+1) == ' ' || *(NextLine+1) == '\t')
NextLine++;
NextLine++;
if(*(s_eol-1) == '\r')
s_eol--;
MoveMemory(s_eol - 1, NextLine, (CharsInBuf - (NextLine - buf) + 1)*sizeof(WCHAR));
CharsInBuf -= NextLine - s_eol + 1;
s_eol = 0;
continue;
}
/* Remove any line feed. Leave s_eol on the \0 */ /* Remove any line feed. Leave s_eol on the \0 */
if (s_eol) { if (s_eol) {
*s_eol = '\0'; *s_eol = '\0';
@ -779,21 +798,6 @@ void processRegLinesW(FILE *in)
*(s_eol-1) = '\0'; *(s_eol-1) = '\0';
} }
/* If there is a concatenating \\ then go around again */
if (s_eol > buf && *(s_eol-1) == '\\') {
WCHAR c[2];
s = s_eol+1;
/* The following error protection could be made more self-
* correcting but I thought it not worth trying.
*/
if(!fread(&c, sizeof(WCHAR), 2, in))
break;
if (feof(in) || c[0] != ' ' || c[1] != ' ')
fprintf(stderr,"%s: ERROR - invalid continuation.\n",
getAppName());
continue;
}
if(!s_eol) if(!s_eol)
break; break;