November 2008 - Wine-Commits

Francois Gouget : reg: Avoid wvsprintfW() so we can avoid loading user32. dll.
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: 3bb449468d2194ca2aa7d6ad62fab438c54053ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bb449468d2194ca2aa7d6ad6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 20 20:49:30 2008 +0100 reg: Avoid wvsprintfW() so we can avoid loading user32.dll. --- programs/reg/Makefile.in | 3 ++- programs/reg/reg.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in index 17e8f81..6fb05f1 100644 --- a/programs/reg/Makefile.in +++ b/programs/reg/Makefile.in @@ -5,7 +5,8 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = reg.exe APPMODE = -mconsole -municode -IMPORTS = advapi32 user32 kernel32 +IMPORTS = advapi32 kernel32 +DELAYIMPORTS = user32 C_SRCS = reg.c diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 2f1da6e..34da9f1 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -17,6 +17,7 @@ */ #include <windows.h> +#include <wine/unicode.h> #include "reg.h" static int reg_printfW(const WCHAR *msg, ...) @@ -27,7 +28,7 @@ static int reg_printfW(const WCHAR *msg, ...) WCHAR msg_buffer[8192]; va_start(va_args, msg); - wvsprintfW(msg_buffer, msg, va_args); + vsprintfW(msg_buffer, msg, va_args); va_end(va_args); wlen = lstrlenW(msg_buffer);

1 0

Francois Gouget : advapi32/tests: Check how the registry APIs handle non-terminated strings.
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: b700a1b11a2a820ab086802aa6a543cf94abeeaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b700a1b11a2a820ab086802aa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 20 20:47:59 2008 +0100 advapi32/tests: Check how the registry APIs handle non-terminated strings. --- dlls/advapi32/tests/registry.c | 82 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index a508504..b3331b4 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1312,6 +1312,87 @@ cleanup: RegCloseKey(subkey); } +static void test_string_termination(void) +{ + HKEY subkey; + LSTATUS ret; + static const char string[] = "FullString"; + char name[11]; + BYTE buffer[11]; + DWORD insize, outsize, nsize; + + ret = RegCreateKeyA(hkey_main, "string_termination", &subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + /* Off-by-one RegSetValueExA -> adds a trailing '\0'! */ + insize=sizeof(string)-1; + ret = RegSetValueExA(subkey, "stringtest", 0, REG_SZ, (BYTE*)string, insize); + ok(ret == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", ret); + outsize=insize; + ret = RegQueryValueExA(subkey, "stringtest", NULL, NULL, buffer, &outsize); + ok(ret == ERROR_MORE_DATA, "RegQueryValueExA returned: %d\n", ret); + + /* Off-by-two RegSetValueExA -> no trailing '\0', except on Win9x */ + insize=sizeof(string)-2; + ret = RegSetValueExA(subkey, "stringtest", 0, REG_SZ, (BYTE*)string, insize); + ok(ret == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", ret); + outsize=0; + ret = RegQueryValueExA(subkey, "stringtest", NULL, NULL, NULL, &outsize); + ok(ret == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", ret); + ok(outsize == insize || broken(outsize == sizeof(string)) /* Win9x */, + "wrong size %u != %u\n", outsize, insize); + + if (outsize == insize) + { + /* RegQueryValueExA may return a string with no trailing '\0' */ + outsize=insize; + memset(buffer, 0xbd, sizeof(buffer)); + ret = RegQueryValueExA(subkey, "stringtest", NULL, NULL, buffer, &outsize); + ok(ret == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", ret); + ok(outsize == insize, "wrong size: %u != %u\n", outsize, insize); + ok(memcmp(buffer, string, outsize) == 0, "bad string: %s/%u != %s\n", + wine_debugstr_an((char*)buffer, outsize), outsize, string); + ok(buffer[insize] == 0xbd, "buffer overflow at %u %02x\n", insize, buffer[insize]); + + /* RegQueryValueExA adds a trailing '\0' if there is room */ + outsize=insize+1; + memset(buffer, 0xbd, sizeof(buffer)); + ret = RegQueryValueExA(subkey, "stringtest", NULL, NULL, buffer, &outsize); + ok(ret == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", ret); + ok(outsize == insize, "wrong size: %u != %u\n", outsize, insize); + ok(memcmp(buffer, string, outsize) == 0, "bad string: %s/%u != %s\n", + wine_debugstr_an((char*)buffer, outsize), outsize, string); + ok(buffer[insize] == 0, "buffer overflow at %u %02x\n", insize, buffer[insize]); + + /* RegEnumValueA may return a string with no trailing '\0' */ + outsize=insize; + memset(buffer, 0xbd, sizeof(buffer)); + nsize=sizeof(name); + ret = RegEnumValueA(subkey, 0, name, &nsize, NULL, NULL, buffer, &outsize); + ok(ret == ERROR_SUCCESS, "RegEnumValueA failed: %d\n", ret); + ok(strcmp(name, "stringtest") == 0, "wrong name: %s\n", name); + ok(outsize == insize, "wrong size: %u != %u\n", outsize, insize); + ok(memcmp(buffer, string, outsize) == 0, "bad string: %s/%u != %s\n", + wine_debugstr_an((char*)buffer, outsize), outsize, string); + ok(buffer[insize] == 0xbd, "buffer overflow at %u %02x\n", insize, buffer[insize]); + + /* RegEnumValueA adds a trailing '\0' if there is room */ + outsize=insize+1; + memset(buffer, 0xbd, sizeof(buffer)); + nsize=sizeof(name); + ret = RegEnumValueA(subkey, 0, name, &nsize, NULL, NULL, buffer, &outsize); + ok(ret == ERROR_SUCCESS, "RegEnumValueA failed: %d\n", ret); + ok(strcmp(name, "stringtest") == 0, "wrong name: %s\n", name); + ok(outsize == insize, "wrong size: %u != %u\n", outsize, insize); + ok(memcmp(buffer, string, outsize) == 0, "bad string: %s/%u != %s\n", + wine_debugstr_an((char*)buffer, outsize), outsize, string); + ok(buffer[insize] == 0, "buffer overflow at %u %02x\n", insize, buffer[insize]); + } + + RegDeleteKeyA(subkey, ""); + RegCloseKey(subkey); +} + static void test_reg_delete_tree(void) { CHAR buffer[MAX_PATH]; @@ -1402,6 +1483,7 @@ START_TEST(registry) test_reg_close_key(); test_reg_delete_key(); test_reg_query_value(); + test_string_termination(); /* SaveKey/LoadKey require the SE_BACKUP_NAME privilege to be set */ if (set_privileges(SE_BACKUP_NAME, TRUE) &&

1 0

Francois Gouget : advapi32/tests: Fix the line number reported by test_hkey_main_Value_[AW]().
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: ece65a4828acda3364f57d185efbbafe7662ce1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece65a4828acda3364f57d185… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 20 20:47:43 2008 +0100 advapi32/tests: Fix the line number reported by test_hkey_main_Value_[AW](). --- dlls/advapi32/tests/registry.c | 35 +++++++++++++++++++---------------- 1 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 29342d0..a508504 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -199,7 +199,9 @@ static void setup_main_key(void) assert (!RegCreateKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Test", &hkey_main )); } -static void test_hkey_main_Value_A(LPCSTR name, LPCSTR string, +#define lok ok_(__FILE__, line) +#define test_hkey_main_Value_A(name, string, full_byte_len) _test_hkey_main_Value_A(__LINE__, name, string, full_byte_len) +static void _test_hkey_main_Value_A(int line, LPCSTR name, LPCSTR string, DWORD full_byte_len) { DWORD ret, type, cbData; @@ -214,14 +216,14 @@ static void test_hkey_main_Value_A(LPCSTR name, LPCSTR string, SetLastError(0xdeadbeef); ret = RegQueryValueExA(hkey_main, name, NULL, &type, NULL, &cbData); GLE = GetLastError(); - ok(ret == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%d\n", ret, GLE); + lok(ret == ERROR_SUCCESS, "RegQueryValueExA/1 failed: %d, GLE=%d\n", ret, GLE); /* It is wrong for the Ansi version to not be implemented */ ok(GLE == 0xdeadbeef, "RegQueryValueExA set GLE = %u\n", GLE); if(GLE == ERROR_CALL_NOT_IMPLEMENTED) return; str_byte_len = (string ? lstrlenA(string) : 0) + 1; - ok(type == REG_SZ, "RegQueryValueExA returned type %d\n", type); - ok(cbData == full_byte_len || cbData == str_byte_len /* Win9x */, + lok(type == REG_SZ, "RegQueryValueExA/1 returned type %d\n", type); + lok(cbData == full_byte_len || cbData == str_byte_len /* Win9x */, "cbData=%d instead of %d or %d\n", cbData, full_byte_len, str_byte_len); value = HeapAlloc(GetProcessHeap(), 0, cbData+1); @@ -229,24 +231,25 @@ static void test_hkey_main_Value_A(LPCSTR name, LPCSTR string, type=0xdeadbeef; ret = RegQueryValueExA(hkey_main, name, NULL, &type, value, &cbData); GLE = GetLastError(); - ok(ret == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%d\n", ret, GLE); + lok(ret == ERROR_SUCCESS, "RegQueryValueExA/2 failed: %d, GLE=%d\n", ret, GLE); if (!string) { /* When cbData == 0, RegQueryValueExA() should not modify the buffer */ - ok(*value == 0xbd || (cbData == 1 && *value == '\0') /* Win9x */, + lok(*value == 0xbd || (cbData == 1 && *value == '\0') /* Win9x */, "RegQueryValueExA overflowed: cbData=%u *value=%02x\n", cbData, *value); } else { - ok(memcmp(value, string, cbData) == 0, "RegQueryValueExA failed: %s/%d != %s/%d\n", + lok(memcmp(value, string, cbData) == 0, "RegQueryValueExA/2 failed: %s/%d != %s/%d\n", wine_debugstr_an((char*)value, cbData), cbData, wine_debugstr_an(string, full_byte_len), full_byte_len); - ok(*(value+cbData) == 0xbd, "RegQueryValueExA overflowed at %u: %02x != bd\n", cbData, *(value+cbData)); + lok(*(value+cbData) == 0xbd, "RegQueryValueExA/2 overflowed at offset %u: %02x != bd\n", cbData, *(value+cbData)); } HeapFree(GetProcessHeap(), 0, value); } -static void test_hkey_main_Value_W(LPCWSTR name, LPCWSTR string, +#define test_hkey_main_Value_W(name, string, full_byte_len) _test_hkey_main_Value_W(__LINE__, name, string, full_byte_len) +static void _test_hkey_main_Value_W(int line, LPCWSTR name, LPCWSTR string, DWORD full_byte_len) { DWORD ret, type, cbData; @@ -260,15 +263,15 @@ static void test_hkey_main_Value_W(LPCWSTR name, LPCWSTR string, SetLastError(0xdeadbeef); ret = RegQueryValueExW(hkey_main, name, NULL, &type, NULL, &cbData); GLE = GetLastError(); - ok(ret == ERROR_SUCCESS, "RegQueryValueExW failed: %d, GLE=%d\n", ret, GLE); + lok(ret == ERROR_SUCCESS, "RegQueryValueExW/1 failed: %d, GLE=%d\n", ret, GLE); if(GLE == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("RegQueryValueExW() is not implemented\n"); return; } - ok(type == REG_SZ, "RegQueryValueExW returned type %d\n", type); - ok(cbData == full_byte_len, + lok(type == REG_SZ, "RegQueryValueExW/1 returned type %d\n", type); + lok(cbData == full_byte_len, "cbData=%d instead of %d\n", cbData, full_byte_len); /* Give enough space to overflow by one WCHAR */ @@ -277,16 +280,16 @@ static void test_hkey_main_Value_W(LPCWSTR name, LPCWSTR string, type=0xdeadbeef; ret = RegQueryValueExW(hkey_main, name, NULL, &type, value, &cbData); GLE = GetLastError(); - ok(ret == ERROR_SUCCESS, "RegQueryValueExW failed: %d, GLE=%d\n", ret, GLE); + lok(ret == ERROR_SUCCESS, "RegQueryValueExW/2 failed: %d, GLE=%d\n", ret, GLE); if (string) { - ok(memcmp(value, string, cbData) == 0, "RegQueryValueExW failed: %s/%d != %s/%d\n", + lok(memcmp(value, string, cbData) == 0, "RegQueryValueExW failed: %s/%d != %s/%d\n", wine_debugstr_wn((WCHAR*)value, cbData / sizeof(WCHAR)), cbData, wine_debugstr_wn(string, full_byte_len / sizeof(WCHAR)), full_byte_len); } /* This implies that when cbData == 0, RegQueryValueExW() should not modify the buffer */ - ok(*(value+cbData) == 0xbd, "RegQueryValueExW overflowed at %u: %02x != bd\n", cbData, *(value+cbData)); - ok(*(value+cbData+1) == 0xbd, "RegQueryValueExW overflowed at %u+1: %02x != bd\n", cbData, *(value+cbData+1)); + lok(*(value+cbData) == 0xbd, "RegQueryValueExW/2 overflowed at %u: %02x != bd\n", cbData, *(value+cbData)); + lok(*(value+cbData+1) == 0xbd, "RegQueryValueExW/2 overflowed at %u+1: %02x != bd\n", cbData, *(value+cbData+1)); HeapFree(GetProcessHeap(), 0, value); }

1 0

Francois Gouget : advapi32/tests: Cleanup test_hkey_main_Value_[AW]().
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: 9ce2bd20e4e9faf230446b49747a7af95d2d2030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce2bd20e4e9faf230446b497… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 20 20:46:34 2008 +0100 advapi32/tests: Cleanup test_hkey_main_Value_[AW](). Fix a byte vs. WCHAR count issue in test_hkey_main_Value_W(). Check that RegQueryValueEx[AW]() did not write more data than expected. --- dlls/advapi32/tests/registry.c | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 95608c6..29342d0 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -204,8 +204,7 @@ static void test_hkey_main_Value_A(LPCSTR name, LPCSTR string, { DWORD ret, type, cbData; DWORD str_byte_len; - LPSTR value; - static const char nA[]={'N', 0}; + BYTE* value; type=0xdeadbeef; cbData=0xdeadbeef; @@ -225,23 +224,24 @@ static void test_hkey_main_Value_A(LPCSTR name, LPCSTR string, ok(cbData == full_byte_len || cbData == str_byte_len /* Win9x */, "cbData=%d instead of %d or %d\n", cbData, full_byte_len, str_byte_len); - value = HeapAlloc(GetProcessHeap(), 0, (cbData+2)*sizeof(*value)); - strcpy(value, nA); + value = HeapAlloc(GetProcessHeap(), 0, cbData+1); + memset(value, 0xbd, cbData+1); type=0xdeadbeef; - ret = RegQueryValueExA(hkey_main, name, NULL, &type, (BYTE*)value, &cbData); + ret = RegQueryValueExA(hkey_main, name, NULL, &type, value, &cbData); GLE = GetLastError(); ok(ret == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%d\n", ret, GLE); if (!string) { /* When cbData == 0, RegQueryValueExA() should not modify the buffer */ - ok(strcmp(value, nA) == 0 || (cbData == 1 && *value == '\0') /* Win9x */, - "RegQueryValueExA failed: '%s' != '%s'\n", value, string); + ok(*value == 0xbd || (cbData == 1 && *value == '\0') /* Win9x */, + "RegQueryValueExA overflowed: cbData=%u *value=%02x\n", cbData, *value); } else { ok(memcmp(value, string, cbData) == 0, "RegQueryValueExA failed: %s/%d != %s/%d\n", - wine_debugstr_an(value, cbData), cbData, + wine_debugstr_an((char*)value, cbData), cbData, wine_debugstr_an(string, full_byte_len), full_byte_len); + ok(*(value+cbData) == 0xbd, "RegQueryValueExA overflowed at %u: %02x != bd\n", cbData, *(value+cbData)); } HeapFree(GetProcessHeap(), 0, value); } @@ -250,8 +250,7 @@ static void test_hkey_main_Value_W(LPCWSTR name, LPCWSTR string, DWORD full_byte_len) { DWORD ret, type, cbData; - LPWSTR value; - static const WCHAR nW[]={'N', 0}; + BYTE* value; type=0xdeadbeef; cbData=0xdeadbeef; @@ -272,20 +271,22 @@ static void test_hkey_main_Value_W(LPCWSTR name, LPCWSTR string, ok(cbData == full_byte_len, "cbData=%d instead of %d\n", cbData, full_byte_len); - value = HeapAlloc(GetProcessHeap(), 0, (cbData+2)*sizeof(*value)); - lstrcpyW(value, nW); + /* Give enough space to overflow by one WCHAR */ + value = HeapAlloc(GetProcessHeap(), 0, cbData+2); + memset(value, 0xbd, cbData+2); type=0xdeadbeef; - ret = RegQueryValueExW(hkey_main, name, NULL, &type, (BYTE*)value, &cbData); + ret = RegQueryValueExW(hkey_main, name, NULL, &type, value, &cbData); GLE = GetLastError(); ok(ret == ERROR_SUCCESS, "RegQueryValueExW failed: %d, GLE=%d\n", ret, GLE); - if (!string) + if (string) { - /* When cbData == 0, RegQueryValueExW() should not modify the buffer */ - string=nW; + ok(memcmp(value, string, cbData) == 0, "RegQueryValueExW failed: %s/%d != %s/%d\n", + wine_debugstr_wn((WCHAR*)value, cbData / sizeof(WCHAR)), cbData, + wine_debugstr_wn(string, full_byte_len / sizeof(WCHAR)), full_byte_len); } - ok(memcmp(value, string, cbData) == 0, "RegQueryValueExW failed: %s/%d != %s/%d\n", - wine_debugstr_wn(value, cbData / sizeof(WCHAR)), cbData, - wine_debugstr_wn(string, full_byte_len / sizeof(WCHAR)), full_byte_len); + /* This implies that when cbData == 0, RegQueryValueExW() should not modify the buffer */ + ok(*(value+cbData) == 0xbd, "RegQueryValueExW overflowed at %u: %02x != bd\n", cbData, *(value+cbData)); + ok(*(value+cbData+1) == 0xbd, "RegQueryValueExW overflowed at %u+1: %02x != bd\n", cbData, *(value+cbData+1)); HeapFree(GetProcessHeap(), 0, value); }

1 0

Francois Gouget : regedit: Fix exporting of REG_EXPAND_SZ and other 'weird' strings.
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: a81bb704df0438870d9cc0f024ed8777831eba1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a81bb704df0438870d9cc0f02… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 20 20:43:25 2008 +0100 regedit: Fix exporting of REG_EXPAND_SZ and other 'weird' strings. REG_EXPAND_SZ must be exported as hexadecimal to preserve the string type. 0-byte strings and those missing a trailing '\0' or with odd sizes must be saved as hexadecimal too so they are restored as is. Move the binary-value export code to the new REGPROC_export_binary() function. --- programs/regedit/regproc.c | 171 ++++++++++++++++++++++++-------------------- 1 files changed, 92 insertions(+), 79 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 957f87c..509a36f 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -925,6 +925,75 @@ static void REGPROC_export_string(WCHAR **line_buf, DWORD *line_buf_size, DWORD *line_len = pos; } +static void REGPROC_export_binary(WCHAR **line_buf, DWORD *line_buf_size, DWORD *line_len, DWORD type, BYTE *value, DWORD value_size, BOOL unicode) +{ + DWORD i, hex_pos, data_pos, column; + const WCHAR *hex_prefix; + const WCHAR hex[] = {'h','e','x',':',0}; + WCHAR hex_buf[17]; + const WCHAR format[] = {'%','0','2','x',0}; + const WCHAR comma[] = {',',0}; + const WCHAR concat[] = {'\\','\n',' ',' ',0}; + DWORD concat_prefix, concat_len; + const WCHAR newline[] = {'\n',0}; + CHAR* value_multibyte = NULL; + + if (type == REG_BINARY) { + hex_prefix = hex; + } else { + const WCHAR hex_format[] = {'h','e','x','(','%','u',')',':',0}; + hex_prefix = hex_buf; + wsprintfW(hex_buf, hex_format, type); + if ((type == REG_SZ || type == REG_EXPAND_SZ || type == REG_MULTI_SZ) && !unicode) + { + value_multibyte = GetMultiByteStringN((WCHAR*)value, value_size / sizeof(WCHAR), &value_size); + value = (BYTE*)value_multibyte; + } + } + + concat_len = lstrlenW(concat); + concat_prefix = 2; + + hex_pos = *line_len; + *line_len += lstrlenW(hex_prefix); + data_pos = *line_len; + *line_len += value_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 */ + i = 0; + while (1) + { + wsprintfW(*line_buf + data_pos, format, (unsigned int)value[i]); + data_pos += 2; + if (++i == value_size) + break; + + lstrcpyW(*line_buf + data_pos, comma); + data_pos++; + column += 3; + + /* wrap the line */ + if (column >= REG_FILE_HEX_LINE_LEN) { + lstrcpyW(*line_buf + data_pos, concat); + data_pos += concat_len; + column = concat_prefix; + } + } + lstrcpyW(*line_buf + data_pos, newline); + if (value_multibyte) + HeapFree(GetProcessHeap(), 0, value_multibyte); +} + /****************************************************************************** * Writes the given line to a file, in multi-byte or wide characters */ @@ -1030,22 +1099,30 @@ static void export_hkey(FILE *file, HKEY key, switch (value_type) { case REG_SZ: - case REG_EXPAND_SZ: { - const WCHAR start[] = {'"',0}; - const WCHAR end[] = {'"','\n',0}; - DWORD len; + WCHAR* wstr = (WCHAR*)*val_buf; + + if (val_size1 < sizeof(WCHAR) || val_size1 % sizeof(WCHAR) || + wstr[val_size1 / sizeof(WCHAR) - 1]) { + REGPROC_export_binary(line_buf, line_buf_size, &line_len, value_type, *val_buf, val_size1, unicode); + } else { + const WCHAR start[] = {'"',0}; + const WCHAR end[] = {'"','\n',0}; + DWORD len; - len = lstrlenW(start); - REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len + len); - lstrcpyW(*line_buf + line_len, start); - line_len += len; + 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, val_size1 / sizeof(WCHAR) - 1); + /* At this point we know wstr is '\0'-terminated + * so we can substract 1 from the size + */ + REGPROC_export_string(line_buf, line_buf_size, &line_len, wstr, val_size1 / sizeof(WCHAR) - 1); - REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len + lstrlenW(end)); - lstrcpyW(*line_buf + line_len, end); + REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len + lstrlenW(end)); + lstrcpyW(*line_buf + line_len, end); + } break; } @@ -1071,75 +1148,11 @@ static void export_hkey(FILE *file, HKEY key, HeapFree(GetProcessHeap(), 0, value_nameA); } /* falls through */ + case REG_EXPAND_SZ: case REG_MULTI_SZ: /* falls through */ - case REG_BINARY: { - DWORD i1; - const WCHAR *hex_prefix; - WCHAR buf[20]; - int hex_pos, data_pos, column; - const WCHAR hex[] = {'h','e','x',':',0}; - 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; - - if (value_type == REG_BINARY) { - hex_prefix = hex; - } else { - const WCHAR hex_format[] = {'h','e','x','(','%','d',')',':',0}; - hex_prefix = buf; - wsprintfW(buf, hex_format, value_type); - if(value_type == REG_MULTI_SZ && !unicode) - 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; - /* - 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 */ - i1 = 0; - while (1) - { - wsprintfW(*line_buf + data_pos, format, (unsigned int)(val_buf1)[i1]); - data_pos += 2; - 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) { - lstrcpyW(*line_buf + data_pos, concat); - data_pos += concat_len; - column = concat_prefix; - } - } - lstrcpyW(*line_buf + data_pos, newline); - if(value_type == REG_MULTI_SZ && !unicode) - HeapFree(GetProcessHeap(), 0, val_buf1); - break; - } + case REG_BINARY: + REGPROC_export_binary(line_buf, line_buf_size, &line_len, value_type, *val_buf, val_size1, unicode); } REGPROC_write_line(file, *line_buf, unicode); }

1 0

Francois Gouget : ntdll/tests: Remove a redundant 'if'.
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: b0cf129c98433390cf1b62a9c4f4077843c74586 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0cf129c98433390cf1b62a9c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 20 20:49:43 2008 +0100 ntdll/tests: Remove a redundant 'if'. --- dlls/ntdll/tests/reg.c | 49 ++++++++++++++++++++++------------------------- 1 files changed, 23 insertions(+), 26 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 23dd278..1525bb1 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -161,32 +161,29 @@ static BOOL InitFunctionPtrs(void) trace("Could not load ntdll.dll\n"); return FALSE; } - if (hntdll) - { - NTDLL_GET_PROC(RtlCreateUnicodeStringFromAsciiz) - NTDLL_GET_PROC(RtlCreateUnicodeString) - NTDLL_GET_PROC(RtlFreeUnicodeString) - NTDLL_GET_PROC(NtDeleteValueKey) - NTDLL_GET_PROC(RtlQueryRegistryValues) - NTDLL_GET_PROC(RtlCheckRegistryKey) - NTDLL_GET_PROC(RtlOpenCurrentUser) - NTDLL_GET_PROC(NtClose) - NTDLL_GET_PROC(NtDeleteValueKey) - NTDLL_GET_PROC(NtCreateKey) - NTDLL_GET_PROC(NtFlushKey) - NTDLL_GET_PROC(NtDeleteKey) - NTDLL_GET_PROC(NtQueryValueKey) - NTDLL_GET_PROC(NtSetValueKey) - NTDLL_GET_PROC(NtOpenKey) - NTDLL_GET_PROC(RtlFormatCurrentUserKeyPath) - NTDLL_GET_PROC(RtlReAllocateHeap) - NTDLL_GET_PROC(RtlAppendUnicodeToString) - NTDLL_GET_PROC(RtlUnicodeStringToAnsiString) - NTDLL_GET_PROC(RtlFreeHeap) - NTDLL_GET_PROC(RtlAllocateHeap) - NTDLL_GET_PROC(RtlZeroMemory) - NTDLL_GET_PROC(RtlpNtQueryValueKey) - } + NTDLL_GET_PROC(RtlCreateUnicodeStringFromAsciiz) + NTDLL_GET_PROC(RtlCreateUnicodeString) + NTDLL_GET_PROC(RtlFreeUnicodeString) + NTDLL_GET_PROC(NtDeleteValueKey) + NTDLL_GET_PROC(RtlQueryRegistryValues) + NTDLL_GET_PROC(RtlCheckRegistryKey) + NTDLL_GET_PROC(RtlOpenCurrentUser) + NTDLL_GET_PROC(NtClose) + NTDLL_GET_PROC(NtDeleteValueKey) + NTDLL_GET_PROC(NtCreateKey) + NTDLL_GET_PROC(NtFlushKey) + NTDLL_GET_PROC(NtDeleteKey) + NTDLL_GET_PROC(NtQueryValueKey) + NTDLL_GET_PROC(NtSetValueKey) + NTDLL_GET_PROC(NtOpenKey) + NTDLL_GET_PROC(RtlFormatCurrentUserKeyPath) + NTDLL_GET_PROC(RtlReAllocateHeap) + NTDLL_GET_PROC(RtlAppendUnicodeToString) + NTDLL_GET_PROC(RtlUnicodeStringToAnsiString) + NTDLL_GET_PROC(RtlFreeHeap) + NTDLL_GET_PROC(RtlAllocateHeap) + NTDLL_GET_PROC(RtlZeroMemory) + NTDLL_GET_PROC(RtlpNtQueryValueKey) return TRUE; } #undef NTDLL_GET_PROC

1 0

Francois Gouget : regedit: Avoid wsprintfW() so we can avoid loading user32 .dll for 'regedit /E'.
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: be19acfbe8838a744b6cee8ab34c1e564dffb07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=be19acfbe8838a744b6cee8ab… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 20 20:45:12 2008 +0100 regedit: Avoid wsprintfW() so we can avoid loading user32.dll for 'regedit /E'. --- programs/regedit/regproc.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 509a36f..56d7a5a 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -943,7 +943,7 @@ static void REGPROC_export_binary(WCHAR **line_buf, DWORD *line_buf_size, DWORD } else { const WCHAR hex_format[] = {'h','e','x','(','%','u',')',':',0}; hex_prefix = hex_buf; - wsprintfW(hex_buf, hex_format, type); + sprintfW(hex_buf, hex_format, type); if ((type == REG_SZ || type == REG_EXPAND_SZ || type == REG_MULTI_SZ) && !unicode) { value_multibyte = GetMultiByteStringN((WCHAR*)value, value_size / sizeof(WCHAR), &value_size); @@ -973,7 +973,7 @@ static void REGPROC_export_binary(WCHAR **line_buf, DWORD *line_buf_size, DWORD i = 0; while (1) { - wsprintfW(*line_buf + data_pos, format, (unsigned int)value[i]); + sprintfW(*line_buf + data_pos, format, (unsigned int)value[i]); data_pos += 2; if (++i == value_size) break; @@ -1063,7 +1063,7 @@ static void export_hkey(FILE *file, HKEY key, REGPROC_resize_char_buffer(line_buf, line_buf_size, lstrlenW(*reg_key_name_buf) + 4); /* output data for the current key */ - wsprintfW(*line_buf, key_format, *reg_key_name_buf); + sprintfW(*line_buf, key_format, *reg_key_name_buf); REGPROC_write_line(file, *line_buf, unicode); /* print all the values */ @@ -1089,7 +1089,7 @@ static void export_hkey(FILE *file, HKEY key, 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); + sprintfW(*line_buf, val_start, *val_name_buf); } else { const WCHAR std_val[] = {'@','=',0}; line_len = 2; @@ -1131,7 +1131,7 @@ static void export_hkey(FILE *file, HKEY key, WCHAR format[] = {'d','w','o','r','d',':','%','0','8','x','\n',0}; REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len + 15); - wsprintfW(*line_buf + line_len, format, *((DWORD *)*val_buf)); + sprintfW(*line_buf + line_len, format, *((DWORD *)*val_buf)); break; }

1 0

Francois Gouget : regedit: Pass the string length to REGPROC_export_string( ).
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: 3ef0b0ef2d92b4d5105fc1092afdbf6ba9819005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ef0b0ef2d92b4d5105fc1092… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 20 20:45:25 2008 +0100 regedit: Pass the string length to REGPROC_export_string(). We already know it in the caller so this saves us one lstrlenW() call. --- programs/regedit/regproc.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 6d04a44..957f87c 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -890,22 +890,21 @@ 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_len, WCHAR *str) +static void REGPROC_export_string(WCHAR **line_buf, DWORD *line_buf_size, DWORD *line_len, WCHAR *str, DWORD str_len) { - DWORD len = lstrlenW(str); DWORD i, pos; DWORD extra = 0; - REGPROC_resize_char_buffer(line_buf, line_buf_size, *line_len + len + 10); + REGPROC_resize_char_buffer(line_buf, line_buf_size, *line_len + str_len + 10); /* escaping characters */ pos = *line_len; - for (i = 0; i < len; i++) { + for (i = 0; i < str_len; i++) { WCHAR c = str[i]; switch (c) { case '\n': extra++; - REGPROC_resize_char_buffer(line_buf, line_buf_size, *line_len + len + extra); + REGPROC_resize_char_buffer(line_buf, line_buf_size, *line_len + str_len + extra); (*line_buf)[pos++] = '\\'; (*line_buf)[pos++] = 'n'; break; @@ -913,7 +912,7 @@ static void REGPROC_export_string(WCHAR **line_buf, DWORD *line_buf_size, DWORD case '\\': case '"': extra++; - REGPROC_resize_char_buffer(line_buf, line_buf_size, *line_len + len + extra); + REGPROC_resize_char_buffer(line_buf, line_buf_size, *line_len + str_len + extra); (*line_buf)[pos++] = '\\'; /* Fall through */ @@ -1043,7 +1042,7 @@ static void export_hkey(FILE *file, HKEY key, line_len += len; if (val_size1) - REGPROC_export_string(line_buf, line_buf_size, &line_len, (WCHAR*) *val_buf); + REGPROC_export_string(line_buf, line_buf_size, &line_len, (WCHAR*)*val_buf, val_size1 / sizeof(WCHAR) - 1); REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len + lstrlenW(end)); lstrcpyW(*line_buf + line_len, end);

1 0

Juan Lang : crypt32: Formatted bits are always in a single line, regardless of dwFormatStrType.
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: 9d4ab487504ee92bfed0bb05da63fda31f1dc812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d4ab487504ee92bfed0bb05d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 20 09:19:15 2008 -0800 crypt32: Formatted bits are always in a single line, regardless of dwFormatStrType. --- dlls/crypt32/object.c | 45 ++++++++++++++------------------------------- 1 files changed, 14 insertions(+), 31 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index e09ca03..5784cc9 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -604,7 +604,6 @@ static BOOL WINAPI CRYPT_FormatHexString(DWORD dwCertEncodingType, #define MAX_STRING_RESOURCE_LEN 128 -static const WCHAR crlf[] = { '\r','\n',0 }; static const WCHAR commaSpace[] = { ',',' ',0 }; struct BitToString @@ -614,30 +613,18 @@ struct BitToString WCHAR str[MAX_STRING_RESOURCE_LEN]; }; -static BOOL CRYPT_FormatBits(DWORD dwFormatStrType, BYTE bits, - const struct BitToString *map, DWORD mapEntries, void *pbFormat, - DWORD *pcbFormat, BOOL *first) +static BOOL CRYPT_FormatBits(BYTE bits, const struct BitToString *map, + DWORD mapEntries, void *pbFormat, DWORD *pcbFormat, BOOL *first) { - LPCWSTR sep; - DWORD sepLen, bytesNeeded = sizeof(WCHAR); + DWORD bytesNeeded = sizeof(WCHAR); int i; BOOL ret = TRUE, localFirst = *first; - if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) - { - sep = crlf; - sepLen = strlenW(crlf) * sizeof(WCHAR); - } - else - { - sep = commaSpace; - sepLen = strlenW(commaSpace) * sizeof(WCHAR); - } for (i = 0; i < mapEntries; i++) if (bits & map[i].bit) { if (!localFirst) - bytesNeeded += sepLen; + bytesNeeded += strlenW(commaSpace) * sizeof(WCHAR); localFirst = FALSE; bytesNeeded += strlenW(map[i].str) * sizeof(WCHAR); } @@ -664,8 +651,8 @@ static BOOL CRYPT_FormatBits(DWORD dwFormatStrType, BYTE bits, { if (!localFirst) { - strcpyW(str, sep); - str += sepLen / sizeof(WCHAR); + strcpyW(str, commaSpace); + str += strlenW(commaSpace); } localFirst = FALSE; strcpyW(str, map[i].str); @@ -753,15 +740,13 @@ static BOOL WINAPI CRYPT_FormatKeyUsage(DWORD dwCertEncodingType, keyUsageByte1Map[i].str, MAX_STRING_RESOURCE_LEN); stringsLoaded = TRUE; } - CRYPT_FormatBits(dwFormatStrType, bits->pbData[0], - keyUsageByte0Map, + CRYPT_FormatBits(bits->pbData[0], keyUsageByte0Map, sizeof(keyUsageByte0Map) / sizeof(keyUsageByte0Map[0]), NULL, &bitStringLen, &first); bytesNeeded += bitStringLen; if (bits->cbData == 2) { - CRYPT_FormatBits(dwFormatStrType, bits->pbData[1], - keyUsageByte1Map, + CRYPT_FormatBits(bits->pbData[1], keyUsageByte1Map, sizeof(keyUsageByte1Map) / sizeof(keyUsageByte1Map[0]), NULL, &bitStringLen, &first); bytesNeeded += bitStringLen; @@ -784,16 +769,14 @@ static BOOL WINAPI CRYPT_FormatKeyUsage(DWORD dwCertEncodingType, bitStringLen = bytesNeeded; first = TRUE; - CRYPT_FormatBits(dwFormatStrType, bits->pbData[0], - keyUsageByte0Map, + CRYPT_FormatBits(bits->pbData[0], keyUsageByte0Map, sizeof(keyUsageByte0Map) / sizeof(keyUsageByte0Map[0]), str, &bitStringLen, &first); str += bitStringLen / sizeof(WCHAR) - 1; if (bits->cbData == 2) { bitStringLen = bytesNeeded; - CRYPT_FormatBits(dwFormatStrType, bits->pbData[1], - keyUsageByte1Map, + CRYPT_FormatBits(bits->pbData[1], keyUsageByte1Map, sizeof(keyUsageByte1Map) / sizeof(keyUsageByte1Map[0]), str, &bitStringLen, &first); str += bitStringLen / sizeof(WCHAR) - 1; @@ -812,6 +795,8 @@ static BOOL WINAPI CRYPT_FormatKeyUsage(DWORD dwCertEncodingType, return ret; } +static const WCHAR crlf[] = { '\r','\n',0 }; + static WCHAR subjectTypeHeader[MAX_STRING_RESOURCE_LEN]; static WCHAR subjectTypeCA[MAX_STRING_RESOURCE_LEN]; static WCHAR subjectTypeEndCert[MAX_STRING_RESOURCE_LEN]; @@ -2123,8 +2108,7 @@ static BOOL WINAPI CRYPT_FormatNetscapeCertType(DWORD dwCertEncodingType, netscapeCertTypeMap[i].str, MAX_STRING_RESOURCE_LEN); stringsLoaded = TRUE; } - CRYPT_FormatBits(dwFormatStrType, bits->pbData[0], - netscapeCertTypeMap, + CRYPT_FormatBits(bits->pbData[0], netscapeCertTypeMap, sizeof(netscapeCertTypeMap) / sizeof(netscapeCertTypeMap[0]), NULL, &bitStringLen, &first); bytesNeeded += bitStringLen; @@ -2146,8 +2130,7 @@ static BOOL WINAPI CRYPT_FormatNetscapeCertType(DWORD dwCertEncodingType, bitStringLen = bytesNeeded; first = TRUE; - CRYPT_FormatBits(dwFormatStrType, bits->pbData[0], - netscapeCertTypeMap, + CRYPT_FormatBits(bits->pbData[0], netscapeCertTypeMap, sizeof(netscapeCertTypeMap) / sizeof(netscapeCertTypeMap[0]), str, &bitStringLen, &first); str += bitStringLen / sizeof(WCHAR) - 1;

1 0

Juan Lang : crypt32: Check registered CryptFormatObject functions before using default hex format .
by Alexandre Julliard Nov. 21, 2008

Nov. 21, 2008

Module: wine Branch: master Commit: 57fde4e8a2c32992bb66a6cfcc28cc9db9c1972a URL: http://source.winehq.org/git/wine.git/?a=commit;h=57fde4e8a2c32992bb66a6cfc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 20 09:32:57 2008 -0800 crypt32: Check registered CryptFormatObject functions before using default hex format. --- dlls/crypt32/object.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index bd3ad11..e09ca03 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -2337,8 +2337,6 @@ static CryptFormatObjectFunc CRYPT_GetBuiltinFormatFunction(DWORD encodingType, format = CRYPT_FormatNetscapeCertType; else if (!strcmp(lpszStructType, SPC_FINANCIAL_CRITERIA_OBJID)) format = CRYPT_FormatSpcFinancialCriteria; - if (!format && !(formatStrType & CRYPT_FORMAT_STR_NO_HEX)) - format = CRYPT_FormatHexString; return format; } @@ -2364,6 +2362,9 @@ BOOL WINAPI CryptFormatObject(DWORD dwCertEncodingType, DWORD dwFormatType, CryptGetOIDFunctionAddress(set, dwCertEncodingType, lpszStructType, 0, (void **)&format, &hFunc); } + if (!format && (dwCertEncodingType & CERT_ENCODING_TYPE_MASK) == + X509_ASN_ENCODING && !(dwFormatStrType & CRYPT_FORMAT_STR_NO_HEX)) + format = CRYPT_FormatHexString; if (format) ret = format(dwCertEncodingType, dwFormatType, dwFormatStrType, pFormatStruct, lpszStructType, pbEncoded, cbEncoded, pbFormat,

1 0