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

Gerald Pfeifer : gdi32: Remove variable x which is not really used from testJustification.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 08b88c42ee42d5ab081755272241e92d2bc29ca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08b88c42ee42d5ab081755272… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 2 20:53:58 2010 +0200 gdi32: Remove variable x which is not really used from testJustification. --- dlls/gdi32/tests/font.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 87ca494..7982a73 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1343,7 +1343,7 @@ static void test_GetOutlineTextMetrics(void) static void testJustification(HDC hdc, PSTR str, RECT *clientArea) { - INT x, y, + INT y, breakCount, justifiedWidth = 0, /* to test GetTextExtentExPointW() */ areaWidth = clientArea->right - clientArea->left, @@ -1399,8 +1399,6 @@ static void testJustification(HDC hdc, PSTR str, RECT *clientArea) } else lastExtent = TRUE; - x = clientArea->left; - /* catch errors and report them */ if (!lastExtent && (justifiedWidth != areaWidth)) {

1 0

Gerald Pfeifer : mshtml/tests: Fix return value of ActiveScript_SetScriptState.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 5dac305bab9d29c2f5452e017c1be28821edba0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dac305bab9d29c2f5452e017… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 2 21:16:06 2010 +0200 mshtml/tests: Fix return value of ActiveScript_SetScriptState. --- dlls/mshtml/tests/script.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 56d83ef..dab2047 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -1995,7 +1995,7 @@ static HRESULT WINAPI ActiveScript_SetScriptState(IActiveScript *iface, SCRIPTST } hres = IActiveScriptSite_OnStateChange(site, (state = ss)); - return S_OK; + return hres; } static HRESULT WINAPI ActiveScript_GetScriptState(IActiveScript *iface, SCRIPTSTATE *pssState)

1 0

Gerald Pfeifer : ntoskrnl.exe: Remove variable retX which is not really used from emulate_instruction.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 9c69b23551557580953f0570e907cb86e8d9b1a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c69b23551557580953f0570e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 2 21:20:53 2010 +0200 ntoskrnl.exe: Remove variable retX which is not really used from emulate_instruction. --- dlls/ntoskrnl.exe/instr.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 9d04823..e7046f4 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -260,7 +260,7 @@ static BYTE *INSTR_GetOperandAddr( CONTEXT86 *context, BYTE *instr, */ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT86 *context ) { - int prefix, segprefix, prefixlen, len, repX, long_op, long_addr; + int prefix, segprefix, prefixlen, len, long_op, long_addr; BYTE *instr; long_op = long_addr = 1; @@ -271,7 +271,6 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT86 *context ) segprefix = -1; /* no prefix */ prefix = 1; - repX = 0; prefixlen = 0; while(prefix) { @@ -304,10 +303,8 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT86 *context ) case 0xf0: /* lock */ break; case 0xf2: /* repne */ - repX = 1; break; case 0xf3: /* repe */ - repX = 2; break; default: prefix = 0; /* no more prefixes */

1 0

Gerald Pfeifer : oleaut32/tests: Remove variable expectedhres which is not really used from test_VarDiv.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 9c3729795f8c1ba4332fde6c52a33038e9a29ede URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c3729795f8c1ba4332fde6c5… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 2 21:23:49 2010 +0200 oleaut32/tests: Remove variable expectedhres which is not really used from test_VarDiv. --- dlls/oleaut32/tests/vartest.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index ef2445a..2374051 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -7130,7 +7130,7 @@ static void test_VarDiv(void) VARIANT left, right, exp, result, cy, dec; BSTR num1_str, num2_str; VARTYPE i; - HRESULT hres, expectedhres; + HRESULT hres; double r; num1_str = SysAllocString(str1); @@ -7170,7 +7170,6 @@ static void test_VarDiv(void) V_VT(&right) = rightvt | ExtraFlags[i]; V_VT(&result) = VT_EMPTY; resvt = VT_EMPTY; - expectedhres = S_OK; if (leftvt == VT_BSTR) V_BSTR(&left) = num2_str;

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

03 May '10

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