Module: wine Branch: master Commit: efeb9ee4d2dd6ef4c178d60d52d29d13d4716300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efeb9ee4d2dd6ef4c178d60d52...
Author: Michael Stefaniuc mstefani@redhat.de Date: Tue May 18 01:30:51 2010 +0200
taskmgr: Avoid using long.
---
programs/taskmgr/graphctl.c | 6 +++--- programs/taskmgr/run.c | 2 +- programs/taskmgr/taskmgr.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/programs/taskmgr/graphctl.c b/programs/taskmgr/graphctl.c index 657ac6c..2fe2a29 100644 --- a/programs/taskmgr/graphctl.c +++ b/programs/taskmgr/graphctl.c @@ -416,14 +416,14 @@ static void GraphCtrl_DrawPoint(TGraphCtrl* this)
/* move to the previous point */ prevX = this->m_rectPlot.right-this->m_nPlotShiftPixels; - prevY = this->m_rectPlot.bottom - - (long)((this->m_dPreviousPosition[i] - this->m_dLowerLimit) * this->m_dVerticalFactor); + prevY = this->m_rectPlot.bottom - + (int)((this->m_dPreviousPosition[i] - this->m_dLowerLimit) * this->m_dVerticalFactor); MoveToEx(this->m_dcPlot, prevX, prevY, NULL);
/* draw to the current point */ currX = this->m_rectPlot.right-this->m_nHalfShiftPixels; currY = this->m_rectPlot.bottom - - (long)((this->m_dCurrentPosition[i] - this->m_dLowerLimit) * this->m_dVerticalFactor); + (int)((this->m_dCurrentPosition[i] - this->m_dLowerLimit) * this->m_dVerticalFactor); LineTo(this->m_dcPlot, currX, currY);
/* Restore the pen */ diff --git a/programs/taskmgr/run.c b/programs/taskmgr/run.c index 3ecab9b..dc8cf7b 100644 --- a/programs/taskmgr/run.c +++ b/programs/taskmgr/run.c @@ -56,7 +56,7 @@ void TaskManager_OnFileNew(void) static const WCHAR wszShell32[] = {'S','H','E','L','L','3','2','.','D','L','L',0};
hShell32 = LoadLibraryW(wszShell32); - RunFileDlg = (RUNFILEDLG)(FARPROC)GetProcAddress(hShell32, (char*)((long)0x3D)); + RunFileDlg = (void *)GetProcAddress(hShell32, (LPCSTR)61);
/* Show "Run..." dialog */ if (RunFileDlg) diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index 542555f..08acf71 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -754,7 +754,7 @@ LPWSTR GetLastErrorText(LPWSTR lpwszBuf, DWORD dwSize) NULL );
/* supplied buffer is not long enough */ - if (!dwRet || ( (long)dwSize < (long)dwRet+14)) { + if (!dwRet || ( dwSize < dwRet+14)) { lpwszBuf[0] = '\0'; } else { lpwszTemp[strlenW(lpwszTemp)-2] = '\0'; /* remove cr and newline character */