wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Gerald Pfeifer : msi: Fix return value for ITERATE_RemoveFiles ( in the error case).
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: effda58ad3ab16ca93246d164d4a4b1f7d305941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=effda58ad3ab16ca93246d164… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 17:45:56 2010 +0200 msi: Fix return value for ITERATE_RemoveFiles (in the error case). --- dlls/msi/files.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 4445773..10dbb28 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -890,7 +890,7 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param) UINT install_mode; LPWSTR dir = NULL, path = NULL; DWORD size; - UINT r; + UINT ret = ERROR_SUCCESS; component = MSI_RecordGetString(row, 2); filename = MSI_RecordGetString(row, 3); @@ -920,7 +920,7 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param) path = msi_alloc(size * sizeof(WCHAR)); if (!path) { - r = ERROR_OUTOFMEMORY; + ret = ERROR_OUTOFMEMORY; goto done; } @@ -948,7 +948,7 @@ done: msi_free(path); msi_free(dir); - return ERROR_SUCCESS; + return ret; } UINT ACTION_RemoveFiles( MSIPACKAGE *package )

1 0

Gerald Pfeifer : wineps.drv: Fix return value in PSDRV_SetBrush.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 13e16f5f3754d28519495a87ef1732131b8a7d13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13e16f5f3754d28519495a87e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 17:37:37 2010 +0200 wineps.drv: Fix return value in PSDRV_SetBrush. --- dlls/wineps.drv/brush.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/brush.c b/dlls/wineps.drv/brush.c index fb063ec..c88ab49 100644 --- a/dlls/wineps.drv/brush.c +++ b/dlls/wineps.drv/brush.c @@ -93,7 +93,7 @@ static BOOL PSDRV_SetBrush(PSDRV_PDEVICE *physDev) } physDev->brush.set = TRUE; - return TRUE; + return ret; }

1 0

Gerald Pfeifer : winhlp32: Remove variable keyDelta which is not really used from WINHELP_MainWndProc .
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 073743170c757fed66936a14b2d3d7e8a46e94e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=073743170c757fed66936a14b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 17:20:09 2010 +0200 winhlp32: Remove variable keyDelta which is not really used from WINHELP_MainWndProc. --- programs/winhlp32/winhelp.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index ffab618..b6da3fa 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -1335,7 +1335,6 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, { WINHELP_WINDOW *win; WINHELP_BUTTON *button; - INT keyDelta; HWND hTextWnd; LRESULT ret; @@ -1449,7 +1448,6 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, break; case WM_KEYDOWN: - keyDelta = 0; win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); hTextWnd = GetDlgItem(win->hMainWnd, CTL_ID_TEXT);

1 0

Gerald Pfeifer : riched20: Remove variable yprev which is not really used from ME_ArrowPageDown.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 01777ac5cef2db6c0a8c130a23ff935d39a6cae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01777ac5cef2db6c0a8c130a2… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 17:24:06 2010 +0200 riched20: Remove variable yprev which is not really used from ME_ArrowPageDown. --- dlls/riched20/caret.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index a72a42b..8360f06 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1416,7 +1416,7 @@ static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) } else { ME_DisplayItem *pRun = pCursor->pRun; ME_DisplayItem *p; - int ys, yd, yp, yprev; + int ys, yd, yp; int yOldScrollPos = editor->vert_si.nPos; if (!pCursor->nOffset && editor->bCaretAtEnd) @@ -1425,7 +1425,7 @@ static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) p = ME_FindItemBack(pRun, diStartRowOrParagraph); assert(p->type == diStartRow); yp = ME_FindItemBack(p, diParagraph)->member.para.pt.y; - yprev = ys = y = yp + p->member.row.pt.y; + ys = y = yp + p->member.row.pt.y; /* For native richedit controls: * v1.0 - v3.1 can only scroll down as far as the scrollbar lets us @@ -1447,7 +1447,6 @@ static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) if (y >= yd) break; pLast = p; - yprev = y; } while(1); pCursor->pRun = ME_FindRunInRow(editor, pLast, x, &pCursor->nOffset,

1 0

Gerald Pfeifer : winhlp32: Remove a hunk of dead code from HLPFILE_BrowsePage.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: bbbd723aa5afd97603dd04a23c879dcfa01cbf6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbbd723aa5afd97603dd04a23… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 17:18:24 2010 +0200 winhlp32: Remove a hunk of dead code from HLPFILE_BrowsePage. --- programs/winhlp32/hlpfile.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 7031c76..8c0d325 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -1736,16 +1736,6 @@ BOOL HLPFILE_BrowsePage(HLPFILE_PAGE* page, struct RtfData* rd, if (!HLPFILE_RtfAddControl(rd, "{\\colortbl ;\\red0\\green128\\blue0;")) return FALSE; for (index = 0; index < hlpfile->numFonts; index++) { - const char* family; - switch (hlpfile->fonts[index].LogFont.lfPitchAndFamily & 0xF0) - { - case FF_MODERN: family = "modern"; break; - case FF_ROMAN: family = "roman"; break; - case FF_SWISS: family = "swiss"; break; - case FF_SCRIPT: family = "script"; break; - case FF_DECORATIVE: family = "decor"; break; - default: family = "nil"; break; - } sprintf(tmp, "\\red%d\\green%d\\blue%d;", GetRValue(hlpfile->fonts[index].color), GetGValue(hlpfile->fonts[index].color),

1 0

Gerald Pfeifer : taskmgr: Shed one parameter and one local variable from ProcessPageOnNotify.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 2aa11ff62eb1b1c32f9cba17449f72cd726ab386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aa11ff62eb1b1c32f9cba174… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 16:48:48 2010 +0200 taskmgr: Shed one parameter and one local variable from ProcessPageOnNotify. --- programs/taskmgr/procpage.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index 4575605..7f91114 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -148,9 +148,8 @@ static void ProcessPageShowContextMenu(DWORD dwProcessId) DestroyMenu(hMenu); } -static void ProcessPageOnNotify(WPARAM wParam, LPARAM lParam) +static void ProcessPageOnNotify(LPARAM lParam) { - int idctrl; LPNMHDR pnmh; LPNMLISTVIEW pnmv; NMLVDISPINFOW* pnmdi; @@ -163,7 +162,6 @@ static void ProcessPageOnNotify(WPARAM wParam, LPARAM lParam) static const WCHAR wszFmt02D[] = {'%','0','2','d',0}; static const WCHAR wszUnitK[] = {' ','K',0}; - idctrl = (int) wParam; pnmh = (LPNMHDR) lParam; pnmv = (LPNMLISTVIEW) lParam; pnmdi = (NMLVDISPINFOW*) lParam; @@ -542,8 +540,7 @@ ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) break; case WM_NOTIFY: - - ProcessPageOnNotify(wParam, lParam); + ProcessPageOnNotify(lParam); break; }

1 0

Gerald Pfeifer : taskmgr: Remove unused variable PageSize which is not really used from PerfDataGetPhysicalMemorySystemCacheK .
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 370cbe5e5be03bf721a2ac5aa148feeda61b551e URL: http://source.winehq.org/git/wine.git/?a=commit;h=370cbe5e5be03bf721a2ac5aa… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 16:45:36 2010 +0200 taskmgr: Remove unused variable PageSize which is not really used from PerfDataGetPhysicalMemorySystemCacheK. --- programs/taskmgr/perfdata.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index 91400a5..0f3bf14 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -807,16 +807,13 @@ ULONG PerfDataGetPhysicalMemoryAvailableK(void) ULONG PerfDataGetPhysicalMemorySystemCacheK(void) { ULONG SystemCache; - ULONG PageSize; EnterCriticalSection(&PerfDataCriticalSection); SystemCache = SystemCacheInfo.CurrentSize; - PageSize = SystemBasicInfo.uPageSize; LeaveCriticalSection(&PerfDataCriticalSection); - /* SystemCache = SystemCache * (PageSize / 1024); */ SystemCache = SystemCache / 1024; return SystemCache;

1 0

Gerald Pfeifer : taskmgr: Remove variable CommitChargeLimit which is not really used from Graph_DrawMemUsageHistoryGraph .
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: e9c1750204645617c97de21a03d15b30d646f27e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9c1750204645617c97de21a0… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 16:42:24 2010 +0200 taskmgr: Remove variable CommitChargeLimit which is not really used from Graph_DrawMemUsageHistoryGraph. --- programs/taskmgr/graph.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/programs/taskmgr/graph.c b/programs/taskmgr/graph.c index 5e26ead..84a7307 100644 --- a/programs/taskmgr/graph.c +++ b/programs/taskmgr/graph.c @@ -320,7 +320,6 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) static void Graph_DrawMemUsageHistoryGraph(HDC hDC, HWND hWnd) { RECT rcClient; - ULONGLONG CommitChargeLimit; int i; static int offset = 0; @@ -338,11 +337,6 @@ static void Graph_DrawMemUsageHistoryGraph(HDC hDC, HWND hWnd) FillSolidRect(hDC, &rcClient, RGB(0, 0, 0)); /* - * Get the memory usage - */ - CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); - - /* * Draw the graph background * * Draw the horizontal bars

1 0

Gerald Pfeifer : regedit: Remove variable ExportKeyPath which is not really used from ExportRegistryFile .
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 8283920268971b7567c3c2da9145caec13b668d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8283920268971b7567c3c2da9… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 16:38:50 2010 +0200 regedit: Remove variable ExportKeyPath which is not really used from ExportRegistryFile. --- programs/regedit/framewnd.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index a737d8d..c5eba38 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -363,10 +363,8 @@ static BOOL ImportRegistryFile(HWND hWnd) static BOOL ExportRegistryFile(HWND hWnd) { OPENFILENAMEW ofn; - WCHAR ExportKeyPath[_MAX_PATH]; WCHAR title[128]; - ExportKeyPath[0] = 0; InitOpenFileName(hWnd, &ofn); LoadStringW(hInst, IDS_FILEDIALOG_EXPORT_TITLE, title, COUNT_OF(title)); ofn.lpstrTitle = title;

1 0

Gerald Pfeifer : regedit: Remove variable hdc which is not really used from OnPaint.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: d9dbfa7d7c1fd78b15c5d889b83ffdaeb0d933e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9dbfa7d7c1fd78b15c5d889b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 16:36:49 2010 +0200 regedit: Remove variable hdc which is not really used from OnPaint. --- programs/regedit/childwnd.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 1e7171a..bb56cb2 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -94,10 +94,9 @@ static void OnPaint(HWND hWnd) { PAINTSTRUCT ps; RECT rt; - HDC hdc; GetClientRect(hWnd, &rt); - hdc = BeginPaint(hWnd, &ps); + BeginPaint(hWnd, &ps); FillRect(ps.hdc, &rt, GetSysColorBrush(COLOR_BTNFACE)); EndPaint(hWnd, &ps); }

1 0

← Newer
1
...
89
90
91
92
93
94
95
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2010