February 2007 - Wine-Commits

Vitaliy Margolen : winex11.drv: Popup windows with system menu are managed.
by Alexandre Julliard Feb. 13, 2007

Feb. 13, 2007

Module: wine Branch: master Commit: abcbcc35da3b6800494bd908aa7294294c90708c URL: http://source.winehq.org/git/wine.git/?a=commit;h=abcbcc35da3b6800494bd908a… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Feb 10 10:40:50 2007 -0700 winex11.drv: Popup windows with system menu are managed. --- dlls/winex11.drv/window.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 3f67069..38da952 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -86,10 +86,13 @@ inline static BOOL is_window_managed( HW if (style & WS_THICKFRAME) return TRUE; /* application windows are managed */ if (ex_style & WS_EX_APPWINDOW) return TRUE; - /* full-screen popup windows are managed */ if (style & WS_POPUP) { RECT rect; + + /* popup with sysmenu == caption are managed */ + if (style & WS_SYSMENU) return TRUE; + /* full-screen popup windows are managed */ GetWindowRect( hwnd, &rect ); if ((rect.right - rect.left) == screen_width && (rect.bottom - rect.top) == screen_height) return TRUE;

1 0

Leslie Choong : comctl32: updown: Getter and setter tests for updown control.
by Alexandre Julliard Feb. 13, 2007

Feb. 13, 2007

Module: wine Branch: master Commit: b3c0a290610c53c90cdf57713ab607e464e77cfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3c0a290610c53c90cdf57713… Author: Leslie Choong <septikus(a)gmail.com> Date: Sat Feb 10 20:37:26 2007 -0800 comctl32: updown: Getter and setter tests for updown control. --- dlls/comctl32/tests/updown.c | 172 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 172 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 7caa0b3..b8e2a27 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -2,6 +2,7 @@ * * Copyright 2005 C. Scott Ananian * Copyright (C) 2007 James Hawkins + * Copyright (C) 2007 Leslie Choong * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -511,6 +512,171 @@ static HWND create_updown_control() return updown; } +static void test_updown_pos(void) +{ + int r; + + /* Set Range from 0 to 100 */ + SendMessage(updown, UDM_SETRANGE, 0 , MAKELONG(100,0) ); + r = SendMessage(updown, UDM_GETRANGE, 0,0); + ok(LOWORD(r) == 100, "Expected 100, got %d\n", LOWORD(r)); + ok(HIWORD(r) == 0, "Expected 0, got %d\n", HIWORD(r)); + + /* Set the position to 5, return is not checked as it was set before func call */ + SendMessage(updown, UDM_SETPOS, 0 , MAKELONG(5,0) ); + /* Since UDM_SETBUDDYINT was not set at creation HIWORD(r) will always be 1 as a return from UDM_GETPOS */ + /* Get the position, which should be 5 */ + r = SendMessage(updown, UDM_GETPOS, 0 , 0 ); + ok(LOWORD(r) == 5, "Expected 5, got %d\n", LOWORD(r)); + ok(HIWORD(r) == 1, "Expected 1, got %d\n", HIWORD(r)); + + /* Set the position to 0, return should be 5 */ + r = SendMessage(updown, UDM_SETPOS, 0 , MAKELONG(0,0) ); + ok(r == 5, "Expected 5, got %d\n", r); + /* Get the position, which should be 0 */ + r = SendMessage(updown, UDM_GETPOS, 0 , 0 ); + ok(LOWORD(r) == 0, "Expected 0, got %d\n", LOWORD(r)); + ok(HIWORD(r) == 1, "Expected 1, got %d\n", HIWORD(r)); + + /* Set the position to -1, return should be 0 */ + r = SendMessage(updown, UDM_SETPOS, 0 , MAKELONG(-1,0) ); + ok(r == 0, "Expected 0, got %d\n", r); + /* Get the position, which should be 0 */ + r = SendMessage(updown, UDM_GETPOS, 0 , 0 ); + ok(LOWORD(r) == 0, "Expected 0, got %d\n", LOWORD(r)); + ok(HIWORD(r) == 1, "Expected 1, got %d\n", HIWORD(r)); + + /* Set the position to 100, return should be 0 */ + r = SendMessage(updown, UDM_SETPOS, 0 , MAKELONG(100,0) ); + ok(r == 0, "Expected 0, got %d\n", r); + /* Get the position, which should be 100 */ + r = SendMessage(updown, UDM_GETPOS, 0 , 0 ); + ok(LOWORD(r) == 100, "Expected 100, got %d\n", LOWORD(r)); + ok(HIWORD(r) == 1, "Expected 1, got %d\n", HIWORD(r)); + + /* Set the position to 101, return should be 100 */ + r = SendMessage(updown, UDM_SETPOS, 0 , MAKELONG(101,0) ); + ok(r == 100, "Expected 100, got %d\n", r); + /* Get the position, which should be 100 */ + r = SendMessage(updown, UDM_GETPOS, 0 , 0 ); + ok(LOWORD(r) == 100, "Expected 100, got %d\n", LOWORD(r)); + ok(HIWORD(r) == 1, "Expected 1, got %d\n", HIWORD(r)); +} + +static void test_updown_pos32(void) +{ + int r; + int low, high; + + /* Set the position to 0 to 1000 */ + SendMessage(updown, UDM_SETRANGE32, 0 , 1000 ); + + r = SendMessage(updown, UDM_GETRANGE32, (WPARAM) &low , (LPARAM) &high ); + ok(low == 0, "Expected 0, got %d\n", low); + ok(high == 1000, "Expected 1000, got %d\n", high); + + /* Set position to 500, don't check return since it is unset*/ + r = SendMessage(updown, UDM_SETPOS32, 0 , 500 ); + + /* Since UDM_SETBUDDYINT was not set at creation bRet will always be true as a return from UDM_GETPOS32 */ + + r = SendMessage(updown, UDM_GETPOS32, 0 , (LPARAM) &high ); + ok(r == 500, "Expected 500, got %d\n", r); + ok(high == 1 , "Expected 0, got %d\n", high); + + /* Set position to 0, return should be 500 */ + r = SendMessage(updown, UDM_SETPOS32, 0 , 0 ); + ok(r == 500, "Expected 500, got %d\n", r); + r = SendMessage(updown, UDM_GETPOS32, 0 , (LPARAM) &high ); + ok(r == 0, "Expected 0, got %d\n", r); + ok(high == 1 , "Expected 0, got %d\n", high); + + /* Set position to -1 which sohuld become 0, return should be 0 */ + r = SendMessage(updown, UDM_SETPOS32, 0 , -1 ); + ok(r == 0, "Expected 0, got %d\n", r); + r = SendMessage(updown, UDM_GETPOS32, 0 , (LPARAM) &high ); + ok(r == 0, "Expected 0, got %d\n", r); + ok(high == 1 , "Expected 0, got %d\n", high); + + /* Set position to 1000, return should be 0 */ + r = SendMessage(updown, UDM_SETPOS32, 0 , 1000 ); + ok(r == 0, "Expected 0, got %d\n", r); + r = SendMessage(updown, UDM_GETPOS32, 0 , (LPARAM) &high ); + ok(r == 1000, "Expected 1000, got %d\n", r); + ok(high == 1 , "Expected 0, got %d\n", high); + + /* Set position to 1001 which sohuld become 1000, return should be 1000 */ + r = SendMessage(updown, UDM_SETPOS32, 0 , 1001 ); + ok(r == 1000, "Expected 1000, got %d\n", r); + r = SendMessage(updown, UDM_GETPOS32, 0 , (LPARAM) &high ); + ok(r == 1000, "Expected 0, got %d\n", r); + ok(high == 1 , "Expected 0, got %d\n", high); +} + +static void test_updown_buddy(void) +{ + HWND buddyReturn; + + buddyReturn = (HWND)SendMessage(updown, UDM_GETBUDDY, 0 , 0 ); + ok(buddyReturn == edit, "Expected edit handle\n"); +} + +static void test_updown_base(void) +{ + int r; + + SendMessage(updown, UDM_SETBASE, 10 , 0); + r = SendMessage(updown, UDM_GETBASE, 0 , 0); + ok(r == 10, "Expected 10, got %d\n", r); + + /* Set base to an invalid value, should return 0 and stay at 10 */ + r = SendMessage(updown, UDM_SETBASE, 80 , 0); + ok(r == 0, "Expected 0, got %d\n", r); + r = SendMessage(updown, UDM_GETBASE, 0 , 0); + ok(r == 10, "Expected 10, got %d\n", r); + + /* Set base to 16 now, should get 16 as the return */ + r = SendMessage(updown, UDM_SETBASE, 16 , 0); + ok(r == 10, "Expected 10, got %d\n", r); + r = SendMessage(updown, UDM_GETBASE, 0 , 0); + ok(r == 16, "Expected 16, got %d\n", r); + + /* Set base to an invalid value, should return 0 and stay at 16 */ + r = SendMessage(updown, UDM_SETBASE, 80 , 0); + ok(r == 0, "Expected 0, got %d\n", r); + r = SendMessage(updown, UDM_GETBASE, 0 , 0); + ok(r == 16, "Expected 16, got %d\n", r); + + /* Set base back to 10, return should be 16 */ + r = SendMessage(updown, UDM_SETBASE, 10 , 0); + ok(r == 16, "Expected 16, got %d\n", r); + r = SendMessage(updown, UDM_GETBASE, 0 , 0); + ok(r == 10, "Expected 10, got %d\n", r); +} + +static void test_updown_unicode(void) +{ + int r; + + /* Set it to ANSI, don't check return as we don't know previous state */ + SendMessage(updown, UDM_SETUNICODEFORMAT, 0 , 0); + r = SendMessage(updown, UDM_GETUNICODEFORMAT, 0 , 0); + ok(r == 0, "Expected 0, got %d\n", r); + + /* Now set it to Unicode format */ + r = SendMessage(updown, UDM_SETUNICODEFORMAT, 1 , 0); + ok(r == 0, "Expected 0, got %d\n", r); + r = SendMessage(updown, UDM_GETUNICODEFORMAT, 0 , 0); + ok(r == 1, "Expected 1, got %d\n", r); + + /* And now set it back to ANSI */ + r = SendMessage(updown, UDM_SETUNICODEFORMAT, 0 , 0); + ok(r == 1, "Expected 1, got %d\n", r); + r = SendMessage(updown, UDM_GETUNICODEFORMAT, 0 , 0); + ok(r == 0, "Expected 0, got %d\n", r); +} + + static void test_create_updown_control(void) { CHAR text[MAX_PATH]; @@ -539,6 +705,12 @@ static void test_create_updown_control(v ok_sequence(EDIT_SEQ_INDEX, get_edit_text_seq, "get edit text", FALSE); flush_sequences(); + + test_updown_pos(); + test_updown_pos32(); + test_updown_buddy(); + test_updown_base(); + test_updown_unicode(); } START_TEST(updown)

1 0

Anatoly Lyutin : comdlg32: fontdlg: Add initialisation for comboboxes.
by Alexandre Julliard Feb. 13, 2007

Feb. 13, 2007

Module: wine Branch: master Commit: bea5ed4fa95ba3adebce18e02baecfea70d059d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bea5ed4fa95ba3adebce18e02… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Sat Feb 10 16:34:30 2007 +0300 comdlg32: fontdlg: Add initialisation for comboboxes. --- dlls/comdlg32/fontdlg.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index cd36ed3..2f01b3b 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -709,6 +709,15 @@ LRESULT CFn_WMInitDialog(HWND hDlg, WPAR SendDlgItemMessageW(hDlg,cmb1,CB_SETCURSEL,0,0); SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb1, CBN_SELCHANGE), (LPARAM)GetDlgItem(hDlg,cmb1)); + SendDlgItemMessageW(hDlg,cmb2,CB_SETCURSEL,0,0); + SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb2, CBN_SELCHANGE), + (LPARAM)GetDlgItem(hDlg,cmb1)); + SendDlgItemMessageW(hDlg,cmb3,CB_SETCURSEL,0,0); + SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb3, CBN_SELCHANGE), + (LPARAM)GetDlgItem(hDlg,cmb3)); + SendDlgItemMessageW(hDlg,cmb5,CB_SETCURSEL,0,0); + SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb5, CBN_SELCHANGE), + (LPARAM)GetDlgItem(hDlg,cmb5)); } if ((lpcf->Flags & CF_USESTYLE) && lpcf->lpszStyle) {

1 0

Anatoly Lyutin : wineconsole: Added range of value for all up-down controls on config dialog.
by Alexandre Julliard Feb. 13, 2007

Feb. 13, 2007

Module: wine Branch: master Commit: 06999c504463ffa5f8745bbf6cbe69f5e424ea62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06999c504463ffa5f8745bbf6… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Sat Feb 10 14:44:18 2007 +0300 wineconsole: Added range of value for all up-down controls on config dialog. --- programs/wineconsole/dialog.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c index aa8f096..cc43684 100644 --- a/programs/wineconsole/dialog.c +++ b/programs/wineconsole/dialog.c @@ -599,17 +599,25 @@ static INT_PTR WINAPI WCUSER_FontDlgProc static INT_PTR WINAPI WCUSER_ConfigDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { struct dialog_info* di; + int nMaxUD = 2000; switch (msg) { case WM_INITDIALOG: - di = (struct dialog_info*)((PROPSHEETPAGEA*)lParam)->lParam; - di->hDlg = hDlg; - SetWindowLongPtr(hDlg, DWLP_USER, (DWORD_PTR)di); - SetDlgItemInt(hDlg, IDC_CNF_SB_WIDTH, di->config.sb_width, FALSE); - SetDlgItemInt(hDlg, IDC_CNF_SB_HEIGHT, di->config.sb_height, FALSE); - SetDlgItemInt(hDlg, IDC_CNF_WIN_WIDTH, di->config.win_width, FALSE); - SetDlgItemInt(hDlg, IDC_CNF_WIN_HEIGHT, di->config.win_height, FALSE); + di = (struct dialog_info*)((PROPSHEETPAGEA*)lParam)->lParam; + di->hDlg = hDlg; + + SetWindowLongPtr(hDlg, DWLP_USER, (DWORD_PTR)di); + SetDlgItemInt(hDlg, IDC_CNF_SB_WIDTH, di->config.sb_width, FALSE); + SetDlgItemInt(hDlg, IDC_CNF_SB_HEIGHT, di->config.sb_height, FALSE); + SetDlgItemInt(hDlg, IDC_CNF_WIN_WIDTH, di->config.win_width, FALSE); + SetDlgItemInt(hDlg, IDC_CNF_WIN_HEIGHT, di->config.win_height, FALSE); + + SendMessage(GetDlgItem(hDlg,IDC_CNF_WIN_HEIGHT_UD), UDM_SETRANGE, (WPARAM) 0, MAKELONG (nMaxUD, 0)); + SendMessage(GetDlgItem(hDlg,IDC_CNF_WIN_WIDTH_UD), UDM_SETRANGE, (WPARAM) 0, MAKELONG (nMaxUD, 0)); + SendMessage(GetDlgItem(hDlg,IDC_CNF_SB_HEIGHT_UD), UDM_SETRANGE, (WPARAM) 0, MAKELONG (nMaxUD, 0)); + SendMessage(GetDlgItem(hDlg,IDC_CNF_SB_WIDTH_UD), UDM_SETRANGE, (WPARAM) 0, MAKELONG (nMaxUD, 0)); + SendDlgItemMessage(hDlg, IDC_CNF_CLOSE_EXIT, BM_SETCHECK, (di->config.exit_on_die) ? BST_CHECKED : BST_UNCHECKED, 0L); {

1 0

Tijl Coosemans : wineshelllink: Fix mktemp usage on FreeBSD.
by Alexandre Julliard Feb. 13, 2007

Feb. 13, 2007

Module: wine Branch: master Commit: 6f49b38a5e7ac31605fbf9ae2df95c26700ef059 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f49b38a5e7ac31605fbf9ae2… Author: Tijl Coosemans <tijl(a)ulyssis.org> Date: Fri Feb 9 18:31:18 2007 +0100 wineshelllink: Fix mktemp usage on FreeBSD. --- tools/wineshelllink | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wineshelllink b/tools/wineshelllink index 84d4671..ad11b8c 100755 --- a/tools/wineshelllink +++ b/tools/wineshelllink @@ -156,7 +156,7 @@ write_menu_file() menu=`echo $1 | sed 's!/!-!g'` filename=`echo $2 | sed 's!/!-!g'` - tmpfile=`mktemp` + tmpfile=`mktemp /tmp/wine.XXXXXX` ( echo '<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"' echo '"http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">'

1 0

Marcus Meissner : ntdll/tests: Fixed WCHAR overflow.
by Alexandre Julliard Feb. 13, 2007

Feb. 13, 2007

Module: wine Branch: master Commit: fa32d538107551f4fe5e08a1db172c2259aff615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa32d538107551f4fe5e08a1d… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Feb 8 17:15:50 2007 +0100 ntdll/tests: Fixed WCHAR overflow. --- dlls/ntdll/tests/rtlstr.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 5c70eda..3d85aff 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -637,7 +637,7 @@ static void test_RtlDowncaseUnicodeStrin UNICODE_STRING result_str; UNICODE_STRING lower_str; - for (i = 0; i <= 1024; i++) { + for (i = 0; i < 1024; i++) { ch = (WCHAR) i; if (ch >= 'A' && ch <= 'Z') { lower_ch = ch - 'A' + 'a'; @@ -678,7 +678,6 @@ static void test_RtlDowncaseUnicodeStrin case 0x38c: lower_ch = 0x3cc; break; case 0x38e: lower_ch = 0x3cd; break; case 0x38f: lower_ch = 0x3ce; break; - case 0x400: lower_ch = 0x0; break; default: lower_ch = ch; break; } /* switch */ }

1 0

Kim Lilliestierna : cmd: Fix the "move" command the same way as the "copy" command.
by Alexandre Julliard Feb. 13, 2007

Feb. 13, 2007

Module: wine Branch: master Commit: 9d90abe1b9f22809bf0249147803167e0e9e1e04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d90abe1b9f22809bf0249147… Author: Kim Lilliestierna <kill(a)itr.no> Date: Sat Jan 27 15:26:03 2007 +0100 cmd: Fix the "move" command the same way as the "copy" command. --- programs/cmd/builtins.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 018a8e0..49548de 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -519,6 +519,8 @@ HANDLE hff; /* If 2nd parm is directory, then use original filename */ GetFullPathName (param2, sizeof(outpath), outpath, NULL); + if (outpath[strlen(outpath) - 1] == '\\') + outpath[strlen(outpath) - 1] = '\0'; hff = FindFirstFile (outpath, &fd); if (hff != INVALID_HANDLE_VALUE) { if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {

1 0

Marcus Meissner : winedump: Free function_name on all error paths.
by Alexandre Julliard Feb. 13, 2007

Feb. 13, 2007

Module: wine Branch: master Commit: aef6e2d35d267abe08ccd52ec45cd5d53c5fc9d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aef6e2d35d267abe08ccd52ec… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Feb 13 08:49:24 2007 +0100 winedump: Free function_name on all error paths. --- tools/winedump/msmangle.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index c330b8c..574a3b5 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -191,8 +191,10 @@ int symbol_demangle (parsed_symbol *sym) /* Class the function is associated with, terminated by '@@' */ class_name = name; while (*name && *name++ != '@') ; - if (*name++ != '@') + if (*name++ != '@') { + free (function_name); return -1; + } class_name = str_substring (class_name, name - 2); } @@ -215,6 +217,7 @@ int symbol_demangle (parsed_symbol *sym) { if (VERBOSE) printf ("/*FIXME: %s: unknown data*/\n", sym->symbol); + free (function_name); return -1; } sym->flags |= SYM_DATA; @@ -223,6 +226,7 @@ int symbol_demangle (parsed_symbol *sym) is_static ? "static_" : "_", function_name); sym->arg_text[0] = str_create (3, ct.expression, " ", sym->arg_name[0]); FREE_CT (ct); + free (function_name); return 0; break; @@ -238,8 +242,10 @@ int symbol_demangle (parsed_symbol *sym) if (VERBOSE) puts ("Demangled symbol OK [vtable]"); + free (function_name); return 0; } + free (function_name); return -1; break; @@ -284,6 +290,7 @@ int symbol_demangle (parsed_symbol *sym) break; /* FIXME: G,H / O,P / W,X are private / protected / public thunks */ default: + free (function_name); return -1; } @@ -297,6 +304,7 @@ int symbol_demangle (parsed_symbol *sym) case 'C': is_const = CT_VOLATILE; break; case 'D': is_const = (CT_CONST | CT_VOLATILE); break; default: + free (function_name); return -1; } } @@ -327,6 +335,7 @@ int symbol_demangle (parsed_symbol *sym) sym->flags |= SYM_STDCALL; break; default: + free (function_name); return -1; } @@ -355,8 +364,10 @@ int symbol_demangle (parsed_symbol *sym) if (*name != '@') { INIT_CT (ct); - if (!demangle_datatype(&name, &ct, sym)) + if (!demangle_datatype(&name, &ct, sym)) { + free (function_name); return -1; + } if (strcmp (ct.expression, "void")) { @@ -381,8 +392,10 @@ int symbol_demangle (parsed_symbol *sym) /* Functions are always terminated by 'Z'. If we made it this far and * Don't find it, we have incorrectly identified a data type. */ - if (*name != 'Z') + if (*name != 'Z') { + free (function_name); return -1; + } /* Note: '()' after 'Z' means 'throws', but we don't care here */

1 0

Peter Oberndorfer : ntdll: Test that shows RtlRaiseException with EXCEPTION_BREAKPOINT mangles Eip of context .
by Alexandre Julliard Feb. 13, 2007

Feb. 13, 2007

Module: wine Branch: master Commit: b54cecab406f93197a8bf6b1a53cc20e66dc25ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b54cecab406f93197a8bf6b1a… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Mon Feb 12 21:22:37 2007 +0100 ntdll: Test that shows RtlRaiseException with EXCEPTION_BREAKPOINT mangles Eip of context. --- dlls/ntdll/tests/exception.c | 85 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index d18f3d2..e892bc6 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -39,6 +39,7 @@ static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static NTSTATUS (WINAPI *pNtGetContextThread)(HANDLE,CONTEXT*); static NTSTATUS (WINAPI *pNtSetContextThread)(HANDLE,CONTEXT*); +static NTSTATUS (WINAPI *pRtlRaiseException)(EXCEPTION_RECORD *rec); static void *code_mem; /* Test various instruction combinations that cause a protection fault on the i386, @@ -184,6 +185,79 @@ static void run_exception_test(const voi pNtCurrentTeb()->Tib.ExceptionList = exc_frame.frame.Prev; } +static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) +{ + trace( "exception: %08x flags:%x addr:%p context: Eip:%x\n", + rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, context->Eip ); + + todo_wine { + ok(rec->ExceptionAddress == (char *)code_mem + 0xb, "ExceptionAddress at %p instead of %p\n", + rec->ExceptionAddress, (char *)code_mem + 0xb); + } + + /* check that context.Eip is fixed up only for EXCEPTION_BREAKPOINT + * even if raised by RtlRaiseException + */ + if(rec->ExceptionCode == EXCEPTION_BREAKPOINT) + { + todo_wine { + ok(context->Eip == (DWORD)code_mem + 0xa, "Eip at %x instead of %x\n", + context->Eip, (DWORD)code_mem + 0xa); + } + } + else + { + ok(context->Eip == (DWORD)code_mem + 0xb, "Eip at %x instead of %x\n", + context->Eip, (DWORD)code_mem + 0xb); + } + + /* Eip in context is decreased by 1 + * Increase it again, else execution will continue in the middle of a instruction */ + if(rec->ExceptionCode == EXCEPTION_BREAKPOINT && (context->Eip == (DWORD)code_mem + 0xa)) + context->Eip += 1; + return ExceptionContinueExecution; +} + + +static const BYTE call_one_arg_code[] = { + 0x8b, 0x44, 0x24, 0x08, /* mov 0x8(%esp),%eax */ + 0x50, /* push %eax */ + 0x8b, 0x44, 0x24, 0x08, /* mov 0x8(%esp),%eax */ + 0xff, 0xd0, /* call *%eax */ + 0x90, /* nop */ + 0x90, /* nop */ + 0x90, /* nop */ + 0x90, /* nop */ + 0xc3, /* ret */ +}; + + +static void run_rtlraiseexception_test(DWORD exceptioncode) +{ + + EXCEPTION_REGISTRATION_RECORD frame; + EXCEPTION_RECORD record; + + void (*func)(void* function, EXCEPTION_RECORD* record) = code_mem; + + record.ExceptionCode = exceptioncode; + record.ExceptionFlags = 0; + record.ExceptionRecord = NULL; + record.ExceptionAddress = NULL; /* does not matter, copied return address */ + record.NumberParameters = 0; + + frame.Handler = rtlraiseexception_handler; + frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; + + memcpy(code_mem, call_one_arg_code, sizeof(call_one_arg_code)); + + pNtCurrentTeb()->Tib.ExceptionList = &frame; + func(pRtlRaiseException, &record); + pNtCurrentTeb()->Tib.ExceptionList = frame.Prev; +} + + static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { @@ -391,6 +465,8 @@ static void test_exceptions(void) pNtGetContextThread = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtGetContextThread" ); pNtSetContextThread = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtSetContextThread" ); + pRtlRaiseException = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "RtlRaiseException" ); + if (!pNtGetContextThread || !pNtSetContextThread) { trace( "NtGetContextThread/NtSetContextThread not found, skipping tests\n" ); @@ -400,6 +476,15 @@ static void test_exceptions(void) /* test handling of debug registers */ run_exception_test(dreg_handler, NULL, &segfault_code, sizeof(segfault_code)); + if (pRtlRaiseException) + { + run_rtlraiseexception_test(0x12345); + run_rtlraiseexception_test(EXCEPTION_BREAKPOINT); + run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE); + } + else + skip( "RtlRaiseException not found\n" ); + ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; res = pNtGetContextThread(GetCurrentThread(), &ctx); ok (res == STATUS_SUCCESS,"NtGetContextThread failed with %x\n", res);

1 0

Michael Stefaniuc : wldap32: Missing HeapFree on error path ( found by Smatch).
by Alexandre Julliard Feb. 13, 2007

Feb. 13, 2007

Module: wine Branch: master Commit: c6c68bf304e4aa2ad66024fb6d64b8250ddb7341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6c68bf304e4aa2ad66024fb6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 13 00:02:34 2007 +0100 wldap32: Missing HeapFree on error path (found by Smatch). --- dlls/wldap32/page.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index cfea875..cc1d0af 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -114,7 +114,10 @@ static ULONG create_page_control( ULONG ctrl = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPControlW) ); if (!ctrl) + { + HeapFree( GetProcessHeap(), 0, val ); return WLDAP32_LDAP_NO_MEMORY; + } ctrl->ldctl_oid = strAtoW( LDAP_PAGED_RESULT_OID_STRING ); ctrl->ldctl_value.bv_len = len;

1 0