May 2015 - Wine-Commits - list.winehq.org

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard May 19, 2015

May 19, 2015

Module: wine Branch: master Commit: ed318c91f2edae0b37c6a9483eae05c9f594dea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed318c91f2edae0b37c6a9483… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 18 21:20:23 2015 +0300 po: Update Russian translation. --- po/ru.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/ru.po b/po/ru.po index ef5ab17..32855da 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-10-06 21:40+0400\n" +"PO-Revision-Date: 2015-05-18 19:06+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -8889,16 +8889,12 @@ msgstr "" "места, или проверьте сетевое подключение." #: winmm.rc:85 -#, fuzzy -#| msgid "" -#| "Cannot find the specified device. Make sure it is installed or that the " -#| "device name is spelled correctly." msgid "" "Cannot find the specified device. Make sure it is installed and that the " "device name is spelled correctly." msgstr "" -"Невозможно найти указанное устройство. Убедитесь, что оно установлено, и что " -"устройство указано правильно." +"Невозможно найти указанное устройство. Убедитесь, что оно установлено и его " +"имя указано правильно." #: winmm.rc:86 msgid ""

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard May 19, 2015

May 19, 2015

Module: wine Branch: master Commit: 97bfece7cc445c347e0d0c534b7527cdfc88979f URL: http://source.winehq.org/git/wine.git/?a=commit;h=97bfece7cc445c347e0d0c534… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Mon May 18 16:30:25 2015 +0300 po: Update Lithuanian translation. --- po/lt.po | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/po/lt.po b/po/lt.po index 695e5d0..4f1af92 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-05-08 14:01+0300\n" +"PO-Revision-Date: 2015-05-18 16:29+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -8889,15 +8889,11 @@ msgstr "" "vietos, ar vis dar prisijungę prie tinklo." #: winmm.rc:85 -#, fuzzy -#| msgid "" -#| "Cannot find the specified device. Make sure it is installed or that the " -#| "device name is spelled correctly." msgid "" "Cannot find the specified device. Make sure it is installed and that the " "device name is spelled correctly." msgstr "" -"Nepavyko rasti nurodyto įrenginio. Įsitikinkite, kad jis įdiegtas ir ar " +"Nepavyko rasti nurodyto įrenginio. Įsitikinkite, kad jis įdiegtas ir " "teisingai įrašytas įrenginio vardas." #: winmm.rc:86

1 0

Michael Müller : kernel32: Return correct device type for cd devices without medium.
by Alexandre Julliard May 19, 2015

May 19, 2015

Module: wine Branch: master Commit: f556d0e93679a10281430835a6e01ce7f12269bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f556d0e93679a10281430835a… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Mar 30 03:03:03 2015 +0200 kernel32: Return correct device type for cd devices without medium. --- dlls/kernel32/volume.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 59eda44..38a72c5 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1610,7 +1610,15 @@ UINT WINAPI GetDriveTypeW(LPCWSTR root) /* [in] String describing drive */ HANDLE handle; UINT ret; - if (!open_device_root( root, &handle )) return DRIVE_NO_ROOT_DIR; + if (!open_device_root( root, &handle )) + { + /* CD ROM devices do not necessarily have a volume, but a drive type */ + ret = get_mountmgr_drive_type( root ); + if (ret == DRIVE_CDROM || ret == DRIVE_REMOVABLE) + return ret; + + return DRIVE_NO_ROOT_DIR; + } status = NtQueryVolumeInformationFile( handle, &io, &info, sizeof(info), FileFsDeviceInformation ); NtClose( handle );

1 0

Stefan Dösinger : wined3d: Don' t allow 3D depth textures.
by Alexandre Julliard May 19, 2015

May 19, 2015

Module: wine Branch: master Commit: d030c5ad06d3b8e988846ffa782ecd867425486d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d030c5ad06d3b8e988846ffa7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat May 16 15:29:13 2015 +0200 wined3d: Don't allow 3D depth textures. --- dlls/wined3d/utils.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 3090131..94ed858 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1857,13 +1857,19 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win format->flags[WINED3D_GL_RES_TYPE_TEX_1D] |= format_texture_info[i].flags; format->flags[WINED3D_GL_RES_TYPE_TEX_2D] |= format_texture_info[i].flags; - if (gl_info->supported[EXT_TEXTURE3D]) + format->flags[WINED3D_GL_RES_TYPE_BUFFER] |= format_texture_info[i].flags; + + /* GL_ARB_depth_texture does not support 3D textures. It also says "cube textures are + * problematic", but doesn't explicitly mandate that an error is generated. */ + if (gl_info->supported[EXT_TEXTURE3D] + && !(format_texture_info[i].flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) format->flags[WINED3D_GL_RES_TYPE_TEX_3D] |= format_texture_info[i].flags; + if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) format->flags[WINED3D_GL_RES_TYPE_TEX_CUBE] |= format_texture_info[i].flags; + if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] |= format_texture_info[i].flags; - format->flags[WINED3D_GL_RES_TYPE_BUFFER] |= format_texture_info[i].flags; if (gl_info->supported[ARB_INTERNALFORMAT_QUERY2]) {

1 0

Huw Davies : comctl32: Layout the toolbar after a potential resize.
by Alexandre Julliard May 19, 2015

May 19, 2015

Module: wine Branch: master Commit: 0bcadfa88f7da527150d5d1040e2e6c65b3aba31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bcadfa88f7da527150d5d104… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 19 12:51:55 2015 +0100 comctl32: Layout the toolbar after a potential resize. --- dlls/comctl32/toolbar.c | 46 +++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 54a31ac..97d509e 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3015,38 +3015,28 @@ TOOLBAR_AddStringA (TOOLBAR_INFO *infoPtr, HINSTANCE hInstance, LPARAM lParam) static LRESULT TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) { - RECT parent_rect; - HWND parent; - INT x, y; - INT cx, cy; - TRACE("auto sizing, style=%x!\n", infoPtr->dwStyle); + TRACE("nRows: %d, infoPtr->nButtonHeight: %d\n", infoPtr->nRows, infoPtr->nButtonHeight); - parent = GetParent (infoPtr->hwndSelf); - - if (!parent || !infoPtr->bDoRedraw) - return 0; - - GetClientRect(parent, &parent_rect); + if (!(infoPtr->dwStyle & CCS_NORESIZE)) + { + RECT window_rect, parent_rect; + UINT uPosFlags = SWP_NOZORDER | SWP_NOACTIVATE; + HWND parent; + INT x, y, cx, cy; - x = parent_rect.left; - y = parent_rect.top; + parent = GetParent (infoPtr->hwndSelf); - TRACE("nRows: %d, infoPtr->nButtonHeight: %d\n", infoPtr->nRows, infoPtr->nButtonHeight); + if (!parent || !infoPtr->bDoRedraw) + return 0; - cy = TOP_BORDER + infoPtr->nRows * infoPtr->nButtonHeight + BOTTOM_BORDER; - cx = parent_rect.right - parent_rect.left; + GetClientRect(parent, &parent_rect); - if ((infoPtr->dwStyle & TBSTYLE_WRAPABLE) || (infoPtr->dwExStyle & TBSTYLE_EX_VERTICAL)) - { - TOOLBAR_LayoutToolbar(infoPtr); - InvalidateRect( infoPtr->hwndSelf, NULL, TRUE ); - } + x = parent_rect.left; + y = parent_rect.top; - if (!(infoPtr->dwStyle & CCS_NORESIZE)) - { - RECT window_rect; - UINT uPosFlags = SWP_NOZORDER | SWP_NOACTIVATE; + cy = TOP_BORDER + infoPtr->nRows * infoPtr->nButtonHeight + BOTTOM_BORDER; + cx = parent_rect.right - parent_rect.left; if ((infoPtr->dwStyle & CCS_BOTTOM) == CCS_NOMOVEY) { @@ -3075,6 +3065,12 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) SetWindowPos(infoPtr->hwndSelf, NULL, x, y, cx, cy, uPosFlags); } + if ((infoPtr->dwStyle & TBSTYLE_WRAPABLE) || (infoPtr->dwExStyle & TBSTYLE_EX_VERTICAL)) + { + TOOLBAR_LayoutToolbar(infoPtr); + InvalidateRect( infoPtr->hwndSelf, NULL, TRUE ); + } + return 0; }

1 0

Huw Davies : comctl32: Don' t store the width in the toolbar info structure.
by Alexandre Julliard May 19, 2015

May 19, 2015

Module: wine Branch: master Commit: 9d218048a6b0284f629ed85bfec59cb967b63e26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d218048a6b0284f629ed85bf… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 19 12:51:54 2015 +0100 comctl32: Don't store the width in the toolbar info structure. It's only set and used by a single function. --- dlls/comctl32/toolbar.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index b86ae9f..54a31ac 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -119,7 +119,6 @@ typedef struct typedef struct { DWORD dwStructSize; /* size of TBBUTTON struct */ - INT nWidth; /* width of the toolbar */ RECT client_rect; RECT rcBound; /* bounding rectangle */ INT nButtonHeight; @@ -1282,7 +1281,7 @@ static void TOOLBAR_WrapToolbar(TOOLBAR_INFO *infoPtr) { TBUTTON_INFO *btnPtr; - INT x, cx, i, j; + INT x, cx, i, j, width; RECT rc; BOOL bButtonWrap; @@ -1302,18 +1301,18 @@ TOOLBAR_WrapToolbar(TOOLBAR_INFO *infoPtr) * toolbars in a rebar control */ GetClientRect( GetParent(infoPtr->hwndSelf), &rc ); - infoPtr->nWidth = rc.right - rc.left; + width = rc.right - rc.left; } else { GetWindowRect( infoPtr->hwndSelf, &rc ); - infoPtr->nWidth = rc.right - rc.left; + width = rc.right - rc.left; } bButtonWrap = FALSE; - TRACE("start ButtonWidth=%d, BitmapWidth=%d, nWidth=%d, nIndent=%d\n", - infoPtr->nButtonWidth, infoPtr->nBitmapWidth, infoPtr->nWidth, + TRACE("start ButtonWidth=%d, BitmapWidth=%d, width=%d, nIndent=%d\n", + infoPtr->nButtonWidth, infoPtr->nBitmapWidth, width, infoPtr->nIndent); for (i = 0; i < infoPtr->nNumButtons; i++ ) @@ -1351,9 +1350,8 @@ TOOLBAR_WrapToolbar(TOOLBAR_INFO *infoPtr) /* The layout makes sure the bitmap is visible, but not the button. */ /* Test added to also wrap after a button that starts a row but */ /* is bigger than the area. - GA 8/01 */ - if (( x + cx - (infoPtr->nButtonWidth - infoPtr->nBitmapWidth) / 2 - > infoPtr->nWidth ) || - ((x == infoPtr->nIndent) && (cx > infoPtr->nWidth))) + if ((x + cx - (infoPtr->nButtonWidth - infoPtr->nBitmapWidth) / 2 > width) || + ((x == infoPtr->nIndent) && (cx > width))) { BOOL bFound = FALSE; @@ -5946,7 +5944,6 @@ TOOLBAR_NCCreate (HWND hwnd, WPARAM wParam, const CREATESTRUCTW *lpcs) /* paranoid!! */ infoPtr->dwStructSize = sizeof(TBBUTTON); infoPtr->nRows = 1; - infoPtr->nWidth = 0; /* initialize info structure */ infoPtr->nButtonWidth = 23;

1 0

Huw Davies : comctl32: Wrap the buttons inside the toolbar's client rect.
by Alexandre Julliard May 19, 2015

May 19, 2015

Module: wine Branch: master Commit: 797f42699e86a0e4e3468b55f88e7b8e6d06f323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=797f42699e86a0e4e3468b55f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 19 12:51:56 2015 +0100 comctl32: Wrap the buttons inside the toolbar's client rect. The toolbar need not be the same width as the parent. --- dlls/comctl32/tests/toolbar.c | 56 +++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/toolbar.c | 17 +------------ 2 files changed, 57 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 4bbffd3..2041216 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -2024,6 +2024,61 @@ static void test_TB_GET_SET_EXTENDEDSTYLE(void) DestroyWindow(hwnd); } +static void test_noresize(void) +{ + HWND wnd; + int i; + TBBUTTON button = {0, 10, TBSTATE_ENABLED, 0, {0, }, 0, -1}; + + wnd = CreateWindowExA(0, TOOLBARCLASSNAMEA, NULL, WS_CHILD | WS_VISIBLE | CCS_NORESIZE | TBSTYLE_WRAPABLE, 0, 0, 100, 20, + hMainWnd, (HMENU)5, GetModuleHandleA(NULL), NULL); + SendMessageA(wnd, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); + + for (i=0; i<30; i++) + { + button.idCommand = 10 + i; + SendMessageA(wnd, TB_ADDBUTTONSA, 1, (LPARAM)&button); + } + + SendMessageA(wnd, TB_SETSTATE, 10, TBSTATE_WRAP|TBSTATE_ENABLED); + + /* autosize clears the wrap on button 0 */ + SendMessageA(wnd, TB_AUTOSIZE, 0, 0); + for (i=0; i<30; i++) + { + SendMessageA(wnd, TB_GETBUTTON, i, (LPARAM)&button); + if (i % 4 == 3) + ok(button.fsState == (TBSTATE_WRAP|TBSTATE_ENABLED), "%d: got %08x\n", i, button.fsState); + else + ok(button.fsState == TBSTATE_ENABLED, "%d: got %08x\n", i, button.fsState); + } + + /* changing the parent doesn't do anything */ + MoveWindow(hMainWnd, 0,0, 400, 200, FALSE); + for (i=0; i<30; i++) + { + SendMessageA(wnd, TB_GETBUTTON, i, (LPARAM)&button); + if (i % 4 == 3) + ok(button.fsState == (TBSTATE_WRAP|TBSTATE_ENABLED), "%d: got %08x\n", i, button.fsState); + else + ok(button.fsState == TBSTATE_ENABLED, "%d: got %08x\n", i, button.fsState); + } + + /* again nothing here */ + SendMessageA(wnd, TB_AUTOSIZE, 0, 0); + for (i=0; i<30; i++) + { + SendMessageA(wnd, TB_GETBUTTON, i, (LPARAM)&button); + if (i % 4 == 3) + ok(button.fsState == (TBSTATE_WRAP|TBSTATE_ENABLED), "%d: got %08x\n", i, button.fsState); + else + ok(button.fsState == TBSTATE_ENABLED, "%d: got %08x\n", i, button.fsState); + } + + DestroyWindow(wnd); + +} + START_TEST(toolbar) { WNDCLASSA wc; @@ -2066,6 +2121,7 @@ START_TEST(toolbar) test_get_set_style(); test_create(); test_TB_GET_SET_EXTENDEDSTYLE(); + test_noresize(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 97d509e..9f70063 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1282,7 +1282,6 @@ TOOLBAR_WrapToolbar(TOOLBAR_INFO *infoPtr) { TBUTTON_INFO *btnPtr; INT x, cx, i, j, width; - RECT rc; BOOL bButtonWrap; /* When the toolbar window style is not TBSTYLE_WRAPABLE, */ @@ -1293,21 +1292,7 @@ TOOLBAR_WrapToolbar(TOOLBAR_INFO *infoPtr) btnPtr = infoPtr->buttons; x = infoPtr->nIndent; - - if (GetParent(infoPtr->hwndSelf)) - { - /* this can get the parents width, to know how far we can extend - * this toolbar. We cannot use its height, as there may be multiple - * toolbars in a rebar control - */ - GetClientRect( GetParent(infoPtr->hwndSelf), &rc ); - width = rc.right - rc.left; - } - else - { - GetWindowRect( infoPtr->hwndSelf, &rc ); - width = rc.right - rc.left; - } + width = infoPtr->client_rect.right - infoPtr->client_rect.left; bButtonWrap = FALSE;

1 0

Nikolay Sivov : riched20: Implement GetBold()/GetItalic().
by Alexandre Julliard May 19, 2015

May 19, 2015

Module: wine Branch: master Commit: a96b04737cf8817f35454654499e15c8213b48cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96b04737cf8817f354546544… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 17 22:15:30 2015 +0300 riched20: Implement GetBold()/GetItalic(). --- dlls/riched20/richole.c | 139 +++++++++++++++++++++++++++++++++++++++--- dlls/riched20/tests/richole.c | 30 ++++++++- 2 files changed, 159 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 4f85325..aa2a6e3 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -31,6 +31,7 @@ #include "ole2.h" #include "richole.h" #include "editor.h" +#include "richedit.h" #include "tom.h" #include "wine/debug.h" @@ -129,6 +130,11 @@ static inline IOleClientSiteImpl *impl_from_IOleInPlaceSite(IOleInPlaceSite *ifa return CONTAINING_RECORD(iface, IOleClientSiteImpl, IOleInPlaceSite_iface); } +static inline ITextRangeImpl *impl_from_ITextRange(ITextRange *iface) +{ + return CONTAINING_RECORD(iface, ITextRangeImpl, ITextRange_iface); +} + static inline ITextSelectionImpl *impl_from_ITextSelection(ITextSelection *iface) { return CONTAINING_RECORD(iface, ITextSelectionImpl, ITextSelection_iface); @@ -147,6 +153,126 @@ static inline ITextParaImpl *impl_from_ITextPara(ITextPara *iface) static HRESULT create_textfont(ITextRange*, ITextFont**); static HRESULT create_textpara(ITextRange*, ITextPara**); +enum textfont_prop_id { + FONT_ALLCAPS = 0, + FONT_ANIMATION, + FONT_BACKCOLOR, + FONT_BOLD, + FONT_EMBOSS, + FONT_FORECOLOR, + FONT_HIDDEN, + FONT_ENGRAVE, + FONT_ITALIC, + FONT_KERNING, + FONT_LANGID, + FONT_NAME, + FONT_OUTLINE, + FONT_POSITION, + FONT_PROTECTED, + FONT_SHADOW, + FONT_SIZE, + FONT_SMALLCAPS, + FONT_SPACING, + FONT_STRIKETHROUGH, + FONT_SUBSCRIPT, + FONT_SUPERSCRIPT, + FONT_UNDERLINE, + FONT_WEIGHT, + FONT_PROPID_LAST +}; + +static const DWORD textfont_prop_masks[] = { + CFM_ALLCAPS, + CFM_ANIMATION, + CFM_BACKCOLOR, + CFM_BOLD, + CFM_EMBOSS, + CFM_COLOR, + CFM_HIDDEN, + CFM_IMPRINT, + CFM_ITALIC, + CFM_KERNING, + CFM_LCID, + CFM_FACE, + CFM_OUTLINE, + CFM_OFFSET, + CFM_PROTECTED, + CFM_SHADOW, + CFM_SIZE, + CFM_SMALLCAPS, + CFM_SPACING, + CFM_STRIKEOUT, + CFM_SUBSCRIPT, + CFM_SUPERSCRIPT, + CFM_UNDERLINE, + CFM_WEIGHT +}; + +static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, enum textfont_prop_id propid, LONG *value) +{ + ME_Cursor from, to; + CHARFORMAT2W fmt; + + memset(&fmt, 0, sizeof(fmt)); + fmt.cbSize = sizeof(fmt); + fmt.dwMask = textfont_prop_masks[propid]; + + ME_CursorFromCharOfs(reole->editor, pos, &from); + to = from; + ME_MoveCursorChars(reole->editor, &to, 1); + ME_GetCharFormat(reole->editor, &from, &to, &fmt); + + switch (propid) + { + case FONT_BOLD: + *value = fmt.dwEffects & CFE_BOLD ? tomTrue : tomFalse; + break; + case FONT_ITALIC: + *value = fmt.dwEffects & CFE_ITALIC ? tomTrue : tomFalse; + break; + default: + FIXME("unhandled font property %d\n", propid); + return E_FAIL; + } + + return S_OK; +} + +static HRESULT get_textfont_prop(ITextRange *range, enum textfont_prop_id propid, LONG *value) +{ + ITextRangeImpl *rng = impl_from_ITextRange(range); + HRESULT hr; + LONG v; + int i; + + if (!value) + return E_INVALIDARG; + + *value = tomUndefined; + + if (!rng->reOle) + return CO_E_RELEASED; + + /* iterate trough a range to see if property value is consistent */ + hr = get_textfont_prop_for_pos(rng->reOle, rng->start, propid, &v); + if (FAILED(hr)) + return hr; + + for (i = rng->start + 1; i < rng->end; i++) { + LONG cur; + + hr = get_textfont_prop_for_pos(rng->reOle, i, propid, &cur); + if (FAILED(hr)) + return hr; + + if (cur != v) + return S_OK; + } + + *value = v; + return S_OK; +} + static HRESULT WINAPI IRichEditOleImpl_inner_fnQueryInterface(IUnknown *iface, REFIID riid, LPVOID *ppvObj) { IRichEditOleImpl *This = impl_from_IUnknown(iface); @@ -713,11 +839,6 @@ static const IRichEditOleVtbl revt = { }; /* ITextRange interface */ -static inline ITextRangeImpl *impl_from_ITextRange(ITextRange *iface) -{ - return CONTAINING_RECORD(iface, ITextRangeImpl, ITextRange_iface); -} - static HRESULT WINAPI ITextRange_fnQueryInterface(ITextRange *me, REFIID riid, void **ppvObj) { *ppvObj = NULL; @@ -1648,8 +1769,8 @@ static HRESULT WINAPI TextFont_SetBackColor(ITextFont *iface, LONG value) static HRESULT WINAPI TextFont_GetBold(ITextFont *iface, LONG *value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%p): stub\n", This, value); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, value); + return get_textfont_prop(This->range, FONT_BOLD, value); } static HRESULT WINAPI TextFont_SetBold(ITextFont *iface, LONG value) @@ -1718,8 +1839,8 @@ static HRESULT WINAPI TextFont_SetEngrave(ITextFont *iface, LONG value) static HRESULT WINAPI TextFont_GetItalic(ITextFont *iface, LONG *value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%p): stub\n", This, value); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, value); + return get_textfont_prop(This->range, FONT_ITALIC, value); } static HRESULT WINAPI TextFont_SetItalic(ITextFont *iface, LONG value) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index d826298..6e80fd9 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -1217,8 +1217,11 @@ static void test_GetFont(void) ITextDocument *doc = NULL; ITextRange *range = NULL; ITextFont *font, *font2; + CHARFORMAT2A cf; + LONG value; HRESULT hr; HWND hwnd; + BOOL ret; create_interfaces(&hwnd, &reOle, &doc, NULL); SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); @@ -1254,8 +1257,33 @@ static void test_GetFont(void) EXPECT_REF(font, 1); EXPECT_REF(font2, 1); - ITextFont_Release(font); ITextFont_Release(font2); + + /* set different font style within a range */ + hr = ITextFont_GetItalic(font, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* range is non-italic */ + value = tomTrue; + hr = ITextFont_GetItalic(font, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == tomFalse, "got %d\n", value); + + cf.cbSize = sizeof(CHARFORMAT2A); + cf.dwMask = CFM_ITALIC; + cf.dwEffects = CFE_ITALIC; + + SendMessageA(hwnd, EM_SETSEL, 2, 3); + ret = SendMessageA(hwnd, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf); + ok(ret, "got %d\n", ret); + + /* now range is partially italicized */ + value = tomFalse; + hr = ITextFont_GetItalic(font, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == tomUndefined, "got %d\n", value); + + ITextFont_Release(font); ITextRange_Release(range); release_interfaces(&hwnd, &reOle, &doc, NULL); }

1 0

Sebastian Lackner : kernel32/tests: Add tests for delete behaviour of CopyFileEx.
by Alexandre Julliard May 19, 2015

May 19, 2015

Module: wine Branch: master Commit: 7ebe22e99cf3d029a84bf74b2c36ca15ce98c86c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ebe22e99cf3d029a84bf74b2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat May 9 00:26:25 2015 +0200 kernel32/tests: Add tests for delete behaviour of CopyFileEx. --- dlls/kernel32/tests/file.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 9a6e972..64b0b8b 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1099,6 +1099,63 @@ static void test_CopyFile2(void) DeleteFileW(dest); } +static DWORD WINAPI copy_progress_cb(LARGE_INTEGER total_size, LARGE_INTEGER total_transferred, + LARGE_INTEGER stream_size, LARGE_INTEGER stream_transferred, + DWORD stream, DWORD reason, HANDLE source, HANDLE dest, LPVOID userdata) +{ + ok(reason == CALLBACK_STREAM_SWITCH, "expected CALLBACK_STREAM_SWITCH, got %u\n", reason); + CloseHandle(userdata); + return PROGRESS_CANCEL; +} + +static void test_CopyFileEx(void) +{ + char temp_path[MAX_PATH]; + char source[MAX_PATH], dest[MAX_PATH]; + static const char prefix[] = "pfx"; + HANDLE hfile; + DWORD ret; + BOOL retok; + + ret = GetTempPathA(MAX_PATH, temp_path); + ok(ret != 0, "GetTempPathA error %d\n", GetLastError()); + ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n"); + + ret = GetTempFileNameA(temp_path, prefix, 0, source); + ok(ret != 0, "GetTempFileNameA error %d\n", GetLastError()); + + ret = GetTempFileNameA(temp_path, prefix, 0, dest); + ok(ret != 0, "GetTempFileNameA error %d\n", GetLastError()); + + hfile = CreateFileA(dest, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + retok = CopyFileExA(source, dest, copy_progress_cb, hfile, NULL, 0); + todo_wine + ok(!retok, "CopyFileExA unexpectedly succeeded\n"); + todo_wine + ok(GetLastError() == ERROR_REQUEST_ABORTED, "expected ERROR_REQUEST_ABORTED, got %d\n", GetLastError()); + ok(GetFileAttributesA(dest) != INVALID_FILE_ATTRIBUTES, "file was deleted\n"); + + hfile = CreateFileA(dest, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, 0, 0); + todo_wine + ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + retok = CopyFileExA(source, dest, copy_progress_cb, hfile, NULL, 0); + todo_wine + ok(!retok, "CopyFileExA unexpectedly succeeded\n"); + todo_wine + ok(GetLastError() == ERROR_REQUEST_ABORTED, "expected ERROR_REQUEST_ABORTED, got %d\n", GetLastError()); + todo_wine + ok(GetFileAttributesA(dest) == INVALID_FILE_ATTRIBUTES, "file was not deleted\n"); + + ret = DeleteFileA(source); + ok(ret, "DeleteFileA failed with error %d\n", GetLastError()); + ret = DeleteFileA(dest); + ok(!ret, "DeleteFileA unexpectedly succeeded\n"); +} + /* * Debugging routine to dump a buffer in a hexdump-like fashion. */ @@ -4447,6 +4504,7 @@ START_TEST(file) test_CopyFileA(); test_CopyFileW(); test_CopyFile2(); + test_CopyFileEx(); test_CreateFile(); test_CreateFileA(); test_CreateFileW();

1 0

Andrew Eikum : winealsa.drv: Default to Stereo instead of 5.1 Surround.
by Alexandre Julliard May 19, 2015

May 19, 2015

Module: wine Branch: master Commit: b8753ada42562a4648b80ab5bd941495de0319ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8753ada42562a4648b80ab5b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 18 11:38:01 2015 -0500 winealsa.drv: Default to Stereo instead of 5.1 Surround. Some popular ALSA plugins claim support for a large number of channels because they have the capability to mix that down to the actual hardware configuration. Instead of defaulting to 5.1 Surround sound for these plugins, let's fall back on the much more common Stereo configuration. Users with actual 5.1 Surround setups can tell us about it in winecfg. --- dlls/winealsa.drv/mmdevdrv.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 90894b6..14eac39 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1828,7 +1828,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, } if(max_channels > 6) - fmt->Format.nChannels = 6; + fmt->Format.nChannels = 2; else fmt->Format.nChannels = max_channels; @@ -4068,7 +4068,9 @@ HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARI out->vt = VT_UI4; - if (num_speakers >= 6) + if (num_speakers > 6) + out->u.ulVal = KSAUDIO_SPEAKER_STEREO; + else if (num_speakers == 6) out->u.ulVal = KSAUDIO_SPEAKER_5POINT1; else if (num_speakers >= 4) out->u.ulVal = KSAUDIO_SPEAKER_QUAD;

1 0