January 2012 - Wine-Commits

Aric Stewart : wineqtdecoder: Lock thing involved in streaming state in a csReceive critical section.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: 91f9c5377cfdad8e4ef1a4f283875609443ab265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91f9c5377cfdad8e4ef1a4f28… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 18 07:50:07 2012 -0600 wineqtdecoder: Lock thing involved in streaming state in a csReceive critical section. --- dlls/wineqtdecoder/qtsplitter.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 362f535..c206b23 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -163,6 +163,8 @@ typedef struct QTSplitter { DWORD outputSize; FILTER_STATE state; + CRITICAL_SECTION csReceive; + } QTSplitter; static const IPinVtbl QT_OutputPin_Vtbl; @@ -237,6 +239,9 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *punkout, HRESULT *phr) BaseFilter_Init(&This->filter, &QT_Vtbl, &CLSID_QTSplitter, (DWORD_PTR)(__FILE__ ": QTSplitter.csFilter"), &BaseFuncTable); + InitializeCriticalSection(&This->csReceive); + This->csReceive.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": QTSplitter.csReceive"); + This->pVideo_Pin = NULL; This->pAudio_Pin = NULL; This->state = State_Stopped; @@ -288,6 +293,10 @@ static void QT_Destroy(QTSplitter *This) CloseHandle(This->runEvent); ExitMovies(); + + This->csReceive.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->csReceive); + CoTaskMemFree(This); } @@ -338,8 +347,10 @@ static HRESULT WINAPI QT_Stop(IBaseFilter *iface) TRACE("()\n"); + EnterCriticalSection(&This->csReceive); IAsyncReader_BeginFlush(This->pInputPin.pReader); IAsyncReader_EndFlush(This->pInputPin.pReader); + LeaveCriticalSection(&This->csReceive); return S_OK; } @@ -470,11 +481,13 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) LONGLONG mStart=0, mStop=0; float time; + EnterCriticalSection(&This->csReceive); GetMovieNextInterestingTime(This->pQTMovie, nextTimeStep, 0, NULL, movie_time, 1, &next_time, NULL); if (next_time == -1) { TRACE("No next time\n"); + LeaveCriticalSection(&This->csReceive); break; } @@ -615,6 +628,7 @@ audio_error: TRACE("No video to deliver\n"); movie_time = next_time; + LeaveCriticalSection(&This->csReceive); } while (hr == S_OK); This->state = State_Stopped; @@ -634,7 +648,7 @@ static HRESULT WINAPI QT_Run(IBaseFilter *iface, REFERENCE_TIME tStart) TRACE("(%s)\n", wine_dbgstr_longlong(tStart)); - EnterCriticalSection(&This->filter.csFilter); + EnterCriticalSection(&This->csReceive); This->filter.rtStreamStart = tStart; if (This->pVideo_Pin) @@ -647,9 +661,9 @@ static HRESULT WINAPI QT_Run(IBaseFilter *iface, REFERENCE_TIME tStart) hr_any = hr; hr = hr_any; - LeaveCriticalSection(&This->filter.csFilter); SetEvent(This->runEvent); + LeaveCriticalSection(&This->csReceive); return hr; }

1 0

Huw Davies : gdi32: Use separate x and y parameters in the get_pixel primitive.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: ff4045b110d1f6d020281a03e29e7badd4ce3f12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff4045b110d1f6d020281a03e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 18 14:48:24 2012 +0000 gdi32: Use separate x and y parameters in the get_pixel primitive. --- dlls/gdi32/dibdrv/bitblt.c | 5 +---- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/graphics.c | 2 +- dlls/gdi32/dibdrv/primitives.c | 30 +++++++++++++++--------------- 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 3ae53b2..c3acb8c 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1350,13 +1350,10 @@ DWORD gradient_bitmapinfo( const BITMAPINFO *info, void *bits, TRIVERTEX *vert_a COLORREF get_pixel_bitmapinfo( const BITMAPINFO *info, void *bits, struct bitblt_coords *src ) { dib_info dib; - POINT pt; DWORD pixel; init_dib_info_from_bitmapinfo( &dib, info, bits, default_color_table ); - pt.x = src->x; - pt.y = src->y; - pixel = dib.funcs->get_pixel( &dib, &pt ); + pixel = dib.funcs->get_pixel( &dib, src->x, src->y ); return dib.funcs->pixel_to_colorref( &dib, pixel ); } diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 2c980fe..fb7eb21 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -186,7 +186,7 @@ typedef struct primitive_funcs BOOL (* gradient_rect)(const dib_info *dib, const RECT *rc, const TRIVERTEX *v, int mode); void (* draw_glyph)(const dib_info *dst, const RECT *rc, const dib_info *glyph, const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges); - DWORD (* get_pixel)(const dib_info *dib, const POINT *pt); + DWORD (* get_pixel)(const dib_info *dib, int x, int y); DWORD (* colorref_to_pixel)(const dib_info *dib, COLORREF color); COLORREF (* pixel_to_colorref)(const dib_info *dib, DWORD pixel); void (* convert_to)(dib_info *dst, const dib_info *src, const RECT *src_rect); diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 166c577..515f339 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -720,7 +720,7 @@ COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) pt.y < 0 || pt.y >= pdev->dib.height) return CLR_INVALID; - pixel = pdev->dib.funcs->get_pixel( &pdev->dib, &pt ); + pixel = pdev->dib.funcs->get_pixel( &pdev->dib, pt.x, pt.y ); return pdev->dib.funcs->pixel_to_colorref( &pdev->dib, pixel ); } diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 122e750..55c17b7 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -1276,47 +1276,47 @@ static void copy_rect_null(const dib_info *dst, const RECT *rc, return; } -static DWORD get_pixel_32(const dib_info *dib, const POINT *pt) +static DWORD get_pixel_32(const dib_info *dib, int x, int y) { - DWORD *ptr = get_pixel_ptr_32( dib, pt->x, pt->y ); + DWORD *ptr = get_pixel_ptr_32( dib, x, y ); return *ptr; } -static DWORD get_pixel_24(const dib_info *dib, const POINT *pt) +static DWORD get_pixel_24(const dib_info *dib, int x, int y) { - BYTE *ptr = get_pixel_ptr_24( dib, pt->x, pt->y ); + BYTE *ptr = get_pixel_ptr_24( dib, x, y ); return ptr[0] | ((DWORD)ptr[1] << 8) | ((DWORD)ptr[2] << 16); } -static DWORD get_pixel_16(const dib_info *dib, const POINT *pt) +static DWORD get_pixel_16(const dib_info *dib, int x, int y) { - WORD *ptr = get_pixel_ptr_16( dib, pt->x, pt->y ); + WORD *ptr = get_pixel_ptr_16( dib, x, y ); return *ptr; } -static DWORD get_pixel_8(const dib_info *dib, const POINT *pt) +static DWORD get_pixel_8(const dib_info *dib, int x, int y) { - BYTE *ptr = get_pixel_ptr_8( dib, pt->x, pt->y ); + BYTE *ptr = get_pixel_ptr_8( dib, x, y ); return *ptr; } -static DWORD get_pixel_4(const dib_info *dib, const POINT *pt) +static DWORD get_pixel_4(const dib_info *dib, int x, int y) { - BYTE *ptr = get_pixel_ptr_4( dib, pt->x, pt->y ); + BYTE *ptr = get_pixel_ptr_4( dib, x, y ); - if (pt->x & 1) + if (x & 1) return *ptr & 0x0f; else return (*ptr >> 4) & 0x0f; } -static DWORD get_pixel_1(const dib_info *dib, const POINT *pt) +static DWORD get_pixel_1(const dib_info *dib, int x, int y) { - BYTE *ptr = get_pixel_ptr_1( dib, pt->x, pt->y ); - return (*ptr & pixel_masks_1[pt->x & 0x7]) ? 1 : 0; + BYTE *ptr = get_pixel_ptr_1( dib, x, y ); + return (*ptr & pixel_masks_1[x & 0x7]) ? 1 : 0; } -static DWORD get_pixel_null(const dib_info *dib, const POINT *pt) +static DWORD get_pixel_null(const dib_info *dib, int x, int y) { return 0; }

1 0

Huw Davies : gdi32/tests: Add tests for ExtFloodFill.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: b2c3ca090f21c014c3013c32178022591d853159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2c3ca090f21c014c3013c321… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 18 14:48:26 2012 +0000 gdi32/tests: Add tests for ExtFloodFill. --- dlls/gdi32/tests/dib.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 842a8ca..fba4243 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -145,6 +145,7 @@ static const char *sha1_graphics_a8r8g8b8[] = "f451a05f699ac3bbe155d059e7871a2636887b5f", "5dca709c60e0cd50fa85274a2836aec9eb6168e3", "dccaef62738ff90da4554a85d8cb846d6436799e", + "57b3c6ece2c4f322d5cb5e5dde596714607d5502", NULL }; @@ -216,6 +217,7 @@ static const char *sha1_graphics_a8r8g8b8_bitfields[] = "f451a05f699ac3bbe155d059e7871a2636887b5f", "5dca709c60e0cd50fa85274a2836aec9eb6168e3", "dccaef62738ff90da4554a85d8cb846d6436799e", + "57b3c6ece2c4f322d5cb5e5dde596714607d5502", NULL }; @@ -287,6 +289,7 @@ static const char *sha1_graphics_a8b8g8r8[] = "707bc44fc9fed68ff1f537f0473e0cd825dd660f", "f19f5d8e2c96328f06f3985d02ff474fa37b1ea8", "175a7bcb73c74eceecc000657a0100bccf158ff4", + "71085fe7617b710a27a3ee4478d94e4d9209804e", NULL }; @@ -358,6 +361,7 @@ static const char *sha1_graphics_r10g10b10[] = "88cfa7b7c1487f8eda05fce92b622942c9fb7ca4", "64cf929548bc5324fb14b053077bf5bc4be3e15c", "ad91dde8566dceaadc3523cdc8149cd7415a1b70", + "a56731d5c808a8a37ce057818d8c61d563ae4432", NULL }; @@ -429,6 +433,7 @@ static const char *sha1_graphics_r6g6b6[] = "8e32ea3614c3b20899d748db48258761c7158d2b", "5da35bad12e3e9b26a0444d30820099481281e45", "94f004e98ae8035af948611770a4a2dd6643f510", + "130b503745311a795cd565f667c76870326b82d4", NULL }; @@ -500,6 +505,7 @@ static const char *sha1_graphics_24[] = "09cb4ab070083144bed4271c0a2a34ccb6ed13c0", "cc5ed4c9e925f0a457a7437fbb8054528cdd9469", "c95afd0a020e68a76982fe8663b5d64113987233", + "64d9e7cf03118d096a9a5bc5b5ee8c48df8bc0f6", NULL }; @@ -575,6 +581,7 @@ static const char *sha1_graphics_r5g5b5[] = "7de23c68ca224818fdf127c5e96729dcd0de2b8b", "a848b1b0293b05b3f9358a3ffcb21a2e5fdecf05", "1a0fd0df17fa4c455a4a91cad30b5242f77fd233", + "1511523f4c6fd76a10867c44cc87a95446387425", NULL }; @@ -645,6 +652,7 @@ static const char *sha1_graphics_r4g4b4[] = "6fd751b7328c02954bce98bed94b3ce3c73db118", "91d50b5a604d6c38aa0d08b9af995490f8ec246b", "8585783d0373e9696b508776b6e6b18a80b09888", + "2e8fc36b1e534314c153375b9d3f6d217ccc08f1", NULL }; @@ -721,6 +729,7 @@ static const char *sha1_graphics_8_color[] = "d7ffa3893c6fa937569791cf49986518a4a4d96e", "26bc25a011e2b60961ee9d6c6141d928ae24389b", "8771d5ff7b93b9dd9d077e672b342235dfb28472", + "6591276cda7784d91c79ed66ad4558b3f17426bc", NULL }; @@ -802,6 +811,7 @@ static const char *sha1_graphics_8_grayscale[] = "87eab8f81fb2a036080e099760f628037f9306e7", "a3eac75d30f681b3898ee469d368960529634d7d", "cd5caeabdb71241766d24f038cfc5f1e91e11256", + "e2b393dc3f5833f7868668ea31369e90348768cd", NULL }; @@ -876,6 +886,7 @@ static const char *sha1_graphics_8[] = "a6311d74fc058079a327abb536e69353be719925", "fbaa8848a1d3896469c37fd43ab44233f5b875a3", "0000000000000000000000000000000000000000", + "f3e856449b0ad00297cae027f51e3586746f9918", NULL }; @@ -946,6 +957,7 @@ static const char *sha1_graphics_4[] = "6fe7d0d17b892032cfd171c3d7c365f030b5be38", "7ae780dcc7cf04dda50648bfc07cc6a7a2f2189e", "0000000000000000000000000000000000000000", + "3b6e78e568ed3e60e77f45fdf38cdfed4c341bb9", NULL }; @@ -1016,6 +1028,7 @@ static const char *sha1_graphics_4_grayscale[] = "3efe128a5bf250f2c460664e8f543f5ec54d5dc2", "2d5123e757cf00e423a89160d7dc4997c3688829", "0000000000000000000000000000000000000000", + "36dfdad9f3f5cfde6add3cef23368c343d30469a", NULL }; @@ -1107,6 +1120,7 @@ static const char *sha1_graphics_1[] = "8d34215487088b5d4ef63062270ce25c2862643d", "3dc3075b0c87fdcaabbbae8928303fb2358c15c2", "bbae6f0659e095a42b420082079663f937065813", + "ca711c69165e1fa5be72993b9a7870ef6d485249", NULL }; @@ -2532,6 +2546,22 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh compare_hash_broken_todo(bmi, bits, sha1, "PALETTEINDEX", 1 + dib_is_1bpp, dib_is_1bpp ); memset(bits, 0xcc, dib_size); + /* ExtFloodFill */ + + solid_patblt( hdc, 0, 0, 512, 512, RGB( 0, 0, 0xff ) ); + solid_patblt( hdc, 10, 10, 200, 200, RGB( 0, 0xff, 0 ) ); + solid_patblt( hdc, 10, 50, 50, 50, RGB( 0, 0, 0xff ) ); + solid_patblt( hdc, 100, 160, 50, 50, RGB( 0, 0, 0xff ) ); + solid_patblt( hdc, 90, 160, 70, 10, RGB( 0, 0, 0xff ) ); + + solid_brush = CreateSolidBrush( RGB( 0xff, 0, 0 ) ); + SelectObject( hdc, solid_brush ); + + ret = ExtFloodFill( hdc, 100, 100, RGB( 0, 0xff, 0 ), FLOODFILLSURFACE ); + ok (!ret == !!dib_is_1bpp, "got ret %d\n", ret); + compare_hash(bmi, bits, sha1, "flood fill" ); + memset(bits, 0xcc, dib_size); + SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); DeleteObject(hrgn);

1 0

André Hentschel : d3drm: Forward all IUnknown methods from IDirect3DRMDevice3.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: d05f3e06c850b32285ebc94282aa36106d0f2abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05f3e06c850b32285ebc9428… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 17 22:58:58 2012 +0100 d3drm: Forward all IUnknown methods from IDirect3DRMDevice3. --- dlls/d3drm/device.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 8be92e6..559128e 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -524,23 +524,13 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_QueryInterface(IDirect3DRMDevice3* static ULONG WINAPI IDirect3DRMDevice3Impl_AddRef(IDirect3DRMDevice3* iface) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - - TRACE("(%p)\n", This); - - return InterlockedIncrement(&This->ref); + return IDirect3DRMDevice2_AddRef(&This->IDirect3DRMDevice2_iface); } static ULONG WINAPI IDirect3DRMDevice3Impl_Release(IDirect3DRMDevice3* iface) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p)\n", This); - - if (!ref) - HeapFree(GetProcessHeap(), 0, This); - - return ref; + return IDirect3DRMDevice2_Release(&This->IDirect3DRMDevice2_iface); } /*** IDirect3DRMObject methods ***/

1 0

André Hentschel : d3drm: Reorder device creation function to avoid forward declarations.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: 2e963df91121d4b05e3e1b5f334f0f8d22a3a7ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e963df91121d4b05e3e1b5f3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 17 22:56:13 2012 +0100 d3drm: Reorder device creation function to avoid forward declarations. --- dlls/d3drm/device.c | 53 ++++++++++++++++++++++++-------------------------- 1 files changed, 25 insertions(+), 28 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index f02ce33..a203b0c 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -38,9 +38,6 @@ typedef struct { LONG ref; } IDirect3DRMDeviceImpl; -static const struct IDirect3DRMDevice2Vtbl Direct3DRMDevice2_Vtbl; -static const struct IDirect3DRMDevice3Vtbl Direct3DRMDevice3_Vtbl; - static inline IDirect3DRMDeviceImpl *impl_from_IDirect3DRMDevice2(IDirect3DRMDevice2 *iface) { return CONTAINING_RECORD(iface, IDirect3DRMDeviceImpl, IDirect3DRMDevice2_iface); @@ -51,31 +48,6 @@ static inline IDirect3DRMDeviceImpl *impl_from_IDirect3DRMDevice3(IDirect3DRMDev return CONTAINING_RECORD(iface, IDirect3DRMDeviceImpl, IDirect3DRMDevice3_iface); } -HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) -{ - IDirect3DRMDeviceImpl* object; - - TRACE("(%p)\n", ppObj); - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMDeviceImpl)); - if (!object) - { - ERR("Out of memory\n"); - return E_OUTOFMEMORY; - } - - object->IDirect3DRMDevice2_iface.lpVtbl = &Direct3DRMDevice2_Vtbl; - object->IDirect3DRMDevice3_iface.lpVtbl = &Direct3DRMDevice3_Vtbl; - object->ref = 1; - - if (IsEqualGUID(riid, &IID_IDirect3DRMFrame3)) - *ppObj = (IUnknown*)&object->IDirect3DRMDevice3_iface; - else - *ppObj = (IUnknown*)&object->IDirect3DRMDevice2_iface; - - return S_OK; -} - /*** IUnknown methods ***/ static HRESULT WINAPI IDirect3DRMDevice2Impl_QueryInterface(IDirect3DRMDevice2* iface, REFIID riid, void** object) @@ -1021,3 +993,28 @@ static const struct IDirect3DRMDevice3Vtbl Direct3DRMDevice3_Vtbl = IDirect3DRMDevice3Impl_GetStateChangeOptions, IDirect3DRMDevice3Impl_SetStateChangeOptions }; + +HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) +{ + IDirect3DRMDeviceImpl* object; + + TRACE("(%p)\n", ppObj); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMDeviceImpl)); + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + + object->IDirect3DRMDevice2_iface.lpVtbl = &Direct3DRMDevice2_Vtbl; + object->IDirect3DRMDevice3_iface.lpVtbl = &Direct3DRMDevice3_Vtbl; + object->ref = 1; + + if (IsEqualGUID(riid, &IID_IDirect3DRMFrame3)) + *ppObj = (IUnknown*)&object->IDirect3DRMDevice3_iface; + else + *ppObj = (IUnknown*)&object->IDirect3DRMDevice2_iface; + + return S_OK; +}

1 0

Huw Davies : gdi32: Implement ExtFloodFill.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: d69868e464488335cce573d9f4b277f16b159974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d69868e464488335cce573d9f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 18 14:48:25 2012 +0000 gdi32: Implement ExtFloodFill. --- dlls/gdi32/dibdrv/graphics.c | 64 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 63 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 515f339..ace7c6d 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -678,12 +678,74 @@ BOOL dibdrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) return dibdrv_RoundRect( dev, left, top, right, bottom, right - left, bottom - top ); } +static inline BOOL is_interior( dib_info *dib, int x, int y, DWORD pixel, UINT type) +{ + if (type == FLOODFILLBORDER) + return dib->funcs->get_pixel( dib, x, y ) != pixel; + else + return dib->funcs->get_pixel( dib, x, y ) == pixel; +} + +static void fill_row( dib_info *dib, RECT *row, DWORD pixel, UINT type, HRGN rgn ); + +static inline void do_next_row( dib_info *dib, const RECT *row, int offset, DWORD pixel, UINT type, HRGN rgn ) +{ + RECT next; + + next.top = row->top + offset; + next.bottom = next.top + 1; + next.left = next.right = row->left; + while (next.right < row->right) + { + if (is_interior( dib, next.right, next.top, pixel, type)) next.right++; + else + { + if (next.left != next.right && !PtInRegion( rgn, next.left, next.top )) + fill_row( dib, &next, pixel, type, rgn ); + next.left = ++next.right; + } + } + if (next.left != next.right && !PtInRegion( rgn, next.left, next.top )) + fill_row( dib, &next, pixel, type, rgn ); +} + +static void fill_row( dib_info *dib, RECT *row, DWORD pixel, UINT type, HRGN rgn ) +{ + while (row->left > 0 && is_interior( dib, row->left - 1, row->top, pixel, type)) row->left--; + while (row->right < dib->width && is_interior( dib, row->right, row->top, pixel, type)) row->right++; + add_rect_to_region( rgn, row ); + + if (row->top > 0) do_next_row( dib, row, -1, pixel, type, rgn ); + if (row->top < dib->height - 1) do_next_row( dib, row, 1, pixel, type, rgn ); + + return; +} + /*********************************************************************** * dibdrv_ExtFloodFill */ BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) { - FIXME( "not implemented yet\n" ); + dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); + DWORD pixel = get_pixel_color( pdev, color, FALSE ); + RECT row; + HRGN rgn; + + TRACE( "(%p, %d, %d, %08x, %d\n", pdev, x, y, color, type ); + + if (!is_interior( &pdev->dib, x, y, pixel, type )) return FALSE; + + rgn = CreateRectRgn( 0, 0, 0, 0 ); + row.left = x; + row.right = x + 1; + row.top = y; + row.bottom = y + 1; + + fill_row( &pdev->dib, &row, pixel, type, rgn ); + + brush_region( pdev, rgn ); + + DeleteObject( rgn ); return TRUE; }

1 0

André Hentschel : d3drm: Add IDirect3DRMWinDevice interface.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: e1c00d32ed2414aa1981ae63357ea7f77b76a1ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c00d32ed2414aa1981ae633… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 17 22:56:24 2012 +0100 d3drm: Add IDirect3DRMWinDevice interface. --- dlls/d3drm/device.c | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 155 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index a203b0c..8be92e6 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -29,12 +29,15 @@ #include "wingdi.h" #include "d3drm_private.h" +#include "initguid.h" +#include "d3drmwin.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm); typedef struct { IDirect3DRMDevice2 IDirect3DRMDevice2_iface; IDirect3DRMDevice3 IDirect3DRMDevice3_iface; + IDirect3DRMWinDevice IDirect3DRMWinDevice_iface; LONG ref; } IDirect3DRMDeviceImpl; @@ -48,6 +51,11 @@ static inline IDirect3DRMDeviceImpl *impl_from_IDirect3DRMDevice3(IDirect3DRMDev return CONTAINING_RECORD(iface, IDirect3DRMDeviceImpl, IDirect3DRMDevice3_iface); } +static inline IDirect3DRMDeviceImpl *impl_from_IDirect3DRMWinDevice(IDirect3DRMWinDevice *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DRMDeviceImpl, IDirect3DRMWinDevice_iface); +} + /*** IUnknown methods ***/ static HRESULT WINAPI IDirect3DRMDevice2Impl_QueryInterface(IDirect3DRMDevice2* iface, REFIID riid, void** object) @@ -68,6 +76,10 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_QueryInterface(IDirect3DRMDevice2* { *object = &This->IDirect3DRMDevice3_iface; } + else if(IsEqualGUID(riid, &IID_IDirect3DRMWinDevice)) + { + *object = &This->IDirect3DRMWinDevice_iface; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); @@ -994,6 +1006,148 @@ static const struct IDirect3DRMDevice3Vtbl Direct3DRMDevice3_Vtbl = IDirect3DRMDevice3Impl_SetStateChangeOptions }; + +/*** IUnknown methods ***/ +static HRESULT WINAPI IDirect3DRMWinDeviceImpl_QueryInterface(IDirect3DRMWinDevice* iface, + REFIID riid, void** object) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + return IDirect3DRMDevice2_QueryInterface(&This->IDirect3DRMDevice2_iface, riid, object); +} + +static ULONG WINAPI IDirect3DRMWinDeviceImpl_AddRef(IDirect3DRMWinDevice* iface) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + return IDirect3DRMDevice2_AddRef(&This->IDirect3DRMDevice2_iface); +} + +static ULONG WINAPI IDirect3DRMWinDeviceImpl_Release(IDirect3DRMWinDevice* iface) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + return IDirect3DRMDevice2_Release(&This->IDirect3DRMDevice2_iface); +} + +/*** IDirect3DRMObject methods ***/ +static HRESULT WINAPI IDirect3DRMWinDeviceImpl_Clone(IDirect3DRMWinDevice* iface, + LPUNKNOWN unkwn, REFIID riid, + LPVOID* object) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + + FIXME("(%p/%p)->(%p, %s, %p): stub\n", iface, This, unkwn, debugstr_guid(riid), object); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IDirect3DRMWinDeviceImpl_AddDestroyCallback(IDirect3DRMWinDevice* iface, + D3DRMOBJECTCALLBACK cb, + LPVOID argument) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + + FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, cb, argument); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IDirect3DRMWinDeviceImpl_DeleteDestroyCallback(IDirect3DRMWinDevice* iface, + D3DRMOBJECTCALLBACK cb, + LPVOID argument) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + + FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, cb, argument); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IDirect3DRMWinDeviceImpl_SetAppData(IDirect3DRMWinDevice* iface, + DWORD data) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + + FIXME("(%p/%p)->(%u): stub\n", iface, This, data); + + return E_NOTIMPL; +} + +static DWORD WINAPI IDirect3DRMWinDeviceImpl_GetAppData(IDirect3DRMWinDevice* iface) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + + FIXME("(%p/%p)->(): stub\n", iface, This); + + return 0; +} + +static HRESULT WINAPI IDirect3DRMWinDeviceImpl_SetName(IDirect3DRMWinDevice* iface, LPCSTR name) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + + FIXME("(%p/%p)->(%s): stub\n", iface, This, name); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IDirect3DRMWinDeviceImpl_GetName(IDirect3DRMWinDevice* iface, + LPDWORD size, LPSTR name) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + + FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IDirect3DRMWinDeviceImpl_GetClassName(IDirect3DRMWinDevice* iface, + LPDWORD size, LPSTR name) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + + FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + + return E_NOTIMPL; +} + +/*** IDirect3DRMWinDevice methods ***/ +static HRESULT WINAPI IDirect3DRMWinDeviceImpl_HandlePaint(IDirect3DRMWinDevice* iface, HDC hdc) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + + FIXME("(%p/%p)->(%p): stub\n", iface, This, hdc); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IDirect3DRMWinDeviceImpl_HandleActivate(IDirect3DRMWinDevice* iface, WORD wparam) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + + FIXME("(%p/%p)->(%u): stub\n", iface, This, wparam); + + return E_NOTIMPL; +} + +static const struct IDirect3DRMWinDeviceVtbl Direct3DRMWinDevice_Vtbl = +{ + /*** IUnknown methods ***/ + IDirect3DRMWinDeviceImpl_QueryInterface, + IDirect3DRMWinDeviceImpl_AddRef, + IDirect3DRMWinDeviceImpl_Release, + /*** IDirect3DRMObject methods ***/ + IDirect3DRMWinDeviceImpl_Clone, + IDirect3DRMWinDeviceImpl_AddDestroyCallback, + IDirect3DRMWinDeviceImpl_DeleteDestroyCallback, + IDirect3DRMWinDeviceImpl_SetAppData, + IDirect3DRMWinDeviceImpl_GetAppData, + IDirect3DRMWinDeviceImpl_SetName, + IDirect3DRMWinDeviceImpl_GetName, + IDirect3DRMWinDeviceImpl_GetClassName, + /*** IDirect3DRMWinDevice methods ***/ + IDirect3DRMWinDeviceImpl_HandlePaint, + IDirect3DRMWinDeviceImpl_HandleActivate +}; + HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) { IDirect3DRMDeviceImpl* object; @@ -1009,6 +1163,7 @@ HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) object->IDirect3DRMDevice2_iface.lpVtbl = &Direct3DRMDevice2_Vtbl; object->IDirect3DRMDevice3_iface.lpVtbl = &Direct3DRMDevice3_Vtbl; + object->IDirect3DRMWinDevice_iface.lpVtbl = &Direct3DRMWinDevice_Vtbl; object->ref = 1; if (IsEqualGUID(riid, &IID_IDirect3DRMFrame3))

1 0

Alexandre Julliard : winex11: Move handling of negative width/ height into the XRender blit helper functions.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: 0e3bfb8951ccba1e023a2be56a8f3358ee5e284b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e3bfb8951ccba1e023a2be56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 18 14:39:18 2012 +0100 winex11: Move handling of negative width/height into the XRender blit helper functions. --- dlls/winex11.drv/xrender.c | 117 +++++++++++++++++++++++++++++--------------- 1 files changed, 77 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e3bfb8951ccba1e023a2…

1 0

Alexandre Julliard : gdi32: Negative destination sizes are allowed after coordinate mapping in GdiAlphaBlend .
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: 7e9d5a17710cf36e9fb67ba7639ee89539e17db3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e9d5a17710cf36e9fb67ba76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 18 14:40:12 2012 +0100 gdi32: Negative destination sizes are allowed after coordinate mapping in GdiAlphaBlend. --- dlls/gdi32/bitblt.c | 6 +++- dlls/gdi32/tests/bitmap.c | 52 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 80a42ea..71b8e8f 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -932,6 +932,7 @@ BOOL WINAPI GdiAlphaBlend(HDC hdcDst, int xDst, int yDst, int widthDst, int heig blendFunction.SourceConstantAlpha, blendFunction.AlphaFormat ); if (src.x < 0 || src.y < 0 || src.width < 0 || src.height < 0 || + src.log_width < 0 || src.log_height < 0 || (dcSrc->header.type == OBJ_MEMDC && (src.width > dcSrc->vis_rect.right - dcSrc->vis_rect.left - src.x || src.height > dcSrc->vis_rect.bottom - dcSrc->vis_rect.top - src.y))) @@ -940,9 +941,10 @@ BOOL WINAPI GdiAlphaBlend(HDC hdcDst, int xDst, int yDst, int widthDst, int heig SetLastError( ERROR_INVALID_PARAMETER ); ret = FALSE; } - else if (dst.width < 0 || dst.height < 0) + else if (dst.log_width < 0 || dst.log_height < 0) { - WARN( "Invalid dst coords: (%d,%d), size %dx%d\n", dst.x, dst.y, dst.width, dst.height ); + WARN( "Invalid dst coords: (%d,%d), size %dx%d\n", + dst.log_x, dst.log_y, dst.log_width, dst.log_height ); SetLastError( ERROR_INVALID_PARAMETER ); ret = FALSE; } diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 7f609f2..d28b74f 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2747,7 +2747,6 @@ static void check_BitBlt_pixel(HDC hdcDst, HDC hdcSrc, UINT32 *dstBuffer, UINT32 { *srcBuffer = 0xFEDCBA98; *dstBuffer = 0x89ABCDEF; - Rectangle(hdcSrc, 0, 0, 1, 1); /* A null operation to ensure dibs are coerced to X11 */ BitBlt(hdcDst, 0, 0, 1, 1, hdcSrc, 0, 0, dwRop); ok(expected == *dstBuffer, "BitBlt with dwRop %06X. Expected 0x%08X, got 0x%08X from line %d\n", @@ -2781,7 +2780,7 @@ static void test_BitBlt(void) NULL, 0); oldDst = SelectObject(hdcDst, bmpDst); - hBrush = CreateSolidBrush(0x012345678); + hBrush = CreateSolidBrush(0x12345678); hOldBrush = SelectObject(hdcDst, hBrush); /* Setup the source dib section */ @@ -3394,6 +3393,55 @@ static void test_GdiAlphaBlend(void) ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, -1, 30, 30, blend); ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() ); + SetMapMode(hdcDst, MM_ANISOTROPIC); + SetViewportExtEx(hdcDst, -1, -1, NULL); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, -1, 50, 50, blend); + ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() ); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, -20, -20, 20, 20, hdcSrc, 0, -1, 50, 50, blend); + ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() ); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, -20, -20, -20, -20, hdcSrc, 0, -1, 50, 50, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, -20, 0, -20, 20, hdcSrc, 0, -1, 50, 50, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, -20, 20, -20, hdcSrc, 0, -1, 50, 50, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetMapMode(hdcDst, MM_TEXT); + + SetViewportExtEx(hdcSrc, -1, -1, NULL); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, -20, -20, -30, -30, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, -20, -20, 30, -30, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, -20, -20, -30, 30, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, -20, -20, 30, 30, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 20, 20, 30, 30, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, -60, -60, 30, 30, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetViewportExtEx(hdcSrc, 1, 1, NULL); + SetLastError(0xdeadbeef); ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, NULL, 0, 0, 20, 20, blend); ok( !ret, "GdiAlphaBlend succeeded\n" );

1 0

Alexandre Julliard : winedbg: Display the crash details dialog from a separate thread so that it appears right away .
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

1 0