wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

Francois Gouget : netapi32: Fix the compilation on Solaris by including errno.h instead of sys/errno.h .
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: 625f88c6f3c59f55c3fc0320ea64f46fc7f6cb21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=625f88c6f3c59f55c3fc0320e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 2 15:29:04 2011 +0100 netapi32: Fix the compilation on Solaris by including errno.h instead of sys/errno.h. --- dlls/netapi32/access.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index d3b9063..c48c693 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -21,9 +21,7 @@ #include "config.h" #include <stdarg.h> #include <fcntl.h> -#ifdef HAVE_SYS_ERRNO_H -#include <sys/errno.h> -#endif +#include <errno.h> #ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> #endif

1 0

Francois Gouget : libwine: Include a couple of extra system headers to fix the compilation on Solaris .
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: e4387430410c81cf339923b6d041a2e9b076293d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4387430410c81cf339923b6d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 2 15:27:33 2011 +0100 libwine: Include a couple of extra system headers to fix the compilation on Solaris. --- libs/wine/mmap.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 1529a85..6ec814a 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -23,11 +23,15 @@ #include <assert.h> #include <ctype.h> +#include <errno.h> #include <fcntl.h> #include <stdlib.h> #include <stdio.h> #include <string.h> #include <sys/types.h> +#ifdef HAVE_SYS_WAIT_H +#include <sys/wait.h> +#endif #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif

1 0

Huw Davies : gdi32: Add support for checking the font's gasp flags.
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: 4ce3af3fad1dfacfe39a441054586707f848038f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ce3af3fad1dfacfe39a44105… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 2 14:11:51 2011 +0000 gdi32: Add support for checking the font's gasp flags. --- dlls/gdi32/font.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 74 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5b7d500..a785283 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -32,11 +32,18 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "winternl.h" #include "gdi_private.h" #include "wine/exception.h" #include "wine/unicode.h" #include "wine/debug.h" +#ifdef WORDS_BIGENDIAN +#define get_be_word(x) (x) +#else +#define get_be_word(x) RtlUshortByteSwap(x) +#endif + WINE_DEFAULT_DEBUG_CHANNEL(font); /* Device -> World size conversion */ @@ -258,10 +265,73 @@ static void FONT_NewTextMetricExWToA(const NEWTEXTMETRICEXW *ptmW, NEWTEXTMETRIC memcpy(&ptmA->ntmFontSig, &ptmW->ntmFontSig, sizeof(FONTSIGNATURE)); } +static DWORD get_font_ppem( HDC hdc ) +{ + TEXTMETRICW tm; + DWORD ppem; + DC *dc = get_dc_ptr( hdc ); + + if (!dc) return GDI_ERROR; + + GetTextMetricsW( hdc, &tm ); + ppem = abs( INTERNAL_YWSTODS( dc, tm.tmAscent + tm.tmDescent - tm.tmInternalLeading ) ); + release_dc_ptr( dc ); + return ppem; +} + +#define GASP_GRIDFIT 0x01 +#define GASP_DOGRAY 0x02 + +static BOOL get_gasp_flags( HDC hdc, WORD *flags ) +{ + DWORD size, gasp_tag = 0x70736167; + WORD buf[16]; /* Enough for seven ranges before we need to alloc */ + WORD *alloced = NULL, *ptr = buf; + WORD num_recs, version; + DWORD ppem = get_font_ppem( hdc ); + BOOL ret = FALSE; + + *flags = 0; + if (ppem == GDI_ERROR) return FALSE; + + size = GetFontData( hdc, gasp_tag, 0, NULL, 0 ); + if (size == GDI_ERROR) return FALSE; + if (size < 4 * sizeof(WORD)) return FALSE; + if (size > sizeof(buf)) + { + ptr = alloced = HeapAlloc( GetProcessHeap(), 0, size ); + if (!ptr) return FALSE; + } + + GetFontData( hdc, gasp_tag, 0, ptr, size ); + + version = get_be_word( *ptr++ ); + num_recs = get_be_word( *ptr++ ); + + if (version > 1 || size < (num_recs * 2 + 2) * sizeof(WORD)) + { + FIXME( "Unsupported gasp table: ver %d size %d recs %d\n", version, size, num_recs ); + goto done; + } + + while (num_recs--) + { + *flags = get_be_word( *(ptr + 1) ); + if (ppem <= get_be_word( *ptr )) break; + ptr += 2; + } + TRACE( "got flags %04x for ppem %d\n", *flags, ppem ); + ret = TRUE; + +done: + HeapFree( GetProcessHeap(), 0, alloced ); + return ret; +} UINT get_font_aa_flags( HDC hdc ) { LOGFONTW lf; + WORD gasp_flags; if (GetObjectType( hdc ) == OBJ_MEMDC) { @@ -274,7 +344,10 @@ UINT get_font_aa_flags( HDC hdc ) GetObjectW( GetCurrentObject( hdc, OBJ_FONT ), sizeof(lf), &lf ); if (lf.lfQuality == NONANTIALIASED_QUALITY) return GGO_BITMAP; - /* FIXME, check gasp and user prefs */ + if (get_gasp_flags( hdc, &gasp_flags ) && !(gasp_flags & GASP_DOGRAY)) + return GGO_BITMAP; + + /* FIXME, check user prefs */ return GGO_GRAY4_BITMAP; }

1 0

Aric Stewart : usp10: Handle Thai SARA AM differently than GDEF.
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: 225de02a292e273dbfbf4a586fa7d6f580ea55ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=225de02a292e273dbfbf4a586… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Dec 2 08:59:25 2011 -0600 usp10: Handle Thai SARA AM differently than GDEF. --- dlls/usp10/shape.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 8791bef..04f0ff4 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -3131,6 +3131,8 @@ static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS } } + GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); + for (i = 0; i < cGlyphs; i++) { int char_index[20]; @@ -3157,10 +3159,13 @@ static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; else pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_CHARACTER; + + /* handle Thai SARA AM (U+0E33) differently than GDEF */ + if (char_count == 1 && pwcChars[char_index[0]] == 0x0e33) + pGlyphProp[i].sva.fClusterStart = 0; } HeapFree(GetProcessHeap(),0,spaces); - GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); /* Do not allow justification between marks and their base */

1 0

Aric Stewart : usp10: More properly handle the glyph properties on glyphs added by multiple substitutions .
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: 183fdedb905acf175357087091ee309f10acbcb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=183fdedb905acf17535708709… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Dec 2 07:22:33 2011 -0600 usp10: More properly handle the glyph properties on glyphs added by multiple substitutions. --- dlls/usp10/shape.c | 36 +++++++++++++++--------------------- 1 files changed, 15 insertions(+), 21 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 7772573..8791bef 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1269,7 +1269,7 @@ static VOID *load_gdef_table(HDC hdc) return GDEF_Table; } -static void GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGlyphs, const WORD cGlyphs, WORD* pwLogClust, SCRIPT_GLYPHPROP *pGlyphProp) +static void GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGlyphs, const WORD cGlyphs, WORD* pwLogClust, const WORD cChars, SCRIPT_GLYPHPROP *pGlyphProp) { int i; @@ -1279,6 +1279,12 @@ static void GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGlyph for (i = 0; i < cGlyphs; i++) { WORD class; + int char_count = 0; + int k; + + for (k = 0; k < cChars; k++) + if (pwLogClust[k] == i) + char_count++; class = GDEF_get_glyph_class(psc->GDEF_Table, pwGlyphs[i]); @@ -1311,6 +1317,9 @@ static void GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGlyph pGlyphProp[i].sva.fDiacritic = 0; pGlyphProp[i].sva.fZeroWidth = 0; } + + if (char_count == 0) + pGlyphProp[i].sva.fClusterStart = 0; } } @@ -2964,10 +2973,7 @@ static void ShapeCharGlyphProp_Default( HDC hdc, ScriptCache* psc, SCRIPT_ANALYS } if (char_count == 0) - { - FIXME("No chars in this glyph? Must be an error\n"); continue; - } if (char_count ==1 && pwcChars[char_index[0]] == 0x0020) /* space */ { @@ -2978,7 +2984,7 @@ static void ShapeCharGlyphProp_Default( HDC hdc, ScriptCache* psc, SCRIPT_ANALYS pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_CHARACTER; } - GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); + GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); } @@ -3036,10 +3042,7 @@ static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI isFinal = (i == finaGlyph || (i+dirL > 0 && i+dirL < cGlyphs && spaces[i+dirL])); if (char_count == 0) - { - FIXME("No chars in this glyph? Must be an error\n"); continue; - } if (char_count == 1) { @@ -3092,7 +3095,7 @@ static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; } - GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); + GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); HeapFree(GetProcessHeap(),0,spaces); } @@ -3143,10 +3146,7 @@ static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS } if (char_count == 0) - { - FIXME("No chars in this glyph? Must be an error\n"); continue; - } if (char_count ==1 && pwcChars[char_index[0]] == 0x0020) /* space */ { @@ -3160,7 +3160,7 @@ static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS } HeapFree(GetProcessHeap(),0,spaces); - GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); + GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); /* Do not allow justification between marks and their base */ @@ -3190,10 +3190,7 @@ static void ShapeCharGlyphProp_None( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS* } if (char_count == 0) - { - FIXME("No chars in this glyph? Must be an error\n"); continue; - } if (char_count ==1 && pwcChars[char_index[0]] == 0x0020) /* space */ { @@ -3203,7 +3200,7 @@ static void ShapeCharGlyphProp_None( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS* else pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; } - GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); + GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); } @@ -3226,10 +3223,7 @@ static void ShapeCharGlyphProp_Tibet( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS } if (char_count == 0) - { - FIXME("No chars in this glyph? Must be an error\n"); continue; - } if (char_count ==1 && pwcChars[char_index[0]] == 0x0020) /* space */ { @@ -3239,7 +3233,7 @@ static void ShapeCharGlyphProp_Tibet( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS else pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; } - GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); + GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); /* Tibeten script does not set sva.fDiacritic or sva.fZeroWidth */

1 0

Aric Stewart : usp10: Phags-Pa wants the calt feature enabled.
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: ceca716999dc6dd90d5fb816221d68f416ce18aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceca716999dc6dd90d5fb8162… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Dec 2 07:22:13 2011 -0600 usp10: Phags-Pa wants the calt feature enabled. --- dlls/usp10/shape.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 36fa404..7772573 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -408,6 +408,13 @@ static OPENTYPE_FEATURE_RECORD tibetan_features[] = { MS_MAKE_TAG('b','l','w','s'), 1}, }; +static OPENTYPE_FEATURE_RECORD phags_features[] = +{ + { MS_MAKE_TAG('a','b','v','s'), 1}, + { MS_MAKE_TAG('b','l','w','s'), 1}, + { MS_MAKE_TAG('c','a','l','t'), 1}, +}; + static OPENTYPE_FEATURE_RECORD thai_features[] = { { MS_MAKE_TAG('c','c','m','p'), 1}, @@ -563,7 +570,7 @@ static const ScriptShapeData ShapingData[] = {{ sinhala_features, 3}, NULL, "sinh", "", ContextualShape_Sinhala, ShapeCharGlyphProp_Sinhala}, {{ tibetan_features, 2}, NULL, "tibt", "", NULL, ShapeCharGlyphProp_Tibet}, {{ tibetan_features, 2}, NULL, "tibt", "", NULL, ShapeCharGlyphProp_Tibet}, - {{ tibetan_features, 2}, NULL, "phag", "", ContextualShape_Phags_pa, ShapeCharGlyphProp_Thai}, + {{ phags_features, 3}, NULL, "phag", "", ContextualShape_Phags_pa, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, NULL, "thai", "", NULL, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, NULL, "thai", "", NULL, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, required_lao_features, "lao", "", NULL, ShapeCharGlyphProp_Thai},

1 0

Alexandre Julliard : winex11: Always ignore alpha channel with XRender gradients.
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: e332ebb20020727ab69aeae3f8b54755a7027aff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e332ebb20020727ab69aeae3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 2 14:12:07 2011 +0100 winex11: Always ignore alpha channel with XRender gradients. --- dlls/winex11.drv/xrender.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index f7fd11e..bccbe4d 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2562,12 +2562,8 @@ static BOOL xrenderdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG n colors[1].red = v2->Red * 257 / 256; colors[1].green = v2->Green * 257 / 256; colors[1].blue = v2->Blue * 257 / 256; - if (has_alpha( physdev->format )) - { - colors[0].alpha = v1->Alpha * 257 / 256; - colors[1].alpha = v2->Alpha * 257 / 256; - } - else colors[0].alpha = colors[1].alpha = 65535; + /* always ignore alpha since otherwise xrender will want to pre-multiply the colors */ + colors[0].alpha = colors[1].alpha = 65535; pt[0].x = v1->x; pt[0].y = v1->y;

1 0

Alexandre Julliard : gdi32: Add some parameter checks in GdiGradientFill.
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: c5bddce3aa20e39dd446548f83f1d5e33f8f1ec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5bddce3aa20e39dd446548f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 1 18:08:09 2011 +0100 gdi32: Add some parameter checks in GdiGradientFill. --- dlls/gdi32/painting.c | 15 +++++-- dlls/gdi32/tests/bitmap.c | 90 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 99 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 5effffe..75c32c8 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -1217,19 +1217,26 @@ POINT *GDI_Bezier( const POINT *Points, INT count, INT *nPtsOut ) /****************************************************************************** * GdiGradientFill (GDI32.@) - * - * FIXME: we don't support the Alpha channel properly */ BOOL WINAPI GdiGradientFill( HDC hdc, TRIVERTEX *vert_array, ULONG nvert, void * grad_array, ULONG ngrad, ULONG mode ) { - DC *dc = get_dc_ptr( hdc ); + DC *dc; PHYSDEV physdev; BOOL ret; TRACE("%p vert_array:%p nvert:%d grad_array:%p ngrad:%d\n", hdc, vert_array, nvert, grad_array, ngrad); - if (!dc) return FALSE; + if (!vert_array || !nvert || !grad_array || !ngrad || mode > GRADIENT_FILL_TRIANGLE) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (!(dc = get_dc_ptr( hdc ))) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pGradientFill ); diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 5397d85..8b62be6 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -33,6 +33,7 @@ #include "wine/test.h" static BOOL (WINAPI *pGdiAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION); +static BOOL (WINAPI *pGdiGradientFill)(HDC,TRIVERTEX*,ULONG,void*,ULONG,ULONG); static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); static inline int get_bitmap_stride( int width, int bpp ) @@ -3350,6 +3351,89 @@ static void test_GdiAlphaBlend(void) } +static void test_GdiGradientFill(void) +{ + HDC hdc; + BOOL ret; + HBITMAP bmp; + BITMAPINFO *bmi; + void *bits; + GRADIENT_RECT rect[] = { { 0, 0 }, { 0, 1 }, { 2, 3 } }; + GRADIENT_TRIANGLE tri[] = { { 0, 0, 0 }, { 0, 1, 2 }, { 0, 2, 1 }, { 0, 1, 3 } }; + TRIVERTEX vt[3] = { { 2, 2, 0xff00, 0x0000, 0x0000, 0x8000 }, + { 10, 10, 0x0000, 0xff00, 0x0000, 0x8000 }, + { 20, 10, 0x0000, 0x0000, 0xff00, 0xff00 } }; + + if (!pGdiGradientFill) + { + win_skip( "GdiGradientFill is not implemented\n" ); + return; + } + + hdc = CreateCompatibleDC( NULL ); + bmi = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO, bmiColors[3] )); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + bmi->bmiHeader.biHeight = 20; + bmi->bmiHeader.biWidth = 20; + bmi->bmiHeader.biBitCount = 32; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + bmp = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, &bits, NULL, 0); + ok( bmp != NULL, "couldn't create bitmap\n" ); + SelectObject( hdc, bmp ); + + SetLastError( 0xdeadbeef ); + ret = pGdiGradientFill( hdc, vt, 3, rect, 1, GRADIENT_FILL_RECT_H ); + ok( ret, "GdiGradientFill failed err %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pGdiGradientFill( hdc, vt, 3, rect, 1, 3 ); + ok( !ret, "GdiGradientFill succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pGdiGradientFill( (HDC)0xdead, vt, 3, rect, 1, GRADIENT_FILL_RECT_H ); + ok( !ret, "GdiGradientFill succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pGdiGradientFill( NULL, NULL, 0, rect, 1, GRADIENT_FILL_RECT_H ); + ok( !ret, "GdiGradientFill succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + ret = pGdiGradientFill( hdc, NULL, 0, rect, 1, GRADIENT_FILL_RECT_H ); + ok( !ret, "GdiGradientFill succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pGdiGradientFill( hdc, NULL, 3, rect, 1, GRADIENT_FILL_RECT_H ); + ok( !ret, "GdiGradientFill succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pGdiGradientFill( hdc, vt, 3, NULL, 0, GRADIENT_FILL_RECT_H ); + ok( !ret, "GdiGradientFill succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pGdiGradientFill( hdc, vt, 3, NULL, 1, GRADIENT_FILL_RECT_H ); + ok( !ret, "GdiGradientFill succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pGdiGradientFill( hdc, vt, 3, rect, 0, GRADIENT_FILL_RECT_H ); + ok( !ret, "GdiGradientFill succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pGdiGradientFill( hdc, vt, 1, tri, 0, GRADIENT_FILL_TRIANGLE ); + ok( !ret, "GdiGradientFill succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pGdiGradientFill( hdc, vt, 1, tri, 1, GRADIENT_FILL_TRIANGLE ); + ok( ret, "GdiGradientFill failed err %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pGdiGradientFill( hdc, vt, 3, tri, 2, GRADIENT_FILL_TRIANGLE ); + ok( ret, "GdiGradientFill failed err %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pGdiGradientFill( hdc, vt, 3, tri, 3, GRADIENT_FILL_TRIANGLE ); + ok( ret, "GdiGradientFill failed err %u\n", GetLastError() ); + + DeleteDC( hdc ); + DeleteObject( bmp ); +} + static void test_clipping(void) { HBITMAP bmpDst; @@ -4911,8 +4995,9 @@ START_TEST(bitmap) HMODULE hdll; hdll = GetModuleHandle("gdi32.dll"); - pGdiAlphaBlend = (void*)GetProcAddress(hdll, "GdiAlphaBlend"); - pSetLayout = (void*)GetProcAddress(hdll, "SetLayout"); + pGdiAlphaBlend = (void*)GetProcAddress(hdll, "GdiAlphaBlend"); + pGdiGradientFill = (void*)GetProcAddress(hdll, "GdiGradientFill"); + pSetLayout = (void*)GetProcAddress(hdll, "SetLayout"); test_createdibitmap(); test_dibsections(); @@ -4933,6 +5018,7 @@ START_TEST(bitmap) test_StretchBlt(); test_StretchDIBits(); test_GdiAlphaBlend(); + test_GdiGradientFill(); test_32bit_bitmap_blt(); test_bitmapinfoheadersize(); test_get16dibits();

1 0

André Hentschel : ntoskrnl: Add a stub for ExInitializePagedLookasideList.
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: c0892ca989bb155feb2da782e650fabed333f0ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0892ca989bb155feb2da782e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 1 20:07:52 2011 +0100 ntoskrnl: Add a stub for ExInitializePagedLookasideList. --- dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6126c3f..bc64ce1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1076,6 +1076,19 @@ void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST Lookaside, FIXME( "stub: %p, %p, %p, %u, %lu, %u, %u\n", Lookaside, Allocate, Free, Flags, Size, Tag, Depth ); } +/*********************************************************************** + * ExInitializePagedLookasideList (NTOSKRNL.EXE.@) + */ +void WINAPI ExInitializePagedLookasideList(PPAGED_LOOKASIDE_LIST Lookaside, + PALLOCATE_FUNCTION Allocate, + PFREE_FUNCTION Free, + ULONG Flags, + SIZE_T Size, + ULONG Tag, + USHORT Depth) +{ + FIXME( "stub: %p, %p, %p, %u, %lu, %u, %u\n", Lookaside, Allocate, Free, Flags, Size, Tag, Depth ); +} /*********************************************************************** * ExInitializeZone (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 3ecb7ec..97c15a4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -140,7 +140,7 @@ @ stub ExGetPreviousMode @ stub ExGetSharedWaiterCount @ stdcall ExInitializeNPagedLookasideList(ptr ptr ptr long long long long) -@ stub ExInitializePagedLookasideList +@ stdcall ExInitializePagedLookasideList(ptr ptr ptr long long long long) @ stdcall ExInitializeResourceLite(ptr) @ stdcall ExInitializeZone(ptr long ptr long) @ stub ExInterlockedAddLargeInteger diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 8f5aa04..356b1f7 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -139,6 +139,7 @@ typedef struct _EPROCESS *PEPROCESS; typedef struct _ERESOURCE *PERESOURCE; typedef struct _IO_WORKITEM *PIO_WORKITEM; typedef struct _NPAGED_LOOKASIDE_LIST *PNPAGED_LOOKASIDE_LIST; +typedef struct _PAGED_LOOKASIDE_LIST *PPAGED_LOOKASIDE_LIST; typedef struct _OBJECT_TYPE *POBJECT_TYPE; typedef struct _OBJECT_HANDLE_INFORMATION *POBJECT_HANDLE_INFORMATION; typedef struct _ZONE_HEADER *PZONE_HEADER;

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: c066bdb24093c9507864cb043e5b646eafe5837f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c066bdb24093c9507864cb043… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 1 21:24:00 2011 +0100 po: Update German translation. --- po/de.po | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index 0c1bf12..528293e 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-01 20:05+0100\n" +"PO-Revision-Date: 2011-12-01 21:21+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -113,7 +113,6 @@ msgid "Wine Gecko Installer" msgstr "Wine-Gecko-Installation" #: appwiz.rc:100 -#, fuzzy msgid "" "Wine could not find a Gecko package which is needed for applications " "embedding HTML to work correctly. Wine can automatically download and " @@ -128,7 +127,8 @@ msgstr "" "Wine kann das Paket für Sie herunterladen und installieren.\n" "\n" "Hinweis: Es wird empfohlen das Paket ihrer Distribution zu verwenden. " -"Weitere Hinweise finden Sie unter http://wiki.winehq.org/Gecko" +"Weitere Hinweise finden Sie unter <a href=\"http://wiki.winehq.org/Gecko\"> " +"http://wiki.winehq.org/Gecko</a>." #: appwiz.rc:106 msgid "&Install" @@ -6016,9 +6016,8 @@ msgid "&Data Rate" msgstr "&Datenrate" #: msvfw32.rc:52 -#, fuzzy msgid "kB/sec" -msgstr "KB/sec" +msgstr "kB/Sek" #: msvfw32.rc:25 msgid "Full Frames (Uncompressed)"

1 0

← Newer
1
...
72
73
74
75
76
77
78
...
81
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 December 2011