December 2009 - Wine-Commits

Michael Stefaniuc : oledlg: Remove some explicit WPARAM casts.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 610fba7519fa15abb3b4dd130f2c2facea95742d URL: http://source.winehq.org/git/wine.git/?a=commit;h=610fba7519fa15abb3b4dd130… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 27 23:52:04 2009 +0100 oledlg: Remove some explicit WPARAM casts. --- dlls/oledlg/insobjdlg.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index 5db79f6..01d242e 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -380,7 +380,7 @@ static BOOL UIINSERTOBJECTDLG_PopulateObjectTypes(InsertObjectDlgInfo* pdlgInfo) *lpclsid = clsid; len = SendMessageW(pdlgInfo->hwndObjTypeLB, LB_ADDSTRING, 0, (LPARAM)keydesc); - SendMessageW(pdlgInfo->hwndObjTypeLB, LB_SETITEMDATA, (WPARAM)len, (LPARAM)lpclsid); + SendMessageW(pdlgInfo->hwndObjTypeLB, LB_SETITEMDATA, len, (LPARAM)lpclsid); } } @@ -426,7 +426,7 @@ static void UIINSERTOBJECTDLG_SelChange(InsertObjectDlgInfo* pdlgInfo) if (LoadStringW(OLEDLG_hInstance, IDS_RESULTOBJDESC, resstr, MAX_PATH) && ((index = SendMessageW(pdlgInfo->hwndObjTypeLB, LB_GETCURSEL, 0, 0)) >= 0) && - SendMessageW(pdlgInfo->hwndObjTypeLB, LB_GETTEXT, (WPARAM)index, (LPARAM)objname)) + SendMessageW(pdlgInfo->hwndObjTypeLB, LB_GETTEXT, index, (LPARAM)objname)) wsprintfW(objdesc, resstr, objname); else objdesc[0] = 0; @@ -452,7 +452,7 @@ static BOOL UIINSERTOBJECTDLG_OnOpen(InsertObjectDlgInfo* pdlgInfo) if (index >= 0) { CLSID* clsid = (CLSID*) SendMessageA(pdlgInfo->hwndObjTypeLB, - LB_GETITEMDATA, (WPARAM)index, 0); + LB_GETITEMDATA, index, 0); pdlgInfo->lpOleUIInsertObject->clsid = *clsid; if (pdlgInfo->lpOleUIInsertObject->dwFlags & IOF_CREATENEWOBJECT) @@ -525,7 +525,7 @@ static void UIINSERTOBJECTDLG_BrowseFile(InsertObjectDlgInfo* pdlgInfo) fn.nMaxCustFilter = 0; fn.nFilterIndex = 0; - SendMessageA(pdlgInfo->hwndFileTB, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)fname); + SendMessageA(pdlgInfo->hwndFileTB, WM_GETTEXT, MAX_PATH, (LPARAM)fname); fn.lpstrFile = fname; fn.nMaxFile = MAX_PATH;

1 0

Gerald Pfeifer : ntdll: Use #ifdef instead of #if to check for _DARWIN_FEATURE_64_BIT_INODE.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: e8d387fd45a27d44ea324c4ca3130cb6f9f2fb03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8d387fd45a27d44ea324c4ca… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Dec 25 11:08:53 2009 +0100 ntdll: Use #ifdef instead of #if to check for _DARWIN_FEATURE_64_BIT_INODE. --- dlls/ntdll/directory.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 5e68837..350dd8a 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1378,7 +1378,7 @@ done: #elif defined HAVE_GETDIRENTRIES -#if _DARWIN_FEATURE_64_BIT_INODE +#ifdef _DARWIN_FEATURE_64_BIT_INODE /* Darwin doesn't provide a version of getdirentries with support for 64-bit * inodes. When 64-bit inodes are enabled, the getdirentries symbol is mapped @@ -1563,7 +1563,7 @@ done: return res; } -#if _DARWIN_FEATURE_64_BIT_INODE +#ifdef _DARWIN_FEATURE_64_BIT_INODE #undef getdirentries #undef dirent #endif

1 0

Michael Stefaniuc : comdlg32: Remove some explicit LPARAM/WPARAM casts.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: db4fab9fc07aa60af5b987fb6d9235ab92f05175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db4fab9fc07aa60af5b987fb6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 27 23:53:05 2009 +0100 comdlg32: Remove some explicit LPARAM/WPARAM casts. --- dlls/comdlg32/filedlg.c | 4 +- dlls/comdlg32/finddlg.c | 4 +- dlls/comdlg32/printdlg.c | 56 +++++++++++++++++++-------------------------- 3 files changed, 28 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db4fab9fc07aa60af5b98…

1 0

Gerald Pfeifer : winedbg: Use #elif defined(...) instead of plain #elif in main().
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: f2d18c1c26432c29df56559c0f4e11e8cc26f344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2d18c1c26432c29df56559c0… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Dec 26 00:31:11 2009 +0100 winedbg: Use #elif defined(...) instead of plain #elif in main(). --- programs/winedbg/winedbg.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index e2bc83a..78bf722 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -628,11 +628,11 @@ int main(int argc, char** argv) #ifdef __i386__ be_cpu = &be_i386; -#elif __powerpc__ +#elif defined(__powerpc__) be_cpu = &be_ppc; -#elif __ALPHA__ +#elif defined(__ALPHA__) be_cpu = &be_alpha; -#elif __x86_64__ +#elif defined(__x86_64__) be_cpu = &be_x86_64; #else # error CPU unknown

1 0

Michael Stefaniuc : shell32: Remove some superfluous LPARAM/WPARAM casts.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 6f36945f2b6db8d4de43574b2ff36e60e591130c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f36945f2b6db8d4de43574b2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 27 23:53:28 2009 +0100 shell32: Remove some superfluous LPARAM/WPARAM casts. --- dlls/shell32/brsfolder.c | 2 +- dlls/shell32/changenotify.c | 2 +- dlls/shell32/shell32_main.c | 2 +- dlls/shell32/shlview.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 44103ab..0bc5820 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -490,7 +490,7 @@ static void BrsFolder_CheckValidSelection( browse_info *info, LPTV_ITEMDATA lptv bEnabled = FALSE; } } - SendMessageW(info->hWnd, BFFM_ENABLEOK, 0, (LPARAM)bEnabled); + SendMessageW(info->hWnd, BFFM_ENABLEOK, 0, bEnabled); } static LRESULT BrsFolder_Treeview_Delete( browse_info *info, NMTREEVIEWW *pnmtv ) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 96ffd99..13d70dc 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -387,7 +387,7 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID ptr->wSignalledEvent |= wEventId; if (ptr->dwFlags & SHCNRF_NewDelivery) - SendMessageA(ptr->hwnd, ptr->uMsg, (WPARAM) ptr, (LPARAM) GetCurrentProcessId()); + SendMessageA(ptr->hwnd, ptr->uMsg, (WPARAM) ptr, GetCurrentProcessId()); else SendMessageA(ptr->hwnd, ptr->uMsg, (WPARAM)Pidls, wEventId); diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 2d0f0b7..5f6a81d 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -956,7 +956,7 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, { /* authors list is in utf-8 format */ MultiByteToWideChar( CP_UTF8, 0, *pstr, -1, buffer, sizeof(buffer)/sizeof(WCHAR) ); - SendMessageW( hWndCtl, LB_ADDSTRING, (WPARAM)-1, (LPARAM)buffer ); + SendMessageW( hWndCtl, LB_ADDSTRING, -1, (LPARAM)buffer ); pstr++; } SendMessageW( hWndCtl, WM_SETREDRAW, 1, 0 ); diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 6deed53..b14ba78 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1262,7 +1262,7 @@ static LRESULT ShellView_OnCommand(IShellViewImpl * This,DWORD dwCmdID, DWORD dw case 0x31: case 0x32: case 0x33: - This->ListViewSortInfo.nHeaderID = (LPARAM) (dwCmdID - 0x30); + This->ListViewSortInfo.nHeaderID = dwCmdID - 0x30; This->ListViewSortInfo.bIsAscending = TRUE; This->ListViewSortInfo.nLastHeaderID = This->ListViewSortInfo.nHeaderID; SendMessageA(This->hWndList, LVM_SORTITEMS, (WPARAM) &This->ListViewSortInfo, (LPARAM)ShellView_ListViewCompareItems);

1 0

Michael Stefaniuc : comctl32: The return value of notify_with_scroll() is never used.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 9c15472a3bc54919dd85e373246470cab183ece1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c15472a3bc54919dd85e3732… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 27 23:50:59 2009 +0100 comctl32: The return value of notify_with_scroll() is never used. So don't bother returning something from that function. --- dlls/comctl32/trackbar.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 5abc77f..c924b53 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -135,18 +135,15 @@ static inline int notify (const TRACKBAR_INFO *infoPtr, INT code) return notify_hdr(infoPtr, code, &nmh); } -static BOOL -notify_with_scroll (const TRACKBAR_INFO *infoPtr, UINT code) +static void notify_with_scroll (const TRACKBAR_INFO *infoPtr, UINT code) { - BOOL bVert = infoPtr->dwStyle & TBS_VERT; + UINT scroll = infoPtr->dwStyle & TBS_VERT ? WM_VSCROLL : WM_HSCROLL; TRACE("%x\n", code); - return (BOOL) SendMessageW (infoPtr->hwndNotify, - bVert ? WM_VSCROLL : WM_HSCROLL, - (WPARAM)code, (LPARAM)infoPtr->hwndSelf); + SendMessageW (infoPtr->hwndNotify, scroll, code, (LPARAM)infoPtr->hwndSelf); } - + static void TRACKBAR_RecalculateTics (TRACKBAR_INFO *infoPtr) { int tic;

1 0

Michael Stefaniuc : winecfg: Remove some explicit WPARAM casts.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 3fae3f3666a82140bc8210f2be15b8c991750c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fae3f3666a82140bc8210f2b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 27 23:53:43 2009 +0100 winecfg: Remove some explicit WPARAM casts. --- programs/winecfg/appdefaults.c | 2 +- programs/winecfg/theme.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 5cb0968..8d28b0a 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -144,7 +144,7 @@ static void update_comboboxes(HWND dialog) if (!strcasecmp (win_versions[i].szVersion, winver)) { SendDlgItemMessage (dialog, IDC_WINVER, CB_SETCURSEL, - (WPARAM) i + (current_app?1:0), 0); + i + (current_app?1:0), 0); WINE_TRACE("match with %s\n", win_versions[i].szVersion); break; } diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index afbd6de..96110b3 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -465,8 +465,8 @@ static void on_theme_changed(HWND dialog) { if (!update_color_and_size (index, GetDlgItem (dialog, IDC_THEME_COLORCOMBO), GetDlgItem (dialog, IDC_THEME_SIZECOMBO))) { - SendMessageW (GetDlgItem (dialog, IDC_THEME_COLORCOMBO), CB_SETCURSEL, (WPARAM)-1, 0); - SendMessageW (GetDlgItem (dialog, IDC_THEME_SIZECOMBO), CB_SETCURSEL, (WPARAM)-1, 0); + SendMessageW (GetDlgItem (dialog, IDC_THEME_COLORCOMBO), CB_SETCURSEL, -1, 0); + SendMessageW (GetDlgItem (dialog, IDC_THEME_SIZECOMBO), CB_SETCURSEL, -1, 0); enable_size_and_color_controls (dialog, FALSE); } else @@ -699,8 +699,8 @@ static void on_theme_install(HWND dialog) GetDlgItem (dialog, IDC_THEME_COLORCOMBO), GetDlgItem (dialog, IDC_THEME_SIZECOMBO))) { - SendMessageW (GetDlgItem (dialog, IDC_THEME_COLORCOMBO), CB_SETCURSEL, (WPARAM)-1, 0); - SendMessageW (GetDlgItem (dialog, IDC_THEME_SIZECOMBO), CB_SETCURSEL, (WPARAM)-1, 0); + SendMessageW (GetDlgItem (dialog, IDC_THEME_COLORCOMBO), CB_SETCURSEL, -1, 0); + SendMessageW (GetDlgItem (dialog, IDC_THEME_SIZECOMBO), CB_SETCURSEL, -1, 0); enable_size_and_color_controls (dialog, FALSE); } else @@ -786,7 +786,7 @@ static void read_shell_folder_link_targets(void) { static void update_shell_folder_listview(HWND dialog) { int i; LVITEMW item; - LONG lSelected = SendDlgItemMessage(dialog, IDC_LIST_SFPATHS, LVM_GETNEXTITEM, (WPARAM)-1, + LONG lSelected = SendDlgItemMessage(dialog, IDC_LIST_SFPATHS, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_SELECTED,0)); SendDlgItemMessage(dialog, IDC_LIST_SFPATHS, LVM_DELETEALLITEMS, 0, 0); @@ -840,7 +840,7 @@ static void update_shell_folder_listview(HWND dialog) { item.mask = LVIF_STATE; item.state = LVIS_SELECTED; item.stateMask = LVIS_SELECTED; - SendDlgItemMessage(dialog, IDC_LIST_SFPATHS, LVM_SETITEMSTATE, (WPARAM)lSelected, + SendDlgItemMessage(dialog, IDC_LIST_SFPATHS, LVM_SETITEMSTATE, lSelected, (LPARAM)&item); } }

1 0

Michael Stefaniuc : wordpad: Remove some explicit LPARAM/WPARAM casts.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: cdaba885921ff0271ffdbfd3d2156ca79fbac918 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdaba885921ff0271ffdbfd3d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 27 23:54:04 2009 +0100 wordpad: Remove some explicit LPARAM/WPARAM casts. --- programs/wordpad/wordpad.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index e983c5d..86e1884 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1241,7 +1241,7 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr) if(pFr->Flags & FR_WHOLEWORD) flags |= FR_WHOLEWORD; - ret = SendMessageW(hEditorWnd, EM_FINDTEXTW, (WPARAM)flags, (LPARAM)&ft); + ret = SendMessageW(hEditorWnd, EM_FINDTEXTW, flags, (LPARAM)&ft); if(ret == -1) { @@ -1250,7 +1250,7 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr) ft.chrg.cpMin = cr.cpMin = 0; ft.chrg.cpMax = cr.cpMax = startPos; - ret = SendMessageW(hEditorWnd, EM_FINDTEXTW, (WPARAM)flags, (LPARAM)&ft); + ret = SendMessageW(hEditorWnd, EM_FINDTEXTW, flags, (LPARAM)&ft); } } @@ -1263,7 +1263,7 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr) { end = ret + lstrlenW(pFr->lpstrFindWhat); cr.cpMin = end; - SendMessageW(hEditorWnd, EM_SETSEL, (WPARAM)ret, (LPARAM)end); + SendMessageW(hEditorWnd, EM_SETSEL, ret, end); SendMessageW(hEditorWnd, EM_SCROLLCARET, 0, 0); if(pFr->Flags & FR_REPLACE || pFr->Flags & FR_REPLACEALL) @@ -1737,7 +1737,7 @@ static int context_menu(LPARAM lParam) int from = 0, to = 0; POINTL pt; SendMessageW(hEditorWnd, EM_GETSEL, (WPARAM)&from, (LPARAM)&to); - SendMessageW(hEditorWnd, EM_POSFROMCHAR, (WPARAM)&pt, (LPARAM)to); + SendMessageW(hEditorWnd, EM_POSFROMCHAR, (WPARAM)&pt, to); ClientToScreen(hEditorWnd, (POINT*)&pt); x = pt.x; y = pt.y;

1 0

Nikolay Sivov : comctl32/rebar: Check for null handles before invalidation.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 46194d39f63317c6dbe4d55293c45765d01ad42b URL: http://source.winehq.org/git/wine.git/?a=commit;h=46194d39f63317c6dbe4d5529… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Dec 26 19:17:06 2009 +0300 comctl32/rebar: Check for null handles before invalidation. This prevents all windows invalidation. --- dlls/comctl32/rebar.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 021bc16..2bb8b92 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -802,7 +802,7 @@ REBAR_CalcHorzBand (const REBAR_INFO *infoPtr, UINT rstart, UINT rend) work.right += SEP_WIDTH; work.bottom += SEP_WIDTH; InvalidateRect(infoPtr->hwndSelf, &work, TRUE); - InvalidateRect(lpBand->hwndChild, NULL, TRUE); + if (lpBand->hwndChild) InvalidateRect(lpBand->hwndChild, NULL, TRUE); } } @@ -923,7 +923,7 @@ REBAR_CalcVertBand (const REBAR_INFO *infoPtr, UINT rstart, UINT rend) work.bottom += SEP_WIDTH; work.right += SEP_WIDTH; InvalidateRect(infoPtr->hwndSelf, &work, TRUE); - InvalidateRect(lpBand->hwndChild, NULL, TRUE); + if (lpBand->hwndChild) InvalidateRect(lpBand->hwndChild, NULL, TRUE); } }

1 0

Henri Verbeet : wined3d: Let "FindContext()" figure out the thread id on its own.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 57ff4b4dead687f7184305731da2dbee678f87a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57ff4b4dead687f7184305731… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 27 19:57:22 2009 +0100 wined3d: Let "FindContext()" figure out the thread id on its own. It doesn't work with anything other than the current thread anyway. --- dlls/wined3d/context.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 797dd6b..a0d16c9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1857,11 +1857,12 @@ static struct wined3d_context *findThreadContextForSwapChain(IWineD3DSwapChain * * Returns: The needed context * *****************************************************************************/ -static inline struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, DWORD tid) +static struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target) { IWineD3DSwapChain *swapchain = NULL; struct wined3d_context *current_context = context_get_current(); const struct StateEntry *StateTable = This->StateTable; + DWORD tid = GetCurrentThreadId(); struct wined3d_context *context; BOOL old_render_offscreen; @@ -2234,7 +2235,7 @@ struct wined3d_context *context_acquire(IWineD3DDeviceImpl *device, IWineD3DSurf TRACE("device %p, target %p, usage %#x.\n", device, target, usage); - context = FindContext(device, target, GetCurrentThreadId()); + context = FindContext(device, target); context_enter(context); if (!context->valid) return context;

1 0