January 2012 - Wine-commits

Nikolay Sivov : msi: Create the rest of objects with separate helpers.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: 5cbe5faf49e651cc5365cc7a21ce0d99d67ab9c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cbe5faf49e651cc5365cc7a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 17 02:12:30 2012 +0300 msi: Create the rest of objects with separate helpers. --- dlls/msi/automation.c | 168 ++++++++++++++++++++++++++++-------------------- 1 files changed, 98 insertions(+), 70 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 593fa93..f1a3532 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); /* * AutomationObject - "base" class for all automation objects. For each interface, we implement Invoke function - * called from AutomationObject::Invoke, and pass this function to create_automation_object. + * called from AutomationObject::Invoke. */ typedef struct AutomationObject AutomationObject; @@ -80,7 +80,10 @@ typedef struct { VARIANT *data; } ListObject; +static HRESULT create_database(MSIHANDLE, IDispatch**); static HRESULT create_list_enumerator(ListObject*, void**); +static HRESULT create_summaryinfo(MSIHANDLE, IDispatch**); +static HRESULT create_view(MSIHANDLE, IDispatch**); /* ListEnumerator - IEnumVARIANT implementation for MSI automation lists */ typedef struct { @@ -461,43 +464,6 @@ static const IProvideMultipleClassInfoVtbl ProvideMultipleClassInfoVtbl = ProvideMultipleClassInfo_GetInfoOfIndex }; -/* Create the automation object, placing the result in the pointer ppObj. The automation object is created - * with the appropriate clsid and invocation function. */ -static HRESULT create_automation_object(MSIHANDLE msiHandle, IUnknown *pUnkOuter, void **ppObj, REFIID clsid, - autoInvokeFunc invokeFunc, autoFreeFunc freeFunc) -{ - AutomationObject *object; - HRESULT hr; - - TRACE("(%d,%p,%p,%s,%p,%p)\n", msiHandle, pUnkOuter, ppObj, debugstr_guid(clsid), invokeFunc, freeFunc); - - if( pUnkOuter ) - return CLASS_E_NOAGGREGATION; - - object = msi_alloc_zero(sizeof(AutomationObject)); - - object->IDispatch_iface.lpVtbl = &AutomationObjectVtbl; - object->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; - object->ref = 1; - - object->msiHandle = msiHandle; - object->clsid = (LPCLSID)clsid; - object->funcInvoke = invokeFunc; - object->funcFree = freeFunc; - - /* Load our TypeInfo so we don't have to process GetIDsOfNames */ - object->iTypeInfo = NULL; - hr = load_type_info(&object->IDispatch_iface, &object->iTypeInfo, clsid, 0x0); - if (FAILED(hr)) { - msi_free( object ); - return hr; - } - - *ppObj = object; - - return S_OK; -} - static HRESULT init_automation_object(AutomationObject *This, MSIHANDLE msiHandle, REFIID clsid, autoInvokeFunc invokeFunc, autoFreeFunc freeFunc) { @@ -960,6 +926,26 @@ static HRESULT RecordImpl_Invoke( return S_OK; } +HRESULT create_record(MSIHANDLE msiHandle, IDispatch **disp) +{ + AutomationObject *record; + HRESULT hr; + + record = msi_alloc(sizeof(*record)); + if (!record) return E_OUTOFMEMORY; + + hr = init_automation_object(record, msiHandle, &DIID_Record, RecordImpl_Invoke, NULL); + if (hr != S_OK) + { + msi_free(record); + return hr; + } + + *disp = &record->IDispatch_iface; + + return hr; +} + static HRESULT ListImpl_Invoke( AutomationObject* This, DISPID dispIdMember, @@ -1119,7 +1105,6 @@ static HRESULT ViewImpl_Invoke( UINT* puArgErr) { MSIHANDLE msiHandle; - IDispatch *pDispatch = NULL; UINT ret; VARIANTARG varg0, varg1; HRESULT hr; @@ -1147,8 +1132,10 @@ static HRESULT ViewImpl_Invoke( V_VT(pVarResult) = VT_DISPATCH; if ((ret = MsiViewFetch(This->msiHandle, &msiHandle)) == ERROR_SUCCESS) { - if (SUCCEEDED(hr = create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_Record, RecordImpl_Invoke, NULL))) - V_DISPATCH(pVarResult) = pDispatch; + IDispatch *dispatch = NULL; + + if (SUCCEEDED(hr = create_record(msiHandle, &dispatch))) + V_DISPATCH(pVarResult) = dispatch; else ERR("Failed to create Record object, hresult 0x%08x\n", hr); } @@ -1225,8 +1212,8 @@ static HRESULT DatabaseImpl_Invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr) { + IDispatch *dispatch = NULL; MSIHANDLE msiHandle; - IDispatch *pDispatch = NULL; UINT ret; VARIANTARG varg0, varg1; HRESULT hr; @@ -1246,9 +1233,9 @@ static HRESULT DatabaseImpl_Invoke( V_VT(pVarResult) = VT_DISPATCH; if ((ret = MsiGetSummaryInformationW(This->msiHandle, NULL, V_I4(&varg0), &msiHandle)) == ERROR_SUCCESS) { - hr = create_automation_object(msiHandle, NULL, (LPVOID *)&pDispatch, &DIID_SummaryInfo, SummaryInfoImpl_Invoke, NULL); + hr = create_summaryinfo(msiHandle, &dispatch); if (SUCCEEDED(hr)) - V_DISPATCH(pVarResult) = pDispatch; + V_DISPATCH(pVarResult) = dispatch; else ERR("Failed to create SummaryInfo object: 0x%08x\n", hr); } @@ -1269,8 +1256,8 @@ static HRESULT DatabaseImpl_Invoke( V_VT(pVarResult) = VT_DISPATCH; if ((ret = MsiDatabaseOpenViewW(This->msiHandle, V_BSTR(&varg0), &msiHandle)) == ERROR_SUCCESS) { - if (SUCCEEDED(hr = create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_View, ViewImpl_Invoke, NULL))) - V_DISPATCH(pVarResult) = pDispatch; + if (SUCCEEDED(hr = create_view(msiHandle, &dispatch))) + V_DISPATCH(pVarResult) = dispatch; else ERR("Failed to create View object, hresult 0x%08x\n", hr); } @@ -1299,28 +1286,6 @@ static HRESULT DatabaseImpl_Invoke( return S_OK; } -static HRESULT create_database(MSIHANDLE msiHandle, IDispatch **dispatch) -{ - AutomationObject *database; - HRESULT hr; - - TRACE("(%d %p)\n", msiHandle, dispatch); - - database = msi_alloc(sizeof(AutomationObject)); - if (!database) return E_OUTOFMEMORY; - - hr = init_automation_object(database, msiHandle, &DIID_Database, DatabaseImpl_Invoke, NULL); - if (hr != S_OK) - { - msi_free(database); - return hr; - } - - *dispatch = &database->IDispatch_iface; - - return hr; -} - static HRESULT SessionImpl_Invoke( AutomationObject* This, DISPID dispIdMember, @@ -1664,8 +1629,7 @@ static HRESULT InstallerImpl_CreateRecord(WORD wFlags, if (!hrec) return DISP_E_EXCEPTION; - hr = create_automation_object(hrec, NULL, (LPVOID*)&dispatch, - &DIID_Record, RecordImpl_Invoke, NULL); + hr = create_record(hrec, &dispatch); if (SUCCEEDED(hr)) V_DISPATCH(pVarResult) = dispatch; @@ -2432,3 +2396,67 @@ HRESULT create_session(MSIHANDLE msiHandle, IDispatch *installer, IDispatch **di return hr; } + +static HRESULT create_database(MSIHANDLE msiHandle, IDispatch **dispatch) +{ + AutomationObject *database; + HRESULT hr; + + TRACE("(%d %p)\n", msiHandle, dispatch); + + database = msi_alloc(sizeof(AutomationObject)); + if (!database) return E_OUTOFMEMORY; + + hr = init_automation_object(database, msiHandle, &DIID_Database, DatabaseImpl_Invoke, NULL); + if (hr != S_OK) + { + msi_free(database); + return hr; + } + + *dispatch = &database->IDispatch_iface; + + return hr; +} + +static HRESULT create_view(MSIHANDLE msiHandle, IDispatch **dispatch) +{ + AutomationObject *view; + HRESULT hr; + + TRACE("(%d %p)\n", msiHandle, dispatch); + + view = msi_alloc(sizeof(AutomationObject)); + if (!view) return E_OUTOFMEMORY; + + hr = init_automation_object(view, msiHandle, &DIID_View, ViewImpl_Invoke, NULL); + if (hr != S_OK) + { + msi_free(view); + return hr; + } + + *dispatch = &view->IDispatch_iface; + + return hr; +} + +static HRESULT create_summaryinfo(MSIHANDLE msiHandle, IDispatch **disp) +{ + AutomationObject *info; + HRESULT hr; + + info = msi_alloc(sizeof(*info)); + if (!info) return E_OUTOFMEMORY; + + hr = init_automation_object(info, msiHandle, &DIID_SummaryInfo, SummaryInfoImpl_Invoke, NULL); + if (hr != S_OK) + { + msi_free(info); + return hr; + } + + *disp = &info->IDispatch_iface; + + return hr; +}

1 0

Aric Stewart : quartz: Lower the merit on our current builtin filters.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: 4cd49d3bf1c64dc6a0e9e3865e0e7929f4a95869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cd49d3bf1c64dc6a0e9e3865… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 17 09:02:25 2012 -0600 quartz: Lower the merit on our current builtin filters. --- dlls/quartz/regsvr.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index 2bf139e..7adf7d4 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -881,7 +881,7 @@ static struct regsvr_filter const filter_list[] = { { &CLSID_AviSplitter, &CLSID_LegacyAmFilterCategory, {'A','V','I',' ','S','p','l','i','t','t','e','r',0}, - 0x600000, + 0x5ffff0, { { 0, { { &MEDIATYPE_Stream, &MEDIASUBTYPE_Avi }, { NULL } @@ -898,7 +898,7 @@ static struct regsvr_filter const filter_list[] = { { &CLSID_MPEG1Splitter, &CLSID_LegacyAmFilterCategory, {'M','P','E','G','-','I',' ','S','t','r','e','a','m',' ','S','p','l','i','t','t','e','r',0}, - 0x600000, + 0x5ffff0, { { 0, { { &MEDIATYPE_Stream, &MEDIASUBTYPE_MPEG1Audio }, { &MEDIATYPE_Stream, &MEDIASUBTYPE_MPEG1Video }, @@ -987,7 +987,7 @@ static struct regsvr_filter const filter_list[] = { { &CLSID_AVIDec, &CLSID_LegacyAmFilterCategory, {'A','V','I',' ','D','e','c','o','m','p','r','e','s','s','o','r',0}, - 0x600000, + 0x5ffff0, { { 0, { { &MEDIATYPE_Video, &GUID_NULL }, { NULL } @@ -1016,7 +1016,7 @@ static struct regsvr_filter const filter_list[] = { { &CLSID_ACMWrapper, &CLSID_LegacyAmFilterCategory, {'A','C','M',' ','W','r','a','p','p','e','r',0}, - 0x600000, + 0x5ffff0, { { 0, { { &MEDIATYPE_Audio, &GUID_NULL }, { NULL }

1 0

Alexandre Julliard : winedbg: Add a dialog to display crash details and save them to a file.
by Alexandre Julliard 17 Jan '12

17 Jan '12

1 0

Alexandre Julliard : winedbg: Make the crash details dialog resizable.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: a70ac0e971cd60ce3c9d5d84c587fd1b3685370e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a70ac0e971cd60ce3c9d5d84c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 17 17:43:06 2012 +0100 winedbg: Make the crash details dialog resizable. --- programs/winedbg/crashdlg.c | 51 +++++++++++++++++++++++++++++++++++++++++++ programs/winedbg/winedbg.rc | 2 +- 2 files changed, 52 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/crashdlg.c b/programs/winedbg/crashdlg.c index e6f0c13..27de37d 100644 --- a/programs/winedbg/crashdlg.c +++ b/programs/winedbg/crashdlg.c @@ -261,12 +261,63 @@ static INT_PTR WINAPI crash_dlg_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM static INT_PTR WINAPI details_dlg_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { static const WCHAR openW[] = {'o','p','e','n',0}; + static POINT orig_size, min_size, edit_size, text_pos, save_pos, close_pos; + RECT rect; switch (msg) { case WM_INITDIALOG: set_fixed_font( hwnd, IDC_CRASH_TXT ); SetDlgItemTextA( hwnd, IDC_CRASH_TXT, crash_log ); + + GetClientRect( hwnd, &rect ); + orig_size.x = rect.right; + orig_size.y = rect.bottom; + + GetWindowRect( hwnd, &rect ); + min_size.x = rect.right - rect.left; + min_size.y = rect.bottom - rect.top; + + GetWindowRect( GetDlgItem( hwnd, IDOK ), &rect ); + MapWindowPoints( 0, hwnd, (POINT *)&rect, 2 ); + close_pos.x = rect.left; + close_pos.y = rect.top; + + GetWindowRect( GetDlgItem( hwnd, ID_SAVEAS ), &rect ); + MapWindowPoints( 0, hwnd, (POINT *)&rect, 2 ); + save_pos.x = rect.left; + save_pos.y = rect.top; + + GetWindowRect( GetDlgItem( hwnd, IDC_STATIC_TXT2 ), &rect ); + MapWindowPoints( 0, hwnd, (POINT *)&rect, 2 ); + text_pos.x = rect.left; + text_pos.y = rect.top; + + GetWindowRect( GetDlgItem( hwnd, IDC_CRASH_TXT ), &rect ); + MapWindowPoints( 0, hwnd, (POINT *)&rect, 2 ); + edit_size.x = rect.right - rect.left; + edit_size.y = rect.bottom - rect.top; + return TRUE; + + case WM_GETMINMAXINFO: + ((MINMAXINFO *)lparam)->ptMinTrackSize = min_size; + return TRUE; + + case WM_SIZE: + if (wparam == SIZE_RESTORED) + { + int off_x = (short)LOWORD( lparam ) - orig_size.x; + int off_y = (short)HIWORD( lparam ) - orig_size.y; + + SetWindowPos( GetDlgItem( hwnd, IDOK ), 0, close_pos.x + off_x, + close_pos.y + off_y, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); + SetWindowPos( GetDlgItem( hwnd, ID_SAVEAS ), 0, save_pos.x + off_x, + save_pos.y + off_y, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); + SetWindowPos( GetDlgItem( hwnd, IDC_STATIC_TXT2 ), 0, text_pos.x, + text_pos.y + off_y, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); + SetWindowPos( GetDlgItem( hwnd, IDC_CRASH_TXT ), 0, 0, 0, edit_size.x + off_x, + edit_size.y + off_y, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE ); + } return TRUE; case WM_NOTIFY: diff --git a/programs/winedbg/winedbg.rc b/programs/winedbg/winedbg.rc index e9e3f18..314500c 100644 --- a/programs/winedbg/winedbg.rc +++ b/programs/winedbg/winedbg.rc @@ -58,7 +58,7 @@ BEGIN END IDD_DETAILS_DLG DIALOGEX 100, 100, 300, 240 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Program Error Details" FONT 8, "Tahoma" BEGIN

1 0

Alexandre Julliard : winedbg: Append some system information to the crash log.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: 2533c1287eb6b389a35816e3936dd85b36a8217a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2533c1287eb6b389a35816e39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 17 19:11:07 2012 +0100 winedbg: Append some system information to the crash log. --- programs/winedbg/tgt_active.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index af8e256..c71974d 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -678,6 +678,42 @@ static HANDLE create_temp_file(void) NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, 0 ); } +static void output_system_info(void) +{ +#ifdef __i386__ + static const char platform[] = "i386"; +#elif defined(__x86_64__) + static const char platform[] = "x86_64"; +#elif defined(__sparc__) + static const char platform[] = "sparc"; +#elif defined(__powerpc__) + static const char platform[] = "powerpc"; +#elif defined(__arm__) + static const char platform[] = "arm"; +#else +# error CPU unknown +#endif + + const char *(CDECL *wine_get_build_id)(void); + void (CDECL *wine_get_host_version)( const char **sysname, const char **release ); + BOOL is_wow64; + + wine_get_build_id = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_build_id"); + wine_get_host_version = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_host_version"); + if (!IsWow64Process( dbg_curr_process->handle, &is_wow64 )) is_wow64 = FALSE; + + dbg_printf( "System information:\n" ); + if (wine_get_build_id) dbg_printf( " Wine build: %s\n", wine_get_build_id() ); + dbg_printf( " Platform: %s%s\n", platform, is_wow64 ? " (WOW64)" : "" ); + if (wine_get_host_version) + { + const char *sysname, *release; + wine_get_host_version( &sysname, &release ); + dbg_printf( " Host system: %s\n", sysname ); + dbg_printf( " Host version: %s\n", release ); + } +} + /****************************************************************** * dbg_active_attach * @@ -801,6 +837,7 @@ enum dbg_start dbg_active_auto(int argc, char* argv[]) if (output != INVALID_HANDLE_VALUE) { + output_system_info(); display_crash_details( output ); CloseHandle( output ); }

1 0

Alexandre Julliard : jscript: Set return value after assert(0) to avoid warnings.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: 902915f6675b384e62205c4ce15fa02b01e6d976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=902915f6675b384e62205c4ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 17 14:59:41 2012 +0100 jscript: Set return value after assert(0) to avoid warnings. --- dlls/jscript/compile.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 8c2c091..8569c53 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -698,6 +698,7 @@ static HRESULT compile_literal(compiler_ctx_t *ctx, literal_t *literal) } default: assert(0); + return E_FAIL; } } @@ -1663,6 +1664,7 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx, break; default: assert(0); + hres = E_FAIL; } if(stat_ctx) {

1 0

Alexandre Julliard : shlwapi: Fix some printf format warnings.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: 51bba9ee07ba05d1248b1610cc76770bf2a8abdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=51bba9ee07ba05d1248b1610c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 17 14:59:02 2012 +0100 shlwapi: Fix some printf format warnings. --- dlls/shlwapi/string.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 45b8d21..903c981 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -865,10 +865,7 @@ BOOL WINAPI StrToIntExA(LPCSTR lpszStr, DWORD dwFlags, LPINT lpiRet) WARN("Invalid parameter would crash under Win32!\n"); return FALSE; } - if (dwFlags > STIF_SUPPORT_HEX) - { - WARN("Unknown flags (%08X)!\n", dwFlags & ~STIF_SUPPORT_HEX); - } + if (dwFlags > STIF_SUPPORT_HEX) WARN("Unknown flags %08x\n", dwFlags); /* Skip leading space, '+', '-' */ while (isspace(*lpszStr)) @@ -935,10 +932,7 @@ BOOL WINAPI StrToIntExW(LPCWSTR lpszStr, DWORD dwFlags, LPINT lpiRet) WARN("Invalid parameter would crash under Win32!\n"); return FALSE; } - if (dwFlags > STIF_SUPPORT_HEX) - { - WARN("Unknown flags (%08X)!\n", dwFlags & ~STIF_SUPPORT_HEX); - } + if (dwFlags > STIF_SUPPORT_HEX) WARN("Unknown flags %08x\n", dwFlags); /* Skip leading space, '+', '-' */ while (isspaceW(*lpszStr)) lpszStr++;

1 0

Alexandre Julliard : user32: Fix some printf format warnings.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: 03820a527bdd3b0a633e7a713f4dbd34e51edf5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=03820a527bdd3b0a633e7a713… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 17 14:59:19 2012 +0100 user32: Fix some printf format warnings. --- dlls/user32/menu.c | 2 +- dlls/user32/tests/edit.c | 8 ++++---- dlls/user32/tests/scroll.c | 18 ++++++------------ dlls/user32/win.c | 8 ++++---- 4 files changed, 15 insertions(+), 21 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 349adc6..76fe007 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2111,7 +2111,7 @@ static MENUITEM *MENU_InsertItem( HMENU hMenu, UINT pos, UINT flags ) (INT_PTR)menu->items[pos - 1].hbmpItem <= (INT_PTR)HBMMENU_MBAR_CLOSE_D) pos--; - TRACE("inserting at %u by pos %u\n", pos, flags & MF_BYPOSITION); + TRACE("inserting at %u flags %x\n", pos, flags); /* Create new items array */ diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 389497e..89a2843 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1736,7 +1736,7 @@ static void test_espassword(void) hwEdit = create_editcontrol(ES_PASSWORD, 0); r = get_edit_style(hwEdit); - ok(r == ES_PASSWORD, "Wrong style expected 0x%x got: 0x%x\n", ES_PASSWORD, r); + ok(r == ES_PASSWORD, "Wrong style expected ES_PASSWORD got: 0x%x\n", r); /* set text */ r = SendMessage(hwEdit , WM_SETTEXT, 0, (LPARAM) password); ok(r == TRUE, "Expected: %d, got: %d\n", TRUE, r); @@ -1840,7 +1840,7 @@ static void test_enter(void) /* multiline */ hwEdit = create_editcontrol(ES_MULTILINE, 0); r = get_edit_style(hwEdit); - ok(ES_MULTILINE == r, "Wrong style expected 0x%x got: 0x%x\n", ES_MULTILINE, r); + ok(ES_MULTILINE == r, "Wrong style expected ES_MULTILINE got: 0x%x\n", r); /* set text */ r = SendMessage(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); @@ -1880,7 +1880,7 @@ static void test_enter(void) /* single line with ES_WANTRETURN */ hwEdit = create_editcontrol(ES_WANTRETURN, 0); r = get_edit_style(hwEdit); - ok(ES_WANTRETURN == r, "Wrong style expected 0x%x got: 0x%x\n", ES_WANTRETURN, r); + ok(ES_WANTRETURN == r, "Wrong style expected ES_WANTRETURN got: 0x%x\n", r); /* set text */ r = SendMessage(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); @@ -1907,7 +1907,7 @@ static void test_tab(void) /* multiline */ hwEdit = create_editcontrol(ES_MULTILINE, 0); r = get_edit_style(hwEdit); - ok(ES_MULTILINE == r, "Wrong style expected 0x%x got: 0x%x\n", ES_MULTILINE, r); + ok(ES_MULTILINE == r, "Wrong style expected ES_MULTILINE got: 0x%x\n", r); /* set text */ r = SendMessage(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 0bf5742..b0e206f 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -302,13 +302,10 @@ todo_wine if (bThemeActive || style != WS_HSCROLL) todo_wine ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == ( style | WS_VSCROLL), - "unexpected style change %08x expected %08x\n", - (winstyle & (WS_HSCROLL|WS_VSCROLL)), style | WS_VSCROLL); + "unexpected style change %08x/%08x\n", winstyle, style); else - ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style || - broken((winstyle & (WS_HSCROLL|WS_VSCROLL)) == (WS_HSCROLL|WS_VSCROLL)), /* Win 9x/ME */ - "unexpected style change %08x expected %08x\n", - (winstyle & (WS_HSCROLL|WS_VSCROLL)), style); + ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style, + "unexpected style change %08x/%08x\n", winstyle, style); } /* do the test again with H and V reversed. * Start with a clean window */ @@ -341,13 +338,10 @@ todo_wine if (bThemeActive || style != WS_VSCROLL) todo_wine ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == ( style | WS_HSCROLL), - "unexpected style change %08x expected %08x\n", - (winstyle & (WS_HSCROLL|WS_VSCROLL)), style | WS_HSCROLL); + "unexpected style change %08x/%08x\n", winstyle, style); else - ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style || - broken((winstyle & (WS_HSCROLL|WS_VSCROLL)) == (WS_HSCROLL|WS_VSCROLL)), /* Win 9x/ME */ - "unexpected style change %08x expected %08x\n", - (winstyle & (WS_HSCROLL|WS_VSCROLL)), style); + ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style, + "unexpected style change %08x/%08x\n", winstyle, style); } /* Slightly change the test to use SetScrollInfo * Start with a clean window */ diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 74e8d6b..3e7d9b1 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1066,7 +1066,7 @@ static void dump_window_styles( DWORD style, DWORD exstyle ) /* FIXME: Add dumping of BS_/ES_/SBS_/LBS_/CBS_/DS_/etc. styles */ #define DUMPED_STYLES \ - (WS_POPUP | \ + ((DWORD)(WS_POPUP | \ WS_CHILD | \ WS_MINIMIZE | \ WS_VISIBLE | \ @@ -1083,7 +1083,7 @@ static void dump_window_styles( DWORD style, DWORD exstyle ) WS_GROUP | \ WS_TABSTOP | \ WS_MINIMIZEBOX | \ - WS_MAXIMIZEBOX) + WS_MAXIMIZEBOX)) if(style & ~DUMPED_STYLES) TRACE(" %08x", style & ~DUMPED_STYLES); TRACE("\n"); @@ -1111,7 +1111,7 @@ static void dump_window_styles( DWORD style, DWORD exstyle ) if(exstyle & WS_EX_LAYOUTRTL) TRACE(" WS_EX_LAYOUTRTL"); #define DUMPED_EX_STYLES \ - (WS_EX_DLGMODALFRAME | \ + ((DWORD)(WS_EX_DLGMODALFRAME | \ WS_EX_DRAGDETECT | \ WS_EX_NOPARENTNOTIFY | \ WS_EX_TOPMOST | \ @@ -1129,7 +1129,7 @@ static void dump_window_styles( DWORD style, DWORD exstyle ) WS_EX_STATICEDGE | \ WS_EX_APPWINDOW | \ WS_EX_LAYERED | \ - WS_EX_LAYOUTRTL) + WS_EX_LAYOUTRTL)) if(exstyle & ~DUMPED_EX_STYLES) TRACE(" %08x", exstyle & ~DUMPED_EX_STYLES); TRACE("\n");

1 0

Alexandre Julliard : user32: Always query actual key state from the server for pressed keys.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: adad80f4bd4aba325549ad8747a2951e97209660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adad80f4bd4aba325549ad874… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 17 16:22:43 2012 +0100 user32: Always query actual key state from the server for pressed keys. --- dlls/user32/input.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 6a76cb8..abd382f 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -369,12 +369,12 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) if ((ret = USER_Driver->pGetAsyncKeyState( key )) == -1) { - if (thread_info->key_state) - { - if (GetTickCount() - thread_info->key_state_time < 50) - return (thread_info->key_state[key] & 0x80) ? 0x8000 : 0; - } - else thread_info->key_state = HeapAlloc( GetProcessHeap(), 0, 256 ); + if (thread_info->key_state && + !(thread_info->key_state[key] & 0xc0) && + GetTickCount() - thread_info->key_state_time < 50) + return 0; + + if (!thread_info->key_state) thread_info->key_state = HeapAlloc( GetProcessHeap(), 0, 256 ); ret = 0; SERVER_START_REQ( get_key_state )

1 0

Alexandre Julliard : winedbg: Split minidump option handling to a separate function.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: dea7ced7f17865c46425a1b18f7e7adff0c8283e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dea7ced7f17865c46425a1b18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 16 14:15:12 2012 +0100 winedbg: Split minidump option handling to a separate function. --- programs/winedbg/debugger.h | 2 + programs/winedbg/tgt_active.c | 142 +++++++++++++++++++++++------------------ programs/winedbg/winedbg.c | 16 +++-- 3 files changed, 94 insertions(+), 66 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 9c72916..0ad654f 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -255,6 +255,7 @@ extern struct dbg_thread* dbg_curr_thread; extern DWORD_PTR dbg_curr_tid; extern CONTEXT dbg_context; extern BOOL dbg_interactiveP; +extern HANDLE dbg_houtput; struct dbg_internal_var { @@ -419,6 +420,7 @@ extern void dbg_wait_next_exception(DWORD cont, int count, int mode) extern enum dbg_start dbg_active_attach(int argc, char* argv[]); extern enum dbg_start dbg_active_launch(int argc, char* argv[]); extern enum dbg_start dbg_active_auto(int argc, char* argv[]); +extern enum dbg_start dbg_active_minidump(int argc, char* argv[]); extern void dbg_active_wait_for_first_exception(void); extern BOOL dbg_attach_debuggee(DWORD pid, BOOL cofe); diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 8302e8e..e7f223e 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -757,75 +757,95 @@ enum dbg_start dbg_active_auto(int argc, char* argv[]) HANDLE hFile; enum dbg_start ds = start_error_parse; - if (!strcmp(argv[0], "--auto")) - { - /* auto mode */ - argc--; argv++; - ds = dbg_active_attach(argc, argv); - if (ds != start_ok) { - msgbox_res_id(NULL, IDS_INVALID_PARAMS, IDS_AUTO_CAPTION, MB_OK); - return ds; - } - if (!display_crash_dialog()) { - dbg_init_console(); - dbg_start_interactive(INVALID_HANDLE_VALUE); - return start_ok; - } - - hFile = parser_generate_command_file("echo Modules:", "info share", - "echo Threads:", "info threads", - "kill", NULL); + DBG_IVAR(BreakOnDllLoad) = 0; + + /* auto mode */ + argc--; argv++; + ds = dbg_active_attach(argc, argv); + if (ds != start_ok) { + msgbox_res_id(NULL, IDS_INVALID_PARAMS, IDS_AUTO_CAPTION, MB_OK); + return ds; + } + if (!display_crash_dialog()) { + dbg_init_console(); + dbg_start_interactive(INVALID_HANDLE_VALUE); + return start_ok; } - else if (!strcmp(argv[0], "--minidump")) + + hFile = parser_generate_command_file("echo Modules:", "info share", + "echo Threads:", "info threads", + "kill", NULL); + if (hFile == INVALID_HANDLE_VALUE) return start_error_parse; + + dbg_houtput = GetStdHandle(STD_ERROR_HANDLE); + + if (dbg_curr_process->active_debuggee) + dbg_active_wait_for_first_exception(); + + dbg_interactiveP = TRUE; + parser_handle(hFile); + + return start_ok; +} + +/****************************************************************** + * dbg_active_minidump + * + * Starts (<pid> or <pid> <evt>) in minidump mode + */ +enum dbg_start dbg_active_minidump(int argc, char* argv[]) +{ + HANDLE hFile; + enum dbg_start ds = start_error_parse; + const char* file = NULL; + char tmp[8 + 1 + MAX_PATH]; /* minidump <file> */ + + dbg_houtput = GetStdHandle(STD_ERROR_HANDLE); + DBG_IVAR(BreakOnDllLoad) = 0; + + argc--; argv++; + /* hard stuff now ; we can get things like: + * --minidump <pid> 1 arg + * --minidump <pid> <evt> 2 args + * --minidump <file> <pid> 2 args + * --minidump <file> <pid> <evt> 3 args + */ + switch (argc) { - const char* file = NULL; - char tmp[8 + 1 + MAX_PATH]; /* minidump <file> */ - - argc--; argv++; - /* hard stuff now ; we can get things like: - * --minidump <pid> 1 arg - * --minidump <pid> <evt> 2 args - * --minidump <file> <pid> 2 args - * --minidump <file> <pid> <evt> 3 args - */ - switch (argc) + case 1: + ds = dbg_active_attach(argc, argv); + break; + case 2: + if ((ds = dbg_active_attach(argc, argv)) != start_ok) { - case 1: - ds = dbg_active_attach(argc, argv); - break; - case 2: - if ((ds = dbg_active_attach(argc, argv)) != start_ok) - { - file = argv[0]; - ds = dbg_active_attach(argc - 1, argv + 1); - } - break; - case 3: file = argv[0]; ds = dbg_active_attach(argc - 1, argv + 1); - break; - default: - return start_error_parse; } - if (ds != start_ok) return ds; - memcpy(tmp, "minidump \"", 10); - if (!file) - { - char path[MAX_PATH]; + break; + case 3: + file = argv[0]; + ds = dbg_active_attach(argc - 1, argv + 1); + break; + default: + return start_error_parse; + } + if (ds != start_ok) return ds; + memcpy(tmp, "minidump \"", 10); + if (!file) + { + char path[MAX_PATH]; - GetTempPathA(sizeof(path), path); - GetTempFileNameA(path, "WD", 0, tmp + 10); - } - else strcpy(tmp + 10, file); - strcat(tmp, "\""); - if (!file) - { - /* FIXME: should generate unix name as well */ - dbg_printf("Capturing program state in %s\n", tmp + 9); - } - hFile = parser_generate_command_file(tmp, "detach", NULL); + GetTempPathA(sizeof(path), path); + GetTempFileNameA(path, "WD", 0, tmp + 10); } - else return start_error_parse; + else strcpy(tmp + 10, file); + strcat(tmp, "\""); + if (!file) + { + /* FIXME: should generate unix name as well */ + dbg_printf("Capturing program state in %s\n", tmp + 9); + } + hFile = parser_generate_command_file(tmp, "detach", NULL); if (hFile == INVALID_HANDLE_VALUE) return start_error_parse; if (dbg_curr_process->active_debuggee) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index a3a9f16..c5f4448 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -89,11 +89,11 @@ DWORD_PTR dbg_curr_tid = 0; DWORD_PTR dbg_curr_pid = 0; CONTEXT dbg_context; BOOL dbg_interactiveP = FALSE; +HANDLE dbg_houtput = 0; static struct list dbg_process_list = LIST_INIT(dbg_process_list); struct dbg_internal_var dbg_internal_vars[DBG_IV_LAST]; -static HANDLE dbg_houtput; static void dbg_outputA(const char* buffer, int len) { @@ -668,11 +668,8 @@ int main(int argc, char** argv) SymSetOptions((SymGetOptions() & ~(SYMOPT_UNDNAME)) | SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS | SYMOPT_AUTO_PUBLICS); - if (argc && (!strcmp(argv[0], "--auto") || !strcmp(argv[0], "--minidump"))) + if (argc && !strcmp(argv[0], "--auto")) { - /* force some internal variables */ - DBG_IVAR(BreakOnDllLoad) = 0; - dbg_houtput = GetStdHandle(STD_ERROR_HANDLE); switch (dbg_active_auto(argc, argv)) { case start_ok: return 0; @@ -680,6 +677,15 @@ int main(int argc, char** argv) case start_error_init: return -1; } } + if (argc && !strcmp(argv[0], "--minidump")) + { + switch (dbg_active_minidump(argc, argv)) + { + case start_ok: return 0; + case start_error_parse: return dbg_winedbg_usage(FALSE); + case start_error_init: return -1; + } + } /* parse options */ while (argc > 0 && argv[0][0] == '-') {

1 0