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

Maarten Lankhorst : quartz: Respect autoshow in video renderer.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: ab9cbecf1b3f48810a11790fc5f17023709903db URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab9cbecf1b3f48810a11790fc… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu May 20 00:01:05 2010 +0200 quartz: Respect autoshow in video renderer. --- dlls/quartz/videorenderer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index f8a5852..f25ab17 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -1828,7 +1828,7 @@ static HRESULT WINAPI Videowindow_put_AutoShow(IVideoWindow *iface, TRACE("(%p/%p)->(%d)\n", This, iface, AutoShow); - This->AutoShow = 1; /* FIXME: Should be AutoShow */; + This->AutoShow = AutoShow; return S_OK; }

1 0

Maarten Lankhorst : quartz: Remove invalid check from put_WindowStyleEx in video renderer.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 02956bf79805322d2e3730b5a063e1f307ac7ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02956bf79805322d2e3730b5a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu May 20 00:10:00 2010 +0200 quartz: Remove invalid check from put_WindowStyleEx in video renderer. --- dlls/quartz/videorenderer.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index f25ab17..40b1acb 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -1802,9 +1802,6 @@ static HRESULT WINAPI Videowindow_put_WindowStyleEx(IVideoWindow *iface, TRACE("(%p/%p)->(%d)\n", This, iface, WindowStyleEx); - if (WindowStyleEx & (WS_DISABLED|WS_HSCROLL|WS_ICONIC|WS_MAXIMIZE|WS_MINIMIZE|WS_VSCROLL)) - return E_INVALIDARG; - if (!SetWindowLongA(This->hWnd, GWL_EXSTYLE, WindowStyleEx)) return E_FAIL;

1 0

Alexandre Julliard : libwine: Generate Unicode data for Arabic shaping.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: a5fe688704da43f3b701f6f0ee46344b3995684e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5fe688704da43f3b701f6f0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 19 17:52:42 2010 +0200 libwine: Generate Unicode data for Arabic shaping. --- dlls/usp10/Makefile.in | 1 + dlls/usp10/shaping.c | 1455 ++++++++++++++++++++++++++++++++++++++++++++++++ libs/wine/cpmap.pl | 134 ++++- 3 files changed, 1566 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a5fe688704da43f3b701f…

1 0

Aric Stewart : usp10: Add Arabic shaping.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 32b9b63a424143509dd3e0978bbf246f15a71448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32b9b63a424143509dd3e0978… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 19 09:17:00 2010 -0500 usp10: Add Arabic shaping. --- dlls/usp10/Makefile.in | 1 + dlls/usp10/shape.c | 152 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 23 +------ dlls/usp10/usp10_internal.h | 21 ++++++ 4 files changed, 178 insertions(+), 19 deletions(-) diff --git a/dlls/usp10/Makefile.in b/dlls/usp10/Makefile.in index 027bdfb..f52aafb 100644 --- a/dlls/usp10/Makefile.in +++ b/dlls/usp10/Makefile.in @@ -9,6 +9,7 @@ IMPORTS = gdi32 kernel32 C_SRCS = \ bidi.c \ mirror.c \ + shape.c \ shaping.c \ usp10.c diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c new file mode 100644 index 0000000..c743c04 --- /dev/null +++ b/dlls/usp10/shape.c @@ -0,0 +1,152 @@ +/* + * Implementation of Shaping for the Uniscribe Script Processor (usp10.dll) + * + * Copyright 2010 CodeWeavers, Aric Stewart + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winnls.h" +#include "usp10.h" + +#include "usp10_internal.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); + +#define FIRST_ARABIC_CHAR 0x0600 +#define LAST_ARABIC_CHAR 0x06ff + +extern const unsigned short wine_shaping_table[]; +extern const unsigned short wine_shaping_forms[LAST_ARABIC_CHAR - FIRST_ARABIC_CHAR + 1][4]; + +enum joining_types { + jtU, + jtT, + jtR, + jtL, + jtD, + jtC +}; + +enum joined_forms { + Xn=0, + Xl, + Xr, + Xm +}; + +static CHAR neighbour_joining_type(int i, int delta, const CHAR* context_type, INT cchLen, SCRIPT_ANALYSIS *psa) +{ + if (i + delta < 0) + { + if (psa->fLinkBefore) + return jtR; + else + return jtU; + } + if ( i+ delta >= cchLen) + { + if (psa->fLinkAfter) + return jtL; + else + return jtU; + } + + i += delta; + + if (context_type[i] == jtT) + return neighbour_joining_type(i,delta,context_type,cchLen,psa); + else + return context_type[i]; +} + +static inline BOOL right_join_causing(CHAR joining_type) +{ + return (joining_type == jtR || joining_type == jtD || joining_type == jtC); +} + +static inline BOOL left_join_causing(CHAR joining_type) +{ + return (joining_type == jtL || joining_type == jtD || joining_type == jtC); +} + +/* SHAPE_ShapeArabicGlyphs + */ +void SHAPE_ShapeArabicGlyphs(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT cMaxGlyphs) +{ + CHAR *context_type; + INT *context_shape; + INT dirR, dirL; + int i; + + if (psa->eScript != Script_Arabic) + return; + + if (!psa->fLogicalOrder && psa->fRTL) + { + dirR = -1; + dirL = 1; + } + else + { + dirR = 1; + dirL = -1; + } + + context_type = HeapAlloc(GetProcessHeap(),0,cChars); + context_shape = HeapAlloc(GetProcessHeap(),0,sizeof(INT) * cChars); + + for (i = 0; i < cChars; i++) + context_type[i] = wine_shaping_table[wine_shaping_table[pwcChars[i] >> 8] + (pwcChars[i] & 0xff)]; + + for (i = 0; i < cChars; i++) + { + if (context_type[i] == jtR && right_join_causing(neighbour_joining_type(i,dirR,context_type,cChars,psa))) + context_shape[i] = Xr; + else if (context_type[i] == jtL && left_join_causing(neighbour_joining_type(i,dirL,context_type,cChars,psa))) + context_shape[i] = Xl; + else if (context_type[i] == jtD && left_join_causing(neighbour_joining_type(i,dirL,context_type,cChars,psa)) && right_join_causing(neighbour_joining_type(i,dirR,context_type,cChars,psa))) + context_shape[i] = Xm; + else if (context_type[i] == jtD && right_join_causing(neighbour_joining_type(i,dirR,context_type,cChars,psa))) + context_shape[i] = Xr; + else if (context_type[i] == jtD && left_join_causing(neighbour_joining_type(i,dirL,context_type,cChars,psa))) + context_shape[i] = Xl; + else + context_shape[i] = Xn; + } + + for (i = 0; i < cChars; i++) + { + WORD newGlyph = pwOutGlyphs[i]; + + if (pwcChars[i] >= FIRST_ARABIC_CHAR && pwcChars[i] <= LAST_ARABIC_CHAR) + { + WCHAR context_char = wine_shaping_forms[pwcChars[i] - FIRST_ARABIC_CHAR][context_shape[i]]; + if (context_char != pwcChars[i] && GetGlyphIndicesW(hdc, &context_char, 1, &newGlyph, 0) != GDI_ERROR && newGlyph != 0x0000) + pwOutGlyphs[i] = newGlyph; + } + } + + HeapFree(GetProcessHeap(),0,context_shape); + HeapFree(GetProcessHeap(),0,context_type); +} diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index b9294e2..70d3738 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -141,18 +141,6 @@ static const SCRIPT_PROPERTIES *script_props[] = &props[73] }; -#define GLYPH_BLOCK_SHIFT 8 -#define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT) -#define GLYPH_BLOCK_MASK (GLYPH_BLOCK_SIZE - 1) -#define GLYPH_MAX 65536 - -typedef struct { - LOGFONTW lf; - TEXTMETRICW tm; - WORD *glyphs[GLYPH_MAX / GLYPH_BLOCK_SIZE]; - ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE]; -} ScriptCache; - typedef struct { int numGlyphs; WORD* glyphs; @@ -529,13 +517,6 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem #define Syriac_stop 0x074f #define Latin_start 0x0001 #define Latin_stop 0x024f -#define Script_Syriac 8 -#define Script_Hebrew 7 -#define Script_Arabic 6 -#define Script_Latin 1 -#define Script_Numeric 5 -#define Script_CR 22 -#define Script_LF 23 int cnt = 0, index = 0; int New_Script = SCRIPT_UNDEFINED; @@ -1395,6 +1376,7 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE) && !psa->fNoGlyphIndex) { + WCHAR *rChars = heap_alloc(sizeof(WCHAR) * cChars); for (i = 0; i < cChars; i++) { int idx = i; @@ -1411,7 +1393,10 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, if (GetGlyphIndicesW(hdc, &chInput, 1, &glyph, 0) == GDI_ERROR) return S_FALSE; pwOutGlyphs[i] = set_cache_glyph(psc, chInput, glyph); } + rChars[i] = chInput; } + SHAPE_ShapeArabicGlyphs(hdc, (ScriptCache *)*psc, psa, rChars, cChars, pwOutGlyphs, cMaxGlyphs); + heap_free(rChars); } else { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 60e4eff..dfe3460 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -19,6 +19,26 @@ * */ +#define Script_Syriac 8 +#define Script_Hebrew 7 +#define Script_Arabic 6 +#define Script_Latin 1 +#define Script_Numeric 5 +#define Script_CR 22 +#define Script_LF 23 + +#define GLYPH_BLOCK_SHIFT 8 +#define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT) +#define GLYPH_BLOCK_MASK (GLYPH_BLOCK_SIZE - 1) +#define GLYPH_MAX 65536 + +typedef struct { + LOGFONTW lf; + TEXTMETRICW tm; + WORD *glyphs[GLYPH_MAX / GLYPH_BLOCK_SIZE]; + ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE]; +} ScriptCache; + #define odd(x) ((x) & 1) BOOL BIDI_DetermineLevels( LPCWSTR lpString, INT uCount, const SCRIPT_STATE *s, @@ -26,3 +46,4 @@ BOOL BIDI_DetermineLevels( LPCWSTR lpString, INT uCount, const SCRIPT_STATE *s, INT BIDI_ReorderV2lLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse); INT BIDI_ReorderL2vLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse); +void SHAPE_ShapeArabicGlyphs(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT cMaxGlyphs);

1 0

Aric Stewart : usp10: Attempt to do shaping via the font GSUB table first.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 841202856276dfbc91a13de9fb5d51ab22a6db6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=841202856276dfbc91a13de9f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 19 09:16:45 2010 -0500 usp10: Attempt to do shaping via the font GSUB table first. Modern fonts expect this and the presentation form B glyphs are a fallback. --- dlls/usp10/shape.c | 376 ++++++++++++++++++++++++++++++++++++++++++- dlls/usp10/usp10.c | 1 + dlls/usp10/usp10_internal.h | 1 + 3 files changed, 377 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=841202856276dfbc91a13…

1 0

Alexandre Julliard : winex11: Add some tracing to the fontconfig subpixel code.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 9479fbfd34cc8bd0f1154abe47befa5d4a645d9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9479fbfd34cc8bd0f1154abe4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 19 19:49:15 2010 +0200 winex11: Add some tracing to the fontconfig subpixel code. --- dlls/winex11.drv/xrender.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index b7e0c2f..cc0b2b5 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -194,6 +194,7 @@ MAKE_FUNCPTR(FcPatternDestroy) MAKE_FUNCPTR(FcPatternAddInteger) MAKE_FUNCPTR(FcPatternAddString) MAKE_FUNCPTR(FcPatternGetInteger) +MAKE_FUNCPTR(FcPatternGetString) static void *fontconfig_handle; static BOOL fontconfig_installed; #endif @@ -408,6 +409,7 @@ LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform) LOAD_FUNCPTR(FcPatternAddInteger); LOAD_FUNCPTR(FcPatternAddString); LOAD_FUNCPTR(FcPatternGetInteger); + LOAD_FUNCPTR(FcPatternGetString); #undef LOAD_FUNCPTR fontconfig_installed = pFcInit(); } @@ -937,6 +939,12 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz) if (pFcPatternGetInteger( match, FC_RGBA, 0, &rgba ) == FcResultMatch) { + FcChar8 *file; + if (pFcPatternGetString( match, FC_FILE, 0, &file ) != FcResultMatch) file = NULL; + + TRACE( "fontconfig returned rgba %u for font %s file %s\n", + rgba, debugstr_w(plfsz->lf.lfFaceName), debugstr_a((char *)file) ); + switch (rgba) { case FC_RGBA_RGB: entry->aa_default = AA_RGB; break;

1 0

Alexandre Julliard : comctl32/imagelist: Clear pixels that fall outside the mask when generating an alpha channel.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 8f1853a309e0f17d83af2725462e8c9aa925e830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f1853a309e0f17d83af27254… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 19 20:11:48 2010 +0200 comctl32/imagelist: Clear pixels that fall outside the mask when generating an alpha channel. --- dlls/comctl32/imagelist.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 27d95f5..11ff27f 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -205,6 +205,8 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, for (j = n * width; j < (n + 1) * width; j++) if (!mask_bits || !((mask_bits[i * mask_width + j / 8] << (j % 8)) & 0x80)) bits[i * bm.bmWidth + j] |= 0xff000000; + else + bits[i * bm.bmWidth + j] = 0; if (hdcMask) StretchBlt( himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, hdcMask, n * width, 0, width, height, SRCCOPY ); }

1 0

Alexandre Julliard : user32: Ignore the bitmap offset if it's not set.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 5decff18972dca75685781fdbc5c5da12d25069a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5decff18972dca75685781fdb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 20 09:48:35 2010 +0200 user32: Ignore the bitmap offset if it's not set. --- dlls/user32/cursoricon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index dcd94b1..6f46e46 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2423,7 +2423,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, WARN("Invalid/unsupported bitmap format!\n"); goto end_close; } - offbits = bmfh->bfOffBits - sizeof(BITMAPFILEHEADER); + if (bmfh->bfOffBits) offbits = bmfh->bfOffBits - sizeof(BITMAPFILEHEADER); } if (info->bmiHeader.biHeight > 65535 || info->bmiHeader.biWidth > 65535) {

1 0

André Hentschel : progman: Remove redundant warranty info.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 1765829b78e631fab34c3c6e86f007a542d8734e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1765829b78e631fab34c3c6e8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed May 19 16:44:56 2010 +0200 progman: Remove redundant warranty info. --- programs/progman/Cs.rc | 6 +----- programs/progman/Da.rc | 16 +--------------- programs/progman/De.rc | 16 +--------------- programs/progman/En.rc | 16 +--------------- programs/progman/Es.rc | 16 +--------------- programs/progman/Fr.rc | 16 +--------------- programs/progman/Hu.rc | 6 +----- programs/progman/It.rc | 16 +--------------- programs/progman/Ko.rc | 16 +--------------- programs/progman/Lt.rc | 16 +--------------- programs/progman/Nl.rc | 13 +------------ programs/progman/No.rc | 16 +--------------- programs/progman/Pl.rc | 16 +--------------- programs/progman/Pt.rc | 22 ++-------------------- programs/progman/Ru.rc | 6 +----- programs/progman/Si.rc | 16 +--------------- programs/progman/Sv.rc | 17 +---------------- programs/progman/Tr.rc | 6 +----- programs/progman/Zh.rc | 12 ++---------- programs/progman/main.c | 13 ------------- programs/progman/progman.h | 4 ---- 21 files changed, 21 insertions(+), 260 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1765829b78e631fab34c3…

1 0

Michael Stefaniuc : qcap: Use the proper types.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: 91c7d4f909eeff585892d112f37bd5fc0e90aab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c7d4f909eeff585892d112f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 19 12:55:49 2010 +0200 qcap: Use the proper types. --- dlls/qcap/capture.h | 6 +++--- dlls/qcap/v4l.c | 30 ++++++++++++++++++------------ 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/qcap/capture.h b/dlls/qcap/capture.h index 42eed57..0d8062d 100644 --- a/dlls/qcap/capture.h +++ b/dlls/qcap/capture.h @@ -30,9 +30,9 @@ Capture *qcap_driver_init(IPin*,USHORT); HRESULT qcap_driver_destroy(Capture*); HRESULT qcap_driver_set_format(Capture*,AM_MEDIA_TYPE*); HRESULT qcap_driver_get_format(const Capture*,AM_MEDIA_TYPE**); -HRESULT qcap_driver_get_prop_range(Capture*,LONG,LONG*,LONG*,LONG*,LONG*,LONG*); -HRESULT qcap_driver_get_prop(Capture*,LONG,LONG*,LONG*); -HRESULT qcap_driver_set_prop(Capture*,long,long,long); +HRESULT qcap_driver_get_prop_range(Capture*,VideoProcAmpProperty,LONG*,LONG*,LONG*,LONG*,LONG*); +HRESULT qcap_driver_get_prop(Capture*,VideoProcAmpProperty,LONG*,LONG*); +HRESULT qcap_driver_set_prop(Capture*,VideoProcAmpProperty,LONG,LONG); HRESULT qcap_driver_run(Capture*,FILTER_STATE*); HRESULT qcap_driver_pause(Capture*,FILTER_STATE*); HRESULT qcap_driver_stop(Capture*,FILTER_STATE*); diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 91dd8f4..3180804 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -351,8 +351,9 @@ HRESULT qcap_driver_get_format(const Capture *capBox, AM_MEDIA_TYPE ** mT) return S_OK; } -HRESULT qcap_driver_get_prop_range( Capture *capBox, LONG Property, LONG *pMin, - LONG *pMax, LONG *pSteppingDelta, LONG *pDefault, LONG *pCapsFlags ) +HRESULT qcap_driver_get_prop_range( Capture *capBox, + VideoProcAmpProperty Property, LONG *pMin, LONG *pMax, + LONG *pSteppingDelta, LONG *pDefault, LONG *pCapsFlags ) { TRACE("%p -> %d %p %p %p %p %p\n", capBox, Property, pMin, pMax, pSteppingDelta, pDefault, pCapsFlags); @@ -382,7 +383,8 @@ HRESULT qcap_driver_get_prop_range( Capture *capBox, LONG Property, LONG *pMin, return S_OK; } -HRESULT qcap_driver_get_prop( Capture *capBox, LONG Property, LONG *lValue, LONG *Flags ) +HRESULT qcap_driver_get_prop( Capture *capBox, + VideoProcAmpProperty Property, LONG *lValue, LONG *Flags ) { TRACE("%p -> %d %p %p\n", capBox, Property, lValue, Flags); @@ -408,9 +410,10 @@ HRESULT qcap_driver_get_prop( Capture *capBox, LONG Property, LONG *lValue, LONG return S_OK; } -HRESULT qcap_driver_set_prop(Capture *capBox, long Property, long lValue, long Flags) +HRESULT qcap_driver_set_prop(Capture *capBox, VideoProcAmpProperty Property, + LONG lValue, LONG Flags) { - TRACE("%p -> %ld %ld %ld\n", capBox, Property, lValue, Flags); + TRACE("%p -> %d %d %d\n", capBox, Property, lValue, Flags); switch (Property) { @@ -427,7 +430,7 @@ HRESULT qcap_driver_set_prop(Capture *capBox, long Property, long lValue, long F capBox->pict.colour = lValue; break; default: - FIXME("Not implemented %ld\n", Property); + FIXME("Not implemented %d\n", Property); return E_NOTIMPL; } @@ -598,7 +601,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) Capture * capBox = lParam; HRESULT hr; IMediaSample *pSample = NULL; - unsigned long framecount = 0; + ULONG framecount = 0; unsigned char *pTarget, *pInput, *pOutput; hr = V4l_Prepare(capBox); @@ -636,7 +639,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) capBox->renderer(capBox, pOutput, pInput); Resize(capBox, pTarget, pOutput); hr = OutputPin_SendSample((OutputPin *)capBox->pOut, pSample); - TRACE("%p -> Frame %lu: %x\n", capBox, ++framecount, hr); + TRACE("%p -> Frame %u: %x\n", capBox, ++framecount, hr); IMediaSample_Release(pSample); V4l_FreeFrame(capBox); } @@ -960,18 +963,21 @@ HRESULT qcap_driver_get_format(const Capture *capBox, AM_MEDIA_TYPE ** mT) FAIL_WITH_ERR; } -HRESULT qcap_driver_get_prop_range( Capture *capBox, LONG Property, LONG *pMin, - LONG *pMax, LONG *pSteppingDelta, LONG *pDefault, LONG *pCapsFlags ) +HRESULT qcap_driver_get_prop_range( Capture *capBox, + VideoProcAmpProperty Property, LONG *pMin, LONG *pMax, + LONG *pSteppingDelta, LONG *pDefault, LONG *pCapsFlags ) { FAIL_WITH_ERR; } -HRESULT qcap_driver_get_prop(Capture *capBox, LONG Property, LONG *lValue, LONG *Flags) +HRESULT qcap_driver_get_prop(Capture *capBox, + VideoProcAmpProperty Property, LONG *lValue, LONG *Flags) { FAIL_WITH_ERR; } -HRESULT qcap_driver_set_prop(Capture *capBox, long Property, long lValue, long Flags) +HRESULT qcap_driver_set_prop(Capture *capBox, VideoProcAmpProperty Property, + LONG lValue, LONG Flags) { FAIL_WITH_ERR; }

1 0