December 2011 - Wine-commits

Francois Gouget : cmd: Print error messages on stderr, not on stdout.
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: bc176ecb8140f319355874790ea307e9156ab8df URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc176ecb8140f319355874790… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 2 10:07:27 2011 +0100 cmd: Print error messages on stderr, not on stdout. --- programs/cmd/builtins.c | 20 ++++++++++---------- programs/cmd/tests/test_builtins.cmd | 1 - programs/cmd/tests/test_builtins.cmd.exp | 7 +++---- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 60f9f99..216a28b 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -194,7 +194,7 @@ void WCMD_clear_screen (void) { void WCMD_change_tty (void) { - WCMD_output (WCMD_LoadMessage(WCMD_NYI)); + WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI)); } @@ -390,7 +390,7 @@ void WCMD_copy (void) { WCHAR ext[MAX_PATH]; if (param1[0] == 0x00) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr (WCMD_LoadMessage(WCMD_NOARG)); return; } @@ -1135,7 +1135,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* Ensure line continues with variable */ if (!*curPos || *curPos != '%') { - WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); + WCMD_output_stderr (WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } @@ -1154,7 +1154,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { if (!*curPos || !WCMD_keyword_ws_found(inW, sizeof(inW)/sizeof(inW[0]), curPos)) { - WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); + WCMD_output_stderr (WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } @@ -1181,7 +1181,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { if ((*cmdList == NULL) || !WCMD_keyword_ws_found(doW, sizeof(doW)/sizeof(doW[0]), (*cmdList)->command)) { - WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); + WCMD_output_stderr (WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } @@ -2199,14 +2199,14 @@ void WCMD_setshow_date (void) { WCMD_output (WCMD_LoadMessage(WCMD_NEWDATE)); WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer)/sizeof(WCHAR), &count); if (count > 2) { - WCMD_output (WCMD_LoadMessage(WCMD_NYI)); + WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI)); } } } else WCMD_print_error (); } else { - WCMD_output (WCMD_LoadMessage(WCMD_NYI)); + WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI)); } } @@ -2427,14 +2427,14 @@ void WCMD_setshow_time (void) { WCMD_output (WCMD_LoadMessage(WCMD_NEWTIME)); WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer)/sizeof(WCHAR), &count); if (count > 2) { - WCMD_output (WCMD_LoadMessage(WCMD_NYI)); + WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI)); } } } else WCMD_print_error (); } else { - WCMD_output (WCMD_LoadMessage(WCMD_NYI)); + WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI)); } } @@ -2515,7 +2515,7 @@ void WCMD_type (WCHAR *command) { FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { WCMD_print_error (); - WCMD_output(WCMD_LoadMessage(WCMD_READFAIL), thisArg); /* should be _stderr */ + WCMD_output_stderr(WCMD_LoadMessage(WCMD_READFAIL), thisArg); errorlevel = 1; } else { if (writeHeaders) { diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index f03a05e..6295f9e 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -141,7 +141,6 @@ if 1==1 (echo foo2>bar) else echo baz2>bar type bar & del bar if 1==1 (echo foo3) else echo baz3>bar type bar || echo file does not exist, ok -echo ----- if 1==1 (echo foo4>bar) else echo baz4>bar type bar & del bar if 1==0 (echo foo5>bar) else echo baz5>bar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index a005fc2..7537ebc 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -166,8 +166,7 @@ food21 ----- foo2 foo3 -(a)todo_wine@file does not exist, ok -(a)todo_wine@----- +file does not exist, ok foo4 baz5 baz6(a)space@ @@ -190,8 +189,8 @@ baz @todo_wine(a)foo | echo bar @todo_wine(a)foo & echo bar @todo_wine(a)bak & -(a)todo_wine@baz(a)space@ -(a)todo_wine@0(a)or_broken@1 +baz(a)space@ +0(a)or_broken@1 @todo_wine(a)foo > foo @todo_wine@< @todo_wine(a)ffoof

1 0

André Hentschel : winebuild: Fill the delay slot on Sparc.
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: c50f25e91b04bd2c0bb971540d1af54969f7253c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c50f25e91b04bd2c0bb971540… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 1 23:56:00 2011 +0100 winebuild: Fill the delay slot on Sparc. --- tools/winebuild/import.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 00c030b..af02a9d 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1071,6 +1071,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) case CPU_SPARC: output( "\tset %d, %%g1\n", (idx << 16) | j ); output( "\tb,a %s\n", asm_name("__wine_delay_load_asm") ); + output( "\tnop\n" ); break; case CPU_ARM: output( "\tstmfd SP!, {r0-r3}\n" );

1 0

Vitaliy Margolen : dinput: Fix device enumeration by DX8 device type.
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: 7260132c5d8aa0aa753c12d1e7420c307e651359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7260132c5d8aa0aa753c12d1e… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Dec 1 21:08:14 2011 -0700 dinput: Fix device enumeration by DX8 device type. --- dlls/dinput/dinput_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index e69bbf0..6350a18 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -359,7 +359,7 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( if (!lpCallback || dwFlags & ~(DIEDFL_ATTACHEDONLY | DIEDFL_FORCEFEEDBACK | DIEDFL_INCLUDEALIASES | DIEDFL_INCLUDEPHANTOMS | DIEDFL_INCLUDEHIDDEN) || - dwDevType > 4) + (dwDevType > DI8DEVCLASS_GAMECTRL && dwDevType < DI8DEVTYPE_DEVICE) || dwDevType > DI8DEVTYPE_SUPPLEMENTAL) return DIERR_INVALIDPARAM; if (!This->initialized) @@ -398,7 +398,7 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices( if (!lpCallback || dwFlags & ~(DIEDFL_ATTACHEDONLY | DIEDFL_FORCEFEEDBACK | DIEDFL_INCLUDEALIASES | DIEDFL_INCLUDEPHANTOMS | DIEDFL_INCLUDEHIDDEN) || - dwDevType > 4) + (dwDevType > DI8DEVCLASS_GAMECTRL && dwDevType < DI8DEVTYPE_DEVICE) || dwDevType > DI8DEVTYPE_SUPPLEMENTAL) return DIERR_INVALIDPARAM; if (!This->initialized)

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

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

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

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

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

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: 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