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

Gerald Pfeifer : mshtml: Remove variable doc which is not really used from process_timer.
by Alexandre Julliard 03 May '10

03 May '10

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

03 May '10

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

03 May '10

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 03 May '10

03 May '10

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 : ole32: Fix return value of DefaultHandler_SetClientSite.
by Alexandre Julliard 03 May '10

03 May '10

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

03 May '10

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

03 May '10

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

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

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 : 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