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

Gerald Pfeifer : oleaut32/tests: Remove variable expectedhres which is not really used from test_VarDiv.
by Alexandre Julliard May 3, 2010

May 3, 2010

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

May 3, 2010

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

May 3, 2010

Module: wine Branch: master Commit: 44f1fbced49fad5901f6f01bce8541ea9a55f70e URL: http://source.winehq.org/git/wine.git/?a=commit;h=44f1fbced49fad5901f6f01bc… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 2 20:40:05 2010 +0200 comctl32: Remove variable old_focused which is not really used from MONTHCAL_Mouse. --- dlls/comctl32/monthcal.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 2c98331..a9795e0 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -2033,7 +2033,7 @@ static LRESULT MONTHCAL_MouseMove(MONTHCAL_INFO *infoPtr, LPARAM lParam) { MCHITTESTINFO ht; - SYSTEMTIME old_focused, st_ht; + SYSTEMTIME st_ht; INT hit; RECT r; @@ -2054,7 +2054,6 @@ MONTHCAL_MouseMove(MONTHCAL_INFO *infoPtr, LPARAM lParam) } st_ht = ht.st; - old_focused = infoPtr->focusedSel; /* if pointer is over focused day still there's nothing to do */ if(!MONTHCAL_SetDayFocus(infoPtr, &ht.st)) return 0;

1 0

Gerald Pfeifer : ole32: Fix return value for CoRevokeMallocSpy.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: c6f74e386b5f527843fd520f3a987bf8d36aff2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6f74e386b5f527843fd520f3… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 22:38:00 2010 +0200 ole32: Fix return value for CoRevokeMallocSpy. --- dlls/ole32/ifs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index c6a6962..1a10c3e 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -501,7 +501,7 @@ HRESULT WINAPI CoRevokeMallocSpy(void) } LeaveCriticalSection(&IMalloc32_SpyCS); - return S_OK; + return hres; } /******************************************************************************

1 0

Gerald Pfeifer : mshtml: Remove variable doc which is not really used from process_timer.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: d0f1b68416184aed40539a181ce75cadc8c495b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0f1b68416184aed40539a181… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 19:19:57 2010 +0200 mshtml: Remove variable doc which is not really used from process_timer. --- dlls/mshtml/task.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index eae51ca..c896179 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -222,7 +222,6 @@ static void call_timer_disp(IDispatch *disp) static LRESULT process_timer(void) { thread_data_t *thread_data = get_thread_data(TRUE); - HTMLDocument *doc; IDispatch *disp; DWORD tc; task_timer_t *timer; @@ -238,7 +237,6 @@ static LRESULT process_timer(void) return 0; } - doc = timer->doc; disp = timer->disp; IDispatch_AddRef(disp);

1 0

Gerald Pfeifer : ole32: Fix return value of DefaultHandler_SetClientSite.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 889900f020858de62dd7438c1b41fba61ac2a198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=889900f020858de62dd7438c1… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 22:33:45 2010 +0200 ole32: Fix return value of DefaultHandler_SetClientSite. --- dlls/ole32/defaulthandler.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 5130513..d0a871f 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -365,7 +365,7 @@ static HRESULT WINAPI DefaultHandler_SetClientSite( if (This->clientSite) IOleClientSite_AddRef(This->clientSite); - return S_OK; + return hr; } /************************************************************************

1 0

Gerald Pfeifer : wineps.drv: Fix return value in PSDRV_SetBrush.
by Alexandre Julliard May 3, 2010

May 3, 2010

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 : wintrust/tests: Remove variable myARGC which is not really used from test_cdf_parsing.
by Alexandre Julliard May 3, 2010

May 3, 2010

Module: wine Branch: master Commit: 7cdcdf781e2850d7aa9cfaedcf44dfdd39bd5ceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cdcdf781e2850d7aa9cfaedc… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 22:31:07 2010 +0200 wintrust/tests: Remove variable myARGC which is not really used from test_cdf_parsing. --- dlls/wintrust/tests/crypt.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index a2e096a..64a91b7 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -1111,7 +1111,6 @@ static void test_cdf_parsing(void) START_TEST(crypt) { - int myARGC; char** myARGV; char sysdir[MAX_PATH]; @@ -1129,7 +1128,7 @@ START_TEST(crypt) lstrcpyA(catroot2, sysdir); lstrcatA(catroot2, "\\CatRoot2"); - myARGC = winetest_get_mainargs(&myARGV); + winetest_get_mainargs(&myARGV); strcpy(selfname, myARGV[0]); GetCurrentDirectoryA(MAX_PATH, CURR_DIR);

1 0

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

May 3, 2010

Module: wine Branch: master Commit: 14ef0fed9cd94ca0aaefa759d709ec1ccc351e4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=14ef0fed9cd94ca0aaefa759d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 22:35:31 2010 +0200 riched20: Remove variable changed which is not really used from ME_PrepareParagraphForWrapping. --- dlls/riched20/wrap.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 3b15490..790c280 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -578,14 +578,12 @@ static void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp) { } /* join runs that can be joined, set up flags */ for (p = tp->next; p!=tp->member.para.next_para; p = p->next) { - int changed = 0; switch(p->type) { case diStartRow: assert(0); break; /* should have deleted it */ case diRun: while (p->next->type == diRun) { /* FIXME */ if (ME_CanJoinRuns(&p->member.run, &p->next->member.run)) { ME_JoinRuns(c->editor, p); - changed = 1; } else break;

1 0

Gerald Pfeifer : winhlp32: Remove variable keyDelta which is not really used from WINHELP_MainWndProc .
by Alexandre Julliard May 3, 2010

May 3, 2010

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