wine-commits August 2015

wine-commits@winehq.org

2 participants
503 discussions

Nikolay Sivov : dwrite: Implement outline mode for DrawGlyphRun().
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 204d46c6741d76f13cd52359eb59990cf4a10d55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=204d46c6741d76f13cd52359e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 13 18:55:52 2015 +0300 dwrite: Implement outline mode for DrawGlyphRun(). --- dlls/dwrite/gdiinterop.c | 168 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/dwrite/tests/font.c | 1 - 2 files changed, 159 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 8c0aa43..da4fc5f 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -45,6 +45,7 @@ struct dib_data { struct rendertarget { IDWriteBitmapRenderTarget1 IDWriteBitmapRenderTarget1_iface; + ID2D1SimplifiedGeometrySink ID2D1SimplifiedGeometrySink_iface; LONG ref; IDWriteFactory *factory; @@ -99,11 +100,111 @@ static inline struct rendertarget *impl_from_IDWriteBitmapRenderTarget1(IDWriteB return CONTAINING_RECORD(iface, struct rendertarget, IDWriteBitmapRenderTarget1_iface); } +static inline struct rendertarget *impl_from_ID2D1SimplifiedGeometrySink(ID2D1SimplifiedGeometrySink *iface) +{ + return CONTAINING_RECORD(iface, struct rendertarget, ID2D1SimplifiedGeometrySink_iface); +} + static inline struct gdiinterop *impl_from_IDWriteGdiInterop(IDWriteGdiInterop *iface) { return CONTAINING_RECORD(iface, struct gdiinterop, IDWriteGdiInterop_iface); } +static HRESULT WINAPI rendertarget_sink_QueryInterface(ID2D1SimplifiedGeometrySink *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_ID2D1SimplifiedGeometrySink) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + ID2D1SimplifiedGeometrySink_AddRef(iface); + return S_OK; + } + + *obj = NULL; + + return E_NOINTERFACE; +} + +static ULONG WINAPI rendertarget_sink_AddRef(ID2D1SimplifiedGeometrySink *iface) +{ + struct rendertarget *This = impl_from_ID2D1SimplifiedGeometrySink(iface); + return IDWriteBitmapRenderTarget1_AddRef(&This->IDWriteBitmapRenderTarget1_iface); +} + +static ULONG WINAPI rendertarget_sink_Release(ID2D1SimplifiedGeometrySink *iface) +{ + struct rendertarget *This = impl_from_ID2D1SimplifiedGeometrySink(iface); + return IDWriteBitmapRenderTarget1_Release(&This->IDWriteBitmapRenderTarget1_iface); +} + +static void WINAPI rendertarget_sink_SetFillMode(ID2D1SimplifiedGeometrySink *iface, D2D1_FILL_MODE mode) +{ + struct rendertarget *This = impl_from_ID2D1SimplifiedGeometrySink(iface); + SetPolyFillMode(This->hdc, mode == D2D1_FILL_MODE_ALTERNATE ? ALTERNATE : WINDING); +} + +static void WINAPI rendertarget_sink_SetSegmentFlags(ID2D1SimplifiedGeometrySink *iface, D2D1_PATH_SEGMENT vertexFlags) +{ +} + +static void WINAPI rendertarget_sink_BeginFigure(ID2D1SimplifiedGeometrySink *iface, D2D1_POINT_2F startPoint, D2D1_FIGURE_BEGIN figureBegin) +{ + struct rendertarget *This = impl_from_ID2D1SimplifiedGeometrySink(iface); + MoveToEx(This->hdc, startPoint.x, startPoint.y, NULL); +} + +static void WINAPI rendertarget_sink_AddLines(ID2D1SimplifiedGeometrySink *iface, const D2D1_POINT_2F *points, UINT32 count) +{ + struct rendertarget *This = impl_from_ID2D1SimplifiedGeometrySink(iface); + + while (count--) { + LineTo(This->hdc, points->x, points->y); + points++; + } +} + +static void WINAPI rendertarget_sink_AddBeziers(ID2D1SimplifiedGeometrySink *iface, const D2D1_BEZIER_SEGMENT *beziers, UINT32 count) +{ + struct rendertarget *This = impl_from_ID2D1SimplifiedGeometrySink(iface); + POINT points[3]; + + while (count--) { + points[0].x = beziers->point1.x; + points[0].y = beziers->point1.y; + points[1].x = beziers->point2.x; + points[1].y = beziers->point2.y; + points[2].x = beziers->point3.x; + points[2].y = beziers->point3.y; + + PolyBezierTo(This->hdc, points, 3); + beziers++; + } +} + +static void WINAPI rendertarget_sink_EndFigure(ID2D1SimplifiedGeometrySink *iface, D2D1_FIGURE_END figureEnd) +{ + struct rendertarget *This = impl_from_ID2D1SimplifiedGeometrySink(iface); + CloseFigure(This->hdc); +} + +static HRESULT WINAPI rendertarget_sink_Close(ID2D1SimplifiedGeometrySink *iface) +{ + return S_OK; +} + +static const ID2D1SimplifiedGeometrySinkVtbl rendertargetsinkvtbl = { + rendertarget_sink_QueryInterface, + rendertarget_sink_AddRef, + rendertarget_sink_Release, + rendertarget_sink_SetFillMode, + rendertarget_sink_SetSegmentFlags, + rendertarget_sink_BeginFigure, + rendertarget_sink_AddLines, + rendertarget_sink_AddBeziers, + rendertarget_sink_EndFigure, + rendertarget_sink_Close +}; + static HRESULT WINAPI rendertarget_QueryInterface(IDWriteBitmapRenderTarget1 *iface, REFIID riid, void **obj) { struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget1(iface); @@ -213,6 +314,8 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac TRACE("(%p)->(%.2f %.2f %d %p %p 0x%08x %p)\n", This, originX, originY, measuring_mode, run, params, color, bbox_ret); + SetRectEmpty(bbox_ret); + if (!This->dib.ptr) return S_OK; @@ -221,9 +324,59 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac if (FAILED(hr)) return hr; - /* FIXME: outline mode rendering is not supported for this target yet */ - if (rendermode == DWRITE_RENDERING_MODE_OUTLINE) - rendermode = DWRITE_RENDERING_MODE_ALIASED; + target.left = target.top = 0; + target.right = This->size.cx; + target.bottom = This->size.cy; + + if (rendermode == DWRITE_RENDERING_MODE_OUTLINE) { + static const XFORM identity = { 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f }; + const DWRITE_MATRIX *m = &This->m; + XFORM xform; + + /* target allows any transform to be set, filter it here */ + if (m->m11 * m->m22 == m->m12 * m->m21) { + xform.eM11 = 1.0f; + xform.eM12 = 0.0f; + xform.eM21 = 0.0f; + xform.eM22 = 1.0f; + xform.eDx = originX; + xform.eDy = originY; + } else { + xform.eM11 = m->m11; + xform.eM12 = m->m12; + xform.eM21 = m->m21; + xform.eM22 = m->m22; + xform.eDx = m->m11 * originX + m->m21 * originY + m->dx; + xform.eDy = m->m12 * originX + m->m22 * originY + m->dy; + } + SetWorldTransform(This->hdc, &xform); + + BeginPath(This->hdc); + + hr = IDWriteFontFace_GetGlyphRunOutline(run->fontFace, run->fontEmSize * This->ppdip, + run->glyphIndices, run->glyphAdvances, run->glyphOffsets, run->glyphCount, + run->isSideways, run->bidiLevel & 1, &This->ID2D1SimplifiedGeometrySink_iface); + + EndPath(This->hdc); + + if (hr == S_OK) { + HBRUSH brush = CreateSolidBrush(color); + + SelectObject(This->hdc, brush); + + FillPath(This->hdc); + + /* FIXME: one way to get affected rectangle bounds is to use region fill */ + if (bbox_ret) + *bbox_ret = target; + + DeleteObject(brush); + } + + SetWorldTransform(This->hdc, &identity); + + return hr; + } hr = IDWriteFactory_CreateGlyphRunAnalysis(This->factory, run, This->ppdip, &This->m, rendermode, measuring_mode, @@ -241,11 +394,6 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac texturetype = DWRITE_TEXTURE_CLEARTYPE_3x1; } - target.left = target.top = 0; - target.right = This->size.cx; - target.bottom = This->size.cy; - - SetRectEmpty(bbox_ret); if (IntersectRect(&target, &target, &bounds)) { UINT32 size = (target.right - target.left) * (target.bottom - target.top); BYTE *bitmap; @@ -261,7 +409,7 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac else blit_subpixel_888(&This->dib, This->size.cx, bitmap, &target, color); - *bbox_ret = target; + if (bbox_ret) *bbox_ret = target; } heap_free(bitmap); @@ -387,9 +535,11 @@ static HRESULT create_rendertarget(IDWriteFactory *factory, HDC hdc, UINT32 widt if (!target) return E_OUTOFMEMORY; target->IDWriteBitmapRenderTarget1_iface.lpVtbl = &rendertargetvtbl; + target->ID2D1SimplifiedGeometrySink_iface.lpVtbl = &rendertargetsinkvtbl; target->ref = 1; target->hdc = CreateCompatibleDC(hdc); + SetGraphicsMode(target->hdc, GM_ADVANCED); hr = create_target_dibsection(target, width, height); if (FAILED(hr)) { IDWriteBitmapRenderTarget1_Release(&target->IDWriteBitmapRenderTarget1_iface); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index b132749..9ba0d18 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -794,7 +794,6 @@ if (0) /* crashes on native */ /* test mode */ ret = GetGraphicsMode(hdc); -todo_wine ok(ret == GM_ADVANCED, "got %d\n", ret); hbm = GetCurrentObject(hdc, OBJ_BITMAP);

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

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

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

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

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

Vincent Povirk : shell32: Fix getting parent shell folder when it' s the desktop folder.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 8657547d9e5b410a5b07dcab68ab73c158ecc22e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8657547d9e5b410a5b07dcab6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 14 14:55:20 2015 -0500 shell32: Fix getting parent shell folder when it's the desktop folder. BindToObject fails in this case. --- dlls/shell32/shellitem.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 853325c..f64c2d0 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -143,8 +143,15 @@ static HRESULT ShellItem_get_parent_shellfolder(ShellItem *This, IShellFolder ** ret = SHGetDesktopFolder(&desktop); if (SUCCEEDED(ret)) { - ret = IShellFolder_BindToObject(desktop, parent_pidl, NULL, &IID_IShellFolder, (void**)ppsf); - IShellFolder_Release(desktop); + if (_ILIsDesktop(parent_pidl)) + { + *ppsf = desktop; + } + else + { + ret = IShellFolder_BindToObject(desktop, parent_pidl, NULL, &IID_IShellFolder, (void**)ppsf); + IShellFolder_Release(desktop); + } } ILFree(parent_pidl); }

1 0

Vincent Povirk : shell32: Use return value from IShellFolder_GetAttributesOf.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 642b2fe789942d1632f3aa9f1394435fd7e89e63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=642b2fe789942d1632f3aa9f1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 14 11:41:55 2015 -0500 shell32: Use return value from IShellFolder_GetAttributesOf. --- dlls/shell32/shellitem.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index a410381..853325c 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -271,10 +271,13 @@ static HRESULT WINAPI ShellItem_GetAttributes(IShellItem2 *iface, SFGAOF sfgaoMa *psfgaoAttribs &= sfgaoMask; IShellFolder_Release(parent_folder); - if(sfgaoMask == *psfgaoAttribs) - return S_OK; - else - return S_FALSE; + if (SUCCEEDED(ret)) + { + if(sfgaoMask == *psfgaoAttribs) + return S_OK; + else + return S_FALSE; + } } return ret;

1 0

Vincent Povirk : comdlg32: Implement overwrite check in item dialog.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: b206287c91cc69a8b6621a4c8dace7eb169bfeb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b206287c91cc69a8b6621a4c8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 13 15:57:02 2015 -0500 comdlg32: Implement overwrite check in item dialog. --- dlls/comdlg32/itemdlg.c | 83 +++++++++++++++++++++++++++++++++++++++++++ dlls/comdlg32/tests/itemdlg.c | 2 +- 2 files changed, 84 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index d1a52cd..3150485 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -213,6 +213,47 @@ static void events_OnTypeChange(FileDialogImpl *This) } } +static HRESULT events_OnOverwrite(FileDialogImpl *This, IShellItem *shellitem) +{ + events_client *cursor; + HRESULT hr = S_OK; + FDE_OVERWRITE_RESPONSE response = FDEOR_DEFAULT; + TRACE("%p %p\n", This, shellitem); + + LIST_FOR_EACH_ENTRY(cursor, &This->events_clients, events_client, entry) + { + TRACE("Notifying %p\n", cursor); + hr = IFileDialogEvents_OnOverwrite(cursor->pfde, (IFileDialog*)&This->IFileDialog2_iface, shellitem, &response); + TRACE("<-- hr=%x response=%u\n", hr, response); + if(FAILED(hr) && hr != E_NOTIMPL) + break; + } + + if(hr == E_NOTIMPL) + hr = S_OK; + + if(SUCCEEDED(hr)) + { + if (response == FDEOR_DEFAULT) + { + WCHAR buf[100]; + int answer; + + LoadStringW(COMDLG32_hInstance, IDS_OVERWRITEFILE, buf, 100); + answer = MessageBoxW(This->dlg_hwnd, buf, This->custom_title, + MB_YESNO | MB_ICONEXCLAMATION); + if (answer == IDNO || answer == IDCANCEL) + { + hr = E_FAIL; + } + } + else if (response == FDEOR_REFUSE) + hr = E_FAIL; + } + + return hr; +} + static inline HRESULT get_cctrl_event(IFileDialogEvents *pfde, IFileDialogControlEvents **pfdce) { return IFileDialogEvents_QueryInterface(pfde, &IID_IFileDialogControlEvents, (void**)pfdce); @@ -423,6 +464,28 @@ static LPWSTR get_first_ext_from_spec(LPWSTR buf, LPCWSTR spec) return ext; } +static BOOL shell_item_exists(IShellItem* shellitem) +{ + LPWSTR filename; + HRESULT hr; + BOOL result; + + hr = IShellItem_GetDisplayName(shellitem, SIGDN_FILESYSPATH, &filename); + if (SUCCEEDED(hr)) + { + /* FIXME: Implement SFGAO_VALIDATE in Wine and use it instead. */ + result = (GetFileAttributesW(filename) != INVALID_FILE_ATTRIBUTES); + CoTaskMemFree(filename); + } + else + { + SFGAOF attributes; + result = SUCCEEDED(IShellItem_GetAttributes(shellitem, SFGAO_VALIDATE, &attributes)); + } + + return result; +} + static HRESULT on_default_action(FileDialogImpl *This) { IShellFolder *psf_parent, *psf_desktop; @@ -589,6 +652,26 @@ static HRESULT on_default_action(FileDialogImpl *This) } } + if((This->options & FOS_OVERWRITEPROMPT) && This->dlg_type == ITEMDLG_TYPE_SAVE) + { + IShellItem *shellitem; + + for (i=0; SUCCEEDED(hr) && i<file_count; i++) + { + hr = IShellItemArray_GetItemAt(This->psia_results, i, &shellitem); + if (SUCCEEDED(hr)) + { + if (shell_item_exists(shellitem)) + hr = events_OnOverwrite(This, shellitem); + + IShellItem_Release(shellitem); + } + } + + if (FAILED(hr)) + break; + } + if(events_OnFileOk(This) == S_OK) ret = S_OK; } diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index b7238bb..6ea3481 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -2370,7 +2370,7 @@ static void test_overwrite(void) hr = IFileDialog_Show(fd, NULL); ok(hr == S_OK, "Show failed: Got 0x%08x\n", hr); - todo_wine ok(pfdeimpl->OnOverwrite == 1, "got %u overwrite events\n", pfdeimpl->OnOverwrite); + ok(pfdeimpl->OnOverwrite == 1, "got %u overwrite events\n", pfdeimpl->OnOverwrite); ok(pfdeimpl->OnFileOk == 1, "got %u ok events\n", pfdeimpl->OnFileOk); hr = IFileDialog_GetFileName(fd, &filename);

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2015