November 2008 - Wine-Commits

Dylan Smith : richedit: Created initial tests for windowless richedit controls.
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: cc1cbadeb2f38e1b1ae1d9cf71bd0d6be8573f0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc1cbadeb2f38e1b1ae1d9cf7… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Nov 11 14:08:53 2008 -0500 richedit: Created initial tests for windowless richedit controls. --- dlls/riched20/tests/Makefile.in | 3 +- dlls/riched20/tests/txtsrv.c | 575 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 577 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc1cbadeb2f38e1b1ae1d…

1 0

Francois Gouget : regedit: Fix the wrapping of binary values in export_hkey ().
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: e1901500ee5f90c72148f1d49125b64f1fdc26b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1901500ee5f90c72148f1d49… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 12 11:32:23 2008 +0100 regedit: Fix the wrapping of binary values in export_hkey(). Don't wait until the line overflows before wrapping it. Don't wrap the last line. --- programs/regedit/regproc.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index d633d1d..2cfa092 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1117,17 +1117,20 @@ static void export_hkey(FILE *file, HKEY key, REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len); lstrcpyW(*line_buf + hex_pos, hex_prefix); column = data_pos; /* no line wrap yet */ - for (i1 = 0; i1 < val_buf1_size; i1++) { + i1 = 0; + while (1) + { wsprintfW(*line_buf + data_pos, format, (unsigned int)(val_buf1)[i1]); data_pos += 2; - if (i1 + 1 < val_buf1_size) { - lstrcpyW(*line_buf + data_pos, comma); - data_pos++; - } + if (++i1 == val_buf1_size) + break; + + lstrcpyW(*line_buf + data_pos, comma); + data_pos++; column += 3; /* wrap the line */ - if (column > REG_FILE_HEX_LINE_LEN) { + if (column >= REG_FILE_HEX_LINE_LEN) { lstrcpyW(*line_buf + data_pos, concat); data_pos += concat_len; column = concat_prefix;

1 0

Francois Gouget : regedit: Fix a buffer overflow when exporting binary values in export_hkey().
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: f0f91a69b3424d4403b6c2b75579878eed77aa9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0f91a69b3424d4403b6c2b75… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 12 11:31:40 2008 +0100 regedit: Fix a buffer overflow when exporting binary values in export_hkey(). We must take the indentation into account to compute the number of lines a binary value will use. --- programs/regedit/regproc.c | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index e3e4811..d633d1d 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -33,8 +33,9 @@ #define REG_VAL_BUF_SIZE 4096 /* maximal number of characters in hexadecimal data line, - not including '\' character */ -#define REG_FILE_HEX_LINE_LEN 76 + * including the indentation, but not including the '\' character + */ +#define REG_FILE_HEX_LINE_LEN (2 + 25 * 3) static const CHAR *reg_class_names[] = { "HKEY_LOCAL_MACHINE", "HKEY_USERS", "HKEY_CLASSES_ROOT", @@ -1082,6 +1083,7 @@ static void export_hkey(FILE *file, HKEY key, const WCHAR format[] = {'%','0','2','x',0}; const WCHAR comma[] = {',',0}; const WCHAR concat[] = {'\\','\n',' ',' ',0}; + int concat_prefix, concat_len; const WCHAR newline[] = {'\n',0}; BYTE* val_buf1 = *val_buf; DWORD val_buf1_size = val_size1; @@ -1096,10 +1098,22 @@ static void export_hkey(FILE *file, HKEY key, val_buf1 = (BYTE*)GetMultiByteStringN((WCHAR*)*val_buf, val_size1 / sizeof(WCHAR), &val_buf1_size); } + concat_len=lstrlenW(concat); + concat_prefix=2; + hex_pos = line_len; line_len += lstrlenW(hex_prefix); data_pos = line_len; - line_len += val_buf1_size * 3 + lstrlenW(concat) * ((int)((float)val_buf1_size * 3.0 / (float)REG_FILE_HEX_LINE_LEN) + 1 ) + 1; + line_len += val_buf1_size * 3; + /* - The 2 spaces that concat places at the start of the + * line effectively reduce the space available for data. + * - If the value name and hex prefix are very long + * ( > REG_FILE_HEX_LINE_LEN) then we may overestimate + * the needed number of lines by one. But that's ok. + * - The trailing linefeed takes the place of a comma so + * it's accounted for already. + */ + line_len += line_len / (REG_FILE_HEX_LINE_LEN - concat_prefix) * concat_len; REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len); lstrcpyW(*line_buf + hex_pos, hex_prefix); column = data_pos; /* no line wrap yet */ @@ -1115,8 +1129,8 @@ static void export_hkey(FILE *file, HKEY key, /* wrap the line */ if (column > REG_FILE_HEX_LINE_LEN) { lstrcpyW(*line_buf + data_pos, concat); - data_pos += lstrlenW(concat); - column = 2; + data_pos += concat_len; + column = concat_prefix; } } lstrcpyW(*line_buf + data_pos, newline);

1 0

Francois Gouget : regedit: Tighten a buffer size calculation.
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: 126ffb1f8a26e8ef78112c5b274c7b5bd0d26d54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=126ffb1f8a26e8ef78112c5b2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 12 11:29:20 2008 +0100 regedit: Tighten a buffer size calculation. --- programs/regedit/regproc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 07fe243..0dda28c 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1052,7 +1052,7 @@ static void export_hkey(FILE *file, HKEY key, { WCHAR format[] = {'d','w','o','r','d',':','%','0','8','x','\n',0}; - line_len += 20; + line_len += 15; REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len); wsprintfW(*line_buf + line_pos, format, *((DWORD *)*val_buf)); break;

1 0

Francois Gouget : regedit: Simplify REGPROC_export_string().
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: d1d3db4183a0c917ed4813de7eb3f879916a3168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1d3db4183a0c917ed4813de7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 12 11:29:09 2008 +0100 regedit: Simplify REGPROC_export_string(). --- programs/regedit/regproc.c | 40 ++++++++++++++-------------------------- 1 files changed, 14 insertions(+), 26 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 8ad3775..07fe243 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -892,49 +892,37 @@ static void REGPROC_resize_char_buffer(WCHAR **buffer, DWORD *len, DWORD require static void REGPROC_export_string(WCHAR **line_buf, DWORD *line_buf_size, DWORD *line_len, WCHAR *str) { DWORD len = lstrlenW(str); - DWORD i; + DWORD i, pos; DWORD extra = 0; REGPROC_resize_char_buffer(line_buf, line_buf_size, *line_len + len + 10); /* escaping characters */ + pos = *line_len; for (i = 0; i < len; i++) { WCHAR c = str[i]; switch (c) { - case '\\': - { - const WCHAR escape[] = {'\\','\\'}; - - REGPROC_resize_char_buffer(line_buf, line_buf_size, *line_len + len + extra + 1); - memcpy(*line_buf + *line_len + i + extra, escape, 2 * sizeof(WCHAR)); + case '\n': extra++; + REGPROC_resize_char_buffer(line_buf, line_buf_size, *line_len + len + extra); + (*line_buf)[pos++] = '\\'; + (*line_buf)[pos++] = 'n'; break; - } - case '"': - { - const WCHAR escape[] = {'\\','"'}; - REGPROC_resize_char_buffer(line_buf, line_buf_size, *line_len + len + extra + 1); - memcpy(*line_buf + *line_len + i + extra, escape, 2 * sizeof(WCHAR)); + case '\\': + case '"': extra++; - break; - } - case '\n': - { - const WCHAR escape[] = {'\\','n'}; + REGPROC_resize_char_buffer(line_buf, line_buf_size, *line_len + len + extra); + (*line_buf)[pos++] = '\\'; + /* Fall through */ - REGPROC_resize_char_buffer(line_buf, line_buf_size, *line_len + len + extra + 1); - memcpy(*line_buf + *line_len + i + extra, escape, 2 * sizeof(WCHAR)); - extra++; - break; - } default: - memcpy(*line_buf + *line_len + i + extra, &c, sizeof(WCHAR)); + (*line_buf)[pos++] = c; break; } } - *line_len += len + extra; - *(*line_buf + *line_len) = 0; + (*line_buf)[pos] = '\0'; + *line_len = pos; } /******************************************************************************

1 0

Francois Gouget : regedit: Simplify / clean up export_hkey().
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: 7df722259486931ccaefaeead2bca8d29166be74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7df722259486931ccaefaeead… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 12 11:29:51 2008 +0100 regedit: Simplify / clean up export_hkey(). Avoid unneeded/redundant calls to lstrcatW() and lstrlenW(). Tighten the scope of variables. --- programs/regedit/regproc.c | 62 ++++++++++++++++++++----------------------- 1 files changed, 29 insertions(+), 33 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 0dda28c..e3e4811 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -972,7 +972,6 @@ static void export_hkey(FILE *file, HKEY key, BOOL more_data; LONG ret; WCHAR key_format[] = {'\n','[','%','s',']','\n',0}; - DWORD line_pos; /* get size information and resize the buffers if necessary */ if (RegQueryInfoKeyW(key, NULL, NULL, NULL, NULL, @@ -1005,7 +1004,6 @@ static void export_hkey(FILE *file, HKEY key, DWORD value_type; DWORD val_name_size1 = *val_name_size; DWORD val_size1 = *val_size; - DWORD line_len = 0; ret = RegEnumValueW(key, i, *val_name_buf, &val_name_size1, NULL, &value_type, *val_buf, &val_size1); if (ret != ERROR_SUCCESS) { @@ -1014,17 +1012,18 @@ static void export_hkey(FILE *file, HKEY key, REGPROC_print_error(); } } else { + DWORD line_len; i++; if ((*val_name_buf)[0]) { const WCHAR val_start[] = {'"','%','s','"','=',0}; - line_pos = line_len = 3 + lstrlenW(*val_name_buf); + line_len = 3 + lstrlenW(*val_name_buf); REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len); wsprintfW(*line_buf, val_start, *val_name_buf); } else { const WCHAR std_val[] = {'@','=',0}; - line_pos = line_len = 2; + line_len = 2; REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len); lstrcpyW(*line_buf, std_val); } @@ -1035,16 +1034,18 @@ static void export_hkey(FILE *file, HKEY key, { const WCHAR start[] = {'"',0}; const WCHAR end[] = {'"','\n',0}; + DWORD len; - line_len += lstrlenW(start); - REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len); - lstrcatW(*line_buf, start); + len = lstrlenW(start); + REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len + len); + lstrcpyW(*line_buf + line_len, start); + line_len += len; - if (val_size1) REGPROC_export_string(line_buf, line_buf_size, &line_len, (WCHAR*) *val_buf); + if (val_size1) + REGPROC_export_string(line_buf, line_buf_size, &line_len, (WCHAR*) *val_buf); - line_len += lstrlenW(end); - REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len); - lstrcatW(*line_buf, end); + REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len + lstrlenW(end)); + lstrcpyW(*line_buf + line_len, end); break; } @@ -1052,9 +1053,8 @@ static void export_hkey(FILE *file, HKEY key, { WCHAR format[] = {'d','w','o','r','d',':','%','0','8','x','\n',0}; - line_len += 15; - REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len); - wsprintfW(*line_buf + line_pos, format, *((DWORD *)*val_buf)); + REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len + 15); + wsprintfW(*line_buf + line_len, format, *((DWORD *)*val_buf)); break; } @@ -1077,9 +1077,8 @@ static void export_hkey(FILE *file, HKEY key, DWORD i1; const WCHAR *hex_prefix; WCHAR buf[20]; - int cur_pos; + int hex_pos, data_pos, column; const WCHAR hex[] = {'h','e','x',':',0}; - const WCHAR delim[] = {'"','"','=',0}; const WCHAR format[] = {'%','0','2','x',0}; const WCHAR comma[] = {',',0}; const WCHAR concat[] = {'\\','\n',' ',' ',0}; @@ -1097,35 +1096,32 @@ static void export_hkey(FILE *file, HKEY key, val_buf1 = (BYTE*)GetMultiByteStringN((WCHAR*)*val_buf, val_size1 / sizeof(WCHAR), &val_buf1_size); } - /* position of where the next character will be printed */ - /* NOTE: yes, strlen("hex:") is used even for hex(x): */ - cur_pos = lstrlenW(delim) + lstrlenW(hex) + - lstrlenW(*val_name_buf); - + hex_pos = line_len; line_len += lstrlenW(hex_prefix); + data_pos = line_len; line_len += val_buf1_size * 3 + lstrlenW(concat) * ((int)((float)val_buf1_size * 3.0 / (float)REG_FILE_HEX_LINE_LEN) + 1 ) + 1; REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len); - lstrcatW(*line_buf, hex_prefix); - line_pos += lstrlenW(hex_prefix); + lstrcpyW(*line_buf + hex_pos, hex_prefix); + column = data_pos; /* no line wrap yet */ for (i1 = 0; i1 < val_buf1_size; i1++) { - wsprintfW(*line_buf + line_pos, format, (unsigned int)(val_buf1)[i1]); - line_pos += 2; + wsprintfW(*line_buf + data_pos, format, (unsigned int)(val_buf1)[i1]); + data_pos += 2; if (i1 + 1 < val_buf1_size) { - lstrcpyW(*line_buf + line_pos, comma); - line_pos++; + lstrcpyW(*line_buf + data_pos, comma); + data_pos++; } - cur_pos += 3; + column += 3; /* wrap the line */ - if (cur_pos > REG_FILE_HEX_LINE_LEN) { - lstrcpyW(*line_buf + line_pos, concat); - line_pos += lstrlenW(concat); - cur_pos = 2; + if (column > REG_FILE_HEX_LINE_LEN) { + lstrcpyW(*line_buf + data_pos, concat); + data_pos += lstrlenW(concat); + column = 2; } } + lstrcpyW(*line_buf + data_pos, newline); if(value_type == REG_MULTI_SZ && !unicode) HeapFree(GetProcessHeap(), 0, val_buf1); - lstrcpyW(*line_buf + line_pos, newline); break; } }

1 0

Francois Gouget : regedit: The xxx_name_len variables track buffer sizes. That is they count the trailing '\0'. Adjust a couple of places that got this wrong and rename them to xxx_name_size .
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: 7f707b3037c7c203b45e2acd7cfe7142e1a5e3c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f707b3037c7c203b45e2acd7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 12 11:28:49 2008 +0100 regedit: The xxx_name_len variables track buffer sizes. That is they count the trailing '\0'. Adjust a couple of places that got this wrong and rename them to xxx_name_size. --- programs/regedit/regproc.c | 46 ++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 9b67f94..8ad3775 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -961,17 +961,17 @@ static void REGPROC_write_line(FILE *file, const WCHAR* str, BOOL unicode) * key - registry branch to export. * reg_key_name_buf - name of the key with registry class. * Is resized if necessary. - * reg_key_name_len - length of the buffer for the registry class in characters. + * reg_key_name_size - length of the buffer for the registry class in characters. * val_name_buf - buffer for storing value name. * Is resized if necessary. - * val_name_len - length of the buffer for storing value names in characters. + * val_name_size - length of the buffer for storing value names in characters. * val_buf - buffer for storing values while extracting. * Is resized if necessary. * val_size - size of the buffer for storing values in bytes. */ static void export_hkey(FILE *file, HKEY key, - WCHAR **reg_key_name_buf, DWORD *reg_key_name_len, - WCHAR **val_name_buf, DWORD *val_name_len, + WCHAR **reg_key_name_buf, DWORD *reg_key_name_size, + WCHAR **val_name_buf, DWORD *val_name_size, BYTE **val_buf, DWORD *val_size, WCHAR **line_buf, DWORD *line_buf_size, BOOL unicode) @@ -994,9 +994,9 @@ static void export_hkey(FILE *file, HKEY key, REGPROC_print_error(); } curr_len = strlenW(*reg_key_name_buf); - REGPROC_resize_char_buffer(reg_key_name_buf, reg_key_name_len, + REGPROC_resize_char_buffer(reg_key_name_buf, reg_key_name_size, max_sub_key_len + curr_len + 1); - REGPROC_resize_char_buffer(val_name_buf, val_name_len, + REGPROC_resize_char_buffer(val_name_buf, val_name_size, max_val_name_len); if (max_val_size > *val_size) { *val_size = max_val_size; @@ -1015,10 +1015,10 @@ static void export_hkey(FILE *file, HKEY key, more_data = TRUE; while(more_data) { DWORD value_type; - DWORD val_name_len1 = *val_name_len; + DWORD val_name_size1 = *val_name_size; DWORD val_size1 = *val_size; DWORD line_len = 0; - ret = RegEnumValueW(key, i, *val_name_buf, &val_name_len1, NULL, + ret = RegEnumValueW(key, i, *val_name_buf, &val_name_size1, NULL, &value_type, *val_buf, &val_size1); if (ret != ERROR_SUCCESS) { more_data = FALSE; @@ -1149,9 +1149,9 @@ static void export_hkey(FILE *file, HKEY key, more_data = TRUE; (*reg_key_name_buf)[curr_len] = '\\'; while(more_data) { - DWORD buf_len = *reg_key_name_len - curr_len; + DWORD buf_size = *reg_key_name_size - curr_len - 1; - ret = RegEnumKeyExW(key, i, *reg_key_name_buf + curr_len + 1, &buf_len, + ret = RegEnumKeyExW(key, i, *reg_key_name_buf + curr_len + 1, &buf_size, NULL, NULL, NULL, NULL); if (ret != ERROR_SUCCESS && ret != ERROR_MORE_DATA) { more_data = FALSE; @@ -1164,8 +1164,8 @@ static void export_hkey(FILE *file, HKEY key, i++; if (RegOpenKeyW(key, *reg_key_name_buf + curr_len + 1, &subkey) == ERROR_SUCCESS) { - export_hkey(file, subkey, reg_key_name_buf, reg_key_name_len, - val_name_buf, val_name_len, val_buf, val_size, + export_hkey(file, subkey, reg_key_name_buf, reg_key_name_size, + val_name_buf, val_name_size, val_buf, val_size, line_buf, line_buf_size, unicode); RegCloseKey(subkey); } else { @@ -1226,17 +1226,17 @@ BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format) WCHAR *val_name_buf; BYTE *val_buf; WCHAR *line_buf; - DWORD reg_key_name_len = KEY_MAX_LEN; - DWORD val_name_len = KEY_MAX_LEN; + DWORD reg_key_name_size = KEY_MAX_LEN; + DWORD val_name_size = KEY_MAX_LEN; DWORD val_size = REG_VAL_BUF_SIZE; DWORD line_buf_size = KEY_MAX_LEN + REG_VAL_BUF_SIZE; FILE *file = NULL; BOOL unicode = (format == REG_FORMAT_5); reg_key_name_buf = HeapAlloc(GetProcessHeap(), 0, - reg_key_name_len * sizeof(*reg_key_name_buf)); + reg_key_name_size * sizeof(*reg_key_name_buf)); val_name_buf = HeapAlloc(GetProcessHeap(), 0, - val_name_len * sizeof(*val_name_buf)); + val_name_size * sizeof(*val_name_buf)); val_buf = HeapAlloc(GetProcessHeap(), 0, val_size); line_buf = HeapAlloc(GetProcessHeap(), 0, line_buf_size); CHECK_ENOUGH_MEMORY(reg_key_name_buf && val_name_buf && val_buf && line_buf); @@ -1246,7 +1246,7 @@ BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format) WCHAR *branch_name = NULL; HKEY key; - REGPROC_resize_char_buffer(&reg_key_name_buf, &reg_key_name_len, + REGPROC_resize_char_buffer(&reg_key_name_buf, &reg_key_name_size, lstrlenW(reg_key_name)); lstrcpyW(reg_key_name_buf, reg_key_name); @@ -1262,15 +1262,15 @@ BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format) /* no branch - registry class is specified */ file = REGPROC_open_export_file(file_name, unicode); export_hkey(file, reg_key_class, - &reg_key_name_buf, &reg_key_name_len, - &val_name_buf, &val_name_len, + &reg_key_name_buf, &reg_key_name_size, + &val_name_buf, &val_name_size, &val_buf, &val_size, &line_buf, &line_buf_size, unicode); } else if (RegOpenKeyW(reg_key_class, branch_name, &key) == ERROR_SUCCESS) { file = REGPROC_open_export_file(file_name, unicode); export_hkey(file, key, - &reg_key_name_buf, &reg_key_name_len, - &val_name_buf, &val_name_len, + &reg_key_name_buf, &reg_key_name_size, + &val_name_buf, &val_name_size, &val_buf, &val_size, &line_buf, &line_buf_size, unicode); RegCloseKey(key); @@ -1294,8 +1294,8 @@ BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format) reg_class_keys[i] != HKEY_DYN_DATA) { lstrcpyW(reg_key_name_buf, reg_class_namesW[i]); export_hkey(file, reg_class_keys[i], - &reg_key_name_buf, &reg_key_name_len, - &val_name_buf, &val_name_len, + &reg_key_name_buf, &reg_key_name_size, + &val_name_buf, &val_name_size, &val_buf, &val_size, &line_buf, &line_buf_size, unicode); }

1 0

Francois Gouget : regedit: line_size is supposed to track a string length.
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: 5940ada80b1e03e93dd2f167552b903859bfc73a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5940ada80b1e03e93dd2f1675… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 12 11:15:26 2008 +0100 regedit: line_size is supposed to track a string length. That is it does not count the trailing '\0'. Fix a few places that got this wrong and rename it to line_len. --- programs/regedit/regproc.c | 54 +++++++++++++++++++++---------------------- 1 files changed, 26 insertions(+), 28 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 7ed45a1..9b67f94 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -889,13 +889,13 @@ static void REGPROC_resize_char_buffer(WCHAR **buffer, DWORD *len, DWORD require /****************************************************************************** * Prints string str to file */ -static void REGPROC_export_string(WCHAR **line_buf, DWORD *line_buf_size, DWORD *line_size, WCHAR *str) +static void REGPROC_export_string(WCHAR **line_buf, DWORD *line_buf_size, DWORD *line_len, WCHAR *str) { DWORD len = lstrlenW(str); DWORD i; DWORD extra = 0; - REGPROC_resize_char_buffer(line_buf, line_buf_size, len + *line_size + 10); + REGPROC_resize_char_buffer(line_buf, line_buf_size, *line_len + len + 10); /* escaping characters */ for (i = 0; i < len; i++) { @@ -905,8 +905,8 @@ static void REGPROC_export_string(WCHAR **line_buf, DWORD *line_buf_size, DWORD { const WCHAR escape[] = {'\\','\\'}; - REGPROC_resize_char_buffer(line_buf, line_buf_size, len + *line_size + extra + 1); - memcpy(*line_buf + *line_size + i + extra - 1, escape, 2 * sizeof(WCHAR)); + REGPROC_resize_char_buffer(line_buf, line_buf_size, *line_len + len + extra + 1); + memcpy(*line_buf + *line_len + i + extra, escape, 2 * sizeof(WCHAR)); extra++; break; } @@ -914,8 +914,8 @@ static void REGPROC_export_string(WCHAR **line_buf, DWORD *line_buf_size, DWORD { const WCHAR escape[] = {'\\','"'}; - REGPROC_resize_char_buffer(line_buf, line_buf_size, len + *line_size + extra + 1); - memcpy(*line_buf + *line_size + i + extra - 1, escape, 2 * sizeof(WCHAR)); + REGPROC_resize_char_buffer(line_buf, line_buf_size, *line_len + len + extra + 1); + memcpy(*line_buf + *line_len + i + extra, escape, 2 * sizeof(WCHAR)); extra++; break; } @@ -923,18 +923,18 @@ static void REGPROC_export_string(WCHAR **line_buf, DWORD *line_buf_size, DWORD { const WCHAR escape[] = {'\\','n'}; - REGPROC_resize_char_buffer(line_buf, line_buf_size, len + *line_size + extra + 1); - memcpy(*line_buf + *line_size + i + extra - 1, escape, 2 * sizeof(WCHAR)); + REGPROC_resize_char_buffer(line_buf, line_buf_size, *line_len + len + extra + 1); + memcpy(*line_buf + *line_len + i + extra, escape, 2 * sizeof(WCHAR)); extra++; break; } default: - memcpy(*line_buf + *line_size + i + extra - 1, &c, sizeof(WCHAR)); + memcpy(*line_buf + *line_len + i + extra, &c, sizeof(WCHAR)); break; } } - *line_size += len + extra; - *(*line_buf + *line_size - 1) = 0; + *line_len += len + extra; + *(*line_buf + *line_len) = 0; } /****************************************************************************** @@ -1017,7 +1017,7 @@ static void export_hkey(FILE *file, HKEY key, DWORD value_type; DWORD val_name_len1 = *val_name_len; DWORD val_size1 = *val_size; - DWORD line_size = 0; + DWORD line_len = 0; ret = RegEnumValueW(key, i, *val_name_buf, &val_name_len1, NULL, &value_type, *val_buf, &val_size1); if (ret != ERROR_SUCCESS) { @@ -1031,16 +1031,14 @@ static void export_hkey(FILE *file, HKEY key, if ((*val_name_buf)[0]) { const WCHAR val_start[] = {'"','%','s','"','=',0}; - line_size = 4 + lstrlenW(*val_name_buf); - REGPROC_resize_char_buffer(line_buf, line_buf_size, line_size); + line_pos = line_len = 3 + lstrlenW(*val_name_buf); + REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len); wsprintfW(*line_buf, val_start, *val_name_buf); - line_pos = lstrlenW(*line_buf); } else { const WCHAR std_val[] = {'@','=',0}; - line_size = 3; - REGPROC_resize_char_buffer(line_buf, line_buf_size, line_size); + line_pos = line_len = 2; + REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len); lstrcpyW(*line_buf, std_val); - line_pos = lstrlenW(*line_buf); } switch (value_type) { @@ -1050,14 +1048,14 @@ static void export_hkey(FILE *file, HKEY key, const WCHAR start[] = {'"',0}; const WCHAR end[] = {'"','\n',0}; - line_size += lstrlenW(start); - REGPROC_resize_char_buffer(line_buf, line_buf_size, line_size); + line_len += lstrlenW(start); + REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len); lstrcatW(*line_buf, start); - if (val_size1) REGPROC_export_string(line_buf, line_buf_size, &line_size, (WCHAR*) *val_buf); + if (val_size1) REGPROC_export_string(line_buf, line_buf_size, &line_len, (WCHAR*) *val_buf); - line_size += lstrlenW(end); - REGPROC_resize_char_buffer(line_buf, line_buf_size, line_size); + line_len += lstrlenW(end); + REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len); lstrcatW(*line_buf, end); break; } @@ -1066,8 +1064,8 @@ static void export_hkey(FILE *file, HKEY key, { WCHAR format[] = {'d','w','o','r','d',':','%','0','8','x','\n',0}; - line_size += 20; - REGPROC_resize_char_buffer(line_buf, line_buf_size, line_size); + line_len += 20; + REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len); wsprintfW(*line_buf + line_pos, format, *((DWORD *)*val_buf)); break; } @@ -1116,9 +1114,9 @@ static void export_hkey(FILE *file, HKEY key, cur_pos = lstrlenW(delim) + lstrlenW(hex) + lstrlenW(*val_name_buf); - line_size += lstrlenW(hex_prefix); - line_size += val_buf1_size * 3 + lstrlenW(concat) * ((int)((float)val_buf1_size * 3.0 / (float)REG_FILE_HEX_LINE_LEN) + 1 ) + 1; - REGPROC_resize_char_buffer(line_buf, line_buf_size, line_size); + line_len += lstrlenW(hex_prefix); + line_len += val_buf1_size * 3 + lstrlenW(concat) * ((int)((float)val_buf1_size * 3.0 / (float)REG_FILE_HEX_LINE_LEN) + 1 ) + 1; + REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len); lstrcatW(*line_buf, hex_prefix); line_pos += lstrlenW(hex_prefix); for (i1 = 0; i1 < val_buf1_size; i1++) {

1 0

Francois Gouget : regedit: Check that we were able to allocate line_buf too .
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: f982e731c577e5f0cc0addb24ce213e76b361d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f982e731c577e5f0cc0addb24… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 12 11:10:29 2008 +0100 regedit: Check that we were able to allocate line_buf too. --- programs/regedit/regproc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index fd99bd3..7ed45a1 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1241,7 +1241,7 @@ BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format) val_name_len * sizeof(*val_name_buf)); val_buf = HeapAlloc(GetProcessHeap(), 0, val_size); line_buf = HeapAlloc(GetProcessHeap(), 0, line_buf_size); - CHECK_ENOUGH_MEMORY(reg_key_name_buf && val_name_buf && val_buf); + CHECK_ENOUGH_MEMORY(reg_key_name_buf && val_name_buf && val_buf && line_buf); if (reg_key_name && reg_key_name[0]) { HKEY reg_key_class;

1 0

Francois Gouget : regedit: Remove unneeded variable initializations.
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: 71af3e15822a3cff278207ee294764c0853a3193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71af3e15822a3cff278207ee2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 12 11:10:00 2008 +0100 regedit: Remove unneeded variable initializations. --- programs/regedit/regproc.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index c3825bd..fd99bd3 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -73,7 +73,7 @@ WCHAR* GetWideString(const char* strA) { if(strA) { - WCHAR* strW = NULL; + WCHAR* strW; int len = MultiByteToWideChar(CP_ACP, 0, strA, -1, NULL, 0); strW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); @@ -92,7 +92,7 @@ WCHAR* GetWideStringN(const char* strA, int chars, DWORD *len) { if(strA) { - WCHAR* strW = NULL; + WCHAR* strW; *len = MultiByteToWideChar(CP_ACP, 0, strA, chars, NULL, 0); strW = HeapAlloc(GetProcessHeap(), 0, *len * sizeof(WCHAR)); @@ -112,7 +112,7 @@ char* GetMultiByteString(const WCHAR* strW) { if(strW) { - char* strA = NULL; + char* strA; int len = WideCharToMultiByte(CP_ACP, 0, strW, -1, NULL, 0, NULL, NULL); strA = HeapAlloc(GetProcessHeap(), 0, len); @@ -131,7 +131,7 @@ char* GetMultiByteStringN(const WCHAR* strW, int chars, DWORD* len) { if(strW) { - char* strA = NULL; + char* strA; *len = WideCharToMultiByte(CP_ACP, 0, strW, chars, NULL, 0, NULL, NULL); strA = HeapAlloc(GetProcessHeap(), 0, *len);

1 0