wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

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 : widl: Simplify write_struct_tfs and remove an unused variable.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 194fd8744ad9752ffa614f50b35ea153b610e9c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=194fd8744ad9752ffa614f50b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 2 20:48:39 2010 +0200 widl: Simplify write_struct_tfs and remove an unused variable. --- tools/widl/typegen.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 694e98d..8541c5a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2452,7 +2452,6 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, unsigned int total_size; const var_t *array; unsigned int start_offset; - unsigned int array_offset; unsigned int align; unsigned int corroff; var_t *f; @@ -2473,10 +2472,12 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, array = find_array_or_string_in_struct(type); if (array && !processed(array->type)) - array_offset - = is_string_type(array->attrs, array->type) - ? write_string_tfs(file, array->attrs, array->type, FALSE, array->name, tfsoff) - : write_array_tfs(file, array->attrs, array->type, array->name, tfsoff); + { + if(is_string_type(array->attrs, array->type)) + write_string_tfs(file, array->attrs, array->type, FALSE, array->name, tfsoff); + else + write_array_tfs(file, array->attrs, array->type, array->name, tfsoff); + } corroff = *tfsoff; write_descriptors(file, type, tfsoff);

1 0

Gerald Pfeifer : comctl32: Remove variable old_focused which is not really used from MONTHCAL_Mouse.
by Alexandre Julliard 03 May '10

03 May '10

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

03 May '10

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

← Newer
1
...
88
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