October 2011 - Wine-Commits

Alexandre Julliard : gdi32: Implement GdiRealizationInfo as a standard driver entry point.
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: 7fbb16d4ba9c4d36f6ac990e0e3823a12f1df742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fbb16d4ba9c4d36f6ac990e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 21 11:40:35 2011 +0200 gdi32: Implement GdiRealizationInfo as a standard driver entry point. --- dlls/gdi32/font.c | 7 ++++--- dlls/gdi32/freetype.c | 27 +++++++++++++++------------ dlls/gdi32/gdi_private.h | 1 - 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 700fc27..cda41dc 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3397,11 +3397,12 @@ BOOL WINAPI FontIsLinked(HDC hdc) BOOL WINAPI GdiRealizationInfo(HDC hdc, realization_info_t *info) { DC *dc = get_dc_ptr(hdc); - BOOL ret = FALSE; + PHYSDEV dev; + BOOL ret; if (!dc) return FALSE; - if (dc->gdiFont) ret = WineEngRealizationInfo(dc->gdiFont, info); + dev = GET_DC_PHYSDEV( dc, pGdiRealizationInfo ); + ret = dev->funcs->pGdiRealizationInfo( dev, info ); release_dc_ptr(dc); - return ret; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 81115ea..dee97ad 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6831,17 +6831,26 @@ BOOL WINAPI GetRasterizerCaps( LPRASTERIZER_STATUS lprs, UINT cbNumBytes) } /************************************************************* - * WineEngRealizationInfo + * freetype_GdiRealizationInfo */ -BOOL WineEngRealizationInfo(GdiFont *font, realization_info_t *info) +static BOOL freetype_GdiRealizationInfo( PHYSDEV dev, void *ptr ) { - FIXME("(%p, %p): stub!\n", font, info); + struct freetype_physdev *physdev = get_freetype_dev( dev ); + realization_info_t *info = ptr; + + if (!physdev->font) + { + dev = GET_NEXT_PHYSDEV( dev, pGdiRealizationInfo ); + return dev->funcs->pGdiRealizationInfo( dev, ptr ); + } + + FIXME("(%p, %p): stub!\n", physdev->font, info); info->flags = 1; - if(FT_IS_SCALABLE(font->ft_face)) + if(FT_IS_SCALABLE(physdev->font->ft_face)) info->flags |= 2; - info->cache_num = font->cache_num; + info->cache_num = physdev->font->cache_num; info->unknown2 = -1; return TRUE; } @@ -7141,7 +7150,7 @@ static const struct gdi_dc_funcs freetype_funcs = freetype_FontIsLinked, /* pFontIsLinked */ NULL, /* pFrameRgn */ NULL, /* pGdiComment */ - NULL, /* pGdiRealizationInfo */ + freetype_GdiRealizationInfo, /* pGdiRealizationInfo */ freetype_GetCharABCWidths, /* pGetCharABCWidths */ freetype_GetCharABCWidthsI, /* pGetCharABCWidthsI */ freetype_GetCharWidth, /* pGetCharWidth */ @@ -7285,10 +7294,4 @@ BOOL WINAPI GetRasterizerCaps( LPRASTERIZER_STATUS lprs, UINT cbNumBytes) return TRUE; } -BOOL WineEngRealizationInfo(GdiFont *font, realization_info_t *info) -{ - ERR("called but we don't have FreeType\n"); - return FALSE; -} - #endif /* HAVE_FREETYPE */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index f9c86d0..a506756 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -294,7 +294,6 @@ extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; extern BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) DECLSPEC_HIDDEN; extern BOOL WineEngInit(void) DECLSPEC_HIDDEN; -extern BOOL WineEngRealizationInfo(GdiFont*, realization_info_t*) DECLSPEC_HIDDEN; extern BOOL WineEngRemoveFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; /* gdiobj.c */

1 0

Alexandre Julliard : gdi32: Implement GetFontData as a standard driver entry point.
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: e31c51b65e63e159b6361abba5aa8825c3fbb5d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e31c51b65e63e159b6361abba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 17:58:09 2011 +0200 gdi32: Implement GetFontData as a standard driver entry point. --- dlls/gdi32/font.c | 8 ++-- dlls/gdi32/freetype.c | 110 +++++++++++++++++++++++----------------------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 59 insertions(+), 60 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index ae00b89..0416103 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2759,13 +2759,13 @@ DWORD WINAPI GetFontData(HDC hdc, DWORD table, DWORD offset, LPVOID buffer, DWORD length) { DC *dc = get_dc_ptr(hdc); - DWORD ret = GDI_ERROR; + PHYSDEV dev; + DWORD ret; if(!dc) return GDI_ERROR; - if(dc->gdiFont) - ret = WineEngGetFontData(dc->gdiFont, table, offset, buffer, length); - + dev = GET_DC_PHYSDEV( dc, pGetFontData ); + ret = dev->funcs->pGetFontData( dev, table, offset, buffer, length ); release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3ac3677..f11d935 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3440,6 +3440,40 @@ static void free_font(GdiFont *font) } +static DWORD get_font_data( GdiFont *font, DWORD table, DWORD offset, LPVOID buf, DWORD cbData) +{ + FT_Face ft_face = font->ft_face; + FT_ULong len; + FT_Error err; + + if (!FT_IS_SFNT(ft_face)) return GDI_ERROR; + + if(!buf) + len = 0; + else + len = cbData; + + table = RtlUlongByteSwap( table ); /* MS tags differ in endianness from FT ones */ + + /* make sure value of len is the value freetype says it needs */ + if (buf && len) + { + FT_ULong needed = 0; + err = pFT_Load_Sfnt_Table(ft_face, table, offset, NULL, &needed); + if( !err && needed < len) len = needed; + } + err = pFT_Load_Sfnt_Table(ft_face, table, offset, buf, &len); + if (err) + { + TRACE("Can't find table %c%c%c%c\n", + /* bytes were reversed */ + HIBYTE(HIWORD(table)), LOBYTE(HIWORD(table)), + HIBYTE(LOWORD(table)), LOBYTE(LOWORD(table))); + return GDI_ERROR; + } + return len; +} + /************************************************************* * load_VDMX * @@ -3477,7 +3511,7 @@ static LONG load_VDMX(GdiFont *font, LONG height) LONG ppem = 0; int i; - result = WineEngGetFontData(font, MS_VDMX_TAG, 0, hdr, 6); + result = get_font_data(font, MS_VDMX_TAG, 0, hdr, 6); if(result == GDI_ERROR) /* no vdmx table present, use linear scaling */ return ppem; @@ -3494,7 +3528,7 @@ static LONG load_VDMX(GdiFont *font, LONG height) Ratios ratio; offset = (3 * 2) + (i * sizeof(Ratios)); - WineEngGetFontData(font, MS_VDMX_TAG, offset, &ratio, sizeof(Ratios)); + get_font_data(font, MS_VDMX_TAG, offset, &ratio, sizeof(Ratios)); offset = -1; TRACE("Ratios[%d] %d %d : %d -> %d\n", i, ratio.bCharSet, ratio.xRatio, ratio.yStartRatio, ratio.yEndRatio); @@ -3507,7 +3541,7 @@ static LONG load_VDMX(GdiFont *font, LONG height) devYRatio <= ratio.yEndRatio)) { offset = (3 * 2) + (numRatios * 4) + (i * 2); - WineEngGetFontData(font, MS_VDMX_TAG, offset, &tmp, 2); + get_font_data(font, MS_VDMX_TAG, offset, &tmp, 2); offset = GET_BE_WORD(tmp); break; } @@ -3518,7 +3552,7 @@ static LONG load_VDMX(GdiFont *font, LONG height) return ppem; } - if(WineEngGetFontData(font, MS_VDMX_TAG, offset, &group, 4) != GDI_ERROR) { + if(get_font_data(font, MS_VDMX_TAG, offset, &group, 4) != GDI_ERROR) { USHORT recs; BYTE startsz, endsz; WORD *vTable; @@ -3530,7 +3564,7 @@ static LONG load_VDMX(GdiFont *font, LONG height) TRACE("recs=%d startsz=%d endsz=%d\n", recs, startsz, endsz); vTable = HeapAlloc(GetProcessHeap(), 0, recs * 6); - result = WineEngGetFontData(font, MS_VDMX_TAG, offset + 4, vTable, recs * 6); + result = get_font_data(font, MS_VDMX_TAG, offset + 4, vTable, recs * 6); if(result == GDI_ERROR) { FIXME("Failed to retrieve vTable\n"); goto end; @@ -4217,11 +4251,11 @@ found_face: if (lf.lfFaceName[0]=='@') /* We need to try to load the GSUB table */ { - int length = WineEngGetFontData (ret, GSUB_TAG , 0, NULL, 0); + int length = get_font_data(ret, GSUB_TAG , 0, NULL, 0); if (length != GDI_ERROR) { ret->GSUB_Table = HeapAlloc(GetProcessHeap(),0,length); - WineEngGetFontData(ret, GSUB_TAG , 0, ret->GSUB_Table, length); + get_font_data(ret, GSUB_TAG , 0, ret->GSUB_Table, length); TRACE("Loaded GSUB table of %i bytes\n",length); } } @@ -6548,50 +6582,23 @@ static BOOL freetype_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, IN } /************************************************************* - * WineEngGetFontData - * + * freetype_GetFontData */ -DWORD WineEngGetFontData(GdiFont *font, DWORD table, DWORD offset, LPVOID buf, - DWORD cbData) +static DWORD freetype_GetFontData( PHYSDEV dev, DWORD table, DWORD offset, LPVOID buf, DWORD cbData ) { - FT_Face ft_face = font->ft_face; - FT_ULong len; - FT_Error err; - - TRACE("font=%p, table=%c%c%c%c, offset=0x%x, buf=%p, cbData=0x%x\n", - font, LOBYTE(LOWORD(table)), HIBYTE(LOWORD(table)), - LOBYTE(HIWORD(table)), HIBYTE(HIWORD(table)), offset, buf, cbData); - - if(!FT_IS_SFNT(ft_face)) - return GDI_ERROR; - - if(!buf) - len = 0; - else - len = cbData; - - if(table) { /* MS tags differ in endianness from FT ones */ - table = table >> 24 | table << 24 | - (table >> 8 & 0xff00) | (table << 8 & 0xff0000); - } + struct freetype_physdev *physdev = get_freetype_dev( dev ); - /* make sure value of len is the value freetype says it needs */ - if(buf && len) + if (!physdev->font) { - FT_ULong needed = 0; - err = pFT_Load_Sfnt_Table(ft_face, table, offset, NULL, &needed); - if( !err && needed < len) len = needed; + dev = GET_NEXT_PHYSDEV( dev, pGetFontData ); + return dev->funcs->pGetFontData( dev, table, offset, buf, cbData ); } - err = pFT_Load_Sfnt_Table(ft_face, table, offset, buf, &len); - if(err) { - TRACE("Can't find table %c%c%c%c\n", - /* bytes were reversed */ - HIBYTE(HIWORD(table)), LOBYTE(HIWORD(table)), - HIBYTE(LOWORD(table)), LOBYTE(LOWORD(table))); - return GDI_ERROR; - } - return len; + TRACE("font=%p, table=%c%c%c%c, offset=0x%x, buf=%p, cbData=0x%x\n", + physdev->font, LOBYTE(LOWORD(table)), HIBYTE(LOWORD(table)), + LOBYTE(HIWORD(table)), HIBYTE(HIWORD(table)), offset, buf, cbData); + + return get_font_data( physdev->font, table, offset, buf, cbData ); } /************************************************************* @@ -6963,7 +6970,7 @@ static DWORD freetype_GetKerningPairs( PHYSDEV dev, DWORD cPairs, KERNINGPAIR *k font->total_kern_pairs = 0; - length = WineEngGetFontData(font, MS_KERN_TAG, 0, NULL, 0); + length = get_font_data(font, MS_KERN_TAG, 0, NULL, 0); if (length == GDI_ERROR) { @@ -6980,7 +6987,7 @@ static DWORD freetype_GetKerningPairs( PHYSDEV dev, DWORD cPairs, KERNINGPAIR *k return 0; } - WineEngGetFontData(font, MS_KERN_TAG, 0, buf, length); + get_font_data(font, MS_KERN_TAG, 0, buf, length); /* build a glyph index to char code map */ glyph_to_char = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(USHORT) * 65536); @@ -7132,7 +7139,7 @@ static const struct gdi_dc_funcs freetype_funcs = freetype_GetCharWidth, /* pGetCharWidth */ NULL, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ - NULL, /* pGetFontData */ + freetype_GetFontData, /* pGetFontData */ freetype_GetFontUnicodeRanges, /* pGetFontUnicodeRanges */ freetype_GetGlyphIndices, /* pGetGlyphIndices */ freetype_GetGlyphOutline, /* pGetGlyphOutline */ @@ -7236,13 +7243,6 @@ BOOL WineEngDestroyFontInstance(HFONT hfont) return FALSE; } -DWORD WineEngGetFontData(GdiFont *font, DWORD table, DWORD offset, LPVOID buf, - DWORD cbData) -{ - ERR("called but we don't have FreeType\n"); - return GDI_ERROR; -} - INT WineEngAddFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) { FIXME("(%s, %x, %p): stub\n", debugstr_w(file), flags, pdv); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2e1a650..40c3cba 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -292,7 +292,6 @@ typedef struct extern INT WineEngAddFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC_HIDDEN; extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; -extern DWORD WineEngGetFontData(GdiFont*, DWORD, DWORD, LPVOID, DWORD) DECLSPEC_HIDDEN; extern BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) DECLSPEC_HIDDEN; extern BOOL WineEngFontIsLinked(GdiFont*) DECLSPEC_HIDDEN; extern BOOL WineEngInit(void) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Implement GetTextFace as a standard driver entry point.
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: 441d6cfcd4649af7df4f81f1f2217c0348b559ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=441d6cfcd4649af7df4f81f1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 17:14:53 2011 +0200 gdi32: Implement GetTextFace as a standard driver entry point. --- dlls/gdi32/driver.c | 15 ++++++++++++++- dlls/gdi32/font.c | 19 ++++--------------- dlls/gdi32/freetype.c | 35 +++++++++++++++++++---------------- dlls/gdi32/gdi_private.h | 1 - 4 files changed, 37 insertions(+), 33 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index d2883a7..ea15eab 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -434,7 +434,20 @@ static BOOL nulldrv_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, INT static INT nulldrv_GetTextFace( PHYSDEV dev, INT size, LPWSTR name ) { - return 0; + INT ret = 0; + LOGFONTW font; + HFONT hfont = GetCurrentObject( dev->hdc, OBJ_FONT ); + + if (GetObjectW( hfont, sizeof(font), &font )) + { + ret = strlenW( font.lfFaceName ) + 1; + if (name) + { + lstrcpynW( name, font.lfFaceName, size ); + ret = min( size, ret ); + } + } + return ret; } static BOOL nulldrv_GetTextMetrics( PHYSDEV dev, TEXTMETRICW *metrics ) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 98529db..ae00b89 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -852,25 +852,14 @@ INT WINAPI GetTextFaceA( HDC hdc, INT count, LPSTR name ) */ INT WINAPI GetTextFaceW( HDC hdc, INT count, LPWSTR name ) { - FONTOBJ *font; - INT ret = 0; + PHYSDEV dev; + INT ret; DC * dc = get_dc_ptr( hdc ); if (!dc) return 0; - if(dc->gdiFont) - ret = WineEngGetTextFace(dc->gdiFont, count, name); - else if ((font = GDI_GetObjPtr( dc->hFont, OBJ_FONT ))) - { - INT n = strlenW(font->logfont.lfFaceName) + 1; - if (name) - { - lstrcpynW( name, font->logfont.lfFaceName, count ); - ret = min(count, n); - } - else ret = n; - GDI_ReleaseObj( dc->hFont ); - } + dev = GET_DC_PHYSDEV( dc, pGetTextFace ); + ret = dev->funcs->pGetTextFace( dev, count, name ); release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 7ca7262..3ac3677 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6595,17 +6595,26 @@ DWORD WineEngGetFontData(GdiFont *font, DWORD table, DWORD offset, LPVOID buf, } /************************************************************* - * WineEngGetTextFace - * + * freetype_GetTextFace */ -INT WineEngGetTextFace(GdiFont *font, INT count, LPWSTR str) +static INT freetype_GetTextFace( PHYSDEV dev, INT count, LPWSTR str ) { - INT n = strlenW(font->name) + 1; - if(str) { - lstrcpynW(str, font->name, count); - return min(count, n); - } else - return n; + INT n; + struct freetype_physdev *physdev = get_freetype_dev( dev ); + + if (!physdev->font) + { + dev = GET_NEXT_PHYSDEV( dev, pGetTextFace ); + return dev->funcs->pGetTextFace( dev, count, str ); + } + + n = strlenW(physdev->font->name) + 1; + if (str) + { + lstrcpynW(str, physdev->font->name, count); + n = min(count, n); + } + return n; } /************************************************************* @@ -7138,7 +7147,7 @@ static const struct gdi_dc_funcs freetype_funcs = freetype_GetTextCharsetInfo, /* pGetTextCharsetInfo */ freetype_GetTextExtentExPoint, /* pGetTextExtentExPoint */ freetype_GetTextExtentExPointI, /* pGetTextExtentExPointI */ - NULL, /* pGetTextFace */ + freetype_GetTextFace, /* pGetTextFace */ freetype_GetTextMetrics, /* pGetTextMetrics */ NULL, /* pIntersectClipRect */ NULL, /* pInvertRgn */ @@ -7234,12 +7243,6 @@ DWORD WineEngGetFontData(GdiFont *font, DWORD table, DWORD offset, LPVOID buf, return GDI_ERROR; } -INT WineEngGetTextFace(GdiFont *font, INT count, LPWSTR str) -{ - ERR("called but we don't have FreeType\n"); - return 0; -} - INT WineEngAddFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) { FIXME("(%s, %x, %p): stub\n", debugstr_w(file), flags, pdv); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index ee7aacf..2e1a650 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -294,7 +294,6 @@ extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; extern DWORD WineEngGetFontData(GdiFont*, DWORD, DWORD, LPVOID, DWORD) DECLSPEC_HIDDEN; extern BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) DECLSPEC_HIDDEN; -extern INT WineEngGetTextFace(GdiFont*, INT, LPWSTR) DECLSPEC_HIDDEN; extern BOOL WineEngFontIsLinked(GdiFont*) DECLSPEC_HIDDEN; extern BOOL WineEngInit(void) DECLSPEC_HIDDEN; extern BOOL WineEngRealizationInfo(GdiFont*, realization_info_t*) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Implement GetTextExtentExPointI as a standard driver entry point.
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: a2de6a8766e1b28288f18983741ffd35d502fcdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2de6a8766e1b28288f189837… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 17:03:17 2011 +0200 gdi32: Implement GetTextExtentExPointI as a standard driver entry point. --- dlls/gdi32/font.c | 22 +++++++--------------- dlls/gdi32/freetype.c | 31 +++++++++++++++---------------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 22 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 38ad477..98529db 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -945,7 +945,8 @@ BOOL WINAPI GetTextExtentPoint32W( BOOL WINAPI GetTextExtentExPointI( HDC hdc, const WORD *indices, INT count, INT max_ext, LPINT nfit, LPINT dxs, LPSIZE size ) { - BOOL ret = FALSE; + PHYSDEV dev; + BOOL ret; DC *dc; if (count < 0) return FALSE; @@ -953,20 +954,11 @@ BOOL WINAPI GetTextExtentExPointI( HDC hdc, const WORD *indices, INT count, INT dc = get_dc_ptr( hdc ); if (!dc) return FALSE; - if(dc->gdiFont) - { - ret = WineEngGetTextExtentExPointI(dc->gdiFont, indices, count, max_ext, nfit, dxs, size); - size->cx = abs(INTERNAL_XDSTOWS(dc, size->cx)); - size->cy = abs(INTERNAL_YDSTOWS(dc, size->cy)); - size->cx += count * dc->charExtra; - } - else - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetTextExtentExPoint ); - FIXME("calling GetTextExtentExPoint\n"); - ret = physdev->funcs->pGetTextExtentExPoint( physdev, indices, count, max_ext, nfit, dxs, size ); - } - + dev = GET_DC_PHYSDEV( dc, pGetTextExtentExPointI ); + ret = dev->funcs->pGetTextExtentExPointI( dev, indices, count, max_ext, nfit, dxs, size ); + size->cx = abs(INTERNAL_XDSTOWS(dc, size->cx)); + size->cy = abs(INTERNAL_YDSTOWS(dc, size->cy)); + size->cx += count * dc->charExtra; release_dc_ptr( dc ); TRACE("(%p %p %d %p): returning %d x %d\n", diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 31f52b8..7ca7262 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6501,30 +6501,36 @@ static BOOL freetype_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR wstr, INT count, } /************************************************************* - * WineEngGetTextExtentExPointI - * + * freetype_GetTextExtentExPointI */ -BOOL WineEngGetTextExtentExPointI(GdiFont *font, const WORD *indices, INT count, - INT max_ext, LPINT pnfit, LPINT dxs, LPSIZE size) +static BOOL freetype_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, INT count, + INT max_ext, LPINT pnfit, LPINT dxs, LPSIZE size ) { static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; INT idx; INT nfit = 0, ext; GLYPHMETRICS gm; TEXTMETRICW tm; + struct freetype_physdev *physdev = get_freetype_dev( dev ); + + if (!physdev->font) + { + dev = GET_NEXT_PHYSDEV( dev, pGetTextExtentExPointI ); + return dev->funcs->pGetTextExtentExPointI( dev, indices, count, max_ext, pnfit, dxs, size ); + } - TRACE("%p, %p, %d, %d, %p\n", font, indices, count, max_ext, size); + TRACE("%p, %p, %d, %d, %p\n", physdev->font, indices, count, max_ext, size); GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); size->cx = 0; - get_text_metrics(font, &tm); + get_text_metrics(physdev->font, &tm); size->cy = tm.tmHeight; for(idx = 0; idx < count; idx++) { - get_glyph_outline(font, indices[idx], GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0, NULL, &identity); - size->cx += FONT_GM(font,indices[idx])->adv; + get_glyph_outline(physdev->font, indices[idx], GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0, NULL, &identity); + size->cx += FONT_GM(physdev->font,indices[idx])->adv; ext = size->cx; if (! pnfit || ext <= max_ext) { ++nfit; @@ -7131,7 +7137,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pGetSystemPaletteEntries */ freetype_GetTextCharsetInfo, /* pGetTextCharsetInfo */ freetype_GetTextExtentExPoint, /* pGetTextExtentExPoint */ - NULL, /* pGetTextExtentExPointI */ + freetype_GetTextExtentExPointI, /* pGetTextExtentExPointI */ NULL, /* pGetTextFace */ freetype_GetTextMetrics, /* pGetTextMetrics */ NULL, /* pIntersectClipRect */ @@ -7221,13 +7227,6 @@ BOOL WineEngDestroyFontInstance(HFONT hfont) return FALSE; } -BOOL WineEngGetTextExtentExPointI(GdiFont *font, const WORD *indices, INT count, - INT max_ext, LPINT nfit, LPINT dx, LPSIZE size) -{ - ERR("called but we don't have FreeType\n"); - return FALSE; -} - DWORD WineEngGetFontData(GdiFont *font, DWORD table, DWORD offset, LPVOID buf, DWORD cbData) { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 365d158..ee7aacf 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -294,7 +294,6 @@ extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; extern DWORD WineEngGetFontData(GdiFont*, DWORD, DWORD, LPVOID, DWORD) DECLSPEC_HIDDEN; extern BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) DECLSPEC_HIDDEN; -extern BOOL WineEngGetTextExtentExPointI(GdiFont*, const WORD *, INT, INT, LPINT, LPINT, LPSIZE) DECLSPEC_HIDDEN; extern INT WineEngGetTextFace(GdiFont*, INT, LPWSTR) DECLSPEC_HIDDEN; extern BOOL WineEngFontIsLinked(GdiFont*) DECLSPEC_HIDDEN; extern BOOL WineEngInit(void) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Only check for sRGB attachability when needed in surface_load_texture().
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: a42774f0425155368af1ac056952a77ff869be0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a42774f0425155368af1ac056… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 25 21:20:26 2011 +0200 wined3d: Only check for sRGB attachability when needed in surface_load_texture(). --- dlls/wined3d/surface.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 32dafcf..63c9e33 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6030,7 +6030,6 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface, static HRESULT surface_load_texture(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, const RECT *rect, BOOL srgb) { - const DWORD attach_flags = WINED3DFMT_FLAG_FBO_ATTACHABLE | WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB; RECT src_rect = {0, 0, surface->resource.width, surface->resource.height}; struct wined3d_device *device = surface->resource.device; struct wined3d_context *context; @@ -6051,7 +6050,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } if (surface->flags & (SFLAG_INSRGBTEX | SFLAG_INTEXTURE) - && (surface->resource.format->flags & attach_flags) == attach_flags + && (surface->resource.format->flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) && fbo_blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, NULL, surface->resource.usage, surface->resource.pool, surface->resource.format, NULL, surface->resource.usage, surface->resource.pool, surface->resource.format)) @@ -6067,7 +6066,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } if (surface->flags & (SFLAG_INRB_MULTISAMPLE | SFLAG_INRB_RESOLVED) - && (surface->resource.format->flags & attach_flags) == attach_flags + && (!srgb || (surface->resource.format->flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB)) && fbo_blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, NULL, surface->resource.usage, surface->resource.pool, surface->resource.format, NULL, surface->resource.usage, surface->resource.pool, surface->resource.format))

1 0

Henri Verbeet : wined3d: Mark a format as sRGB attachable if the internal format is the same for RGB and sRGB .
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: bc3c72f2cc6e71f7f4bcd8fdfc3ea924af3d9a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc3c72f2cc6e71f7f4bcd8fdf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 25 21:20:25 2011 +0200 wined3d: Mark a format as sRGB attachable if the internal format is the same for RGB and sRGB. --- dlls/wined3d/utils.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9661eb4..f374967 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1105,6 +1105,8 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined WARN("Format %s's sRGB format is not FBO attachable.\n", debug_d3dformat(format->id)); } } + else if (status == GL_FRAMEBUFFER_COMPLETE) + format->flags |= WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB; glDeleteTextures(1, &tex);

1 0

Alexandre Julliard : gdi32: Implement FontIsLinked as a standard driver entry point.
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: 8796831a9f567ee1ea94a47b0f5f30a98693e3e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8796831a9f567ee1ea94a47b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 21 11:37:48 2011 +0200 gdi32: Implement FontIsLinked as a standard driver entry point. --- dlls/gdi32/font.c | 6 ++++-- dlls/gdi32/freetype.c | 21 ++++++++++++--------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 0416103..700fc27 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3378,10 +3378,12 @@ DWORD WINAPI GetFontUnicodeRanges(HDC hdc, LPGLYPHSET lpgs) BOOL WINAPI FontIsLinked(HDC hdc) { DC *dc = get_dc_ptr(hdc); - BOOL ret = FALSE; + PHYSDEV dev; + BOOL ret; if (!dc) return FALSE; - if (dc->gdiFont) ret = WineEngFontIsLinked(dc->gdiFont); + dev = GET_DC_PHYSDEV( dc, pFontIsLinked ); + ret = dev->funcs->pFontIsLinked( dev ); release_dc_ptr(dc); TRACE("returning %d\n", ret); return ret; diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f11d935..81115ea 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6748,14 +6748,22 @@ static DWORD freetype_GetFontUnicodeRanges( PHYSDEV dev, LPGLYPHSET glyphset ) } /************************************************************* - * FontIsLinked + * freetype_FontIsLinked */ -BOOL WineEngFontIsLinked(GdiFont *font) +static BOOL freetype_FontIsLinked( PHYSDEV dev ) { + struct freetype_physdev *physdev = get_freetype_dev( dev ); BOOL ret; + + if (!physdev->font) + { + dev = GET_NEXT_PHYSDEV( dev, pFontIsLinked ); + return dev->funcs->pFontIsLinked( dev ); + } + GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); - ret = !list_empty(&font->child_fonts); + ret = !list_empty(&physdev->font->child_fonts); LeaveCriticalSection( &freetype_cs ); return ret; } @@ -7130,7 +7138,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pFillPath */ NULL, /* pFillRgn */ NULL, /* pFlattenPath */ - NULL, /* pFontIsLinked */ + freetype_FontIsLinked, /* pFontIsLinked */ NULL, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ @@ -7266,11 +7274,6 @@ BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) return FALSE; } -BOOL WineEngFontIsLinked(GdiFont *font) -{ - return FALSE; -} - /************************************************************************* * GetRasterizerCaps (GDI32.@) */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 40c3cba..f9c86d0 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -293,7 +293,6 @@ extern INT WineEngAddFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC_HIDDEN; extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; extern BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) DECLSPEC_HIDDEN; -extern BOOL WineEngFontIsLinked(GdiFont*) DECLSPEC_HIDDEN; extern BOOL WineEngInit(void) DECLSPEC_HIDDEN; extern BOOL WineEngRealizationInfo(GdiFont*, realization_info_t*) DECLSPEC_HIDDEN; extern BOOL WineEngRemoveFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Implement GetGlyphIndices as a standard driver entry point.
by Alexandre Julliard Oct. 25, 2011

Oct. 25, 2011

Module: wine Branch: master Commit: ff96c4dd4e23c2a20fc3f63176618be2e6cff06a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff96c4dd4e23c2a20fc3f6317… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 16:30:32 2011 +0200 gdi32: Implement GetGlyphIndices as a standard driver entry point. --- dlls/gdi32/font.c | 8 ++++---- dlls/gdi32/freetype.c | 31 +++++++++++++++---------------- dlls/gdi32/gdi_private.h | 2 -- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 72490c9..8fa9173 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2837,16 +2837,16 @@ DWORD WINAPI GetGlyphIndicesW(HDC hdc, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags) { DC *dc = get_dc_ptr(hdc); - DWORD ret = GDI_ERROR; + PHYSDEV dev; + DWORD ret; TRACE("(%p, %s, %d, %p, 0x%x)\n", hdc, debugstr_wn(lpstr, count), count, pgi, flags); if(!dc) return GDI_ERROR; - if(dc->gdiFont) - ret = WineEngGetGlyphIndices(dc->gdiFont, lpstr, count, pgi, flags); - + dev = GET_DC_PHYSDEV( dc, pGetGlyphIndices ); + ret = dev->funcs->pGetGlyphIndices( dev, lpstr, count, pgi, flags ); release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 11245d6..da9de0d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4947,16 +4947,21 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) } /************************************************************* - * WineEngGetGlyphIndices - * + * freetype_GetGlyphIndices */ -DWORD WineEngGetGlyphIndices(GdiFont *font, LPCWSTR lpstr, INT count, - LPWORD pgi, DWORD flags) +static DWORD freetype_GetGlyphIndices( PHYSDEV dev, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags ) { + struct freetype_physdev *physdev = get_freetype_dev( dev ); int i; WORD default_char; BOOL got_default = FALSE; + if (!physdev->font) + { + dev = GET_NEXT_PHYSDEV( dev, pGetGlyphIndices ); + return dev->funcs->pGetGlyphIndices( dev, lpstr, count, pgi, flags ); + } + if (flags & GGI_MARK_NONEXISTING_GLYPHS) { default_char = 0xffff; /* XP would use 0x1f for bitmap fonts */ @@ -4968,20 +4973,20 @@ DWORD WineEngGetGlyphIndices(GdiFont *font, LPCWSTR lpstr, INT count, for(i = 0; i < count; i++) { - pgi[i] = get_glyph_index(font, lpstr[i]); + pgi[i] = get_glyph_index(physdev->font, lpstr[i]); if (pgi[i] == 0) { if (!got_default) { - if (FT_IS_SFNT(font->ft_face)) + if (FT_IS_SFNT(physdev->font->ft_face)) { - TT_OS2 *pOS2 = pFT_Get_Sfnt_Table(font->ft_face, ft_sfnt_os2); - default_char = (pOS2->usDefaultChar ? get_glyph_index(font, pOS2->usDefaultChar) : 0); + TT_OS2 *pOS2 = pFT_Get_Sfnt_Table(physdev->font->ft_face, ft_sfnt_os2); + default_char = (pOS2->usDefaultChar ? get_glyph_index(physdev->font, pOS2->usDefaultChar) : 0); } else { TEXTMETRICW textm; - get_text_metrics(font, &textm); + get_text_metrics(physdev->font, &textm); default_char = textm.tmDefaultChar; } got_default = TRUE; @@ -7083,7 +7088,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetFontData */ freetype_GetFontUnicodeRanges, /* pGetFontUnicodeRanges */ - NULL, /* pGetGlyphIndices */ + freetype_GetGlyphIndices, /* pGetGlyphIndices */ NULL, /* pGetGlyphOutline */ NULL, /* pGetICMProfile */ NULL, /* pGetImage */ @@ -7185,12 +7190,6 @@ BOOL WineEngDestroyFontInstance(HFONT hfont) return FALSE; } -DWORD WineEngGetGlyphIndices(GdiFont *font, LPCWSTR lpstr, INT count, - LPWORD pgi, DWORD flags) -{ - return GDI_ERROR; -} - DWORD WineEngGetGlyphOutline(GdiFont *font, UINT glyph, UINT format, LPGLYPHMETRICS lpgm, DWORD buflen, LPVOID buf, const MAT2* lpmat) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 316e6a9..c09ecf1 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -293,8 +293,6 @@ extern INT WineEngAddFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC_HIDDEN; extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; extern DWORD WineEngGetFontData(GdiFont*, DWORD, DWORD, LPVOID, DWORD) DECLSPEC_HIDDEN; -extern DWORD WineEngGetGlyphIndices(GdiFont *font, LPCWSTR lpstr, INT count, - LPWORD pgi, DWORD flags) DECLSPEC_HIDDEN; extern DWORD WineEngGetGlyphOutline(GdiFont*, UINT glyph, UINT format, LPGLYPHMETRICS, DWORD buflen, LPVOID buf, const MAT2*) DECLSPEC_HIDDEN;

1 0

André Hentschel : winex11.drv: Remove remaining pixmap prefix to fix compilation without libxrender.
by Alexandre Julliard Oct. 25, 2011

Oct. 25, 2011

Module: wine Branch: master Commit: d63651fe183715f8ef12ea31c5c6485a78c7f9ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d63651fe183715f8ef12ea31c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 25 19:39:22 2011 +0200 winex11.drv: Remove remaining pixmap prefix to fix compilation without libxrender. --- dlls/winex11.drv/xrender.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 59035d6..8ee3f59 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -3149,10 +3149,10 @@ void X11DRV_XRender_Finalize(void) void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, int width, int height) { wine_tsx11_lock(); - physDev->brush.pixmap = XCreatePixmap(gdi_display, root_window, width, height, physBitmap->pixmap_depth); + physDev->brush.pixmap = XCreatePixmap(gdi_display, root_window, width, height, physBitmap->depth); XCopyArea( gdi_display, physBitmap->pixmap, physDev->brush.pixmap, - get_bitmap_gc(physBitmap->pixmap_depth), 0, 0, width, height, 0, 0 ); + get_bitmap_gc(physBitmap->depth), 0, 0, width, height, 0, 0 ); wine_tsx11_unlock(); }

1 0

Dan Kegel : kernel32/tests: fni-> FileName is not nul terminated in test_readdirectorychanges_cr.
by Alexandre Julliard Oct. 25, 2011

Oct. 25, 2011

Module: wine Branch: master Commit: 6ca1a943eb388fc2e87e1a381136943811bfb806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ca1a943eb388fc2e87e1a381… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Oct 15 11:27:34 2011 -0700 kernel32/tests: fni->FileName is not nul terminated in test_readdirectorychanges_cr. --- dlls/kernel32/tests/change.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 4d0bc1c..6142e43 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -858,7 +858,7 @@ static void test_readdirectorychanges_cr(void) ok(fni->FileNameLength == lstrlenW(szFile)*sizeof(WCHAR), "FileNameLength = %d\n", fni->FileNameLength); ok(!memcmp(fni->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), - "FileName = %s\n", wine_dbgstr_w(fni->FileName)); + "FileName = %s\n", wine_dbgstr_wn(fni->FileName, fni->FileNameLength/sizeof(WCHAR))); r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ov, readdirectorychanges_cr); @@ -878,7 +878,7 @@ static void test_readdirectorychanges_cr(void) ok(fni->FileNameLength == lstrlenW(szFile)*sizeof(WCHAR), "FileNameLength = %d\n", fni->FileNameLength); ok(!memcmp(fni->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), - "FileName = %s\n", wine_dbgstr_w(fni->FileName)); + "FileName = %s\n", wine_dbgstr_wn(fni->FileName, fni->FileNameLength/sizeof(WCHAR))); r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ov, readdirectorychanges_cr); @@ -894,7 +894,7 @@ static void test_readdirectorychanges_cr(void) ok(fni->FileNameLength == lstrlenW(szFile)*sizeof(WCHAR), "FileNameLength = %d\n", fni->FileNameLength); ok(!memcmp(fni->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), - "FileName = %s\n", wine_dbgstr_w(fni->FileName)); + "FileName = %s\n", wine_dbgstr_wn(fni->FileName, fni->FileNameLength/sizeof(WCHAR))); r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ov, readdirectorychanges_cr); @@ -910,7 +910,7 @@ static void test_readdirectorychanges_cr(void) ok(fni->FileNameLength == lstrlenW(szFile)*sizeof(WCHAR), "FileNameLength = %d\n", fni->FileNameLength); ok(!memcmp(fni->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), - "FileName = %s\n", wine_dbgstr_w(fni->FileName)); + "FileName = %s\n", wine_dbgstr_wn(fni->FileName, fni->FileNameLength/sizeof(WCHAR))); CloseHandle(hdir); @@ -934,7 +934,7 @@ static void test_readdirectorychanges_cr(void) ok(fni->FileNameLength == lstrlenW(szDir)*sizeof(WCHAR), "FileNameLength = %d\n", fni->FileNameLength); ok(!memcmp(fni->FileName, szDir, lstrlenW(szDir)*sizeof(WCHAR)), - "FileName = %s\n", wine_dbgstr_w(fni->FileName)); + "FileName = %s\n", wine_dbgstr_wn(fni->FileName, fni->FileNameLength/sizeof(WCHAR))); ok(fni->NextEntryOffset != 0, "no next entry in movement event\n"); fni_next = (FILE_NOTIFY_INFORMATION*)((char*)fni+fni->NextEntryOffset); ok(fni_next->NextEntryOffset == 0, "there should be no more events in buffer\n"); @@ -942,7 +942,7 @@ static void test_readdirectorychanges_cr(void) ok(fni_next->FileNameLength == lstrlenW(szFile)*sizeof(WCHAR), "FileNameLength = %d\n", fni_next->FileNameLength); ok(!memcmp(fni_next->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), - "FileName = %s\n", wine_dbgstr_w(fni_next->FileName)); + "FileName = %s\n", wine_dbgstr_wn(fni_next->FileName, fni_next->FileNameLength/sizeof(WCHAR))); } else { @@ -975,7 +975,7 @@ static void test_readdirectorychanges_cr(void) ok(fni->FileNameLength == lstrlenW(szDir)*sizeof(WCHAR), "FileNameLength = %d\n", fni->FileNameLength); ok(!memcmp(fni->FileName, szDir, lstrlenW(szDir)*sizeof(WCHAR)), - "FileName = %s\n", wine_dbgstr_w(fni->FileName)); + "FileName = %s\n", wine_dbgstr_wn(fni->FileName, fni->FileNameLength/sizeof(WCHAR))); if (fni->NextEntryOffset) fni_next = (FILE_NOTIFY_INFORMATION*)((char*)fni+fni->NextEntryOffset); else @@ -993,7 +993,7 @@ static void test_readdirectorychanges_cr(void) ok(fni_next->FileNameLength == lstrlenW(szDir)*sizeof(WCHAR), "FileNameLength = %d\n", fni_next->FileNameLength); ok(!memcmp(fni_next->FileName, szDir, lstrlenW(szDir)*sizeof(WCHAR)), - "FileName = %s\n", wine_dbgstr_w(fni_next->FileName)); + "FileName = %s\n", wine_dbgstr_wn(fni_next->FileName, fni_next->FileNameLength/sizeof(WCHAR))); CloseHandle(hdir); RemoveDirectoryW(file);

1 0