April 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : msvcrt: Initialize exported common variables to fix the build on Mac OS.
by Alexandre Julliard April 16, 2010

April 16, 2010

Module: wine Branch: master Commit: d4880b7a1f929997c60e69da77a8b1ca07ee71af URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4880b7a1f929997c60e69da7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 16 12:01:35 2010 +0200 msvcrt: Initialize exported common variables to fix the build on Mac OS. --- dlls/msvcrt/ctype.c | 2 +- dlls/msvcrt/locale.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 7baa572..7e7d9f0 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -55,7 +55,7 @@ WORD MSVCRT__ctype [257] = { * changes to affect ctypes (i.e. isleadbyte), we use a second table * and update its flags whenever the current locale changes. */ -WORD* MSVCRT__pctype; +WORD* MSVCRT__pctype = NULL; /********************************************************************* * __pctype_func (MSVCRT.@) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 55d2ca9..59d94ae 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -44,8 +44,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define MAX_ELEM_LEN 64 /* Max length of country/language/CP string */ #define MAX_LOCALE_LENGTH 256 MSVCRT__locale_t MSVCRT_locale = NULL; -int MSVCRT___lc_codepage; -int MSVCRT___lc_collate_cp; +int MSVCRT___lc_codepage = 0; +int MSVCRT___lc_collate_cp = 0; HANDLE MSVCRT___lc_handle[MSVCRT_LC_MAX - MSVCRT_LC_MIN + 1] = { 0 }; unsigned char charmax = CHAR_MAX;

1 0

Alexandre Julliard : configure: Don' t disable 32-bit programs on Wow64 to support a future 32-bit compatibility mode .
by Alexandre Julliard April 16, 2010

April 16, 2010

Module: wine Branch: master Commit: 980b688fd8acd8edbce3ea84238ea166cebb3fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=980b688fd8acd8edbce3ea842… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 22:52:36 2010 +0200 configure: Don't disable 32-bit programs on Wow64 to support a future 32-bit compatibility mode. --- configure | 4 ---- configure.ac | 4 ---- 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 6db971a..7557ad9 100755 --- a/configure +++ b/configure @@ -4121,12 +4121,8 @@ then WOW64_DISABLE=\# enable_fonts=${enable_fonts:-no} - enable_rpcss=${enable_rpcss:-no} enable_server=${enable_server:-no} enable_tools=${enable_tools:-no} - enable_wineboot=${enable_wineboot:-no} - enable_winedbg=${enable_winedbg:-no} - enable_winemenubuilder=${enable_winemenubuilder:-no} test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib32" fi diff --git a/configure.ac b/configure.ac index bd1276b..4aa7cfd 100644 --- a/configure.ac +++ b/configure.ac @@ -190,12 +190,8 @@ then fi AC_SUBST([WOW64_DISABLE],[\#]) enable_fonts=${enable_fonts:-no} - enable_rpcss=${enable_rpcss:-no} enable_server=${enable_server:-no} enable_tools=${enable_tools:-no} - enable_wineboot=${enable_wineboot:-no} - enable_winedbg=${enable_winedbg:-no} - enable_winemenubuilder=${enable_winemenubuilder:-no} test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib32" fi

1 0

Vincent Povirk : gdiplus: Ensure GdipGetGenericFontFamilySansSerif returns a truetype font.
by Alexandre Julliard April 16, 2010

April 16, 2010

Module: wine Branch: master Commit: 049aa8dacd8135ac11e9deee982c14959e9511fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=049aa8dacd8135ac11e9deee9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 15 11:40:21 2010 -0500 gdiplus: Ensure GdipGetGenericFontFamilySansSerif returns a truetype font. --- dlls/gdiplus/font.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 37cca71..0b7f9f6 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -829,15 +829,21 @@ GpStatus WINGDIPAPI GdipGetGenericFontFamilySerif(GpFontFamily **nativeFamily) */ GpStatus WINGDIPAPI GdipGetGenericFontFamilySansSerif(GpFontFamily **nativeFamily) { - /* FIXME: On Windows this is called Microsoft Sans Serif, this shouldn't - * affect anything */ - static const WCHAR MSSansSerif[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; + GpStatus stat; + static const WCHAR MicrosoftSansSerif[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; + static const WCHAR Tahoma[] = {'T','a','h','o','m','a','\0'}; TRACE("(%p)\n", nativeFamily); if (nativeFamily == NULL) return InvalidParameter; - return GdipCreateFontFamilyFromName(MSSansSerif, NULL, nativeFamily); + stat = GdipCreateFontFamilyFromName(MicrosoftSansSerif, NULL, nativeFamily); + + if (stat == FontFamilyNotFound) + /* FIXME: Microsoft Sans Serif is not installed on Wine. */ + stat = GdipCreateFontFamilyFromName(Tahoma, NULL, nativeFamily); + + return stat; } /*****************************************************************************

1 0

Henri Verbeet : wined3d: Get rid of the width and height parameters to surface_allocate_surface().
by Alexandre Julliard April 16, 2010

April 16, 2010

Module: wine Branch: master Commit: 212bfab2dfb586f5563a9fe95cfee6112ee18219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=212bfab2dfb586f5563a9fe95… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 15 19:21:22 2010 +0200 wined3d: Get rid of the width and height parameters to surface_allocate_surface(). --- dlls/wined3d/surface.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 182e219..7c95530 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -797,9 +797,11 @@ static void surface_upload_data(IWineD3DSurfaceImpl *This, const struct wined3d_ * the correct texture. */ /* Context activation is done by the caller. */ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, const struct wined3d_gl_info *gl_info, - const struct wined3d_format_desc *format_desc, BOOL srgb, GLsizei width, GLsizei height) + const struct wined3d_format_desc *format_desc, BOOL srgb) { BOOL enable_client_storage = FALSE; + GLsizei width = This->pow2Width; + GLsizei height = This->pow2Height; const BYTE *mem = NULL; GLenum internal; @@ -1531,7 +1533,7 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) if (!(This->Flags & alloc_flag)) { - surface_allocate_surface(This, gl_info, This->resource.format_desc, srgb, This->pow2Width, This->pow2Height); + surface_allocate_surface(This, gl_info, This->resource.format_desc, srgb); This->Flags |= alloc_flag; } @@ -1570,8 +1572,7 @@ void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_ else surface->Flags &= ~SFLAG_CONVERTED; surface_bind_and_dirtify(surface, srgb); - surface_allocate_surface(surface, gl_info, &desc, srgb, - surface->pow2Width, surface->pow2Height); + surface_allocate_surface(surface, gl_info, &desc, srgb); surface->Flags |= alloc_flag; }

1 0

Henri Verbeet : wined3d: Get rid of the width and height parameters to surface_upload_data().
by Alexandre Julliard April 16, 2010

April 16, 2010

Module: wine Branch: master Commit: bc2850a587088eca16e55dbf2c0c587aedae6907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc2850a587088eca16e55dbf2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 15 19:21:23 2010 +0200 wined3d: Get rid of the width and height parameters to surface_upload_data(). --- dlls/wined3d/surface.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7c95530..0ac29c8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -720,8 +720,10 @@ static void surface_download_data(IWineD3DSurfaceImpl *This, const struct wined3 * correct texture. */ /* Context activation is done by the caller. */ static void surface_upload_data(IWineD3DSurfaceImpl *This, const struct wined3d_gl_info *gl_info, - const struct wined3d_format_desc *format_desc, BOOL srgb, GLsizei width, GLsizei height, const GLvoid *data) + const struct wined3d_format_desc *format_desc, BOOL srgb, const GLvoid *data) { + GLsizei width = This->currentDesc.Width; + GLsizei height = This->currentDesc.Height; GLenum internal; if (srgb) @@ -4517,10 +4519,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D LEAVE_GL(); if (mem || (This->Flags & SFLAG_PBO)) - { - surface_upload_data(This, gl_info, &desc, srgb, - This->currentDesc.Width, This->currentDesc.Height, mem); - } + surface_upload_data(This, gl_info, &desc, srgb, mem); /* Restore the default pitch */ ENTER_GL();

1 0

Henri Verbeet : wined3d: The currentDesc and pow2 width/ height are the same for power of two textures.
by Alexandre Julliard April 16, 2010

April 16, 2010

Module: wine Branch: master Commit: 7f6ab3c06e921074c6944eda8b3dd9863fe6e49c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f6ab3c06e921074c6944eda8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 15 19:21:21 2010 +0200 wined3d: The currentDesc and pow2 width/height are the same for power of two textures. --- dlls/wined3d/surface.c | 20 ++++---------------- 1 files changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 177001e..182e219 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4515,22 +4515,10 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D glPixelStorei(GL_UNPACK_ROW_LENGTH, width); LEAVE_GL(); - if (This->Flags & SFLAG_NONPOW2) { - TRACE("non power of two support\n"); - if (mem || (This->Flags & SFLAG_PBO)) - { - surface_upload_data(This, gl_info, &desc, srgb, - This->currentDesc.Width, This->currentDesc.Height, mem); - } - } else { - /* When making the realloc conditional, keep in mind that GL_APPLE_client_storage may be in use, and This->resource.allocatedMemory - * changed. So also keep track of memory changes. In this case the texture has to be reallocated - */ - if (mem || (This->Flags & SFLAG_PBO)) - { - surface_upload_data(This, gl_info, &desc, srgb, - This->pow2Width, This->pow2Height, mem); - } + if (mem || (This->Flags & SFLAG_PBO)) + { + surface_upload_data(This, gl_info, &desc, srgb, + This->currentDesc.Width, This->currentDesc.Height, mem); } /* Restore the default pitch */

1 0

Vincent Povirk : gdiplus: Do not create FontFamilies for bitmap fonts.
by Alexandre Julliard April 16, 2010

April 16, 2010

Module: wine Branch: master Commit: 531219f84d0d6fa236283e5c3d061b5f752df793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=531219f84d0d6fa236283e5c3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 15 11:49:20 2010 -0500 gdiplus: Do not create FontFamilies for bitmap fonts. --- dlls/gdiplus/font.c | 5 ++++- dlls/gdiplus/tests/font.c | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 0b7f9f6..3a29771 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -521,7 +521,7 @@ GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi, static INT CALLBACK is_font_installed_proc(const LOGFONTW *elf, const TEXTMETRICW *ntm, DWORD type, LPARAM lParam) { - if (!ntm) + if (!ntm || type == RASTER_FONTTYPE) { return 1; } @@ -966,6 +966,9 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, GpFontCollection* fonts = (GpFontCollection*)lParam; int i; + if (type == RASTER_FONTTYPE) + return 1; + /* skip duplicates */ for (i=0; i<fonts->count; i++) if (strcmpiW(lfw->lfFaceName, fonts->FontFamilies[i]->FamilyName) == 0) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 1bf2c1e..80f11bc 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -192,12 +192,9 @@ static void test_fontfamily (void) expect (FontFamilyNotFound, stat); /* Bitmap fonts are not found */ -todo_wine -{ stat = GdipCreateFontFamilyFromName (MSSansSerif, NULL, &family); expect (FontFamilyNotFound, stat); if(stat == Ok) GdipDeleteFontFamily(family); -} stat = GdipCreateFontFamilyFromName (arial, NULL, &family); if(stat == FontFamilyNotFound)

1 0

Alexandre Julliard : wine.inf: Register iexplore from the system directory so that the 32-bit version gets registered too .
by Alexandre Julliard April 16, 2010

April 16, 2010

Module: wine Branch: master Commit: 53dfaf0d58e38672a53b1e0fc4f9217e5eebf6a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53dfaf0d58e38672a53b1e0fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 22:52:54 2010 +0200 wine.inf: Register iexplore from the system directory so that the 32-bit version gets registered too. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 53c3461..998ec7e 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2532,7 +2532,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,wintrust.dll,1 11,,wmiutils.dll,1 11,,wuapi.dll,1 -16422,Internet Explorer,iexplore.exe,1 +11,,iexplore.exe,1 ; 32bit-only fake dlls [FakeDllsWin32]

1 0

Aric Stewart : usp10/tests: Expanded tests for ScriptShape.
by Alexandre Julliard April 15, 2010

April 15, 2010

Module: wine Branch: master Commit: d4b853695276be6d1492a909a263bcc7ce4ca828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4b853695276be6d1492a909a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Apr 15 09:23:04 2010 -0500 usp10/tests: Expanded tests for ScriptShape. --- dlls/usp10/tests/usp10.c | 125 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 119 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 1a9301b..b7f3d2f 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -289,16 +289,14 @@ static void test_ScriptItemize( void ) static void test_ScriptShape(HDC hdc) { - static const WCHAR test1[] = {'t', 'e', 's', 't',0}; - BOOL ret; + static const WCHAR test1[] = {'w', 'i', 'n', 'e',0}; + static const WCHAR test2[] = {0x202B, 'i', 'n', 0x202C,0}; HRESULT hr; SCRIPT_CACHE sc = NULL; - WORD glyphs[4], logclust[4]; + WORD glyphs[4], glyphs2[4], logclust[4]; SCRIPT_VISATTR attrs[4]; SCRIPT_ITEM items[2]; - int nb, widths[4]; - GOFFSET offset[4]; - ABC abc[4]; + int nb; hr = ScriptItemize(test1, 4, 2, NULL, NULL, items, NULL); ok(!hr, "ScriptItemize should return S_OK not %08x\n", hr); @@ -324,8 +322,122 @@ static void test_ScriptShape(HDC hdc) ok(!hr, "ScriptShape should return S_OK not %08x\n", hr); ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); + + memset(glyphs,-1,sizeof(glyphs)); + memset(logclust,-1,sizeof(logclust)); + memset(attrs,-1,sizeof(attrs)); hr = ScriptShape(NULL, &sc, test1, 4, 4, &items[0].a, glyphs, logclust, attrs, &nb); ok(!hr, "ScriptShape should return S_OK not %08x\n", hr); + ok(nb == 4, "Wrong number of items\n"); + ok(logclust[0] == 0, "clusters out of order\n"); + ok(logclust[1] == 1, "clusters out of order\n"); + ok(logclust[2] == 2, "clusters out of order\n"); + ok(logclust[3] == 3, "clusters out of order\n"); + ok(attrs[0].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[1].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[2].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[3].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[0].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[1].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[2].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[3].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[0].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[1].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[2].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[3].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[0].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[1].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[2].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[3].fZeroWidth == 0, "fZeroWidth incorrect\n"); + + ScriptFreeCache(&sc); + sc = NULL; + + memset(glyphs2,-1,sizeof(glyphs2)); + memset(logclust,-1,sizeof(logclust)); + memset(attrs,-1,sizeof(attrs)); + hr = ScriptShape(hdc, &sc, test2, 4, 4, &items[0].a, glyphs2, logclust, attrs, &nb); + ok(hr == S_OK, "ScriptShape should return S_OK not %08x\n", hr); + ok(nb == 4, "Wrong number of items\n"); + ok(glyphs2[0] == 0, "Incorrect glyph for 0x202B\n"); + ok(glyphs2[3] == 0, "Incorrect glyph for 0x202C\n"); + ok(logclust[0] == 0, "clusters out of order\n"); + ok(logclust[1] == 1, "clusters out of order\n"); + ok(logclust[2] == 2, "clusters out of order\n"); + ok(logclust[3] == 3, "clusters out of order\n"); + ok(attrs[0].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[1].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[2].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[3].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[0].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[1].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[2].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[3].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[0].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[1].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[2].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[3].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[0].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[1].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[2].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[3].fZeroWidth == 0, "fZeroWidth incorrect\n"); + + /* modify LTR to RTL */ + items[0].a.fRTL = 1; + memset(glyphs2,-1,sizeof(glyphs2)); + memset(logclust,-1,sizeof(logclust)); + memset(attrs,-1,sizeof(attrs)); + hr = ScriptShape(hdc, &sc, test1, 4, 4, &items[0].a, glyphs2, logclust, attrs, &nb); + ok(!hr, "ScriptShape should return S_OK not %08x\n", hr); + ok(nb == 4, "Wrong number of items\n"); + ok(glyphs2[0] == glyphs[3], "Glyphs not reordered properly\n"); + ok(glyphs2[1] == glyphs[2], "Glyphs not reordered properly\n"); + ok(glyphs2[2] == glyphs[1], "Glyphs not reordered properly\n"); + ok(glyphs2[3] == glyphs[0], "Glyphs not reordered properly\n"); + ok(logclust[0] == 3, "clusters out of order\n"); + ok(logclust[1] == 2, "clusters out of order\n"); + ok(logclust[2] == 1, "clusters out of order\n"); + ok(logclust[3] == 0, "clusters out of order\n"); + ok(attrs[0].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[1].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[2].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[3].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[0].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[1].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[2].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[3].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[0].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[1].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[2].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[3].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[0].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[1].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[2].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[3].fZeroWidth == 0, "fZeroWidth incorrect\n"); + + ScriptFreeCache(&sc); +} + +static void test_ScriptPlace(HDC hdc) +{ + static const WCHAR test1[] = {'t', 'e', 's', 't',0}; + BOOL ret; + HRESULT hr; + SCRIPT_CACHE sc = NULL; + WORD glyphs[4], logclust[4]; + SCRIPT_VISATTR attrs[4]; + SCRIPT_ITEM items[2]; + int nb, widths[4]; + GOFFSET offset[4]; + ABC abc[4]; + + hr = ScriptItemize(test1, 4, 2, NULL, NULL, items, NULL); + ok(!hr, "ScriptItemize should return S_OK not %08x\n", hr); + ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); + + hr = ScriptShape(hdc, &sc, test1, 4, 4, &items[0].a, glyphs, logclust, attrs, &nb); + ok(!hr, "ScriptShape should return S_OK not %08x\n", hr); + ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); hr = ScriptPlace(hdc, &sc, glyphs, 4, NULL, &items[0].a, widths, NULL, NULL); ok(hr == E_INVALIDARG, "ScriptPlace should return E_INVALIDARG not %08x\n", hr); @@ -1667,6 +1779,7 @@ START_TEST(usp10) test_ScriptCacheGetHeight(hdc); test_ScriptGetGlyphABCWidth(hdc); test_ScriptShape(hdc); + test_ScriptPlace(hdc); test_ScriptGetFontProperties(hdc); test_ScriptTextOut(hdc);

1 0

Roderick Colenbrander : wined3d: Remove call to d3dfmt_get_conv from read_from_framebuffer_texture.
by Alexandre Julliard April 15, 2010

April 15, 2010

Module: wine Branch: master Commit: 2a949ec323aac6f1826148ef97ab6ad992bfc9ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a949ec323aac6f1826148ef9… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Apr 15 12:41:58 2010 +0200 wined3d: Remove call to d3dfmt_get_conv from read_from_framebuffer_texture. --- dlls/wined3d/surface.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9e3cef9..2986bc0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1487,13 +1487,9 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) IWineD3DDeviceImpl *device = This->resource.device; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - struct wined3d_format_desc desc; - CONVERT_TYPES convert; GLint prevRead; BOOL alloc_flag = srgb ? SFLAG_SRGBALLOCATED : SFLAG_ALLOCATED; - d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, &desc, &convert); - /* Activate the surface to read from. In some situations it isn't the currently active target(e.g. backbuffer * locking during offscreen rendering). RESOURCELOAD is ok because glCopyTexSubImage2D isn't affected by any * states in the stateblock, and no driver was found yet that had bugs in that regard. @@ -1535,7 +1531,7 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) if (!(This->Flags & alloc_flag)) { - surface_allocate_surface(This, gl_info, &desc, srgb, This->pow2Width, This->pow2Height); + surface_allocate_surface(This, gl_info, This->resource.format_desc, srgb, This->pow2Width, This->pow2Height); This->Flags |= alloc_flag; }

1 0