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

Gerald Pfeifer : sfnt2fnt: Remove variable descent which is not really used from fill_fontinfo.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 0151175127abe24ec26988ad4cdb70b602ba7a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0151175127abe24ec26988ad4… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 12:32:44 2010 +0200 sfnt2fnt: Remove variable descent which is not really used from fill_fontinfo. --- tools/sfnt2fnt.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fnt.c index 3b6cafc..f58c40b 100644 --- a/tools/sfnt2fnt.c +++ b/tools/sfnt2fnt.c @@ -365,7 +365,7 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, unsigned char def_char, int avg_width ) { FT_Face face; - int ascent = 0, il, el, descent = 0, width_bytes = 0, space_size, max_width = 0; + int ascent = 0, il, el, width_bytes = 0, space_size, max_width = 0; BYTE left_byte, right_byte, byte; DWORD start; int i, x, y, x_off, x_end, first_char; @@ -413,7 +413,6 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, if(size_table->hori.ascender - size_table->hori.descender == ppem) { ascent = size_table->hori.ascender; - descent = -size_table->hori.descender; break; } size_table++; @@ -431,7 +430,6 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, if(FT_Load_Char(face, 0xc5, FT_LOAD_DEFAULT)) error("Can't find Aring\n"); ascent = face->glyph->metrics.horiBearingY >> 6; - descent = ppem - ascent; } start = sizeof(FNT_HEADER);

1 0

Gerald Pfeifer : wordpad: Remove variable i which is not really used from OnCommand.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 2488c8a545408866d1a2b69e9f511c69d505af18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2488c8a545408866d1a2b69e9… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 14:09:26 2010 +0200 wordpad: Remove variable i which is not really used from OnCommand. --- programs/wordpad/wordpad.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index d5f9af5..af1b24d 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2244,12 +2244,12 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) case ID_EDIT_DEFCHARFORMAT: { CHARFORMAT2W cf; - LRESULT i; + ZeroMemory(&cf, sizeof(cf)); cf.cbSize = sizeof(cf); cf.dwMask = 0; - i = SendMessageW(hwndEditor, EM_GETCHARFORMAT, - LOWORD(wParam) == ID_EDIT_CHARFORMAT, (LPARAM)&cf); + SendMessageW(hwndEditor, EM_GETCHARFORMAT, + LOWORD(wParam) == ID_EDIT_CHARFORMAT, (LPARAM)&cf); return 0; }

1 0

Gerald Pfeifer : rpcrt4: Remove variable size which is not really used from NdrComplexArrayUnmarshall .
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 3b3085fba1deec467b15a66ba8fa31a17bd6a345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b3085fba1deec467b15a66ba… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 15:55:22 2010 +0200 rpcrt4: Remove variable size which is not really used from NdrComplexArrayUnmarshall. --- dlls/rpcrt4/ndr_marshall.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 283cac9..3ad55aa 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -4187,7 +4187,6 @@ unsigned char * WINAPI NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, unsigned char fMustAlloc) { - ULONG size; unsigned char *saved_buffer; int pointer_buffer_mark_set = 0; int saved_ignore_embedded; @@ -4209,7 +4208,6 @@ unsigned char * WINAPI NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, pStubMsg->IgnoreEmbeddedPointers = 1; pStubMsg->MemorySize = 0; NdrComplexArrayMemorySize(pStubMsg, pFormat); - size = pStubMsg->MemorySize; pStubMsg->IgnoreEmbeddedPointers = saved_ignore_embedded; TRACE("difference = 0x%x\n", (ULONG)(pStubMsg->Buffer - saved_buffer));

1 0

Gerald Pfeifer : d3drm: Remove two variables which are not really used from IDirect3DRMMeshBuilderImpl_Load .
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 40b1b8fa7eca7d8ec35624c45ce588c3d717d354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b1b8fa7eca7d8ec35624c45… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 15:59:49 2010 +0200 d3drm: Remove two variables which are not really used from IDirect3DRMMeshBuilderImpl_Load. --- dlls/d3drm/meshbuilder.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 6eb5d1b..a2013f4 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -459,10 +459,6 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if if (loadflags == D3DRMLOAD_FROMMEMORY) { - DXFILELOADMEMORY info; - LPD3DRMLOADMEMORY pinfo = (LPD3DRMLOADMEMORY)filename; - info.lpMemory = pinfo->lpMemory; - info.dSize = pinfo->dSize; load_options = DXFILELOAD_FROMMEMORY; } else

1 0

Gerald Pfeifer : winex11: Remove variable datasize which is not really used from X11DRV_CLIPBOARD_ExportTextHtml .
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: ad714303287eee97022d33c6688db42167ade952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad714303287eee97022d33c66… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 16:28:13 2010 +0200 winex11: Remove variable datasize which is not really used from X11DRV_CLIPBOARD_ExportTextHtml. --- dlls/winex11.drv/clipboard.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 4d4306e..f674b2e 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1809,7 +1809,6 @@ static HANDLE X11DRV_CLIPBOARD_ExportTextHtml(Display *display, Window requestor Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes) { HANDLE hdata; - UINT datasize; LPCSTR data, field_value; UINT fragmentstart, fragmentend, htmlsize; HANDLE hhtmldata=NULL; @@ -1825,8 +1824,6 @@ static HANDLE X11DRV_CLIPBOARD_ExportTextHtml(Display *display, Window requestor hdata = lpdata->hData; - datasize = GlobalSize(hdata); - data = GlobalLock(hdata); if (!data) {

1 0

Gerald Pfeifer : winex11: Remove variable size which is not really used from X11DRV_CLIPBOARD_SerializeMetafile .
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: f6a79921aea88d548851dd16376b0f40aac7bdc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6a79921aea88d548851dd163… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 14:05:19 2010 +0200 winex11: Remove variable size which is not really used from X11DRV_CLIPBOARD_SerializeMetafile. --- dlls/winex11.drv/clipboard.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index f674b2e..584136a 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2411,14 +2411,13 @@ static HANDLE X11DRV_CLIPBOARD_SerializeMetafile(INT wformat, HANDLE hdata, LPDW h = GlobalAlloc(0, sizeof(METAFILEPICT)); if (h) { - unsigned int wiresize, size; + unsigned int wiresize; LPMETAFILEPICT lpmfp = GlobalLock(h); memcpy(lpmfp, hdata, sizeof(METAFILEPICT)); wiresize = *lpcbytes - sizeof(METAFILEPICT); lpmfp->hMF = SetMetaFileBitsEx(wiresize, ((const BYTE *)hdata) + sizeof(METAFILEPICT)); - size = GetMetaFileBitsEx(lpmfp->hMF, 0, NULL); GlobalUnlock(h); } }

1 0

Alexandre Julliard : configure: Don' t warn about libhal if we can use an alternative.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: d80627362d8141524075630491c5908e20e380f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d80627362d814152407563049… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 06:57:49 2010 -0500 configure: Don't warn about libhal if we can use an alternative. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 783b776..bcc43d8 100755 --- a/configure +++ b/configure @@ -9377,7 +9377,7 @@ fi fi CPPFLAGS="$ac_save_CPPFLAGS" fi -if test "x$ac_cv_lib_soname_hal" = "x"; then : +if test "x$ac_cv_lib_soname_hal" = "x" -a "x$ac_cv_header_DiskArbitration_DiskArbitration_h" != "xyes"; then : case "x$with_hal" in x) as_fn_append wine_notices "|libhal/libdbus ${notice_platform}development files not found, no dynamic device support." ;; xno) ;; diff --git a/configure.ac b/configure.ac index 83b3240..71b1f16 100644 --- a/configure.ac +++ b/configure.ac @@ -1133,7 +1133,7 @@ then fi CPPFLAGS="$ac_save_CPPFLAGS" fi -WINE_NOTICE_WITH(hal,[test "x$ac_cv_lib_soname_hal" = "x"], +WINE_NOTICE_WITH(hal,[test "x$ac_cv_lib_soname_hal" = "x" -a "x$ac_cv_header_DiskArbitration_DiskArbitration_h" != "xyes"], [libhal/libdbus ${notice_platform}development files not found, no dynamic device support.]) dnl **** Check for libgnutls ****

1 0

Gerald Pfeifer : localspl: Remove variable res which is not really used from test_XcvClosePort.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: cfd18661ef1feedea36fd007425a014900589020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfd18661ef1feedea36fd0074… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Apr 23 14:50:23 2010 +0200 localspl: Remove variable res which is not really used from test_XcvClosePort. --- dlls/localspl/tests/localmon.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 23a3608..496be71 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -775,9 +775,6 @@ static void test_XcvClosePort(void) static void test_XcvDataPort_AddPort(void) { - DWORD res; - - /* * The following tests crash with native localspl.dll on w2k and xp, * but it works, when the native dll (w2k and xp) is used in wine. @@ -790,28 +787,28 @@ static void test_XcvDataPort_AddPort(void) { /* create a Port for a normal, writable file */ SetLastError(0xdeadbeef); - res = pXcvDataPort(hXcv, cmd_AddPortW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, NULL); + pXcvDataPort(hXcv, cmd_AddPortW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, NULL); /* add our testport again */ SetLastError(0xdeadbeef); - res = pXcvDataPort(hXcv, cmd_AddPortW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, NULL); + pXcvDataPort(hXcv, cmd_AddPortW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, NULL); /* create a well-known Port */ SetLastError(0xdeadbeef); - res = pXcvDataPort(hXcv, cmd_AddPortW, (PBYTE) portname_lpt1W, (lstrlenW(portname_lpt1W) + 1) * sizeof(WCHAR), NULL, 0, NULL); + pXcvDataPort(hXcv, cmd_AddPortW, (PBYTE) portname_lpt1W, (lstrlenW(portname_lpt1W) + 1) * sizeof(WCHAR), NULL, 0, NULL); SetLastError(0xdeadbeef); - res = pXcvDataPort(hXcv, cmd_AddPortW, (PBYTE) portname_lpt1W, (lstrlenW(portname_lpt1W) + 1) * sizeof(WCHAR), NULL, 0, NULL); + pXcvDataPort(hXcv, cmd_AddPortW, (PBYTE) portname_lpt1W, (lstrlenW(portname_lpt1W) + 1) * sizeof(WCHAR), NULL, 0, NULL); /* native localspl.dll on wine: ERROR_ALREADY_EXISTS */ /* ERROR_ALREADY_EXISTS is also returned from native localspl.dll on wine, when "RPT1:" was already installed for redmonnt.dll: - res = pXcvDataPort(hXcv, cmd_AddPortW, (PBYTE) portname_rpt1W, ... + pXcvDataPort(hXcv, cmd_AddPortW, (PBYTE) portname_rpt1W, ... */ /* cleanup */ SetLastError(0xdeadbeef); - res = pXcvDataPort(hXcv, cmd_DeletePortW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, NULL); + pXcvDataPort(hXcv, cmd_DeletePortW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, NULL); } }

1 0

Gerald Pfeifer : fnt2bdf: Remove variable dpi which is not really used from dump_bdf_hdr.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 878df9a7e629936d18a558a6251d17bdc655d665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=878df9a7e629936d18a558a62… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Apr 23 20:42:32 2010 +0200 fnt2bdf: Remove variable dpi which is not really used from dump_bdf_hdr. --- tools/fnt2bdf.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/fnt2bdf.c b/tools/fnt2bdf.c index 89e24c8..4dc20e5 100644 --- a/tools/fnt2bdf.c +++ b/tools/fnt2bdf.c @@ -445,7 +445,7 @@ int l_ascent = return_data_value(dfShort, &cpe_font_struct->hdr.fi.dfAscent); if( l_nameoffset && l_nameoffset < return_data_value(dfLong, &cpe_font_struct->hdr.dfSize) ) { - int dpi, point_size; + int point_size; char* lpFace = (char*)(file_buffer + l_nameoffset), *lpChar; short tmWeight = return_data_value(dfShort, &cpe_font_struct->hdr.fi.dfWeight); @@ -479,7 +479,6 @@ int l_ascent = return_data_value(dfShort, &cpe_font_struct->hdr.fi.dfAscent); /* y extents */ point_size = 10 * return_data_value(dfShort, &cpe_font_struct->hdr.fi.dfPoints ); - dpi = (l_cellheight * 720) / point_size; fprintf(fs, "%d-%d-%d-%d-",l_cellheight, point_size, return_data_value (dfShort, &cpe_font_struct->hdr.fi.dfHorizRes),

1 0

Gerald Pfeifer : widl: Remove variable size which is not really used from print_phase_basetype.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: ea6590af160dc4227345d8f9112a8cb3caeda62a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea6590af160dc4227345d8f91… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Apr 23 20:46:08 2010 +0200 widl: Remove variable size which is not really used from print_phase_basetype. --- tools/widl/typegen.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 9e85fa0..694e98d 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3279,7 +3279,6 @@ void print_phase_basetype(FILE *file, int indent, const char *local_var_prefix, const char *varname) { type_t *type = var->type; - unsigned int size; unsigned int alignment = 0; /* no work to do for other phases, buffer sizing is done elsewhere */ @@ -3317,14 +3316,12 @@ void print_phase_basetype(FILE *file, int indent, const char *local_var_prefix, case RPC_FC_CHAR: case RPC_FC_SMALL: case RPC_FC_USMALL: - size = 1; alignment = 1; break; case RPC_FC_WCHAR: case RPC_FC_USHORT: case RPC_FC_SHORT: - size = 2; alignment = 2; break; @@ -3335,13 +3332,11 @@ void print_phase_basetype(FILE *file, int indent, const char *local_var_prefix, /* pointer_size must be 4 if we got here in these two cases */ case RPC_FC_INT3264: case RPC_FC_UINT3264: - size = 4; alignment = 4; break; case RPC_FC_HYPER: case RPC_FC_DOUBLE: - size = 8; alignment = 8; break; @@ -3353,7 +3348,6 @@ void print_phase_basetype(FILE *file, int indent, const char *local_var_prefix, default: error("print_phase_basetype: Unsupported type: %s (0x%02x, ptr_level: 0)\n", var->name, get_basic_fc(ref)); - size = 0; } if (phase == PHASE_MARSHAL && alignment > 1)

1 0