June 2010 - Wine-commits - list.winehq.org

Alexandre Julliard : kernel32/tests: Fix the process title tests to actually test something.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: e091c12b669e7013aabcca301a586255e445d8d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e091c12b669e7013aabcca301… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 8 11:50:20 2010 +0200 kernel32/tests: Fix the process title tests to actually test something. --- dlls/kernel32/tests/process.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 065a94a..77293c6 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -527,6 +527,7 @@ static void test_Startup(void) char buffer[MAX_PATH]; PROCESS_INFORMATION info; STARTUPINFOA startup,si; + char *result; static CHAR title[] = "I'm the title string", desktop[] = "winsta0\\default", empty[] = ""; @@ -699,8 +700,9 @@ static void test_Startup(void) okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); - ok (startup.lpTitle == NULL || !strcmp(startup.lpTitle, selfname), - "StartupInfoA:lpTitle expected '%s' or null, got '%s'\n", selfname, startup.lpTitle); + result = getChildString( "StartupInfoA", "lpTitle" ); + todo_wine ok( broken(!result) || (result && !strCmp( result, selfname, 0 )), + "expected '%s' or null, got '%s'\n", selfname, result ); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY); okChildInt("StartupInfoA", "dwXSize", startup.dwXSize); @@ -1185,6 +1187,7 @@ static void test_SuspendFlag(void) PROCESS_INFORMATION info; STARTUPINFOA startup, us; DWORD exit_status; + char *result; /* let's start simplistic */ memset(&startup, 0, sizeof(startup)); @@ -1210,8 +1213,9 @@ static void test_SuspendFlag(void) okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", us.lpDesktop); - ok (startup.lpTitle == NULL || !strcmp(startup.lpTitle, selfname), - "StartupInfoA:lpTitle expected '%s' or null, got '%s'\n", selfname, startup.lpTitle); + result = getChildString( "StartupInfoA", "lpTitle" ); + todo_wine ok( broken(!result) || (result && !strCmp( result, selfname, 0 )), + "expected '%s' or null, got '%s'\n", selfname, result ); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY); okChildInt("StartupInfoA", "dwXSize", startup.dwXSize); @@ -1233,6 +1237,7 @@ static void test_DebuggingFlag(void) STARTUPINFOA startup, us; DEBUG_EVENT de; unsigned dbg = 0; + char *result; /* let's start simplistic */ memset(&startup, 0, sizeof(startup)); @@ -1270,8 +1275,9 @@ static void test_DebuggingFlag(void) okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", us.lpDesktop); - ok (startup.lpTitle == NULL || !strcmp(startup.lpTitle, selfname), - "StartupInfoA:lpTitle expected '%s' or null, got '%s'\n", selfname, startup.lpTitle); + result = getChildString( "StartupInfoA", "lpTitle" ); + todo_wine ok( broken(!result) || (result && !strCmp( result, selfname, 0 )), + "expected '%s' or null, got '%s'\n", selfname, result ); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY); okChildInt("StartupInfoA", "dwXSize", startup.dwXSize); @@ -1304,6 +1310,7 @@ static void test_Console(void) const char* msg = "This is a std-handle inheritance test."; unsigned msg_len; BOOL run_tests = TRUE; + char *result; memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); @@ -1381,8 +1388,9 @@ static void test_Console(void) okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", us.lpDesktop); - ok (startup.lpTitle == NULL || !strcmp(startup.lpTitle, selfname), - "StartupInfoA:lpTitle expected '%s' or null, got '%s'\n", selfname, startup.lpTitle); + result = getChildString( "StartupInfoA", "lpTitle" ); + todo_wine ok( broken(!result) || (result && !strCmp( result, selfname, 0 )), + "expected '%s' or null, got '%s'\n", selfname, result ); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY); okChildInt("StartupInfoA", "dwXSize", startup.dwXSize);

1 0

Alexandre Julliard : kernel32: Make sure we always have a valid process title.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: 2b99e1c17d73ebdbf422d529046266f0e2bb5fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b99e1c17d73ebdbf422d5290… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 8 11:53:58 2010 +0200 kernel32: Make sure we always have a valid process title. --- dlls/kernel32/environ.c | 6 ++---- dlls/kernel32/process.c | 6 ++++-- dlls/kernel32/tests/process.c | 24 ++++++++++++------------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index b11f7bf..39c1470 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -468,11 +468,9 @@ void ENV_CopyStartupInformation(void) startup_infoA.cb = sizeof(startup_infoA); startup_infoA.lpReserved = NULL; - startup_infoA.lpDesktop = (rupp->Desktop.Length && - RtlUnicodeStringToAnsiString( &ansi, &rupp->Desktop, TRUE) == STATUS_SUCCESS) ? + startup_infoA.lpDesktop = RtlUnicodeStringToAnsiString( &ansi, &rupp->Desktop, TRUE ) == STATUS_SUCCESS ? ansi.Buffer : NULL; - startup_infoA.lpTitle = (rupp->WindowTitle.Length && - RtlUnicodeStringToAnsiString( &ansi, &rupp->WindowTitle, TRUE) == STATUS_SUCCESS) ? + startup_infoA.lpTitle = RtlUnicodeStringToAnsiString( &ansi, &rupp->WindowTitle, TRUE ) == STATUS_SUCCESS ? ansi.Buffer : NULL; startup_infoA.dwX = rupp->dwX; startup_infoA.dwY = rupp->dwY; diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index da99ab9..cc2a6ba 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1481,6 +1481,7 @@ static startup_info_t *create_startup_info( LPCWSTR filename, LPCWSTR cmdline, const STARTUPINFOW *startup, DWORD *info_size ) { const RTL_USER_PROCESS_PARAMETERS *cur_params; + const WCHAR *title; startup_info_t *info; DWORD size; void *ptr; @@ -1510,13 +1511,14 @@ static startup_info_t *create_startup_info( LPCWSTR filename, LPCWSTR cmdline, else cur_dir = cur_params->CurrentDirectory.DosPath.Buffer; } + title = startup->lpTitle ? startup->lpTitle : imagepath; size = sizeof(*info); size += strlenW( cur_dir ) * sizeof(WCHAR); size += cur_params->DllPath.Length; size += strlenW( imagepath ) * sizeof(WCHAR); size += strlenW( cmdline ) * sizeof(WCHAR); - if (startup->lpTitle) size += strlenW( startup->lpTitle ) * sizeof(WCHAR); + size += strlenW( title ) * sizeof(WCHAR); if (startup->lpDesktop) size += strlenW( startup->lpDesktop ) * sizeof(WCHAR); /* FIXME: shellinfo */ if (startup->lpReserved2 && startup->cbReserved2) size += startup->cbReserved2; @@ -1575,7 +1577,7 @@ static startup_info_t *create_startup_info( LPCWSTR filename, LPCWSTR cmdline, ptr = (char *)ptr + cur_params->DllPath.Length; info->imagepath_len = append_string( &ptr, imagepath ); info->cmdline_len = append_string( &ptr, cmdline ); - if (startup->lpTitle) info->title_len = append_string( &ptr, startup->lpTitle ); + info->title_len = append_string( &ptr, title ); if (startup->lpDesktop) info->desktop_len = append_string( &ptr, startup->lpDesktop ); if (startup->lpReserved2 && startup->cbReserved2) { diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 77293c6..b4a048a 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -661,7 +661,7 @@ static void test_Startup(void) WritePrivateProfileStringA(NULL, NULL, NULL, resfile); okChildInt("StartupInfoA", "cb", startup.cb); - todo_wine okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); + okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); okChildString("StartupInfoA", "lpTitle", startup.lpTitle); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY); @@ -701,8 +701,8 @@ static void test_Startup(void) okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); result = getChildString( "StartupInfoA", "lpTitle" ); - todo_wine ok( broken(!result) || (result && !strCmp( result, selfname, 0 )), - "expected '%s' or null, got '%s'\n", selfname, result ); + ok( broken(!result) || (result && !strCmp( result, selfname, 0 )), + "expected '%s' or null, got '%s'\n", selfname, result ); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY); okChildInt("StartupInfoA", "dwXSize", startup.dwXSize); @@ -740,7 +740,7 @@ static void test_Startup(void) okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); - todo_wine okChildString("StartupInfoA", "lpTitle", startup.lpTitle); + okChildString("StartupInfoA", "lpTitle", startup.lpTitle); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY); okChildInt("StartupInfoA", "dwXSize", startup.dwXSize); @@ -777,8 +777,8 @@ static void test_Startup(void) WritePrivateProfileStringA(NULL, NULL, NULL, resfile); okChildInt("StartupInfoA", "cb", startup.cb); - todo_wine okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); - todo_wine okChildString("StartupInfoA", "lpTitle", startup.lpTitle); + okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); + okChildString("StartupInfoA", "lpTitle", startup.lpTitle); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY); okChildInt("StartupInfoA", "dwXSize", startup.dwXSize); @@ -1214,8 +1214,8 @@ static void test_SuspendFlag(void) okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", us.lpDesktop); result = getChildString( "StartupInfoA", "lpTitle" ); - todo_wine ok( broken(!result) || (result && !strCmp( result, selfname, 0 )), - "expected '%s' or null, got '%s'\n", selfname, result ); + ok( broken(!result) || (result && !strCmp( result, selfname, 0 )), + "expected '%s' or null, got '%s'\n", selfname, result ); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY); okChildInt("StartupInfoA", "dwXSize", startup.dwXSize); @@ -1276,8 +1276,8 @@ static void test_DebuggingFlag(void) okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", us.lpDesktop); result = getChildString( "StartupInfoA", "lpTitle" ); - todo_wine ok( broken(!result) || (result && !strCmp( result, selfname, 0 )), - "expected '%s' or null, got '%s'\n", selfname, result ); + ok( broken(!result) || (result && !strCmp( result, selfname, 0 )), + "expected '%s' or null, got '%s'\n", selfname, result ); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY); okChildInt("StartupInfoA", "dwXSize", startup.dwXSize); @@ -1389,8 +1389,8 @@ static void test_Console(void) okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", us.lpDesktop); result = getChildString( "StartupInfoA", "lpTitle" ); - todo_wine ok( broken(!result) || (result && !strCmp( result, selfname, 0 )), - "expected '%s' or null, got '%s'\n", selfname, result ); + ok( broken(!result) || (result && !strCmp( result, selfname, 0 )), + "expected '%s' or null, got '%s'\n", selfname, result ); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY); okChildInt("StartupInfoA", "dwXSize", startup.dwXSize);

1 0

Alexandre Julliard : ntdll: Set a valid process title for the initial process.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: 28e13982370fbe4b281679542f6cab80d0de871b URL: http://source.winehq.org/git/wine.git/?a=commit;h=28e13982370fbe4b281679542… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 8 11:55:23 2010 +0200 ntdll: Set a valid process title for the initial process. --- dlls/ntdll/loader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 74e873b..4a2641b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2639,6 +2639,8 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, peb->LoaderLock = &loader_section; peb->ProcessParameters->ImagePathName = wm->ldr.FullDllName; + if (!peb->ProcessParameters->WindowTitle.Buffer) + peb->ProcessParameters->WindowTitle = wm->ldr.FullDllName; version_init( wm->ldr.FullDllName.Buffer ); LdrQueryImageFileExecutionOptions( &peb->ProcessParameters->ImagePathName, globalflagW,

1 0

Alexandre Julliard : comctl32/imagelist: Grow the has_alpha array also in ImageList_SetImageCount.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: 9eea385a0ead738a78590bb60c1dca93ba366475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eea385a0ead738a78590bb60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 8 12:45:48 2010 +0200 comctl32/imagelist: Grow the has_alpha array also in ImageList_SetImageCount. --- dlls/comctl32/imagelist.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index e4249b9..6e445b5 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2853,6 +2853,17 @@ ImageList_SetImageCount (HIMAGELIST himl, UINT iImageCount) DeleteDC (hdcBitmap); + if (himl->has_alpha) + { + char *new_alpha = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->has_alpha, nNewCount ); + if (new_alpha) himl->has_alpha = new_alpha; + else + { + HeapFree( GetProcessHeap(), 0, himl->has_alpha ); + himl->has_alpha = NULL; + } + } + /* Update max image count and current image count */ himl->cMaxImage = nNewCount; himl->cCurImage = iImageCount;

1 0

Marcus Meissner : dbghelp: Add 2 new darf defines and implement DW_OP_stack_value.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: 4f2e15d053564b457d93492f2c04f1d4fddd2de5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f2e15d053564b457d93492f2… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon May 31 22:08:28 2010 +0200 dbghelp: Add 2 new darf defines and implement DW_OP_stack_value. --- dlls/dbghelp/dwarf.c | 4 ++++ dlls/dbghelp/dwarf.h | 3 +++ dlls/dbghelp/symbol.c | 4 ++++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 35c01a6..f3e2f12 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -847,6 +847,10 @@ compute_location(dwarf2_traverse_context_t* ctx, struct location* loc, loc->kind = loc_dwarf2_block; } break; + case DW_OP_stack_value: + /* Expected behaviour is that this is the last instruction of this + * expression and just the "top of stack" value should be put to loc->offset. */ + break; default: if (op < DW_OP_lo_user) /* as DW_OP_hi_user is 0xFF, we don't need to test against it */ FIXME("Unhandled attr op: %x\n", op); diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h index 23493d6..4ecb816 100644 --- a/dlls/dbghelp/dwarf.h +++ b/dlls/dbghelp/dwarf.h @@ -379,6 +379,9 @@ typedef enum dwarf_operation_e DW_OP_form_tls_address = 0x9b, DW_OP_call_frame_cfa = 0x9c, DW_OP_bit_piece = 0x9d, + /** Dwarf4 new values */ + DW_OP_implicit_value = 0x9e, + DW_OP_stack_value = 0x9f, /* Implementation defined extensions */ DW_OP_lo_user = 0xe0, diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 0eac098..0607278 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -724,6 +724,10 @@ static void symt_fill_sym_info(struct module_pair* pair, sym_info->Register = loc.reg ? loc.reg : CV_REG_EBP; sym_info->Address = loc.offset; break; + case loc_absolute: + sym_info->Flags |= SYMFLAG_VALUEPRESENT; + sym_info->Value = loc.offset; + break; default: FIXME("Shouldn't happen (kind=%d), debug reader backend is broken\n", loc.kind); assert(0);

1 0

Dylan Smith : richedit: Keep default char format on WM_SETFONT in plain text mode.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: 6072a69d384f27f434c52bc1018ace311b75acfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6072a69d384f27f434c52bc10… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sun Jun 6 14:57:44 2010 -0400 richedit: Keep default char format on WM_SETFONT in plain text mode. --- dlls/riched20/editor.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 5bed094..b4bff4f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3502,16 +3502,18 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, CHARFORMAT2W fmt; HDC hDC; BOOL bRepaint = LOWORD(lParam); - ME_Cursor start; if (!wParam) - wParam = (WPARAM)GetStockObject(SYSTEM_FONT); + wParam = (WPARAM)GetStockObject(SYSTEM_FONT); GetObjectW((HGDIOBJ)wParam, sizeof(LOGFONTW), &lf); hDC = ITextHost_TxGetDC(editor->texthost); - ME_CharFormatFromLogFont(hDC, &lf, &fmt); + ME_CharFormatFromLogFont(hDC, &lf, &fmt); ITextHost_TxReleaseDC(editor->texthost, hDC); - ME_SetCursorToStart(editor, &start); - ME_SetCharFormat(editor, &start, NULL, &fmt); + if (editor->mode & TM_RICHTEXT) { + ME_Cursor start; + ME_SetCursorToStart(editor, &start); + ME_SetCharFormat(editor, &start, NULL, &fmt); + } ME_SetDefaultCharFormat(editor, &fmt); ME_CommitUndo(editor);

1 0

André Hentschel : comdlg32: Correctly report the filter.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: 31b9fefe0e0eeca5042742814926454d92e0de1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=31b9fefe0e0eeca5042742814… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jun 4 18:00:12 2010 +0200 comdlg32: Correctly report the filter. --- dlls/comdlg32/filedlg31.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 29c6310..fd2ef36 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -629,10 +629,12 @@ static LRESULT FD31_FileTypeChange( const FD31_DATA *lfs ) lRet = SendDlgItemMessageW(lfs->hwnd, cmb1, CB_GETCURSEL, 0, 0); if (lRet == LB_ERR) return TRUE; + lfs->ofnW->nFilterIndex = lRet + 1; + lfs->ofnA->nFilterIndex = lRet + 1; pstr = (LPWSTR)SendDlgItemMessageW(lfs->hwnd, cmb1, CB_GETITEMDATA, lRet, 0); TRACE("Selected filter : %s\n", debugstr_w(pstr)); - return FD31_Validate( lfs, NULL, cmb1, lRet, TRUE ); + return FD31_Validate( lfs, pstr, cmb1, lRet, TRUE ); } /***********************************************************************

1 0

Alex Balut : comctl32/tests: Added a test that checks whether setting a custom default button in a property sheet works .
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: 32f240bfc13edaf81f772aa7f378681e3dbfe696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32f240bfc13edaf81f772aa7f… Author: Alex Balut <alexandru.balut(a)gmail.com> Date: Sat May 29 23:12:06 2010 +0200 comctl32/tests: Added a test that checks whether setting a custom default button in a property sheet works. --- dlls/comctl32/tests/propsheet.c | 90 +++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/resources.h | 5 ++ dlls/comctl32/tests/rsrc.rc | 8 +++ 3 files changed, 103 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index bf40db4..bfbaaa0 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -371,6 +371,7 @@ static void test_wiznavigation(void) DestroyWindow(hdlg); } + static void test_buttons(void) { HPROPSHEETPAGE hpsp[1]; @@ -436,6 +437,94 @@ static void test_buttons(void) DestroyWindow(hdlg); } +static BOOL add_button_has_been_pressed; + +static INT_PTR CALLBACK +page_with_custom_default_button_dlg_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_COMMAND: + switch(LOWORD(wparam)) + { + case IDC_PS_PUSHBUTTON1: + switch(HIWORD(wparam)) + { + case BN_CLICKED: + add_button_has_been_pressed = TRUE; + return TRUE; + } + break; + } + break; + } + return FALSE; +} + +static void test_custom_default_button(void) +{ + HWND hdlg; + PROPSHEETPAGEA psp[1]; + PROPSHEETHEADERA psh; + MSG msg; + LRESULT result; + + psp[0].dwSize = sizeof (PROPSHEETPAGEA); + psp[0].dwFlags = PSP_USETITLE; + psp[0].hInstance = GetModuleHandleA(NULL); + U(psp[0]).pszTemplate = MAKEINTRESOURCE(IDD_PROP_PAGE_WITH_CUSTOM_DEFAULT_BUTTON); + U2(psp[0]).pszIcon = NULL; + psp[0].pfnDlgProc = page_with_custom_default_button_dlg_proc; + psp[0].pszTitle = "Page1"; + psp[0].lParam = 0; + + psh.dwSize = sizeof (PROPSHEETHEADERA); + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_MODELESS; + psh.hwndParent = GetDesktopWindow(); + psh.hInstance = GetModuleHandleA(NULL); + U(psh).pszIcon = NULL; + psh.pszCaption = "PropertySheet1"; + psh.nPages = 1; + U3(psh).ppsp = psp; + U2(psh).nStartPage = 0; + + /* The goal of the test is to make sure that the Add button is pressed + * when the ENTER key is pressed and a different control, a combobox, + * has the keyboard focus. */ + add_button_has_been_pressed = FALSE; + + /* Create the modeless property sheet. */ + hdlg = (HWND)PropertySheetA(&psh); + ok(hdlg != INVALID_HANDLE_VALUE, "Cannot create the property sheet\n"); + + /* Set the Add button as the default button. */ + SendMessage(hdlg, DM_SETDEFID, (WPARAM)IDC_PS_PUSHBUTTON1, 0); + + /* Make sure the default button is the Add button. */ + result = SendMessage(hdlg, DM_GETDEFID, 0, 0); + ok(DC_HASDEFID == HIWORD(result), "The property sheet does not have a default button\n"); + ok(IDC_PS_PUSHBUTTON1 == LOWORD(result), "The default button is not the Add button\n"); + + /* At this point, the combobox should have keyboard focus, so we press ENTER. + * Pull the lever, Kronk! */ + keybd_event(VK_RETURN, 0, 0, 0); + + /* Process all the messages in the queue for this thread. */ + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) + { + if (!PropSheet_IsDialogMessage(hdlg, &msg)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + + todo_wine + ok(add_button_has_been_pressed, "The Add button has not been pressed!\n"); + + DestroyWindow(hdlg); +} + START_TEST(propsheet) { test_title(); @@ -443,4 +532,5 @@ START_TEST(propsheet) test_disableowner(); test_wiznavigation(); test_buttons(); + test_custom_default_button(); } diff --git a/dlls/comctl32/tests/resources.h b/dlls/comctl32/tests/resources.h index 8459fc8..beabce5 100644 --- a/dlls/comctl32/tests/resources.h +++ b/dlls/comctl32/tests/resources.h @@ -36,9 +36,14 @@ #define IDD_PROP_PAGE_RADIO 32 #define IDD_PROP_PAGE_EXIT 33 +#define IDD_PROP_PAGE_WITH_CUSTOM_DEFAULT_BUTTON 34 + #define IDC_PS_EDIT1 1000 #define IDC_PS_EDIT2 1001 #define IDC_PS_RADIO1 1010 #define IDC_PS_RADIO2 1011 +#define IDC_PS_COMBO1 1020 +#define IDC_PS_PUSHBUTTON1 1021 + #endif /* __WINE_COMCTL32_TEST_RESOURCES_H */ diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc index 06e382e..c817acd 100644 --- a/dlls/comctl32/tests/rsrc.rc +++ b/dlls/comctl32/tests/rsrc.rc @@ -79,3 +79,11 @@ IDB_BITMAP_128x15 BITMAP bmp128x15.bmp /* @makedep: bmp80x15.bmp */ IDB_BITMAP_80x15 BITMAP bmp80x15.bmp + +IDD_PROP_PAGE_WITH_CUSTOM_DEFAULT_BUTTON DIALOG DISCARDABLE 5, 43, 227, 215 +STYLE WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +{ + COMBOBOX IDC_PS_COMBO1, 16, 68, 140, 14, CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Add", IDC_PS_PUSHBUTTON1, 164, 68, 40, 13 +}

1 0

Alexandre Julliard : winapi: Get the list of files from git-ls-files if possible.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: 84ff0631d41e0d9c32180e88f4792a37085f9181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84ff0631d41e0d9c32180e88f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 7 16:46:33 2010 +0200 winapi: Get the list of files from git-ls-files if possible. --- tools/winapi/options.pm | 68 ++++++++++++++++++++++++++-------------------- 1 files changed, 38 insertions(+), 30 deletions(-) diff --git a/tools/winapi/options.pm b/tools/winapi/options.pm index 232de7f..749b9b7 100644 --- a/tools/winapi/options.pm +++ b/tools/winapi/options.pm @@ -236,38 +236,46 @@ sub parse_files($) { } } - if($#c_files == -1 && $#h_files == -1 && $#paths == -1) + if($#c_files == -1 && $#h_files == -1 && $#paths == -1 && -d ".git") { - @paths = "."; - } - - if($#paths != -1 || $#c_files != -1) { - my $c_command = "find " . join(" ", @paths, @c_files) . " -name \\*.c"; - my %found; - @$c_files = sort(map { - s/^\.\/(.*)$/$1/; - if(defined($found{$_})) { - (); - } else { - $found{$_}++; - $_; - } - } split(/\n/, `$c_command`)); + @$c_files = sort split /\0/, `git ls-files -z \\*.c`; + @$h_files = sort split /\0/, `git ls-files -z \\*.h`; } + else + { + if($#c_files == -1 && $#h_files == -1 && $#paths == -1) + { + @paths = "."; + } + + if($#paths != -1 || $#c_files != -1) { + my $c_command = "find " . join(" ", @paths, @c_files) . " -name \\*.c"; + my %found; + @$c_files = sort(map { + s/^\.\/(.*)$/$1/; + if(defined($found{$_})) { + (); + } else { + $found{$_}++; + $_; + } + } split(/\n/, `$c_command`)); + } - if($#paths != -1 || $#h_files != -1) { - my $h_command = "find " . join(" ", @paths, @h_files) . " -name \\*.h"; - my %found; + if($#paths != -1 || $#h_files != -1) { + my $h_command = "find " . join(" ", @paths, @h_files) . " -name \\*.h"; + my %found; - @$h_files = sort(map { - s/^\.\/(.*)$/$1/; - if(defined($found{$_})) { - (); - } else { - $found{$_}++; - $_; - } - } split(/\n/, `$h_command`)); + @$h_files = sort(map { + s/^\.\/(.*)$/$1/; + if(defined($found{$_})) { + (); + } else { + $found{$_}++; + $_; + } + } split(/\n/, `$h_command`)); + } } my %dirs;

1 0

Alexandre Julliard : winapi: Fix a few C parser bugs.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: e1fd4390bf7eba7de7b5c9cf039123dab992147d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1fd4390bf7eba7de7b5c9cf0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 7 16:46:44 2010 +0200 winapi: Fix a few C parser bugs. --- tools/winapi/c_parser.pm | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index 189f780..8bb40d5 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -513,6 +513,12 @@ sub parse_c_declaration($$$$) if(s/\)//) { $column++; } + } elsif(s/^__ASM_STDCALL_FUNC$\s*(\w+)\s*,\s*\d+\s*,\s*//s) { # FIXME: Wine specific kludge + $self->_update_c_position($&, \$line, \$column); + $self->_parse_c_until_one_of("$", \$_, \$line, \$column); + if(s/\)//) { + $column++; + } } elsif(s/^(?:DEFINE_AVIGUID|DEFINE_OLEGUID)\s*(?=$)//s) { # FIXME: Wine specific kludge $self->_update_c_position($&, \$line, \$column); @@ -934,7 +940,7 @@ sub parse_c_file($$$$) $self->_parse_c_error($_, $line, $column, "file", ") without ("); } $declaration .= $&; - if($plevel == 1 && $declaration =~ /^__ASM_GLOBAL_FUNC/) { + if($plevel == 1 && $declaration =~ /^(__ASM_GLOBAL_FUNC|__ASM_STDCALL_FUNC)/) { if(!$self->parse_c_declaration(\$declaration, \$declaration_line, \$declaration_column)) { return 0; } @@ -1390,11 +1396,11 @@ sub parse_c_struct_union($$$$$$$$$) $self->_parse_c_until_one_of("\\S", \$_, \$line, \$column); - if (!s/^(interface|struct|union)\s+((?:MSVCRT|WS)\(\s*\w+\s*$|\w+)?\s*\{\s*//s) { + if (!s/^(interface|struct|union)(\s+((?:MSVCRT|WS)$\s*\w+\s*$|\w+))?\s*\{\s*//s) { return 0; } $kind = $1; - $_name = $2 || ""; + $_name = $3 || ""; $self->_update_c_position($&, \$line, \$column);

1 0