May 2010 - Wine-Commits - list.winehq.org

Gerald Pfeifer : msi: Fix return value for ITERATE_RemoveFiles ( in the error case).
by Alexandre Julliard May 3, 2010

May 3, 2010

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 : winex11: Remove variable bits which is not really used from X11DRV_DIB_GetImageBits_32 .
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 75c738e9e1b4d1b8696b0ac73151b08d533f0257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c738e9e1b4d1b8696b0ac73… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 22:21:52 2010 +0200 winex11: Remove variable bits which is not really used from X11DRV_DIB_GetImageBits_32. --- dlls/winex11.drv/dib.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 7a1aad7..4b9c52b 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -3184,7 +3184,6 @@ static void X11DRV_DIB_GetImageBits_32( X11DRV_PDEVICE *physDev, int lines, BYTE { DWORD x; int h, width = min(srcwidth, dstwidth); - BYTE *bits; const dib_conversions *convs = (bmpImage->byte_order == LSBFirst) ? &dib_normal : &dib_src_byteswap; if (lines < 0 ) @@ -3194,8 +3193,6 @@ static void X11DRV_DIB_GetImageBits_32( X11DRV_PDEVICE *physDev, int lines, BYTE linebytes = -linebytes; } - bits = dstbits; - switch (bmpImage->depth) { case 24:

1 0

Gerald Pfeifer : riched20: Remove variable yprev which is not really used from ME_ArrowPageDown.
by Alexandre Julliard May 3, 2010

May 3, 2010

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 May 3, 2010

May 3, 2010

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 : msi: Remove variable product_code which is not really used from MSI_ApplyPatchW .
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: be8d0bbb1e2e604f075e6facdb40ae7f9884fdc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be8d0bbb1e2e604f075e6facd… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 17:49:14 2010 +0200 msi: Remove variable product_code which is not really used from MSI_ApplyPatchW. --- dlls/msi/msi.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 983c0f5..8d63972 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -304,7 +304,7 @@ static UINT MSI_ApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szProductCode, LPCWS MSIHANDLE patch = 0, info = 0; UINT r = ERROR_SUCCESS, type; DWORD size = 0; - LPCWSTR cmd_ptr = szCommandLine, product_code = szProductCode; + LPCWSTR cmd_ptr = szCommandLine; LPWSTR beg, end, cmd = NULL, codes = NULL; BOOL succeeded = FALSE; @@ -341,8 +341,6 @@ static UINT MSI_ApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szProductCode, LPCWS r = MsiSummaryInfoGetPropertyW(info, PID_TEMPLATE, &type, NULL, NULL, codes, &size); if (r != ERROR_SUCCESS) goto done; - - product_code = codes; } if (!szCommandLine)

1 0

Gerald Pfeifer : regedit: Remove variable hdc which is not really used from OnPaint.
by Alexandre Julliard May 3, 2010

May 3, 2010

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

Gerald Pfeifer : cmd: Remove variable argsProcessed which is not really used from WCMD_directory .
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: f40265b0b4f2a7d5819e28b8dbb650b2bd4efad6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40265b0b4f2a7d5819e28b8d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 16:26:04 2010 +0200 cmd: Remove variable argsProcessed which is not really used from WCMD_directory. --- programs/cmd/directory.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 4e72d33..f397951 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -638,7 +638,6 @@ void WCMD_directory (WCHAR *cmd) { WCHAR *p; WCHAR string[MAXSTRING]; int argno = 0; - int argsProcessed = 0; WCHAR *argN = cmd; WCHAR lastDrive; BOOL trailerReqd = FALSE; @@ -831,7 +830,6 @@ void WCMD_directory (WCHAR *cmd) { } argno = 0; - argsProcessed = 0; argN = cmd; GetCurrentDirectoryW(MAX_PATH, cwd); strcatW(cwd, slashW);

1 0

Gerald Pfeifer : regedit: Remove variable ExportKeyPath which is not really used from ExportRegistryFile .
by Alexandre Julliard May 3, 2010

May 3, 2010

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 : taskmgr: Shed one parameter and one local variable from ProcessPageOnNotify.
by Alexandre Julliard May 3, 2010

May 3, 2010

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 : progman: Remove unused variable from and fix formatting of DIALOG_Execute.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 1419a3fe1a80b89f95a8143b50b7124370b441fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1419a3fe1a80b89f95a8143b5… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 16:30:49 2010 +0200 progman: Remove unused variable from and fix formatting of DIALOG_Execute. --- programs/progman/dialog.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/progman/dialog.c b/programs/progman/dialog.c index fc7c7fd..65eae87 100644 --- a/programs/progman/dialog.c +++ b/programs/progman/dialog.c @@ -622,11 +622,9 @@ static INT_PTR CALLBACK DIALOG_EXECUTE_DlgProc(HWND hDlg, UINT msg, VOID DIALOG_Execute(void) { - INT_PTR z; DLGPROC lpfnDlg = MakeProcInstance(DIALOG_EXECUTE_DlgProc, Globals.hInstance); - z=DialogBox(Globals.hInstance, STRING_EXECUTE, - Globals.hMainWnd, lpfnDlg); - FreeProcInstance(lpfnDlg); + DialogBox(Globals.hInstance, STRING_EXECUTE, Globals.hMainWnd, lpfnDlg); + FreeProcInstance(lpfnDlg); } /* Local Variables: */

1 0