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

Michael Stefaniuc : dinput: Remove explicit cast to long as it happens implicitly.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 127733ebdacfc5ace26578ce0da0e8bdf28a435d URL: http://source.winehq.org/git/wine.git/?a=commit;h=127733ebdacfc5ace26578ce0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 18 09:47:10 2010 +0200 dinput: Remove explicit cast to long as it happens implicitly. LPDIEFFECT->rglDirection is a LPLONG. --- dlls/dinput/effect_linuxinput.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 3c86a34..7802271 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -342,8 +342,8 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetParameters( return diErr; else { if (peff->dwFlags & DIEFF_CARTESIAN) { - peff->rglDirection[0] = (long)(sin(M_PI * 3 * This->effect.direction / 0x7FFF) * 1000); - peff->rglDirection[1] = (long)(cos(M_PI * 3 * This->effect.direction / 0x7FFF) * 1000); + peff->rglDirection[0] = sin(M_PI * 3 * This->effect.direction / 0x7FFF) * 1000; + peff->rglDirection[1] = cos(M_PI * 3 * This->effect.direction / 0x7FFF) * 1000; } else { /* Polar and spherical coordinates are the same for two or less * axes.

1 0

Alexandre Julliard : comctl32/imagelist: Don' t pre-multiply the stored image, do it only at blending time.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 15efbc892b511e16918f576f7f0e70a8d9ef8fdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=15efbc892b511e16918f576f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 18 12:44:35 2010 +0200 comctl32/imagelist: Don't pre-multiply the stored image, do it only at blending time. --- dlls/comctl32/imagelist.c | 42 +++++++++++++++++------------------------- 1 files changed, 17 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index c1ea00a..27d95f5 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -212,20 +212,6 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, { if (himl->has_alpha) himl->has_alpha[pos + n] = 1; - /* pre-multiply by the alpha channel */ - for (i = 0; i < height; i++) - { - for (j = n * width; j < (n + 1) * width; j++) - { - DWORD argb = bits[i * bm.bmWidth + j]; - DWORD alpha = argb >> 24; - bits[i * bm.bmWidth + j] = ((argb & 0xff000000) | - (((argb & 0x00ff0000) * alpha / 255) & 0x00ff0000) | - (((argb & 0x0000ff00) * alpha / 255) & 0x0000ff00) | - (((argb & 0x000000ff) * alpha / 255))); - } - } - if (mask_info && himl->hbmMask) /* generate the mask from the alpha channel */ { for (i = 0; i < height; i++) @@ -247,6 +233,7 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, done: if (hdcMask) DeleteDC( hdcMask ); HeapFree( GetProcessHeap(), 0, info ); + HeapFree( GetProcessHeap(), 0, mask_info ); HeapFree( GetProcessHeap(), 0, bits ); HeapFree( GetProcessHeap(), 0, mask_bits ); return ret; @@ -1195,7 +1182,19 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des SelectObject( hdc, bmp ); BitBlt( hdc, 0, 0, cx, cy, himl->hdcImage, src_x, src_y, SRCCOPY ); - if (himl->hbmMask) + if (himl->uBitsPixel == 32) /* we already have an alpha channel in this case */ + { + /* pre-multiply by the alpha channel */ + for (i = 0, ptr = bits; i < cx * cy; i++, ptr++) + { + DWORD alpha = *ptr >> 24; + *ptr = ((*ptr & 0xff000000) | + (((*ptr & 0x00ff0000) * alpha / 255) & 0x00ff0000) | + (((*ptr & 0x0000ff00) * alpha / 255) & 0x0000ff00) | + (((*ptr & 0x000000ff) * alpha / 255))); + } + } + else if (himl->hbmMask) { unsigned int width_bytes = (cx + 31) / 32 * 4; /* generate alpha channel from the mask */ @@ -1311,12 +1310,8 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) if (bIsTransparent) { - if (himl->uBitsPixel == 32) /* we already have an alpha channel in this case */ - bResult = GdiAlphaBlend( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, - himl->hdcImage, pt.x, pt.y, cx, cy, func ); - else - bResult = alpha_blend_image( himl, pimldp->hdcDst, pimldp->x, pimldp->y, - pt.x, pt.y, cx, cy, func ); + bResult = alpha_blend_image( himl, pimldp->hdcDst, pimldp->x, pimldp->y, + pt.x, pt.y, cx, cy, func ); goto end; } colour = pimldp->rgbBk; @@ -1325,10 +1320,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) hOldBrush = SelectObject (hImageDC, CreateSolidBrush (colour)); PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY ); - if (himl->uBitsPixel == 32) - GdiAlphaBlend( hImageDC, 0, 0, cx, cy, himl->hdcImage, pt.x, pt.y, cx, cy, func ); - else - alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func ); + alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func ); DeleteObject (SelectObject (hImageDC, hOldBrush)); bResult = BitBlt( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, hImageDC, 0, 0, SRCCOPY ); goto end;

1 0

Michael Stefaniuc : taskmgr: Avoid using long.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: efeb9ee4d2dd6ef4c178d60d52d29d13d4716300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efeb9ee4d2dd6ef4c178d60d5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 18 01:30:51 2010 +0200 taskmgr: Avoid using long. --- programs/taskmgr/graphctl.c | 6 +++--- programs/taskmgr/run.c | 2 +- programs/taskmgr/taskmgr.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/taskmgr/graphctl.c b/programs/taskmgr/graphctl.c index 657ac6c..2fe2a29 100644 --- a/programs/taskmgr/graphctl.c +++ b/programs/taskmgr/graphctl.c @@ -416,14 +416,14 @@ static void GraphCtrl_DrawPoint(TGraphCtrl* this) /* move to the previous point */ prevX = this->m_rectPlot.right-this->m_nPlotShiftPixels; - prevY = this->m_rectPlot.bottom - - (long)((this->m_dPreviousPosition[i] - this->m_dLowerLimit) * this->m_dVerticalFactor); + prevY = this->m_rectPlot.bottom - + (int)((this->m_dPreviousPosition[i] - this->m_dLowerLimit) * this->m_dVerticalFactor); MoveToEx(this->m_dcPlot, prevX, prevY, NULL); /* draw to the current point */ currX = this->m_rectPlot.right-this->m_nHalfShiftPixels; currY = this->m_rectPlot.bottom - - (long)((this->m_dCurrentPosition[i] - this->m_dLowerLimit) * this->m_dVerticalFactor); + (int)((this->m_dCurrentPosition[i] - this->m_dLowerLimit) * this->m_dVerticalFactor); LineTo(this->m_dcPlot, currX, currY); /* Restore the pen */ diff --git a/programs/taskmgr/run.c b/programs/taskmgr/run.c index 3ecab9b..dc8cf7b 100644 --- a/programs/taskmgr/run.c +++ b/programs/taskmgr/run.c @@ -56,7 +56,7 @@ void TaskManager_OnFileNew(void) static const WCHAR wszShell32[] = {'S','H','E','L','L','3','2','.','D','L','L',0}; hShell32 = LoadLibraryW(wszShell32); - RunFileDlg = (RUNFILEDLG)(FARPROC)GetProcAddress(hShell32, (char*)((long)0x3D)); + RunFileDlg = (void *)GetProcAddress(hShell32, (LPCSTR)61); /* Show "Run..." dialog */ if (RunFileDlg) diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index 542555f..08acf71 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -754,7 +754,7 @@ LPWSTR GetLastErrorText(LPWSTR lpwszBuf, DWORD dwSize) NULL ); /* supplied buffer is not long enough */ - if (!dwRet || ( (long)dwSize < (long)dwRet+14)) { + if (!dwRet || ( dwSize < dwRet+14)) { lpwszBuf[0] = '\0'; } else { lpwszTemp[strlenW(lpwszTemp)-2] = '\0'; /* remove cr and newline character */

1 0

Michael Stefaniuc : shell32: Remove redundant "not NULL" check of ppidl ( coccicheck).
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: f8bac981960fca46dc548e4c7c2d5d84ffeadf45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8bac981960fca46dc548e4c7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 18 01:31:40 2010 +0200 shell32: Remove redundant "not NULL" check of ppidl (coccicheck). --- dlls/shell32/shfldr_fs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 091c1e0..626f17f 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -431,7 +431,7 @@ IShellFolder_fnParseDisplayName (IShellFolder2 * iface, else *ppidl = NULL; - TRACE ("(%p)->(-- pidl=%p ret=0x%08x)\n", This, ppidl ? *ppidl : 0, hr); + TRACE ("(%p)->(-- pidl=%p ret=0x%08x)\n", This, *ppidl, hr); return hr; }

1 0

Michael Stefaniuc : user32: Remove redundant not NULL check of variable item (coccicheck).
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 48e36e43ddfa613afdca988cb60979a1726f4a0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=48e36e43ddfa613afdca988cb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 18 01:32:11 2010 +0200 user32: Remove redundant not NULL check of variable item (coccicheck). --- dlls/user32/listbox.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 059be04..d7f86a6 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -562,7 +562,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, dis.itemData = item->data; dis.rcItem = *rect; TRACE("[%p]: drawitem %d (%s) action=%02x state=%02x rect=%s\n", - descr->self, index, item ? debugstr_w(item->str) : "", action, + descr->self, index, debugstr_w(item->str), action, dis.itemState, wine_dbgstr_rect(rect) ); SendMessageW(descr->owner, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); }

1 0

Michael Stefaniuc : ddraw: Remove redundant "not NULL" check of This ( coccicheck).
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 989e98202f199e1b351a514f79a0f2ac1c1beebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=989e98202f199e1b351a514f7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 18 01:32:45 2010 +0200 ddraw: Remove redundant "not NULL" check of This (coccicheck). --- dlls/ddraw/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index ed4e7cd..591f46c 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -289,7 +289,7 @@ err_out: /* Let's hope we never need this ;) */ if(wineD3DDevice) IWineD3DDevice_Release(wineD3DDevice); if(wineD3D) IWineD3D_Release(wineD3D); - if(This) HeapFree(GetProcessHeap(), 0, This->decls); + HeapFree(GetProcessHeap(), 0, This->decls); HeapFree(GetProcessHeap(), 0, This); return hr; }

1 0

Michael Stefaniuc : avifil32: Remove some redundant "not NULL" checks ( coccicheck).
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 6178e86a7415507219e541a2c78b22ed9b3dad71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6178e86a7415507219e541a2c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 18 01:31:01 2010 +0200 avifil32: Remove some redundant "not NULL" checks (coccicheck). --- dlls/avifil32/api.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index ac3c35e..8ef75d3 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -1447,7 +1447,7 @@ BOOL WINAPI AVISaveOptions(HWND hWnd, UINT uFlags, INT nStreams, return AVIERR_BADPARAM; /* save options in case the user presses cancel */ - if (ppOptions != NULL && nStreams > 1) { + if (nStreams > 1) { pSavedOptions = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(AVICOMPRESSOPTIONS)); if (pSavedOptions == NULL) return FALSE; @@ -1629,7 +1629,7 @@ HRESULT WINAPI AVISaveVW(LPCWSTR szFile, CLSID *pclsidHandler, /* remember first video stream -- needed for interleaving */ if (lFirstVideo < 0) lFirstVideo = curStream; - } else if (!dwInterleave && plpOptions != NULL) { + } else if (!dwInterleave) { /* check if any non-video stream wants to be interleaved */ WARN("options.flags=0x%X options.dwInterleave=%u\n",plpOptions[curStream]->dwFlags,plpOptions[curStream]->dwInterleaveEvery); if (plpOptions[curStream] != NULL && @@ -1639,7 +1639,7 @@ HRESULT WINAPI AVISaveVW(LPCWSTR szFile, CLSID *pclsidHandler, /* create de-/compressed stream interface if needed */ pInStreams[curStream] = NULL; - if (plpOptions != NULL && plpOptions[curStream] != NULL) { + if (plpOptions[curStream] != NULL) { if (plpOptions[curStream]->fccHandler || plpOptions[curStream]->lpFormat != NULL) { DWORD dwKeySave = plpOptions[curStream]->dwKeyFrameEvery;

1 0

Michael Stefaniuc : mciwave: Remove redundant "not NULL" checks of the variables lpParms.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 2721cff09e6e2e38171a3cc13054ed099ac7afb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2721cff09e6e2e38171a3cc13… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 18 01:32:34 2010 +0200 mciwave: Remove redundant "not NULL" checks of the variables lpParms. Found by coccicheck. --- dlls/mciwave/mciwave.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 87dc260..6485288 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -791,12 +791,12 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, } end = wmw->ckWaveData.cksize; - if (lpParms && (dwFlags & MCI_TO)) { + if (dwFlags & MCI_TO) { DWORD position = WAVE_ConvertTimeFormatToByte(wmw, lpParms->dwTo); if (position > end) return MCIERR_OUTOFRANGE; end = position; } - if (lpParms && (dwFlags & MCI_FROM)) { + if (dwFlags & MCI_FROM) { DWORD position = WAVE_ConvertTimeFormatToByte(wmw, lpParms->dwFrom); if (position > end) return MCIERR_OUTOFRANGE; /* Seek rounds down, so do we. */ @@ -1033,10 +1033,10 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt dwRet = WAVE_mciCreateRIFFSkeleton(wmw); if (dwRet != 0) return dwRet; - if (lpParms && (dwFlags & MCI_TO)) { + if (dwFlags & MCI_TO) { end = WAVE_ConvertTimeFormatToByte(wmw, lpParms->dwTo); } else end = 0xFFFFFFFF; - if (lpParms && (dwFlags & MCI_FROM)) { + if (dwFlags & MCI_FROM) { DWORD position = WAVE_ConvertTimeFormatToByte(wmw, lpParms->dwFrom); if (wmw->ckWaveData.cksize < position) return MCIERR_OUTOFRANGE; /* Seek rounds down, so do we. */

1 0

Michael Stefaniuc : winex11.drv: Remove redundant "not NULL" check of cfgs (coccicheck).
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 31e4cf9313f698336fab6b3d61b6ac8fa8cba926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31e4cf9313f698336fab6b3d6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 18 01:31:10 2010 +0200 winex11.drv: Remove redundant "not NULL" check of cfgs (coccicheck). --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 584abb6..3869619 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1035,7 +1035,7 @@ static WineGLPixelFormat *get_formats(Display *display, int *size_ret, int *onsc } } - if(cfgs != NULL) XFree(cfgs); + XFree(cfgs); done: if (size_ret) *size_ret = size;

1 0

Alexandre Julliard : winex11: Force alpha channel to 0 when blitting to depth 32 from a lower depth.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: ea596f8a5f7d732bb56b5921ceb964137df0b930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea596f8a5f7d732bb56b5921c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 18 14:11:51 2010 +0200 winex11: Force alpha channel to 0 when blitting to depth 32 from a lower depth. --- dlls/winex11.drv/xrender.c | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index d82cbf6..9678def 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -603,6 +603,32 @@ static Picture get_xrender_picture_source(X11DRV_PDEVICE *physDev, BOOL repeat) return info->pict_src; } +/* return a mask picture used to force alpha to 0 */ +static Picture get_no_alpha_mask(void) +{ + static Pixmap pixmap; + static Picture pict; + + wine_tsx11_lock(); + if (!pict) + { + const WineXRenderFormat *fmt = get_xrender_format( WXR_FORMAT_A8R8G8B8 ); + XRenderPictureAttributes pa; + XRenderColor col; + + pixmap = XCreatePixmap( gdi_display, root_window, 1, 1, 32 ); + pa.repeat = RepeatNormal; + pa.component_alpha = True; + pict = pXRenderCreatePicture( gdi_display, pixmap, fmt->pict_format, + CPRepeat|CPComponentAlpha, &pa ); + col.red = col.green = col.blue = 0xffff; + col.alpha = 0; + pXRenderFillRectangle( gdi_display, PictOpSrc, pict, &col, 0, 0, 1, 1 ); + } + wine_tsx11_unlock(); + return pict; +} + static BOOL fontcmp(LFANDSIZE *p1, LFANDSIZE *p2) { if(p1->hash != p2->hash) return TRUE; @@ -2285,6 +2311,7 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE } else /* color -> color (can be at different depths) or mono -> mono */ { + if (physDevDst->depth == 32 && physDevSrc->depth < 32) mask_pict = get_no_alpha_mask(); src_pict = get_xrender_picture_source( physDevSrc, use_repeat ); wine_tsx11_lock(); @@ -2292,7 +2319,8 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE pixmap, dst_format->pict_format, CPSubwindowMode|CPRepeat, &pa); - xrender_blit(PictOpSrc, src_pict, 0, dst_pict, x_src, y_src, 0, 0, xscale, yscale, width, height); + xrender_blit(PictOpSrc, src_pict, mask_pict, dst_pict, + x_src, y_src, 0, 0, xscale, yscale, width, height); if(dst_pict) pXRenderFreePicture(gdi_display, dst_pict); wine_tsx11_unlock();

1 0