July 2017 - Wine-Commits - list.winehq.org

Hugh McMaster : regedit: Use the heap_*() functions in edit.c where possible.
by Alexandre Julliard July 27, 2017

July 27, 2017

Module: wine Branch: master Commit: 6238cd46f21c99a95825240b693565c6a7d63b53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6238cd46f21c99a95825240b6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 27 12:25:26 2017 +0000 regedit: Use the heap_*() functions in edit.c where possible. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 44 ++++++++++++++++++-------------------------- programs/regedit/regproc.c | 2 +- programs/regedit/regproc.h | 1 + 3 files changed, 20 insertions(+), 27 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 038a37a..c72f39d 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -101,7 +101,6 @@ static BOOL change_dword_base(HWND hwndDlg, BOOL toHex) static INT_PTR CALLBACK modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - WCHAR* valueData; HWND hwndValue; int len; @@ -122,12 +121,10 @@ static INT_PTR CALLBACK modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L case IDOK: if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA))) { len = GetWindowTextLengthW(hwndValue); - if ((valueData = HeapReAlloc(GetProcessHeap(), 0, stringValueData, (len + 1) * sizeof(WCHAR)))) { - stringValueData = valueData; - if (!GetWindowTextW(hwndValue, stringValueData, len + 1)) - *stringValueData = 0; + stringValueData = heap_xrealloc(stringValueData, (len + 1) * sizeof(WCHAR)); + if (!GetWindowTextW(hwndValue, stringValueData, len + 1)) + *stringValueData = 0; } - } /* Fall through */ case IDCANCEL: EndDialog(hwndDlg, wParam); @@ -159,13 +156,13 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara case IDOK: params = (struct edit_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER); cbData = SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, 0, 0); - pData = HeapAlloc(GetProcessHeap(), 0, cbData); + pData = heap_xalloc(cbData); if (pData) { SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)cbData, (LPARAM)pData); lRet = RegSetValueExW(params->hKey, params->lpszValueName, 0, REG_BINARY, pData, cbData); - HeapFree(GetProcessHeap(), 0, pData); + heap_free(pData); } else lRet = ERROR_OUTOFMEMORY; @@ -206,7 +203,7 @@ static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, if (lRet == ERROR_FILE_NOT_FOUND && !valueName) { /* no default value here, make it up */ if (len) *len = 1; if (lpType) *lpType = REG_SZ; - buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)); + buffer = heap_xalloc(sizeof(WCHAR)); *buffer = '\0'; return buffer; } @@ -214,10 +211,7 @@ static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, goto done; } if ( *lpType == REG_DWORD ) valueDataLen = sizeof(DWORD); - if (!(buffer = HeapAlloc(GetProcessHeap(), 0, valueDataLen+sizeof(WCHAR)))) { - error_code_messagebox(hwnd, IDS_TOO_BIG_VALUE, valueDataLen); - goto done; - } + buffer = heap_xalloc(valueDataLen + sizeof(WCHAR)); lRet = RegQueryValueExW(hKey, valueName, 0, 0, (LPBYTE)buffer, &valueDataLen); if (lRet != ERROR_SUCCESS) { error_code_messagebox(hwnd, IDS_BAD_VALUE, valueName); @@ -229,7 +223,7 @@ static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, return buffer; done: - HeapFree(GetProcessHeap(), 0, buffer); + heap_free(buffer); return NULL; } @@ -307,7 +301,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) if (lRet == ERROR_SUCCESS) result = TRUE; else error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED); } - HeapFree(GetProcessHeap(), 0, valueA); + heap_free(valueA); } } else if ( type == REG_BINARY ) { struct edit_params params; @@ -325,8 +319,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) for ( i = 0, count = 0; i < len - 1; i++) if ( !stringValueData[i] && stringValueData[i + 1] ) count++; - tmpValueData = HeapAlloc( GetProcessHeap(), 0, ( len + count ) * sizeof(WCHAR)); - if ( !tmpValueData ) goto done; + tmpValueData = heap_xalloc((len + count) * sizeof(WCHAR)); for ( i = 0, j = 0; i < len - 1; i++) { @@ -339,15 +332,14 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) tmpValueData[j++] = stringValueData[i]; } tmpValueData[j] = stringValueData[i]; - HeapFree( GetProcessHeap(), 0, stringValueData); + heap_free(stringValueData); stringValueData = tmpValueData; tmpValueData = NULL; if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_MULTI_STRING), hwnd, modify_dlgproc) == IDOK) { len = lstrlenW( stringValueData ); - tmpValueData = HeapAlloc( GetProcessHeap(), 0, (len + 2) * sizeof(WCHAR)); - if ( !tmpValueData ) goto done; + tmpValueData = heap_xalloc((len + 2) * sizeof(WCHAR)); for ( i = 0, j = 0; i < len - 1; i++) { @@ -363,7 +355,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) tmpValueData[j++] = stringValueData[i]; tmpValueData[j++] = 0; tmpValueData[j++] = 0; - HeapFree( GetProcessHeap(), 0, stringValueData); + heap_free(stringValueData); stringValueData = tmpValueData; lRet = RegSetValueExW(hKey, valueName, 0, type, (LPBYTE)stringValueData, j * sizeof(WCHAR)); @@ -379,13 +371,13 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) { int index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_FOCUSED | LVNI_SELECTED, 0)); - HeapFree(GetProcessHeap(), 0, stringValueData); + heap_free(stringValueData); stringValueData = read_value(hwnd, hKey, valueName, &type, &len); format_value_data(g_pChildWnd->hListWnd, index, type, stringValueData, len); } done: - HeapFree(GetProcessHeap(), 0, stringValueData); + heap_free(stringValueData); stringValueData = NULL; RegCloseKey(hKey); return result; @@ -535,7 +527,7 @@ BOOL RenameValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR oldName, LPC result = TRUE; done: - HeapFree(GetProcessHeap(), 0, value); + heap_free(value); RegCloseKey(hKey); return result; } @@ -559,7 +551,7 @@ BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName) } else { LPWSTR srcSubKey_copy; - parentPath = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(keyPath)+1)*sizeof(WCHAR)); + parentPath = heap_xalloc((lstrlenW(keyPath) + 1) * sizeof(WCHAR)); lstrcpyW(parentPath, keyPath); srcSubKey_copy = strrchrW(parentPath, '\\'); *srcSubKey_copy = 0; @@ -604,7 +596,7 @@ done: RegCloseKey(destKey); if (parentKey) { RegCloseKey(parentKey); - HeapFree(GetProcessHeap(), 0, parentPath); + heap_free(parentPath); } return result; } diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index aae7738..3f055b6 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -55,7 +55,7 @@ void *heap_xalloc(size_t size) return buf; } -static void *heap_xrealloc(void *buf, size_t size) +void *heap_xrealloc(void *buf, size_t size) { void *new_buf; diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index a0ed438..469e988 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -38,6 +38,7 @@ void __cdecl error_exit(unsigned int id, ...); char *GetMultiByteString(const WCHAR *strW); void *heap_xalloc(size_t size); +void *heap_xrealloc(void *buf, size_t size); BOOL heap_free(void *buf); BOOL import_registry_file(FILE *reg_file); void delete_registry_key(WCHAR *reg_key_name);

1 0

Hugh McMaster : regedit: Use the heap_*() functions in regedit.c where possible.
by Alexandre Julliard July 27, 2017

July 27, 2017

Module: wine Branch: master Commit: 9be3c537011c9edbfd5182c13cb440a0234355bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9be3c537011c9edbfd5182c13… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 27 12:25:53 2017 +0000 regedit: Use the heap_*() functions in regedit.c where possible. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index c563628..4dd889b 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -42,12 +42,11 @@ static void output_writeconsole(const WCHAR *str, DWORD wlen) * we should call WriteFile() and assume the console encoding is still correct. */ len = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, NULL, 0, NULL, NULL); - msgA = HeapAlloc(GetProcessHeap(), 0, len); - if (!msgA) return; + msgA = heap_xalloc(len); WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); - HeapFree(GetProcessHeap(), 0, msgA); + heap_free(msgA); } } @@ -123,13 +122,13 @@ static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) size = SearchPathW(NULL, filename, NULL, 0, NULL, NULL); if (size > 0) { - realname = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + realname = heap_xalloc(size * sizeof(WCHAR)); size = SearchPathW(NULL, filename, NULL, size, realname, NULL); } if (size == 0) { output_message(STRING_FILE_NOT_FOUND, filename); - HeapFree(GetProcessHeap(), 0, realname); + heap_free(realname); return; } reg_file = _wfopen(realname, rb_mode); @@ -138,14 +137,14 @@ static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) WCHAR regedit[] = {'r','e','g','e','d','i','t',0}; _wperror(regedit); output_message(STRING_CANNOT_OPEN_FILE, filename); - HeapFree(GetProcessHeap(), 0, realname); + heap_free(realname); return; } } import_registry_file(reg_file); if (realname) { - HeapFree(GetProcessHeap(), 0, realname); + heap_free(realname); fclose(reg_file); } break;

1 0

Hugh McMaster : regedit: Use a helper function to free allocated memory.
by Alexandre Julliard July 27, 2017

July 27, 2017

Module: wine Branch: master Commit: f7bdf34029a7f316ea8040ea2da78e38d7e31056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7bdf34029a7f316ea8040ea2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 27 12:24:58 2017 +0000 regedit: Use a helper function to free allocated memory. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 49 +++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 4b21478..b686714 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -55,6 +55,11 @@ static void *heap_xalloc(size_t size) return buf; } +static BOOL heap_free(void *buf) +{ + return HeapFree(GetProcessHeap(), 0, buf); +} + /****************************************************************************** * Allocates memory and converts input from multibyte to wide chars * Returned string must be freed by the caller @@ -457,7 +462,7 @@ static void close_key(struct parser *parser) { if (parser->hkey) { - HeapFree(GetProcessHeap(), 0, parser->key_name); + heap_free(parser->key_name); parser->key_name = NULL; RegCloseKey(parser->hkey); @@ -498,7 +503,7 @@ static LONG open_key(struct parser *parser, WCHAR *path) static void free_parser_data(struct parser *parser) { if (parser->parse_type == REG_DWORD || parser->parse_type == REG_BINARY) - HeapFree(GetProcessHeap(), 0, parser->data); + heap_free(parser->data); parser->data = NULL; parser->data_size = 0; @@ -520,7 +525,7 @@ static void prepare_hex_string_data(struct parser *parser) { parser->data = GetWideStringN(parser->data, parser->data_size, &parser->data_size); parser->data_size *= sizeof(WCHAR); - HeapFree(GetProcessHeap(), 0, data); + heap_free(data); } } } @@ -578,7 +583,7 @@ static WCHAR *header_state(struct parser *parser, WCHAR *pos) header[1] = parser->two_wchars[1]; lstrcpyW(header + 2, line); parser->reg_version = parse_file_header(header); - HeapFree(GetProcessHeap(), 0, header); + heap_free(header); } else parser->reg_version = parse_file_header(line); @@ -708,7 +713,7 @@ static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos) /* handler for parser DEFAULT_VALUE_NAME state */ static WCHAR *default_value_name_state(struct parser *parser, WCHAR *pos) { - HeapFree(GetProcessHeap(), 0, parser->value_name); + heap_free(parser->value_name); parser->value_name = NULL; set_state(parser, DATA_START); @@ -722,7 +727,7 @@ static WCHAR *quoted_value_name_state(struct parser *parser, WCHAR *pos) if (parser->value_name) { - HeapFree(GetProcessHeap(), 0, parser->value_name); + heap_free(parser->value_name); parser->value_name = NULL; } @@ -957,7 +962,7 @@ static WCHAR *get_lineA(FILE *fp) static char *buf, *next; char *line; - HeapFree(GetProcessHeap(), 0, lineW); + heap_free(lineW); if (!fp) goto cleanup; @@ -1005,7 +1010,7 @@ static WCHAR *get_lineA(FILE *fp) cleanup: lineW = NULL; - if (size) HeapFree(GetProcessHeap(), 0, buf); + if (size) heap_free(buf); size = 0; return NULL; } @@ -1060,7 +1065,7 @@ static WCHAR *get_lineW(FILE *fp) } cleanup: - if (size) HeapFree(GetProcessHeap(), 0, buf); + if (size) heap_free(buf); size = 0; return NULL; } @@ -1103,7 +1108,7 @@ BOOL import_registry_file(FILE *reg_file) if (parser.reg_version == REG_VERSION_FUZZY || parser.reg_version == REG_VERSION_INVALID) return parser.reg_version == REG_VERSION_FUZZY; - HeapFree(GetProcessHeap(), 0, parser.value_name); + heap_free(parser.value_name); close_key(&parser); return TRUE; @@ -1144,7 +1149,7 @@ static void REGPROC_write_line(FILE *fp, const WCHAR *str, BOOL unicode) { char *strA = GetMultiByteString(str); fputs(strA, fp); - HeapFree(GetProcessHeap(), 0, strA); + heap_free(strA); } } @@ -1210,8 +1215,8 @@ static size_t export_value_name(FILE *fp, WCHAR *name, size_t len, BOOL unicode) WCHAR *buf = heap_xalloc((line_len + 4) * sizeof(WCHAR)); line_len = sprintfW(buf, quoted_fmt, str); REGPROC_write_line(fp, buf, unicode); - HeapFree(GetProcessHeap(), 0, buf); - HeapFree(GetProcessHeap(), 0, str); + heap_free(buf); + heap_free(str); } else { @@ -1232,7 +1237,7 @@ static void export_string_data(WCHAR **buf, WCHAR *data, size_t size) str = REGPROC_escape_string(data, len, &line_len); *buf = heap_xalloc((line_len + 3) * sizeof(WCHAR)); sprintfW(*buf, fmt, str); - HeapFree(GetProcessHeap(), 0, str); + heap_free(str); } static void export_dword_data(WCHAR **buf, DWORD *data) @@ -1259,7 +1264,7 @@ static size_t export_hex_data_type(FILE *fp, DWORD type, BOOL unicode) WCHAR *buf = heap_xalloc(15 * sizeof(WCHAR)); line_len = sprintfW(buf, hexp_fmt, type); REGPROC_write_line(fp, buf, unicode); - HeapFree(GetProcessHeap(), 0, buf); + heap_free(buf); } return line_len; @@ -1331,7 +1336,7 @@ static void export_data(FILE *fp, WCHAR *value_name, DWORD value_len, DWORD type } REGPROC_write_line(fp, buf, unicode); - HeapFree(GetProcessHeap(), 0, buf); + heap_free(buf); export_newline(fp, unicode); } @@ -1354,7 +1359,7 @@ static void export_key_name(FILE *fp, WCHAR *name, BOOL unicode) buf = heap_xalloc((lstrlenW(name) + 7) * sizeof(WCHAR)); sprintfW(buf, fmt, name); REGPROC_write_line(fp, buf, unicode); - HeapFree(GetProcessHeap(), 0, buf); + heap_free(buf); } #define MAX_SUBKEY_LEN 257 @@ -1402,8 +1407,8 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) else break; } - HeapFree(GetProcessHeap(), 0, data); - HeapFree(GetProcessHeap(), 0, value_name); + heap_free(data); + heap_free(value_name); subkey_name = heap_xalloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); @@ -1422,13 +1427,13 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) export_registry_data(fp, subkey, subkey_path, unicode); RegCloseKey(subkey); } - HeapFree(GetProcessHeap(), 0, subkey_path); + heap_free(subkey_path); i++; } else break; } - HeapFree(GetProcessHeap(), 0, subkey_name); + heap_free(subkey_name); return 0; } @@ -1530,7 +1535,7 @@ static BOOL export_all(WCHAR *file_name, WCHAR *path, BOOL unicode) export_registry_data(fp, classes[i], class_name, unicode); - HeapFree(GetProcessHeap(), 0, class_name); + heap_free(class_name); RegCloseKey(key); }

1 0

Alistair Leslie-Hughes : rpcrt4/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard July 27, 2017

July 27, 2017

Module: wine Branch: master Commit: a5767fc1f37d12b3413d5993f294ed4a413f4158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5767fc1f37d12b3413d5993f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jul 27 04:44:59 2017 +0000 rpcrt4/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 01a61ae..31f5c4d 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -912,7 +912,7 @@ basic_tests(void) x = sum_double_int(-78, 148.46); ok(x == 70, "RPC sum_double_int got %d\n", x); y = sum_hyper((hyper)0x12345678 << 16, (hyper)0x33557799 << 16); - ok(y == (hyper)0x4589ce11 << 16, "RPC hyper got %x%08x\n", (DWORD)(y >> 32), (DWORD)y); + ok(y == (hyper)0x4589ce11 << 16, "RPC hyper got %s\n", wine_dbgstr_longlong(y)); x = sum_hyper_int((hyper)0x24242424 << 16, -((hyper)0x24241212 << 16)); ok(x == 0x12120000, "RPC hyper_int got 0x%x\n", x); x = sum_char_hyper( 12, ((hyper)0x42424242 << 32) | 0x33334444 );

1 0

Alistair Leslie-Hughes : ucrtbase/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard July 27, 2017

July 27, 2017

Module: wine Branch: master Commit: 56998d567edef8a354273b7c78cbd71917215694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56998d567edef8a354273b7c7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jul 27 04:45:08 2017 +0000 ucrtbase/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 213700f..c70e4b6 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -468,8 +468,8 @@ static void test_lldiv(void) MSVCRT_lldiv_t r; r = p_lldiv((LONGLONG)0x111 << 32 | 0x222, (LONGLONG)1 << 32); - ok(r.quot == 0x111, "quot = %x%08x\n", (INT32)(r.quot >> 32), (UINT32)r.quot); - ok(r.rem == 0x222, "rem = %x%08x\n", (INT32)(r.rem >> 32), (UINT32)r.rem); + ok(r.quot == 0x111, "quot = %s\n", wine_dbgstr_longlong(r.quot)); + ok(r.rem == 0x222, "rem = %s\n", wine_dbgstr_longlong(r.rem)); } static void test_isblank(void)

1 0

Alexandre Julliard : server: Add a platform-specific entry point to initialize registers of a new thread.
by Alexandre Julliard July 27, 2017

July 27, 2017

Module: wine Branch: master Commit: 9a07d210f135c91dda89d888dcedac864ff36781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a07d210f135c91dda89d888d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 27 10:50:41 2017 +0200 server: Add a platform-specific entry point to initialize registers of a new thread. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mach.c | 5 +++++ server/procfs.c | 5 +++++ server/ptrace.c | 15 +++++++++++++++ server/thread.c | 1 + server/thread.h | 1 + 5 files changed, 27 insertions(+) diff --git a/server/mach.c b/server/mach.c index 2ef6e59..9d8d911 100644 --- a/server/mach.c +++ b/server/mach.c @@ -148,6 +148,11 @@ void finish_process_tracing( struct process *process ) } } +/* initialize registers in new thread if necessary */ +void init_thread_context( struct thread *thread ) +{ +} + /* retrieve the thread x86 registers */ void get_thread_context( struct thread *thread, context_t *context, unsigned int flags ) { diff --git a/server/procfs.c b/server/procfs.c index 5caa02b..7b61b2a 100644 --- a/server/procfs.c +++ b/server/procfs.c @@ -202,6 +202,11 @@ error: close( fd ); } +/* initialize registers in new thread if necessary */ +void init_thread_context( struct thread *thread ) +{ +} + /* retrieve the thread registers */ void get_thread_context( struct thread *thread, context_t *context, unsigned int flags ) { diff --git a/server/ptrace.c b/server/ptrace.c index cb436b6..7de506b 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -542,6 +542,11 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base, /* debug register offset in struct user */ #define DR_OFFSET(dr) ((((struct user *)0)->u_debugreg) + (dr)) +/* initialize registers in new thread if necessary */ +void init_thread_context( struct thread *thread ) +{ +} + /* retrieve the thread x86 registers */ void get_thread_context( struct thread *thread, context_t *context, unsigned int flags ) { @@ -652,6 +657,11 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign #include <machine/reg.h> +/* initialize registers in new thread if necessary */ +void init_thread_context( struct thread *thread ) +{ +} + /* retrieve the thread x86 registers */ void get_thread_context( struct thread *thread, context_t *context, unsigned int flags ) { @@ -726,6 +736,11 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign #else /* linux || __FreeBSD__ */ +/* initialize registers in new thread if necessary */ +void init_thread_context( struct thread *thread ) +{ +} + /* retrieve the thread x86 registers */ void get_thread_context( struct thread *thread, context_t *context, unsigned int flags ) { diff --git a/server/thread.c b/server/thread.c index 70f5f28..24e9af5 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1317,6 +1317,7 @@ DECL_HANDLER(init_thread) } if (process->unix_pid != current->unix_pid) process->unix_pid = -1; /* can happen with linuxthreads */ + init_thread_context( current ); stop_thread_if_suspended( current ); generate_debug_event( current, CREATE_THREAD_DEBUG_EVENT, &req->entry ); set_thread_affinity( current, current->affinity ); diff --git a/server/thread.h b/server/thread.h index 2821991..2fdfd66 100644 --- a/server/thread.h +++ b/server/thread.h @@ -131,6 +131,7 @@ extern int is_cpu_supported( enum cpu_type cpu ); /* ptrace functions */ extern void sigchld_callback(void); +extern void init_thread_context( struct thread *thread ); extern void get_thread_context( struct thread *thread, context_t *context, unsigned int flags ); extern void set_thread_context( struct thread *thread, const context_t *context, unsigned int flags ); extern int send_thread_signal( struct thread *thread, int sig );

1 0

Hugh McMaster : regedit: Use a helper function to allocate memory and check for a valid pointer.
by Alexandre Julliard July 27, 2017

July 27, 2017

Module: wine Branch: master Commit: 79ff4148c2691e579ab17ce912a97d7f57627343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ff4148c2691e579ab17ce91… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 27 12:24:49 2017 +0000 regedit: Use a helper function to allocate memory and check for a valid pointer. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 68 ++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index e0393cc..4b21478 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -28,8 +28,11 @@ #include <io.h> #include <windows.h> #include <wine/unicode.h> +#include <wine/debug.h> #include "regproc.h" +WINE_DEFAULT_DEBUG_CHANNEL(regedit); + #define REG_VAL_BUF_SIZE 4096 extern const WCHAR* reg_class_namesW[]; @@ -41,6 +44,17 @@ static HKEY reg_class_keys[] = { #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) +static void *heap_xalloc(size_t size) +{ + void *buf = HeapAlloc(GetProcessHeap(), 0, size); + if (!buf) + { + ERR("Out of memory!\n"); + exit(1); + } + return buf; +} + /****************************************************************************** * Allocates memory and converts input from multibyte to wide chars * Returned string must be freed by the caller @@ -52,8 +66,7 @@ static WCHAR* GetWideString(const char* strA) WCHAR* strW; int len = MultiByteToWideChar(CP_ACP, 0, strA, -1, NULL, 0); - strW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - CHECK_ENOUGH_MEMORY(strW); + strW = heap_xalloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, strA, -1, strW, len); return strW; } @@ -71,8 +84,7 @@ static WCHAR* GetWideStringN(const char* strA, int chars, DWORD *len) WCHAR* strW; *len = MultiByteToWideChar(CP_ACP, 0, strA, chars, NULL, 0); - strW = HeapAlloc(GetProcessHeap(), 0, *len * sizeof(WCHAR)); - CHECK_ENOUGH_MEMORY(strW); + strW = heap_xalloc(*len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, strA, chars, strW, *len); return strW; } @@ -91,8 +103,7 @@ char* GetMultiByteString(const WCHAR* strW) char* strA; int len = WideCharToMultiByte(CP_ACP, 0, strW, -1, NULL, 0, NULL, NULL); - strA = HeapAlloc(GetProcessHeap(), 0, len); - CHECK_ENOUGH_MEMORY(strA); + strA = heap_xalloc(len); WideCharToMultiByte(CP_ACP, 0, strW, -1, strA, len, NULL, NULL); return strA; } @@ -110,8 +121,7 @@ static char* GetMultiByteStringN(const WCHAR* strW, int chars, DWORD* len) char* strA; *len = WideCharToMultiByte(CP_ACP, 0, strW, chars, NULL, 0, NULL, NULL); - strA = HeapAlloc(GetProcessHeap(), 0, *len); - CHECK_ENOUGH_MEMORY(strA); + strA = heap_xalloc(*len); WideCharToMultiByte(CP_ACP, 0, strW, chars, strA, *len, NULL, NULL); return strA; } @@ -476,8 +486,7 @@ static LONG open_key(struct parser *parser, WCHAR *path) if (res == ERROR_SUCCESS) { - parser->key_name = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(path) + 1) * sizeof(WCHAR)); - CHECK_ENOUGH_MEMORY(parser->key_name); + parser->key_name = heap_xalloc((lstrlenW(path) + 1) * sizeof(WCHAR)); lstrcpyW(parser->key_name, path); } else @@ -564,8 +573,7 @@ static WCHAR *header_state(struct parser *parser, WCHAR *pos) if (!parser->is_unicode) { - header = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(line) + 3) * sizeof(WCHAR)); - CHECK_ENOUGH_MEMORY(header); + header = heap_xalloc((lstrlenW(line) + 3) * sizeof(WCHAR)); header[0] = parser->two_wchars[0]; header[1] = parser->two_wchars[1]; lstrcpyW(header + 2, line); @@ -722,8 +730,7 @@ static WCHAR *quoted_value_name_state(struct parser *parser, WCHAR *pos) goto invalid; /* copy the value name in case we need to parse multiple lines and the buffer is overwritten */ - parser->value_name = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(val_name) + 1) * sizeof(WCHAR)); - CHECK_ENOUGH_MEMORY(parser->value_name); + parser->value_name = heap_xalloc((lstrlenW(val_name) + 1) * sizeof(WCHAR)); lstrcpyW(parser->value_name, val_name); set_state(parser, DATA_START); @@ -834,8 +841,7 @@ static WCHAR *dword_data_state(struct parser *parser, WCHAR *pos) { WCHAR *line = pos; - parser->data = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD)); - CHECK_ENOUGH_MEMORY(parser->data); + parser->data = heap_xalloc(sizeof(DWORD)); if (!convert_hex_to_dword(line, parser->data)) goto invalid; @@ -958,8 +964,7 @@ static WCHAR *get_lineA(FILE *fp) if (!size) { size = REG_VAL_BUF_SIZE; - buf = HeapAlloc(GetProcessHeap(), 0, size); - CHECK_ENOUGH_MEMORY(buf); + buf = heap_xalloc(size); *buf = 0; next = buf; } @@ -1016,8 +1021,7 @@ static WCHAR *get_lineW(FILE *fp) if (!size) { size = REG_VAL_BUF_SIZE; - buf = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); - CHECK_ENOUGH_MEMORY(buf); + buf = heap_xalloc(size * sizeof(WCHAR)); *buf = 0; next = buf; } @@ -1156,7 +1160,7 @@ static WCHAR *REGPROC_escape_string(WCHAR *str, size_t str_len, size_t *line_len escape_count++; } - buf = resize_buffer(NULL, (str_len + escape_count + 1) * sizeof(WCHAR)); + buf = heap_xalloc((str_len + escape_count + 1) * sizeof(WCHAR)); for (i = 0, pos = 0; i < str_len; i++, pos++) { @@ -1203,7 +1207,7 @@ static size_t export_value_name(FILE *fp, WCHAR *name, size_t len, BOOL unicode) if (name && *name) { WCHAR *str = REGPROC_escape_string(name, len, &line_len); - WCHAR *buf = resize_buffer(NULL, (line_len + 4) * sizeof(WCHAR)); + WCHAR *buf = heap_xalloc((line_len + 4) * sizeof(WCHAR)); line_len = sprintfW(buf, quoted_fmt, str); REGPROC_write_line(fp, buf, unicode); HeapFree(GetProcessHeap(), 0, buf); @@ -1226,7 +1230,7 @@ static void export_string_data(WCHAR **buf, WCHAR *data, size_t size) len = size / sizeof(WCHAR) - 1; str = REGPROC_escape_string(data, len, &line_len); - *buf = resize_buffer(NULL, (line_len + 3) * sizeof(WCHAR)); + *buf = heap_xalloc((line_len + 3) * sizeof(WCHAR)); sprintfW(*buf, fmt, str); HeapFree(GetProcessHeap(), 0, str); } @@ -1235,7 +1239,7 @@ static void export_dword_data(WCHAR **buf, DWORD *data) { static const WCHAR fmt[] = {'d','w','o','r','d',':','%','0','8','x',0}; - *buf = resize_buffer(NULL, 15 * sizeof(WCHAR)); + *buf = heap_xalloc(15 * sizeof(WCHAR)); sprintfW(*buf, fmt, *data); } @@ -1252,7 +1256,7 @@ static size_t export_hex_data_type(FILE *fp, DWORD type, BOOL unicode) } else { - WCHAR *buf = resize_buffer(NULL, 15 * sizeof(WCHAR)); + WCHAR *buf = heap_xalloc(15 * sizeof(WCHAR)); line_len = sprintfW(buf, hexp_fmt, type); REGPROC_write_line(fp, buf, unicode); HeapFree(GetProcessHeap(), 0, buf); @@ -1276,7 +1280,7 @@ static void export_hex_data(FILE *fp, WCHAR **buf, DWORD type, DWORD line_len, data = GetMultiByteStringN(data, size / sizeof(WCHAR), &size); num_commas = size - 1; - *buf = resize_buffer(NULL, (size * 3) * sizeof(WCHAR)); + *buf = heap_xalloc(size * 3 * sizeof(WCHAR)); for (i = 0, pos = 0; i < size; i++) { @@ -1336,7 +1340,7 @@ static WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, WCHAR *subkey_path; static const WCHAR fmt[] = {'%','s','\\','%','s',0}; - subkey_path = resize_buffer(NULL, (path_len + subkey_len + 2) * sizeof(WCHAR)); + subkey_path = heap_xalloc((path_len + subkey_len + 2) * sizeof(WCHAR)); sprintfW(subkey_path, fmt, path, subkey_name); return subkey_path; @@ -1347,7 +1351,7 @@ static void export_key_name(FILE *fp, WCHAR *name, BOOL unicode) static const WCHAR fmt[] = {'\r','\n','[','%','s',']','\r','\n',0}; WCHAR *buf; - buf = resize_buffer(NULL, (lstrlenW(name) + 7) * sizeof(WCHAR)); + buf = heap_xalloc((lstrlenW(name) + 7) * sizeof(WCHAR)); sprintfW(buf, fmt, name); REGPROC_write_line(fp, buf, unicode); HeapFree(GetProcessHeap(), 0, buf); @@ -1368,8 +1372,8 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) export_key_name(fp, path, unicode); - value_name = resize_buffer(NULL, max_value_len * sizeof(WCHAR)); - data = resize_buffer(NULL, max_data_bytes); + value_name = heap_xalloc(max_value_len * sizeof(WCHAR)); + data = heap_xalloc(max_data_bytes); i = 0; for (;;) @@ -1401,7 +1405,7 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) HeapFree(GetProcessHeap(), 0, data); HeapFree(GetProcessHeap(), 0, value_name); - subkey_name = resize_buffer(NULL, MAX_SUBKEY_LEN * sizeof(WCHAR)); + subkey_name = heap_xalloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); path_len = lstrlenW(path); @@ -1521,7 +1525,7 @@ static BOOL export_all(WCHAR *file_name, WCHAR *path, BOOL unicode) return FALSE; } - class_name = resize_buffer(NULL, (lstrlenW(reg_class_namesW[i]) + 1) * sizeof(WCHAR)); + class_name = heap_xalloc((lstrlenW(reg_class_namesW[i]) + 1) * sizeof(WCHAR)); lstrcpyW(class_name, reg_class_namesW[i]); export_registry_data(fp, classes[i], class_name, unicode);

1 0

Alexandre Julliard : server: Initialize debug registers in new threads if necessary.
by Alexandre Julliard July 27, 2017

July 27, 2017

Module: wine Branch: master Commit: abe0b1c57bbe9a952e55d4f821073b0a5197d746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abe0b1c57bbe9a952e55d4f82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 27 10:55:30 2017 +0200 server: Initialize debug registers in new threads if necessary. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 10 +++++----- server/ptrace.c | 34 +++++++++++++++++++++++++++++++--- server/thread.c | 2 ++ server/thread.h | 1 + 4 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 7cb704c..2308472 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -904,7 +904,7 @@ static void test_exceptions(void) res = pNtGetContextThread( h, &ctx ); ok( res == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", res ); ok( ctx.Dr0 == 0, "dr0 %x\n", ctx.Dr0 ); - todo_wine ok( ctx.Dr7 == 0, "dr7 %x\n", ctx.Dr7 ); + ok( ctx.Dr7 == 0, "dr7 %x\n", ctx.Dr7 ); ctx.Dr0 = (DWORD)code_mem; ctx.Dr7 = 3; res = pNtSetContextThread( h, &ctx ); @@ -2168,8 +2168,8 @@ static DWORD WINAPI register_check_thread(void *arg) ok(!ctx.Dr1, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr1); ok(!ctx.Dr2, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr2); ok(!ctx.Dr3, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr3); - todo_wine ok(!ctx.Dr6, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr6); - todo_wine ok(!ctx.Dr7, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr7); + ok(!ctx.Dr6, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr6); + ok(!ctx.Dr7, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr7); return 0; } @@ -2238,8 +2238,8 @@ static void test_debug_registers(void) ok(!ctx.Dr1, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr1); ok(!ctx.Dr2, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr2); ok(!ctx.Dr3, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr3); - todo_wine ok(!ctx.Dr6, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr6); - todo_wine ok(!ctx.Dr7, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr7); + ok(!ctx.Dr6, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr6); + ok(!ctx.Dr7, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr7); ResumeThread(thread); WaitForSingleObject(thread, 10000); diff --git a/server/ptrace.c b/server/ptrace.c index 7de506b..a647df9 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -545,6 +545,8 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base, /* initialize registers in new thread if necessary */ void init_thread_context( struct thread *thread ) { + /* Linux doesn't clear all registers, but hopefully enough to avoid spurious breakpoints */ + thread->system_regs = 0; } /* retrieve the thread x86 registers */ @@ -558,6 +560,13 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int if (!suspend_for_ptrace( thread )) return; + if (!(thread->system_regs & SERVER_CTX_DEBUG_REGISTERS)) + { + /* caller has initialized everything to 0 already, just return */ + context->flags |= SERVER_CTX_DEBUG_REGISTERS; + goto done; + } + for (i = 0; i < 8; i++) { if (i == 4 || i == 5) continue; @@ -625,6 +634,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.i386_regs.dr7 | 0x55 ); if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.i386_regs.dr7 ) == -1) goto error; if (thread->context) thread->context->debug.i386_regs.dr7 = context->debug.i386_regs.dr7; + thread->system_regs |= SERVER_CTX_DEBUG_REGISTERS; break; case CPU_x86_64: if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.x86_64_regs.dr7 & 0xffff0000 ) == -1) goto error; @@ -641,6 +651,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.x86_64_regs.dr7 | 0x55 ); if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.x86_64_regs.dr7 ) == -1) goto error; if (thread->context) thread->context->debug.x86_64_regs.dr7 = context->debug.x86_64_regs.dr7; + thread->system_regs |= SERVER_CTX_DEBUG_REGISTERS; break; default: set_error( STATUS_INVALID_PARAMETER ); @@ -660,6 +671,18 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign /* initialize registers in new thread if necessary */ void init_thread_context( struct thread *thread ) { + if (!(thread->system_regs & SERVER_CTX_DEBUG_REGISTERS)) return; + + /* FreeBSD doesn't clear the debug registers in new threads */ + if (suspend_for_ptrace( thread )) + { + struct dbreg dbregs; + + memset( &dbregs, 0, sizeof(dbregs) ); + ptrace( PTRACE_SETDBREGS, get_ptrace_tid( thread ), (caddr_t)&dbregs, 0 ); + resume_after_ptrace( thread ); + } + thread->system_regs = 0; } /* retrieve the thread x86 registers */ @@ -728,9 +751,14 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign dbregs.dr6 = context->debug.i386_regs.dr6; dbregs.dr7 = context->debug.i386_regs.dr7; #endif - if (ptrace( PTRACE_SETDBREGS, pid, (caddr_t) &dbregs, 0 ) == -1) file_set_error(); - else if (thread->context) - thread->context->debug.i386_regs = context->debug.i386_regs; /* update the cached values */ + if (ptrace( PTRACE_SETDBREGS, pid, (caddr_t)&dbregs, 0 ) != -1) + { + if (thread->context) + thread->context->debug.i386_regs = context->debug.i386_regs; /* update the cached values */ + thread->system_regs |= SERVER_CTX_DEBUG_REGISTERS; + } + else file_set_error(); + resume_after_ptrace( thread ); } diff --git a/server/thread.c b/server/thread.c index 24e9af5..903420b 100644 --- a/server/thread.c +++ b/server/thread.c @@ -182,6 +182,7 @@ static inline void init_thread_structure( struct thread *thread ) thread->debug_ctx = NULL; thread->debug_event = NULL; thread->debug_break = 0; + thread->system_regs = 0; thread->queue = NULL; thread->wait = NULL; thread->error = 0; @@ -1245,6 +1246,7 @@ DECL_HANDLER(new_thread) if ((thread = create_thread( request_fd, current->process ))) { + thread->system_regs = current->system_regs; if (req->suspend) thread->suspend++; reply->tid = get_thread_id( thread ); if ((reply->handle = alloc_handle( current->process, thread, req->access, req->attributes ))) diff --git a/server/thread.h b/server/thread.h index 2fdfd66..1d81d61 100644 --- a/server/thread.h +++ b/server/thread.h @@ -57,6 +57,7 @@ struct thread struct debug_ctx *debug_ctx; /* debugger context if this thread is a debugger */ struct debug_event *debug_event; /* debug event being sent to debugger */ int debug_break; /* debug breakpoint pending? */ + unsigned int system_regs; /* which system regs have been set */ struct msg_queue *queue; /* message queue */ struct thread_wait *wait; /* current wait condition if sleeping */ struct list system_apc; /* queue of system async procedure calls */

1 0

Alex Henrie : msvcrt: Set ERANGE in exp functions on finite input and infinite output.
by Alexandre Julliard July 26, 2017

July 26, 2017

Module: wine Branch: master Commit: 79c3b610c4a6d2d57d34d609e5cf92e930548dd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79c3b610c4a6d2d57d34d609e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jul 25 00:52:27 2017 -0600 msvcrt: Set ERANGE in exp functions on finite input and infinite output. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 0249493..079446d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -209,8 +209,10 @@ float CDECL MSVCRT_coshf( float x ) */ float CDECL MSVCRT_expf( float x ) { - if (!finitef(x)) *MSVCRT__errno() = MSVCRT_EDOM; - return expf(x); + float ret = expf(x); + if (isnanf(x)) *MSVCRT__errno() = MSVCRT_EDOM; + else if (finitef(x) && !finitef(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; } /********************************************************************* @@ -404,8 +406,10 @@ double CDECL MSVCRT_cosh( double x ) */ double CDECL MSVCRT_exp( double x ) { + double ret = exp(x); if (isnan(x)) *MSVCRT__errno() = MSVCRT_EDOM; - return exp(x); + else if (isfinite(x) && !isfinite(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; } /********************************************************************* @@ -984,7 +988,7 @@ double CDECL MSVCRT_ldexp(double num, MSVCRT_long exp) { double z = ldexp(num,exp); - if (!isfinite(z)) + if (isfinite(num) && !isfinite(z)) *MSVCRT__errno() = MSVCRT_ERANGE; else if (z == 0 && signbit(z)) z = 0.0; /* Convert -0 -> +0 */ @@ -2385,10 +2389,12 @@ LDOUBLE CDECL MSVCR120_cbrtl(LDOUBLE x) double CDECL MSVCR120_exp2(double x) { #ifdef HAVE_EXP2 - return exp2(x); + double ret = exp2(x); #else - return pow(2, x); + double ret = pow(2, x); #endif + if (isfinite(x) && !isfinite(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; } /********************************************************************* @@ -2397,7 +2403,9 @@ double CDECL MSVCR120_exp2(double x) float CDECL MSVCR120_exp2f(float x) { #ifdef HAVE_EXP2F - return exp2f(x); + float ret = exp2f(x); + if (finitef(x) && !finitef(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; #else return MSVCR120_exp2(x); #endif @@ -2421,7 +2429,7 @@ double CDECL MSVCR120_expm1(double x) #else double ret = exp(x) - 1; #endif - if (!isfinite(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; + if (isfinite(x) && !isfinite(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; return ret; } @@ -2435,7 +2443,7 @@ float CDECL MSVCR120_expm1f(float x) #else float ret = exp(x) - 1; #endif - if (!finitef(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; + if (finitef(x) && !finitef(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; return ret; } @@ -3124,8 +3132,7 @@ LDOUBLE CDECL MSVCR120_atanhl(LDOUBLE x) */ double CDECL MSVCRT__scalb(double num, MSVCRT_long power) { - if (!isfinite(num)) *MSVCRT__errno() = MSVCRT_EDOM; - return ldexp(num, power); + return MSVCRT_ldexp(num, power); } /********************************************************************* @@ -3135,8 +3142,7 @@ double CDECL MSVCRT__scalb(double num, MSVCRT_long power) */ float CDECL MSVCRT__scalbf(float num, MSVCRT_long power) { - if (!finitef(num)) *MSVCRT__errno() = MSVCRT_EDOM; - return ldexpf(num, power); + return MSVCRT_ldexp(num, power); } /*********************************************************************

1 0

Michael Stefaniuc : dmloader: Remove a now redundant helper function.
by Alexandre Julliard July 26, 2017

July 26, 2017

Module: wine Branch: master Commit: cfb1f130fdaeb98b696e8a7605e4c9adaadc4fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb1f130fdaeb98b696e8a760… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 26 14:28:32 2017 +0200 dmloader: Remove a now redundant helper function. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 21 +-------------------- dlls/dmloader/tests/loader.c | 2 ++ 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 4b76f32..e44d2b9 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -111,25 +111,6 @@ static HRESULT DMUSIC_CopyDescriptor(DMUS_OBJECTDESC *pDst, DMUS_OBJECTDESC *pSr return S_OK; } - -static BOOL DMUSIC_IsValidLoadableClass (REFCLSID pClassID) { - if (IsEqualCLSID(pClassID, &CLSID_DirectMusicAudioPathConfig) || - IsEqualCLSID(pClassID, &CLSID_DirectMusicBand) || - IsEqualCLSID(pClassID, &CLSID_DirectMusicContainer) || - IsEqualCLSID(pClassID, &CLSID_DirectMusicCollection) || - IsEqualCLSID(pClassID, &CLSID_DirectMusicChordMap) || - IsEqualCLSID(pClassID, &CLSID_DirectMusicSegment) || - IsEqualCLSID(pClassID, &CLSID_DirectMusicScript) || - IsEqualCLSID(pClassID, &CLSID_DirectMusicSong) || - IsEqualCLSID(pClassID, &CLSID_DirectMusicStyle) || - IsEqualCLSID(pClassID, &CLSID_DirectMusicGraph) || - IsEqualCLSID(pClassID, &CLSID_DirectSoundWave) || - IsEqualCLSID(pClassID, &GUID_DirectMusicAllTypes)) - return TRUE; - else - return FALSE; -} - /***************************************************************************** * IDirectMusicLoaderImpl implementation */ @@ -599,7 +580,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_ScanDirectory(IDirectMusicLoader8 * HRESULT result; TRACE("(%p, %s, %s, %s)\n", This, debugstr_dmguid(rguidClass), debugstr_w(pwzFileExtension), debugstr_w(pwzScanFileName)); - if (IsEqualGUID (rguidClass, &GUID_DirectMusicAllTypes) || !DMUSIC_IsValidLoadableClass(rguidClass)) { + if (index_from_class(rguidClass) <= 0) { ERR(": rguidClass invalid CLSID\n"); return REGDB_E_CLASSNOTREG; } diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 5d5cff4..ff084b6 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -87,6 +87,8 @@ static void test_directory(void) IDirectMusicLoader_SetSearchDirectory(loader, NULL, path, 0); /* Crashes on Windows */ hr = IDirectMusicLoader_SetSearchDirectory(loader, &IID_IDirectMusicLoader8, path, 0); ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr); + hr = IDirectMusicLoader_ScanDirectory(loader, &GUID_DirectMusicAllTypes, con, NULL); + ok(hr == REGDB_E_CLASSNOTREG, "ScanDirectory failed, received %#x\n", hr); /* NULL extension is not an error */ hr = IDirectMusicLoader_ScanDirectory(loader, &CLSID_DirectSoundWave, NULL, NULL);

1 0