wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Francois Gouget : comdlg32: Remove the font sample characters string.
by Alexandre Julliard 18 Jan '12

18 Jan '12

1 0

Francois Gouget : crypt32: Remove some strings that don' t need to be translated from the resources.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: 069f9f8e604fbbd1f5e80b7024018e4ecf731347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=069f9f8e604fbbd1f5e80b702… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 17 22:54:03 2012 +0100 crypt32: Remove some strings that don't need to be translated from the resources. --- dlls/crypt32/crypt32.rc | 3 - dlls/crypt32/cryptres.h | 3 - dlls/crypt32/oid.c | 9 +- po/ar.po | 334 +++++++++++++++++++++++------------------------ po/bg.po | 334 +++++++++++++++++++++++------------------------ po/ca.po | 334 +++++++++++++++++++++++------------------------ po/cs.po | 334 +++++++++++++++++++++++------------------------ po/da.po | 334 +++++++++++++++++++++++------------------------ po/de.po | 334 +++++++++++++++++++++++------------------------ po/el.po | 334 +++++++++++++++++++++++------------------------ po/en.po | 334 +++++++++++++++++++++++------------------------ po/en_US.po | 334 +++++++++++++++++++++++------------------------ po/eo.po | 334 +++++++++++++++++++++++------------------------ po/es.po | 334 +++++++++++++++++++++++------------------------ po/fa.po | 334 +++++++++++++++++++++++------------------------ po/fi.po | 334 +++++++++++++++++++++++------------------------ po/fr.po | 334 +++++++++++++++++++++++------------------------ po/he.po | 334 +++++++++++++++++++++++------------------------ po/hi.po | 334 +++++++++++++++++++++++------------------------ po/hu.po | 334 +++++++++++++++++++++++------------------------ po/it.po | 334 +++++++++++++++++++++++------------------------ po/ja.po | 334 +++++++++++++++++++++++------------------------ po/ko.po | 334 +++++++++++++++++++++++------------------------ po/lt.po | 334 +++++++++++++++++++++++------------------------ po/ml.po | 334 +++++++++++++++++++++++------------------------ po/nb_NO.po | 334 +++++++++++++++++++++++------------------------ po/nl.po | 334 +++++++++++++++++++++++------------------------ po/or.po | 334 +++++++++++++++++++++++------------------------ po/pa.po | 334 +++++++++++++++++++++++------------------------ po/pl.po | 334 +++++++++++++++++++++++------------------------ po/pt_BR.po | 334 +++++++++++++++++++++++------------------------ po/pt_PT.po | 334 +++++++++++++++++++++++------------------------ po/rm.po | 334 +++++++++++++++++++++++------------------------ po/ro.po | 334 +++++++++++++++++++++++------------------------ po/ru.po | 334 +++++++++++++++++++++++------------------------ po/sk.po | 334 +++++++++++++++++++++++------------------------ po/sl.po | 334 +++++++++++++++++++++++------------------------ po/sr_RS(a)cyrillic.po | 334 +++++++++++++++++++++++------------------------ po/sr_RS(a)latin.po | 334 +++++++++++++++++++++++------------------------ po/sv.po | 334 +++++++++++++++++++++++------------------------ po/te.po | 334 +++++++++++++++++++++++------------------------ po/th.po | 334 +++++++++++++++++++++++------------------------ po/tr.po | 334 +++++++++++++++++++++++------------------------ po/uk.po | 334 +++++++++++++++++++++++------------------------ po/wa.po | 334 +++++++++++++++++++++++------------------------ po/wine.pot | 334 +++++++++++++++++++++++------------------------ po/zh_CN.po | 334 +++++++++++++++++++++++------------------------ po/zh_TW.po | 334 +++++++++++++++++++++++------------------------ 48 files changed, 7251 insertions(+), 7794 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=069f9f8e604fbbd1f5e80…

1 0

Huw Davies : gdi32/tests: Add tests for ExtFloodFill.
by Alexandre Julliard 18 Jan '12

18 Jan '12

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

Huw Davies : gdi32: Implement ExtFloodFill.
by Alexandre Julliard 18 Jan '12

18 Jan '12

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

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

18 Jan '12

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

Aric Stewart : wineqtdecoder: Add the framework for SourceSeeking to QTSplitter.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: 8d25bfd524ca6b7896aa4623cb13ef05d0853a17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d25bfd524ca6b7896aa4623c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 18 07:50:20 2012 -0600 wineqtdecoder: Add the framework for SourceSeeking to QTSplitter. --- dlls/wineqtdecoder/qtsplitter.c | 90 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 88 insertions(+), 2 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index c206b23..aab9fc1 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -165,15 +165,26 @@ typedef struct QTSplitter { FILTER_STATE state; CRITICAL_SECTION csReceive; + SourceSeeking sourceSeeking; } QTSplitter; static const IPinVtbl QT_OutputPin_Vtbl; static const IPinVtbl QT_InputPin_Vtbl; static const IBaseFilterVtbl QT_Vtbl; +static const IMediaSeekingVtbl QT_Seeking_Vtbl; static HRESULT QT_AddPin(QTSplitter *This, const PIN_INFO *piOutput, const AM_MEDIA_TYPE *amt, BOOL video); static HRESULT QT_RemoveOutputPins(QTSplitter *This); +static HRESULT WINAPI QTSplitter_ChangeStart(IMediaSeeking *iface); +static HRESULT WINAPI QTSplitter_ChangeStop(IMediaSeeking *iface); +static HRESULT WINAPI QTSplitter_ChangeRate(IMediaSeeking *iface); + +static inline QTSplitter *impl_from_IMediaSeeking( IMediaSeeking *iface ) +{ + return (QTSplitter *)((char*)iface - FIELD_OFFSET(QTSplitter, sourceSeeking.lpVtbl)); +} + /* * Base Filter */ @@ -256,6 +267,9 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *punkout, HRESULT *phr) This->pInputPin.pin.refCount = 1; This->pInputPin.pin.pConnectedTo = NULL; This->pInputPin.pin.pCritSec = &This->filter.csFilter; + + SourceSeeking_Init(&This->sourceSeeking, &QT_Seeking_Vtbl, QTSplitter_ChangeStop, QTSplitter_ChangeStart, QTSplitter_ChangeRate, &This->filter.csFilter); + *phr = S_OK; return obj; } @@ -315,6 +329,8 @@ static HRESULT WINAPI QT_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID *ppv = This; else if (IsEqualIID(riid, &IID_IBaseFilter)) *ppv = This; + else if (IsEqualIID(riid, &IID_IMediaSeeking)) + *ppv = &This->sourceSeeking; if (*ppv) { @@ -906,6 +922,8 @@ static HRESULT QT_Process_Movie(QTSplitter* filter) short id = 0; DWORD tid; HANDLE thread; + LONGLONG time; + TimeScale scale; TRACE("Trying movie connect\n"); @@ -944,6 +962,13 @@ static HRESULT QT_Process_Movie(QTSplitter* filter) if (trk) hr = QT_Process_Audio_Track(filter, trk); + time = GetMovieDuration(filter->pQTMovie); + scale = GetMovieTimeScale(filter->pQTMovie); + filter->sourceSeeking.llDuration = ((double)time / scale) * 10000000; + filter->sourceSeeking.llStop = filter->sourceSeeking.llDuration; + + TRACE("Movie duration is %s\n",wine_dbgstr_longlong(filter->sourceSeeking.llDuration)); + thread = CreateThread(NULL, 0, QTSplitter_thread, filter, 0, &tid); if (thread) { @@ -1126,9 +1151,7 @@ static HRESULT WINAPI QTInPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * else if (IsEqualIID(riid, &IID_IPin)) *ppv = iface; else if (IsEqualIID(riid, &IID_IMediaSeeking)) - { return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv); - } if (*ppv) { @@ -1338,3 +1361,66 @@ static HRESULT QT_AddPin(QTSplitter *This, const PIN_INFO *piOutput, const AM_ME ERR("Failed with error %x\n", hr); return hr; } + +static HRESULT WINAPI QTSplitter_ChangeStart(IMediaSeeking *iface) +{ + FIXME("(%p) filter hasn't implemented start position change!\n", iface); + return S_OK; +} + +static HRESULT WINAPI QTSplitter_ChangeStop(IMediaSeeking *iface) +{ + FIXME("(%p) filter hasn't implemented stop position change!\n", iface); + return S_OK; +} + +static HRESULT WINAPI QTSplitter_ChangeRate(IMediaSeeking *iface) +{ + FIXME("(%p) filter hasn't implemented rate change!\n", iface); + return S_OK; +} + +static HRESULT WINAPI QT_Seeking_QueryInterface(IMediaSeeking * iface, REFIID riid, LPVOID * ppv) +{ + QTSplitter *This = impl_from_IMediaSeeking(iface); + + return IUnknown_QueryInterface((IUnknown *)This, riid, ppv); +} + +static ULONG WINAPI QT_Seeking_AddRef(IMediaSeeking * iface) +{ + QTSplitter *This = impl_from_IMediaSeeking(iface); + + return IUnknown_AddRef((IUnknown *)This); +} + +static ULONG WINAPI QT_Seeking_Release(IMediaSeeking * iface) +{ + QTSplitter *This = impl_from_IMediaSeeking(iface); + + return IUnknown_Release((IUnknown *)This); +} + +static const IMediaSeekingVtbl QT_Seeking_Vtbl = +{ + QT_Seeking_QueryInterface, + QT_Seeking_AddRef, + QT_Seeking_Release, + SourceSeekingImpl_GetCapabilities, + SourceSeekingImpl_CheckCapabilities, + SourceSeekingImpl_IsFormatSupported, + SourceSeekingImpl_QueryPreferredFormat, + SourceSeekingImpl_GetTimeFormat, + SourceSeekingImpl_IsUsingTimeFormat, + SourceSeekingImpl_SetTimeFormat, + SourceSeekingImpl_GetDuration, + SourceSeekingImpl_GetStopPosition, + SourceSeekingImpl_GetCurrentPosition, + SourceSeekingImpl_ConvertTimeFormat, + SourceSeekingImpl_SetPositions, + SourceSeekingImpl_GetPositions, + SourceSeekingImpl_GetAvailable, + SourceSeekingImpl_SetRate, + SourceSeekingImpl_GetRate, + SourceSeekingImpl_GetPreroll +};

1 0

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

18 Jan '12

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

Aric Stewart : amstream: Have the MediaStream Filter use strmbase.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: 80c233b9ddf41872f604552a81bf156ef993b441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80c233b9ddf41872f604552a8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 18 07:49:45 2012 -0600 amstream: Have the MediaStream Filter use strmbase. --- dlls/amstream/Makefile.in | 2 +- dlls/amstream/mediastreamfilter.c | 81 ++++++++++++++++--------------------- 2 files changed, 36 insertions(+), 47 deletions(-) diff --git a/dlls/amstream/Makefile.in b/dlls/amstream/Makefile.in index 0418c05..3353a38 100644 --- a/dlls/amstream/Makefile.in +++ b/dlls/amstream/Makefile.in @@ -1,5 +1,5 @@ MODULE = amstream.dll -IMPORTS = strmiids uuid ole32 advapi32 +IMPORTS = strmiids strmbase uuid ole32 advapi32 C_SRCS = \ amstream.c \ diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 0c72c77..d576b49 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -24,6 +24,9 @@ #include "winbase.h" #include "wingdi.h" +#include "dshow.h" + +#include "wine/strmbase.h" #include "amstream_private.h" #include "amstream.h" @@ -33,18 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); typedef struct { - IMediaStreamFilter IMediaStreamFilter_iface; - LONG ref; - CRITICAL_SECTION csFilter; - FILTER_STATE state; - REFERENCE_TIME rtStreamStart; - IReferenceClock * pClock; - FILTER_INFO filterInfo; + BaseFilter filter; + } IMediaStreamFilterImpl; static inline IMediaStreamFilterImpl *impl_from_IMediaStreamFilter(IMediaStreamFilter *iface) { - return CONTAINING_RECORD(iface, IMediaStreamFilterImpl, IMediaStreamFilter_iface); + return CONTAINING_RECORD(iface, IMediaStreamFilterImpl, filter); } /*** IUnknown methods ***/ @@ -80,18 +78,13 @@ static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter *i static ULONG WINAPI MediaStreamFilterImpl_AddRef(IMediaStreamFilter *iface) { - IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); - ULONG refCount = InterlockedIncrement(&This->ref); - - TRACE("(%p)->() AddRef from %d\n", iface, refCount - 1); - - return refCount; + return BaseFilterImpl_AddRef((IBaseFilter*)iface); } static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) { IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + ULONG refCount = BaseFilterImpl_Release((IBaseFilter*)iface); TRACE("(%p)->() Release from %d\n", iface, refCount + 1); @@ -105,14 +98,10 @@ static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) static HRESULT WINAPI MediaStreamFilterImpl_GetClassID(IMediaStreamFilter * iface, CLSID * pClsid) { - TRACE("(%p)->(%p)\n", iface, pClsid); - - *pClsid = CLSID_MediaStreamFilter; - - return S_OK; + return BaseFilterImpl_GetClassID((IBaseFilter*)iface, pClsid); } -/*** IMediaFilter methods ***/ +/*** IBaseFilter methods ***/ static HRESULT WINAPI MediaStreamFilterImpl_Stop(IMediaStreamFilter * iface) { @@ -137,32 +126,22 @@ static HRESULT WINAPI MediaStreamFilterImpl_Run(IMediaStreamFilter * iface, REFE static HRESULT WINAPI MediaStreamFilterImpl_GetState(IMediaStreamFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState) { - FIXME("(%p)->(%d,%p): Stub!\n", iface, dwMilliSecsTimeout, pState); - - return E_NOTIMPL; + return BaseFilterImpl_GetState((IBaseFilter*)iface, dwMilliSecsTimeout, pState); } static HRESULT WINAPI MediaStreamFilterImpl_SetSyncSource(IMediaStreamFilter * iface, IReferenceClock *pClock) { - TRACE("(%p)->(%p): Stub!\n", iface, pClock); - - return E_NOTIMPL; + return BaseFilterImpl_SetSyncSource((IBaseFilter*)iface, pClock); } static HRESULT WINAPI MediaStreamFilterImpl_GetSyncSource(IMediaStreamFilter * iface, IReferenceClock **ppClock) { - FIXME("(%p)->(%p): Stub!\n", iface, ppClock); - - return E_NOTIMPL; + return BaseFilterImpl_GetSyncSource((IBaseFilter*)iface, ppClock); } -/*** IBaseFilter methods ***/ - static HRESULT WINAPI MediaStreamFilterImpl_EnumPins(IMediaStreamFilter * iface, IEnumPins **ppEnum) { - FIXME("(%p)->(%p): Stub!\n", iface, ppEnum); - - return E_NOTIMPL; + return BaseFilterImpl_EnumPins((IBaseFilter*)iface, ppEnum); } static HRESULT WINAPI MediaStreamFilterImpl_FindPin(IMediaStreamFilter * iface, LPCWSTR Id, IPin **ppPin) @@ -174,23 +153,17 @@ static HRESULT WINAPI MediaStreamFilterImpl_FindPin(IMediaStreamFilter * iface, static HRESULT WINAPI MediaStreamFilterImpl_QueryFilterInfo(IMediaStreamFilter * iface, FILTER_INFO *pInfo) { - FIXME("(%p)->(%p): Stub!\n", iface, pInfo); - - return E_NOTIMPL; + return BaseFilterImpl_QueryFilterInfo((IBaseFilter*)iface, pInfo); } static HRESULT WINAPI MediaStreamFilterImpl_JoinFilterGraph(IMediaStreamFilter * iface, IFilterGraph *pGraph, LPCWSTR pName) { - FIXME("(%p)->(%p, %s): Stub!\n", iface, pGraph, debugstr_w(pName)); - - return E_NOTIMPL; + return BaseFilterImpl_JoinFilterGraph((IBaseFilter*)iface, pGraph, pName); } static HRESULT WINAPI MediaStreamFilterImpl_QueryVendorInfo(IMediaStreamFilter * iface, LPWSTR *pVendorInfo) { - FIXME("(%p)->(%p): Stub!\n", iface, pVendorInfo); - - return E_NOTIMPL; + return BaseFilterImpl_QueryVendorInfo((IBaseFilter*)iface, pVendorInfo); } /*** IMediaStreamFilter methods ***/ @@ -286,6 +259,23 @@ static const IMediaStreamFilterVtbl MediaStreamFilter_Vtbl = MediaStreamFilterImpl_EndOfStream }; +static IPin* WINAPI MediaStreamFilterImpl_GetPin(BaseFilter *iface, int pos) +{ + /* No pins */ + return NULL; +} + +static LONG WINAPI MediaStreamFilterImpl_GetPinCount(BaseFilter *iface) +{ + /* No pins */ + return 0; +} + +static const BaseFilterFuncTable BaseFuncTable = { + MediaStreamFilterImpl_GetPin, + MediaStreamFilterImpl_GetPinCount +}; + HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, void **ppObj) { IMediaStreamFilterImpl* object; @@ -302,8 +292,7 @@ HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, void **ppObj) return E_OUTOFMEMORY; } - object->IMediaStreamFilter_iface.lpVtbl = &MediaStreamFilter_Vtbl; - object->ref = 1; + BaseFilter_Init(&object->filter, (IBaseFilterVtbl*)&MediaStreamFilter_Vtbl, &CLSID_MediaStreamFilter, (DWORD_PTR)(__FILE__ ": MediaStreamFilterImpl.csFilter"), &BaseFuncTable); *ppObj = object;

1 0

Jacek Caban : mshtml: Return error in IInternetHostSecurityManager calls on detached documents.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: 58aa5471a50a1e3606e0acf2192019d7b791cc79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58aa5471a50a1e3606e0acf21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 18 13:40:43 2012 +0100 mshtml: Return error in IInternetHostSecurityManager calls on detached documents. --- dlls/mshtml/secmgr.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index a2005aa..ff349ac 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -80,6 +80,9 @@ static HRESULT WINAPI InternetHostSecurityManager_ProcessUrlAction(IInternetHost TRACE("(%p)->(%d %p %d %p %d %x %x)\n", This, dwAction, pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved); + if(!This->basedoc.window) + return E_UNEXPECTED; + url = This->basedoc.window->url ? This->basedoc.window->url : about_blankW; return IInternetSecurityManager_ProcessUrlAction(This->basedoc.window->secmgr, url, dwAction, pPolicy, cbPolicy, @@ -184,6 +187,9 @@ static HRESULT WINAPI InternetHostSecurityManager_QueryCustomPolicy(IInternetHos TRACE("(%p)->(%s %p %p %p %d %x)\n", This, debugstr_guid(guidKey), ppPolicy, pcbPolicy, pContext, cbContext, dwReserved); + if(!This->basedoc.window) + return E_UNEXPECTED; + url = This->basedoc.window->url ? This->basedoc.window->url : about_blankW; hres = IInternetSecurityManager_QueryCustomPolicy(This->basedoc.window->secmgr, url, guidKey, ppPolicy, pcbPolicy,

1 0

Jacek Caban : jscript: Simplify identifier_eval function.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: e5baa750344a255eeb457f8f535b31c3b620625e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5baa750344a255eeb457f8f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 18 13:28:29 2012 +0100 jscript: Simplify identifier_eval function. --- dlls/jscript/engine.c | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index b1b7c69..11b434f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -488,7 +488,7 @@ static BOOL lookup_global_members(script_ctx_t *ctx, BSTR identifier, exprval_t } /* ECMA-262 3rd Edition 10.1.4 */ -static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *ret) { scope_chain_t *scope; named_item_t *item; @@ -545,15 +545,6 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, DWORD flags, if(lookup_global_members(ctx, identifier, ret)) return S_OK; - if(flags & fdexNameEnsure) { - hres = jsdisp_get_id(ctx->global, identifier, fdexNameEnsure, &id); - if(FAILED(hres)) - return hres; - - exprval_set_idref(ret, to_disp(ctx->global), id); - return S_OK; - } - ret->type = EXPRVAL_INVALID; return S_OK; } @@ -1083,7 +1074,7 @@ static HRESULT interp_ident(exec_ctx_t *ctx) TRACE("%s\n", debugstr_w(arg)); - hres = identifier_eval(ctx->parser->script, arg, 0, ctx->ei, &exprval); + hres = identifier_eval(ctx->parser->script, arg, &exprval); if(FAILED(hres)) return hres; @@ -1108,10 +1099,20 @@ static HRESULT interp_identid(exec_ctx_t *ctx) TRACE("%s %x\n", debugstr_w(arg), flags); - hres = identifier_eval(ctx->parser->script, arg, flags, ctx->ei, &exprval); + hres = identifier_eval(ctx->parser->script, arg, &exprval); if(FAILED(hres)) return hres; + if(exprval.type == EXPRVAL_INVALID && (flags & fdexNameEnsure)) { + DISPID id; + + hres = jsdisp_get_id(ctx->parser->script->global, arg, fdexNameEnsure, &id); + if(FAILED(hres)) + return hres; + + exprval_set_idref(&exprval, to_disp(ctx->parser->script->global), id); + } + if(exprval.type != EXPRVAL_IDREF) { WARN("invalid ref\n"); exprval_release(&exprval); @@ -1686,7 +1687,7 @@ static HRESULT interp_delete_ident(exec_ctx_t *ctx) TRACE("%s\n", debugstr_w(arg)); - hres = identifier_eval(ctx->parser->script, arg, 0, ctx->ei, &exprval); + hres = identifier_eval(ctx->parser->script, arg, &exprval); if(FAILED(hres)) return hres; @@ -1804,7 +1805,7 @@ static HRESULT interp_typeofident(exec_ctx_t *ctx) TRACE("%s\n", debugstr_w(arg)); - hres = identifier_eval(ctx->parser->script, arg, 0, ctx->ei, &exprval); + hres = identifier_eval(ctx->parser->script, arg, &exprval); if(FAILED(hres)) return hres;

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
98
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 January 2012