August 2015 - Wine-commits - list.winehq.org

Henri Verbeet : d2d1: Only print a FIXME/ WARN for specific properties in d2d_d3d_render_target_init().
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 3e0af5f1e041c234d794ba281869a5fd97779152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e0af5f1e041c234d794ba281… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 17 12:55:14 2015 +0200 d2d1: Only print a FIXME/WARN for specific properties in d2d_d3d_render_target_init(). --- dlls/d2d1/render_target.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 263cb91..c45768f 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1668,7 +1668,12 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, 0.0f, 0.0f, }; - FIXME("Ignoring render target properties.\n"); + if (desc->type != D2D1_RENDER_TARGET_TYPE_DEFAULT && desc->type != D2D1_RENDER_TARGET_TYPE_HARDWARE) + WARN("Ignoring render target type %#x.\n", desc->type); + if (desc->usage != D2D1_RENDER_TARGET_USAGE_NONE) + FIXME("Ignoring render target usage %#x.\n", desc->usage); + if (desc->minLevel != D2D1_FEATURE_LEVEL_DEFAULT) + WARN("Ignoring feature level %#x.\n", desc->minLevel); render_target->ID2D1RenderTarget_iface.lpVtbl = &d2d_d3d_render_target_vtbl; render_target->IDWriteTextRenderer_iface.lpVtbl = &d2d_text_renderer_vtbl;

1 0

Henri Verbeet : d2d1: Only print a FIXME/ WARN for specific properties in d2d_factory_init().
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: d29af2e460756e5dbf9a3ef611dd04ffe82bd5eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d29af2e460756e5dbf9a3ef61… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 17 12:55:15 2015 +0200 d2d1: Only print a FIXME/WARN for specific properties in d2d_factory_init(). --- dlls/d2d1/factory.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 0d15548..4cf9da5 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -310,7 +310,10 @@ static const struct ID2D1FactoryVtbl d2d_factory_vtbl = static void d2d_factory_init(struct d2d_factory *factory, D2D1_FACTORY_TYPE factory_type, const D2D1_FACTORY_OPTIONS *factory_options) { - FIXME("Ignoring factory type and options.\n"); + if (factory_type != D2D1_FACTORY_TYPE_SINGLE_THREADED) + FIXME("Ignoring factory type %#x.\n", factory_type); + if (factory_options && factory_options->debugLevel != D2D1_DEBUG_LEVEL_NONE) + WARN("Ignoring debug level %#x.\n", factory_options->debugLevel); factory->ID2D1Factory_iface.lpVtbl = &d2d_factory_vtbl; factory->refcount = 1;

1 0

Henri Verbeet : d2d1: Print a WARN instead of a FIXME for the glyph run description in d2d_text_renderer_DrawGlyphRun ().
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 20ad2e397fa12d13d9d296033adf0082f4fe8442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ad2e397fa12d13d9d296033… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 17 12:55:16 2015 +0200 d2d1: Print a WARN instead of a FIXME for the glyph run description in d2d_text_renderer_DrawGlyphRun(). The glyph run description seems to be mostly informational, there doesn't appear to be a lot we could do with it. --- dlls/d2d1/render_target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index c45768f..c6bce45 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1446,7 +1446,7 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRende measuring_mode, glyph_run, desc, effect); if (desc) - FIXME("Ignoring glyph run description %p.\n", desc); + WARN("Ignoring glyph run description %p.\n", desc); if (effect) FIXME("Ignoring effect %p.\n", effect); if (context->options & ~D2D1_DRAW_TEXT_OPTIONS_NO_SNAP)

1 0

Henri Verbeet : d2d1: Only draw if the geometry has any faces in d2d_d3d_render_target_FillGeometry ().
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 4460006fbd1185d55567b5cd754a50bf2e9bed8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4460006fbd1185d55567b5cd7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 17 12:55:17 2015 +0200 d2d1: Only draw if the geometry has any faces in d2d_d3d_render_target_FillGeometry(). --- dlls/d2d1/render_target.c | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index c6bce45..7d80ef5 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -713,32 +713,35 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillGeometry(ID2D1RenderTarg return; } - buffer_desc.ByteWidth = geometry_impl->face_count * sizeof(*geometry_impl->faces); - buffer_desc.BindFlags = D3D10_BIND_INDEX_BUFFER; - buffer_data.pSysMem = geometry_impl->faces; - - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->device, &buffer_desc, &buffer_data, &ib))) + if (geometry_impl->face_count) { - WARN("Failed to create index buffer, hr %#x.\n", hr); - goto done; - } + buffer_desc.ByteWidth = geometry_impl->face_count * sizeof(*geometry_impl->faces); + buffer_desc.BindFlags = D3D10_BIND_INDEX_BUFFER; + buffer_data.pSysMem = geometry_impl->faces; - buffer_desc.ByteWidth = geometry_impl->vertex_count * sizeof(*geometry_impl->vertices); - buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; - buffer_data.pSysMem = geometry_impl->vertices; + if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->device, &buffer_desc, &buffer_data, &ib))) + { + WARN("Failed to create index buffer, hr %#x.\n", hr); + goto done; + } - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->device, &buffer_desc, &buffer_data, &vb))) - { - ERR("Failed to create vertex buffer, hr %#x.\n", hr); - ID3D10Buffer_Release(ib); - goto done; - } + buffer_desc.ByteWidth = geometry_impl->vertex_count * sizeof(*geometry_impl->vertices); + buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_data.pSysMem = geometry_impl->vertices; - d2d_draw(render_target, D2D_SHAPE_TYPE_TRIANGLE, ib, 3 * geometry_impl->face_count, vb, - sizeof(*geometry_impl->vertices), vs_cb, ps_cb, brush_impl); + if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->device, &buffer_desc, &buffer_data, &vb))) + { + ERR("Failed to create vertex buffer, hr %#x.\n", hr); + ID3D10Buffer_Release(ib); + goto done; + } - ID3D10Buffer_Release(vb); - ID3D10Buffer_Release(ib); + d2d_draw(render_target, D2D_SHAPE_TYPE_TRIANGLE, ib, 3 * geometry_impl->face_count, vb, + sizeof(*geometry_impl->vertices), vs_cb, ps_cb, brush_impl); + + ID3D10Buffer_Release(vb); + ID3D10Buffer_Release(ib); + } if (geometry_impl->bezier_count) {

1 0

Sebastian Lackner : server: Initialize irp-> thread immediately after creation of irp_call object.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: b279901546299b327313ba19f2e63d5bcf4d4ff9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b279901546299b327313ba19f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Aug 16 07:59:48 2015 +0200 server: Initialize irp->thread immediately after creation of irp_call object. --- server/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/device.c b/server/device.c index e6dc15e..812bce3 100644 --- a/server/device.c +++ b/server/device.c @@ -259,6 +259,7 @@ static struct irp_call *create_irp( struct device_file *file, const irp_params_t if ((irp = alloc_object( &irp_call_ops ))) { irp->file = (struct device_file *)grab_object( file ); + irp->thread = NULL; irp->async = NULL; irp->params = *params; irp->status = STATUS_PENDING;

1 0

Sebastian Lackner : server: Avoid leaking uninitialized stack memory to applications.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: a8c6fe39af1e47c26e125ff5b3ff0c4ed71bea73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8c6fe39af1e47c26e125ff5b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Aug 16 08:00:13 2015 +0200 server: Avoid leaking uninitialized stack memory to applications. Without the memset() there is a risk of leaking uninitialized stack memory in the get_next_device_request wineserver call. --- server/device.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/device.c b/server/device.c index 812bce3..9ef587c 100644 --- a/server/device.c +++ b/server/device.c @@ -384,6 +384,7 @@ static struct object *device_open_file( struct object *obj, unsigned int access, struct irp_call *irp; irp_params_t params; + memset( &params, 0, sizeof(params) ); params.create.major = IRP_MJ_CREATE; params.create.access = access; params.create.sharing = sharing; @@ -422,6 +423,7 @@ static int device_file_close_handle( struct object *obj, struct process *process struct irp_call *irp; irp_params_t params; + memset( &params, 0, sizeof(params) ); params.close.major = IRP_MJ_CLOSE; params.close.file = file->user_ptr; @@ -516,6 +518,7 @@ static obj_handle_t device_file_read( struct fd *fd, const async_data_t *async_d obj_handle_t handle; irp_params_t params; + memset( &params, 0, sizeof(params) ); params.read.major = IRP_MJ_READ; params.read.key = 0; params.read.pos = pos; @@ -537,6 +540,7 @@ static obj_handle_t device_file_write( struct fd *fd, const async_data_t *async_ obj_handle_t handle; irp_params_t params; + memset( &params, 0, sizeof(params) ); params.write.major = IRP_MJ_WRITE; params.write.key = 0; params.write.pos = pos; @@ -557,6 +561,7 @@ static obj_handle_t device_file_flush( struct fd *fd, const async_data_t *async_ obj_handle_t handle; irp_params_t params; + memset( &params, 0, sizeof(params) ); params.flush.major = IRP_MJ_FLUSH_BUFFERS; params.flush.file = file->user_ptr; @@ -576,6 +581,7 @@ static obj_handle_t device_file_ioctl( struct fd *fd, ioctl_code_t code, const a obj_handle_t handle; irp_params_t params; + memset( &params, 0, sizeof(params) ); params.ioctl.major = IRP_MJ_DEVICE_CONTROL; params.ioctl.code = code; params.ioctl.file = file->user_ptr;

1 0

Carlo Bramini : winecfg: Simplify code by using SetDlgItemInt.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 75e03c13e156691127d881b7a5914b4e91c33f97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75e03c13e156691127d881b7a… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sun Aug 16 12:08:41 2015 +0200 winecfg: Simplify code by using SetDlgItemInt. --- programs/winecfg/x11drvdlg.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index 809068e..9a14fb6 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -78,13 +78,13 @@ static void update_gui_for_desktop_mode(HWND dialog) buf = get_reg_keyW(config_key, explorer_desktopsW, desktop_name, NULL); if (buf && (bufindex = strchrW(buf, 'x'))) { - *bufindex = 0; - ++bufindex; - SetWindowTextW(GetDlgItem(dialog, IDC_DESKTOP_WIDTH), buf); - SetWindowTextW(GetDlgItem(dialog, IDC_DESKTOP_HEIGHT), bufindex); + *bufindex++ = 0; + + SetDlgItemTextW(dialog, IDC_DESKTOP_WIDTH, buf); + SetDlgItemTextW(dialog, IDC_DESKTOP_HEIGHT, bufindex); } else { - SetWindowTextA(GetDlgItem(dialog, IDC_DESKTOP_WIDTH), "800"); - SetWindowTextA(GetDlgItem(dialog, IDC_DESKTOP_HEIGHT), "600"); + SetDlgItemTextA(dialog, IDC_DESKTOP_WIDTH, "800"); + SetDlgItemTextA(dialog, IDC_DESKTOP_HEIGHT, "600"); } HeapFree(GetProcessHeap(), 0, buf); @@ -244,17 +244,14 @@ static INT read_logpixels_reg(void) static void init_dpi_editbox(HWND hDlg) { - static const WCHAR fmtW[] = {'%','u',0}; DWORD dwLogpixels; - WCHAR szLogpixels[MAXBUFLEN]; updating_ui = TRUE; dwLogpixels = read_logpixels_reg(); WINE_TRACE("%u\n", dwLogpixels); - sprintfW(szLogpixels, fmtW, dwLogpixels); - SetDlgItemTextW(hDlg, IDC_RES_DPIEDIT, szLogpixels); + SetDlgItemInt(hDlg, IDC_RES_DPIEDIT, dwLogpixels, FALSE); updating_ui = FALSE; } @@ -276,7 +273,6 @@ static void init_trackbar(HWND hDlg) static void update_dpi_trackbar_from_edit(HWND hDlg, BOOL fix) { - static const WCHAR fmtW[] = {'%','u',0}; DWORD dpi; updating_ui = TRUE; @@ -292,11 +288,8 @@ static void update_dpi_trackbar_from_edit(HWND hDlg, BOOL fix) if (fixed_dpi != dpi) { - WCHAR buf[16]; - dpi = fixed_dpi; - sprintfW(buf, fmtW, dpi); - SetDlgItemTextW(hDlg, IDC_RES_DPIEDIT, buf); + SetDlgItemInt(hDlg, IDC_RES_DPIEDIT, dpi, FALSE); } } @@ -420,13 +413,9 @@ GraphDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_HSCROLL: switch (wParam) { default: { - static const WCHAR fmtW[] = {'%','d',0}; - WCHAR buf[MAXBUFLEN]; int i = SendMessageW(GetDlgItem(hDlg, IDC_RES_TRACKBAR), TBM_GETPOS, 0, 0); - buf[0] = 0; - sprintfW(buf, fmtW, i); - SendMessageW(GetDlgItem(hDlg, IDC_RES_DPIEDIT), WM_SETTEXT, 0, (LPARAM) buf); - update_font_preview(hDlg); + SetDlgItemInt(hDlg, IDC_RES_DPIEDIT, i, TRUE); + update_font_preview(hDlg); set_reg_key_dwordW(HKEY_LOCAL_MACHINE, logpixels_reg, logpixels, i); break; }

1 0

Carlo Bramini : msvcrt: Call SetFilePointer() with correct parameters.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 9b495caacfd072f730780d0041b0a1e48a96c574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b495caacfd072f730780d004… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sun Aug 16 12:46:38 2015 +0200 msvcrt: Call SetFilePointer() with correct parameters. --- dlls/msvcrt/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 68d4d54..75fd9cc 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1309,7 +1309,7 @@ int CDECL MSVCRT__locking(int fd, int mode, LONG nbytes) (mode==MSVCRT__LK_NBRLCK)?"_LK_NBRLCK": "UNKNOWN"); - if ((cur_locn = SetFilePointer(info->handle, 0L, NULL, SEEK_CUR)) == INVALID_SET_FILE_POINTER) + if ((cur_locn = SetFilePointer(info->handle, 0L, NULL, FILE_CURRENT)) == INVALID_SET_FILE_POINTER) { release_ioinfo(info); FIXME ("Seek failed\n");

1 0

Carlo Bramini : msvcrt: Use MSVCRT_xxx macros instead of the same ones from GLIBC.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 13f34481b26e89fddeb0f2231aca3a721b972c8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=13f34481b26e89fddeb0f2231… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sun Aug 16 12:48:38 2015 +0200 msvcrt: Use MSVCRT_xxx macros instead of the same ones from GLIBC. --- dlls/msvcrt/file.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 75fd9cc..6cace71 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1696,13 +1696,13 @@ int CDECL MSVCRT__fstat64(int fd, struct MSVCRT__stat64* buf) if (type == FILE_TYPE_PIPE) { buf->st_dev = buf->st_rdev = fd; - buf->st_mode = S_IFIFO; + buf->st_mode = MSVCRT__S_IFIFO; buf->st_nlink = 1; } else if (type == FILE_TYPE_CHAR) { buf->st_dev = buf->st_rdev = fd; - buf->st_mode = S_IFCHR; + buf->st_mode = MSVCRT__S_IFCHR; buf->st_nlink = 1; } else /* FILE_TYPE_DISK etc. */ @@ -1714,7 +1714,7 @@ int CDECL MSVCRT__fstat64(int fd, struct MSVCRT__stat64* buf) release_ioinfo(info); return -1; } - buf->st_mode = S_IFREG | 0444; + buf->st_mode = MSVCRT__S_IFREG | 0444; if (!(hfi.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) buf->st_mode |= 0222; buf->st_size = ((__int64)hfi.nFileSizeHigh << 32) + hfi.nFileSizeLow; @@ -2835,7 +2835,7 @@ int CDECL MSVCRT__setmode(int fd,int mode) if(info == &MSVCRT___badioinfo) { *MSVCRT__errno() = MSVCRT_EBADF; - return -1; + return MSVCRT_EOF; } if(mode == MSVCRT__O_BINARY) { @@ -3745,7 +3745,7 @@ int CDECL MSVCRT__getw(MSVCRT_FILE* file) if (k == MSVCRT_EOF) { file->_flag |= MSVCRT__IOEOF; MSVCRT__unlock_file(file); - return EOF; + return MSVCRT_EOF; } ch[j] = k; } @@ -4295,7 +4295,7 @@ MSVCRT_size_t CDECL MSVCRT__fread_nolock_s(void *buf, MSVCRT_size_t buf_size, MS }else { int c = MSVCRT__filbuf(stream); - if(c == EOF) + if(c == MSVCRT_EOF) break; if(!MSVCRT_CHECK_PMT_ERR(buf_size != buf_pos, MSVCRT_ERANGE)) {

1 0

Huw Davies : gdi32: Add tests for GetFontRealizationInfo, GetFontFileInfo and GetFontFileData.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 76c321d5e643120921c442017aec75bfd8cc7dcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=76c321d5e643120921c442017… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 13 15:39:19 2015 +0100 gdi32: Add tests for GetFontRealizationInfo, GetFontFileInfo and GetFontFileData. --- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/gdi_private.h | 3 +- dlls/gdi32/tests/font.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 78 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1187598..c67465a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -8151,7 +8151,7 @@ static BOOL freetype_GdiRealizationInfo( PHYSDEV dev, void *ptr ) info->flags |= 2; info->cache_num = physdev->font->cache_num; - info->unknown2 = -1; + info->instance_id = -1; return TRUE; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 430e652..2083606 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -281,8 +281,7 @@ typedef struct { DWORD flags; /* 1 for bitmap fonts, 3 for scalable fonts */ DWORD cache_num; /* keeps incrementing - num of fonts that have been created allowing for caching?? */ - DWORD unknown2; /* fixed for a given font - looks like it could be the order of the face in the font list or the order - in which the face was first rendered. */ + DWORD instance_id; /* identifies a realized font instance */ } realization_info_t; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 8595a4a..68ade9a 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -55,6 +55,9 @@ static HANDLE (WINAPI *pAddFontMemResourceEx)(PVOID, DWORD, PVOID, DWORD *); static BOOL (WINAPI *pRemoveFontMemResourceEx)(HANDLE); static INT (WINAPI *pAddFontResourceExA)(LPCSTR, DWORD, PVOID); static BOOL (WINAPI *pRemoveFontResourceExA)(LPCSTR, DWORD, PVOID); +static BOOL (WINAPI *pGetFontRealizationInfo)(HDC hdc, DWORD *); +static BOOL (WINAPI *pGetFontFileInfo)(DWORD, DWORD, void *, DWORD, DWORD *); +static BOOL (WINAPI *pGetFontFileData)(DWORD, DWORD, ULONGLONG, void *, DWORD); static HMODULE hgdi32 = 0; static const MAT2 mat = { {0,1}, {0,0}, {0,0}, {0,1} }; @@ -97,6 +100,9 @@ static void init(void) pRemoveFontMemResourceEx = (void *)GetProcAddress(hgdi32, "RemoveFontMemResourceEx"); pAddFontResourceExA = (void *)GetProcAddress(hgdi32, "AddFontResourceExA"); pRemoveFontResourceExA = (void *)GetProcAddress(hgdi32, "RemoveFontResourceExA"); + pGetFontRealizationInfo = (void *)GetProcAddress(hgdi32, "GetFontRealizationInfo"); + pGetFontFileInfo = (void *)GetProcAddress(hgdi32, "GetFontFileInfo"); + pGetFontFileData = (void *)GetProcAddress(hgdi32, "GetFontFileData"); system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); } @@ -4106,13 +4112,24 @@ todo_wine DeleteDC(hdc); } -static void test_GdiRealizationInfo(void) +static void test_RealizationInfo(void) { HDC hdc; - DWORD info[4]; + DWORD info[4], info2[10]; BOOL r; HFONT hfont, hfont_old; LOGFONTA lf; + DWORD needed, read; + HANDLE h; + BYTE file[16], data[14]; + struct file_info + { + FILETIME time; + LARGE_INTEGER size; + WCHAR path[MAX_PATH]; + } file_info; + FILETIME time; + LARGE_INTEGER size; if(!pGdiRealizationInfo) { @@ -4147,6 +4164,62 @@ static void test_GdiRealizationInfo(void) ok((info[0] & 0xf) == 3, "info[0] = %x for arial\n", info[0]); ok(info[3] == 0xcccccccc, "structure longer than 3 dwords\n"); + if (pGetFontRealizationInfo) + { + /* The first DWORD represents a struct size. On a + newly rebooted system setting this to < 16 results + in GetFontRealizationInfo failing. However there + appears to be some caching going on which results + in calls after a successful call also succeeding even + if the size < 16. This means we can't reliably test + this behaviour. */ + + memset(info2, 0xcc, sizeof(info2)); + info2[0] = 16; + r = pGetFontRealizationInfo(hdc, info2); + ok(r != 0, "ret 0\n"); + /* We may get the '24' version here if that has been previously + requested. */ + ok(info2[0] == 16 || info2[0] == 24, "got %d\n", info2[0]); + ok(!memcmp(info2 + 1, info, 3 * sizeof(DWORD)), "mismatch\n"); + ok(info2[6] == 0xcccccccc, "structure longer than 6 dwords\n"); + + memset(info2, 0xcc, sizeof(info2)); + info2[0] = 28; + r = pGetFontRealizationInfo(hdc, info2); + ok(r == FALSE, "got %d\n", r); + + memset(info2, 0xcc, sizeof(info2)); + info2[0] = 24; + r = pGetFontRealizationInfo(hdc, info2); + ok(r != 0, "ret 0\n"); + ok(info2[0] == 24, "got %d\n", info2[0]); + ok(!memcmp(info2 + 1, info, 3 * sizeof(DWORD)), "mismatch\n"); + ok(info2[6] == 0xcccccccc, "structure longer than 6 dwords\n"); + + /* Test GetFontFileInfo() */ + r = pGetFontFileInfo(info2[3], 0, &file_info, sizeof(file_info), &needed); + ok(r != 0, "ret 0 gle %d\n", GetLastError()); + + h = CreateFileW(file_info.path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + ok(h != INVALID_HANDLE_VALUE, "Unable to open file %d\n", GetLastError()); + + GetFileTime(h, NULL, NULL, &time); + ok(!CompareFileTime(&file_info.time, &time), "time mismatch\n"); + GetFileSizeEx(h, &size); + ok(file_info.size.QuadPart == size.QuadPart, "size mismatch\n"); + + /* Read first 16 bytes from the file */ + ReadFile(h, file, sizeof(file), &read, NULL); + CloseHandle(h); + + /* Get bytes 2 - 16 using GetFontFileData */ + r = pGetFontFileData(info2[3], 0, 2, data, sizeof(data)); + ok(r != 0, "ret 0 gle %d\n", GetLastError()); + + ok(!memcmp(data, file + 2, sizeof(data)), "mismatch\n"); + } + DeleteObject(SelectObject(hdc, hfont_old)); end: @@ -6374,7 +6447,7 @@ START_TEST(font) skip("Arial Black or Symbol/Wingdings is not installed\n"); test_EnumFontFamiliesEx_default_charset(); test_GetTextMetrics(); - test_GdiRealizationInfo(); + test_RealizationInfo(); test_GetTextFace(); test_GetGlyphOutline(); test_GetTextMetrics2("Tahoma", -11);

1 0