September 2009 - Wine-Commits

Stefan Dösinger : wined3d: Only generate the clipplane emulation KIL if a clipplane is used.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: d6547c535b7d7142841f6ab5a580abba27198a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6547c535b7d7142841f6ab5a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 30 21:02:05 2009 +0200 wined3d: Only generate the clipplane emulation KIL if a clipplane is used. The KIL is quite expensive because it forces drivers to disable early Z discard. It is cheaper to generate and switch between two shaders. --- dlls/wined3d/arb_program_shader.c | 19 +++++++++++++++++-- dlls/wined3d/utils.c | 6 ++++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a26950c..848d83d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -125,7 +125,8 @@ struct arb_ps_np2fixup_info struct arb_ps_compile_args { struct ps_compile_args super; - DWORD bools; /* WORD is enough, use DWORD for alignment */ + WORD bools; + WORD clip; /* only a boolean, use a WORD for alignment */ unsigned char loop_ctrl[MAX_CONST_I][3]; }; @@ -3496,7 +3497,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct next_local += fixup->super.num_consts; } - if (shader_priv->clipplane_emulation != ~0U) + if (shader_priv->clipplane_emulation != ~0U && args->clip) { shader_addline(buffer, "KIL fragment.texcoord[%u];\n", shader_priv->clipplane_emulation); } @@ -4128,6 +4129,20 @@ static inline void find_arb_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWi if(stateblock->pixelShaderConstantB[i]) args->bools |= ( 1 << i); } + /* Only enable the clip plane emulation KIL if at least one clipplane is enabled. The KIL instruction + * is quite expensive because it forces the driver to disable early Z discards. It is cheaper to + * duplicate the shader than have a no-op KIL instruction in every shader + */ + if((!((IWineD3DDeviceImpl *) shader->baseShader.device)->vs_clipping) && use_vs(stateblock) && + stateblock->renderState[WINED3DRS_CLIPPING] && stateblock->renderState[WINED3DRS_CLIPPLANEENABLE]) + { + args->clip = 1; + } + else + { + args->clip = 0; + } + /* Skip if unused or local, or supported natively */ int_skip = ~shader->baseShader.reg_maps.integer_constants | shader->baseShader.reg_maps.local_int_consts; if(int_skip == 0xffff || GL_SUPPORT(NV_FRAGMENT_PROGRAM_OPTION)) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 3c25ebe..ff81078 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2531,9 +2531,11 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting } else { settings->sRGB_write = 0; } - if(device->vs_clipping || !use_vs(stateblock)) { + if(device->vs_clipping || !use_vs(stateblock) || !stateblock->renderState[WINED3DRS_CLIPPING] || + !stateblock->renderState[WINED3DRS_CLIPPLANEENABLE]) { /* No need to emulate clipplanes if GL supports native vertex shader clipping or if - * the fixed function vertex pipeline is used(which always supports clipplanes) + * the fixed function vertex pipeline is used(which always supports clipplanes), or + * if no clipplane is enabled */ settings->emul_clipplanes = 0; } else {

1 0

Vincent Povirk : windowscodecs: Fix the bmpformat test on Windows 7.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: 5a1fb6bd9c332e43da02effbbec88aeb25511409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a1fb6bd9c332e43da02effbb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 4 16:40:01 2009 -0500 windowscodecs: Fix the bmpformat test on Windows 7. --- dlls/windowscodecs/tests/bmpformat.c | 2 +- include/wincodec.idl | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index 39bb3b4..c793dd7 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -108,7 +108,7 @@ static void test_decode_24bpp(void) ok(count == 1, "unexpected count %u\n", count); hr = IWICBitmapDecoder_GetFrame(decoder, 1, &framedecode); - ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %x\n", hr); + ok(hr == E_INVALIDARG || hr == WINCODEC_ERR_FRAMEMISSING, "GetFrame returned %x\n", hr); hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); ok(SUCCEEDED(hr), "GetFrame failed, hr=%x\n", hr); diff --git a/include/wincodec.idl b/include/wincodec.idl index 06475b0..8e8dfe6 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -164,6 +164,7 @@ cpp_quote("#define WINCODEC_ERR_NOTINITIALIZED 0x88982f0c") cpp_quote("#define WINCODEC_ERR_CODECNOTHUMBNAIL 0x88982f44") cpp_quote("#define WINCODEC_ERR_PALETTEUNAVAILABLE 0x88982f45") cpp_quote("#define WINCODEC_ERR_COMPONENTNOTFOUND 0x88982f50") +cpp_quote("#define WINCODEC_ERR_FRAMEMISSING 0x88982f62") cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT 0x88982f80") cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDOPERATION 0x88982f81") cpp_quote("#define WINCODEC_ERR_INSUFFICIENTBUFFER 0x88982f8c")

1 0

Marcus Meissner : oleview: Fixed bad error check.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: 5006da3bb76371fd9d040ff4ba584a92510c2dfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5006da3bb76371fd9d040ff4b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Sep 4 22:42:47 2009 +0200 oleview: Fixed bad error check. --- programs/oleview/pane.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/oleview/pane.c b/programs/oleview/pane.c index 20c2fd6..6418cf7 100644 --- a/programs/oleview/pane.c +++ b/programs/oleview/pane.c @@ -151,7 +151,7 @@ BOOL CreatePanedWindow(HWND hWnd, HWND *hWndCreated, HINSTANCE hInst) pane = HeapAlloc(GetProcessHeap(), 0, sizeof(PANE)); *hWndCreated = CreateWindow(wszPaneClass, NULL, WS_CHILD|WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, hWnd, (HMENU)pane, hInst, NULL); - if(!hWndCreated) + if(!*hWndCreated) { HeapFree(GetProcessHeap(), 0, pane); return FALSE;

1 0

Marcus Meissner : wineoss.drv: Avoid mixer fd leak.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: 063ddfeead661d789e049008e76d830f50ca1d07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=063ddfeead661d789e049008e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Sep 4 22:39:58 2009 +0200 wineoss.drv: Avoid mixer fd leak. --- dlls/wineoss.drv/mmaux.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c index c41c1da..de5ecea 100644 --- a/dlls/wineoss.drv/mmaux.c +++ b/dlls/wineoss.drv/mmaux.c @@ -147,6 +147,7 @@ static DWORD AUX_GetVolume(WORD wDevID, LPDWORD lpdwVol) } if (ioctl(mixer, cmd, &volume) == -1) { WARN("unable to read mixer !\n"); + close(mixer); return MMSYSERR_NOTENABLED; } close(mixer); @@ -208,6 +209,7 @@ static DWORD AUX_SetVolume(WORD wDevID, DWORD dwParam) } if (ioctl(mixer, cmd, &volume) == -1) { WARN("unable to set mixer !\n"); + close(mixer); return MMSYSERR_NOTENABLED; } close(mixer);

1 0

Peter Dons Tychsen : mshtml: Fix crash because of usage of pointer before cheking if it is NULL.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: 7c1ae274438b62f1be2ffe9cb0fc840a5d84a0db URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c1ae274438b62f1be2ffe9cb… Author: Peter Dons Tychsen <donpedro(a)tdcadsl.dk> Date: Wed Sep 2 04:16:19 2009 +0200 mshtml: Fix crash because of usage of pointer before cheking if it is NULL. --- dlls/mshtml/task.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 496b96f..0759580 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -94,6 +94,9 @@ void remove_doc_tasks(const HTMLDocument *doc) task_timer_t *timer; task_t *iter, *tmp; + if(!thread_data) + return; + LIST_FOR_EACH_SAFE(liter, ltmp, &thread_data->timer_list) { timer = LIST_ENTRY(liter, task_timer_t, entry); if(timer->doc == doc) @@ -105,9 +108,6 @@ void remove_doc_tasks(const HTMLDocument *doc) SetTimer(thread_data->thread_hwnd, TIMER_ID, timer->time - GetTickCount(), NULL); } - if(!thread_data) - return; - while(thread_data->task_queue_head && thread_data->task_queue_head->doc == doc) pop_task();

1 0

Vincent Povirk : gdiplus: Remove unused bitmap flipping code.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: aef202507bd85075c32c868efe5eef331d3e55de URL: http://source.winehq.org/git/wine.git/?a=commit;h=aef202507bd85075c32c868ef… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 4 10:30:03 2009 -0500 gdiplus: Remove unused bitmap flipping code. --- dlls/gdiplus/graphics.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 1df3eee..4350e79 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1854,15 +1854,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image else return NotImplemented; - /* IPicture renders bitmaps with the y-axis reversed - * FIXME: flipping for unknown image type might not be correct. */ - if(image->type != ImageTypeMetafile){ - INT temp; - temp = pti[0].y; - pti[0].y = pti[2].y; - pti[2].y = temp; - } - if(IPicture_Render(image->picture, graphics->hdc, pti[0].x, pti[0].y, pti[1].x - pti[0].x, pti[2].y - pti[0].y, srcx * dx, srcy * dy,

1 0

Vincent Povirk : gdiplus: Disable alpha channel support for BMP images.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: 0313f88794823e4b084918d0aee7897de7484c77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0313f88794823e4b084918d0a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 4 10:23:30 2009 -0500 gdiplus: Disable alpha channel support for BMP images. --- dlls/gdiplus/image.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 73b1dc8..28982a1 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1509,7 +1509,20 @@ static GpStatus decode_image_icon(IStream* stream, REFCLSID clsid, GpImage **ima static GpStatus decode_image_bmp(IStream* stream, REFCLSID clsid, GpImage **image) { - return decode_image_wic(stream, &CLSID_WICBmpDecoder, image); + GpStatus status; + GpBitmap* bitmap; + + status = decode_image_wic(stream, &CLSID_WICBmpDecoder, image); + + bitmap = (GpBitmap*)*image; + + if (status == Ok && bitmap->format == PixelFormat32bppARGB) + { + /* WIC supports bmp files with alpha, but gdiplus does not */ + bitmap->format = PixelFormat32bppRGB; + } + + return status; } static GpStatus decode_image_jpeg(IStream* stream, REFCLSID clsid, GpImage **image)

1 0

Vincent Povirk : gdiplus: Use WIC to decode PNG files.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: 91e0ee260bdc7406075d262b4ac22809eba22db6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91e0ee260bdc7406075d262b4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 4 09:59:46 2009 -0500 gdiplus: Use WIC to decode PNG files. --- dlls/gdiplus/image.c | 96 +++----------------------------------------------- 1 files changed, 5 insertions(+), 91 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 4acf706..73b1dc8 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1517,100 +1517,14 @@ static GpStatus decode_image_jpeg(IStream* stream, REFCLSID clsid, GpImage **ima return decode_image_wic(stream, &CLSID_WICJpegDecoder, image); } -static GpStatus decode_image_gif(IStream* stream, REFCLSID clsid, GpImage **image) +static GpStatus decode_image_png(IStream* stream, REFCLSID clsid, GpImage **image) { - return decode_image_wic(stream, &CLSID_WICGifDecoder, image); + return decode_image_wic(stream, &CLSID_WICPngDecoder, image); } -static GpStatus decode_image_olepicture_bitmap(IStream* stream, REFCLSID clsid, GpImage **image) +static GpStatus decode_image_gif(IStream* stream, REFCLSID clsid, GpImage **image) { - IPicture *pic; - BITMAPINFO *pbmi; - BITMAPCOREHEADER* bmch; - HBITMAP hbm; - HDC hdc; - - TRACE("%p %p\n", stream, image); - - if(!stream || !image) - return InvalidParameter; - - if(OleLoadPicture(stream, 0, FALSE, &IID_IPicture, - (LPVOID*) &pic) != S_OK){ - TRACE("Could not load picture\n"); - return GenericError; - } - - pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); - if (!pbmi) - return OutOfMemory; - *image = GdipAlloc(sizeof(GpBitmap)); - if(!*image){ - GdipFree(pbmi); - return OutOfMemory; - } - (*image)->type = ImageTypeBitmap; - - (*((GpBitmap**) image))->width = ipicture_pixel_width(pic); - (*((GpBitmap**) image))->height = ipicture_pixel_height(pic); - - /* get the pixel format */ - IPicture_get_Handle(pic, (OLE_HANDLE*)&hbm); - IPicture_get_CurDC(pic, &hdc); - - (*((GpBitmap**) image))->hbitmap = hbm; - (*((GpBitmap**) image))->hdc = hdc; - (*((GpBitmap**) image))->bits = NULL; - - bmch = (BITMAPCOREHEADER*) (&pbmi->bmiHeader); - bmch->bcSize = sizeof(BITMAPCOREHEADER); - - if(!hdc){ - HBITMAP old; - hdc = CreateCompatibleDC(0); - old = SelectObject(hdc, hbm); - GetDIBits(hdc, hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); - SelectObject(hdc, old); - DeleteDC(hdc); - } - else - GetDIBits(hdc, hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); - - switch(bmch->bcBitCount) - { - case 1: - (*((GpBitmap**) image))->format = PixelFormat1bppIndexed; - break; - case 4: - (*((GpBitmap**) image))->format = PixelFormat4bppIndexed; - break; - case 8: - (*((GpBitmap**) image))->format = PixelFormat8bppIndexed; - break; - case 16: - (*((GpBitmap**) image))->format = PixelFormat16bppRGB565; - break; - case 24: - (*((GpBitmap**) image))->format = PixelFormat24bppRGB; - break; - case 32: - (*((GpBitmap**) image))->format = PixelFormat32bppRGB; - break; - case 48: - (*((GpBitmap**) image))->format = PixelFormat48bppRGB; - break; - default: - FIXME("Bit depth %d is not fully supported yet\n", bmch->bcBitCount); - (*((GpBitmap**) image))->format = (bmch->bcBitCount << 8) | PixelFormatGDI; - break; - } - - GdipFree(pbmi); - - (*image)->picture = pic; - (*image)->flags = ImageFlagsNone; - - return Ok; + return decode_image_wic(stream, &CLSID_WICGifDecoder, image); } static GpStatus decode_image_olepicture_metafile(IStream* stream, REFCLSID clsid, GpImage **image) @@ -2151,7 +2065,7 @@ static const struct image_codec codecs[NUM_CODECS] = { /* SigMask */ png_sig_mask, }, NULL, - decode_image_olepicture_bitmap + decode_image_png }, { { /* ICO */

1 0

Vincent Povirk : gdiplus: Use WIC to decode BMP files.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: 947e39dbc77d3c6b1882d2f1191877961ec87ab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=947e39dbc77d3c6b1882d2f11… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 4 09:54:55 2009 -0500 gdiplus: Use WIC to decode BMP files. --- dlls/gdiplus/image.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index b1e831f..4acf706 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1507,6 +1507,11 @@ static GpStatus decode_image_icon(IStream* stream, REFCLSID clsid, GpImage **ima return decode_image_wic(stream, &CLSID_WICIcoDecoder, image); } +static GpStatus decode_image_bmp(IStream* stream, REFCLSID clsid, GpImage **image) +{ + return decode_image_wic(stream, &CLSID_WICBmpDecoder, image); +} + static GpStatus decode_image_jpeg(IStream* stream, REFCLSID clsid, GpImage **image) { return decode_image_wic(stream, &CLSID_WICJpegDecoder, image); @@ -2051,7 +2056,7 @@ static const struct image_codec codecs[NUM_CODECS] = { /* SigMask */ bmp_sig_mask, }, encode_image_BMP, - decode_image_olepicture_bitmap + decode_image_bmp }, { { /* JPEG */

1 0

Vincent Povirk : gdiplus: Fix a copy outside allocated memory in GdipCreateTextureIA.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: e23ccb787d2c95f9c71312340cc192810407bb8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e23ccb787d2c95f9c71312340… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 4 09:49:32 2009 -0500 gdiplus: Fix a copy outside allocated memory in GdipCreateTextureIA. --- dlls/gdiplus/brush.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 370de61..5e6b26a 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -735,7 +735,7 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, /* image is flipped */ if(pbmi->bmiHeader.biHeight > 0){ - dibits += pbmi->bmiHeader.biSizeImage; + dibits += image_stride * (pbmi->bmiHeader.biHeight - 1); image_stride *= -1; textbits += stride * (n_height - 1); stride *= -1;

1 0