February 2017 - Wine-devel - list.winehq.org

Re: [PATCH 2/2] msvcrt: Check pmode in _wsopen_dispatch.
by Piotr Caban 06 Feb '17

06 Feb '17

Hi Lauri, On 02/04/17 15:38, Lauri Kenttä wrote: > if (oflags & MSVCRT__O_CREAT) > { > - if(pmode & ~(MSVCRT__S_IREAD | MSVCRT__S_IWRITE)) > - FIXME(": pmode 0x%04x ignored\n", pmode); > + if (secure && !MSVCRT_CHECK_PMT(!(pmode & ~(MSVCRT__S_IREAD | MSVCRT__S_IWRITE)))) > + return MSVCRT_EINVAL; According to my testing pmode validation doesn't depend on secure flag value (I've tested _wsopen function in msvcr90, I didn't test the _wsopen_dispatch function). Thanks, Piotr

2 2

winmm: deferred patches
by Carlo Bramini 06 Feb '17

06 Feb '17

Hello friends, I had sent two little patches that they were deferred, I do not know if it was because the code freeze or something else: https://www.winehq.org/pipermail/wine-patches/2016-December/156556.html https://www.winehq.org/pipermail/wine-patches/2016-December/156558.html I was wondering if I have to resend them or somebody could just apply them, since they are so small and if you think that they could be useful. Sincerely, Carlo Bramini.

2 1

Re: [PATCH 1/2] wined3d: Add patch primitives.
by Henri Verbeet 06 Feb '17

06 Feb '17

On 2 February 2017 at 19:45, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > @@ -72,6 +72,38 @@ enum wined3d_primitive_type > WINED3D_PT_LINESTRIP_ADJ = 11, > WINED3D_PT_TRIANGLELIST_ADJ = 12, > WINED3D_PT_TRIANGLESTRIP_ADJ = 13, > + WINED3D_PT_1_CONTROL_POINT_PATCHLIST = 33, > + WINED3D_PT_2_CONTROL_POINT_PATCHLIST = 34, > + WINED3D_PT_3_CONTROL_POINT_PATCHLIST = 35, > + WINED3D_PT_4_CONTROL_POINT_PATCHLIST = 36, > + WINED3D_PT_5_CONTROL_POINT_PATCHLIST = 37, > + WINED3D_PT_6_CONTROL_POINT_PATCHLIST = 38, > + WINED3D_PT_7_CONTROL_POINT_PATCHLIST = 39, > + WINED3D_PT_8_CONTROL_POINT_PATCHLIST = 40, > + WINED3D_PT_9_CONTROL_POINT_PATCHLIST = 41, > + WINED3D_PT_10_CONTROL_POINT_PATCHLIST = 42, > + WINED3D_PT_11_CONTROL_POINT_PATCHLIST = 43, > + WINED3D_PT_12_CONTROL_POINT_PATCHLIST = 44, > + WINED3D_PT_13_CONTROL_POINT_PATCHLIST = 45, > + WINED3D_PT_14_CONTROL_POINT_PATCHLIST = 46, > + WINED3D_PT_15_CONTROL_POINT_PATCHLIST = 47, > + WINED3D_PT_16_CONTROL_POINT_PATCHLIST = 48, > + WINED3D_PT_17_CONTROL_POINT_PATCHLIST = 49, > + WINED3D_PT_18_CONTROL_POINT_PATCHLIST = 50, > + WINED3D_PT_19_CONTROL_POINT_PATCHLIST = 51, > + WINED3D_PT_20_CONTROL_POINT_PATCHLIST = 52, > + WINED3D_PT_21_CONTROL_POINT_PATCHLIST = 53, > + WINED3D_PT_22_CONTROL_POINT_PATCHLIST = 54, > + WINED3D_PT_23_CONTROL_POINT_PATCHLIST = 55, > + WINED3D_PT_24_CONTROL_POINT_PATCHLIST = 56, > + WINED3D_PT_25_CONTROL_POINT_PATCHLIST = 57, > + WINED3D_PT_26_CONTROL_POINT_PATCHLIST = 58, > + WINED3D_PT_27_CONTROL_POINT_PATCHLIST = 59, > + WINED3D_PT_28_CONTROL_POINT_PATCHLIST = 60, > + WINED3D_PT_29_CONTROL_POINT_PATCHLIST = 61, > + WINED3D_PT_30_CONTROL_POINT_PATCHLIST = 62, > + WINED3D_PT_31_CONTROL_POINT_PATCHLIST = 63, > + WINED3D_PT_32_CONTROL_POINT_PATCHLIST = 64, > }; > I'm not sure this really makes sense in wined3d, in OpenGL the primitive type and control point count are separate.

2 2

Re: [PATCH 2/2] wined3d: Add support for SRCCOLOR1, INVSRCCOLOR1, SRCALPHA1 and INVSRCALPHA1 blend modes.
by Henri Verbeet 06 Feb '17

06 Feb '17

On 4 February 2017 at 12:33, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > > Overrides http://source.winehq.org/patches/data/129692 > > Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> > --- > dlls/wined3d/state.c | 8 ++++++++ > include/wine/wined3d.h | 4 ++++ > 2 files changed, 12 insertions(+) > The naming is better in this revision, but it looks like Thunderbird corrupted the patch.

1 0

Re: [PATCH 2/2] user32: Implement BS_SPLITBUTTON and BS_DEFSPLITBUTTON.
by Nikolay Sivov 06 Feb '17

06 Feb '17

On 06.02.2017 3:54, Shu Yokoyama wrote: > Signed-off-by: Shu Yokoyama <yokoyama(a)graco.c.u-tokyo.ac.jp> > --- > dlls/user32/button.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++---- > 1 file changed, 142 insertions(+), 10 deletions(-) > > diff --git a/dlls/user32/button.c b/dlls/user32/button.c > index e85e30d..135fb1b 100644 > --- a/dlls/user32/button.c > +++ b/dlls/user32/button.c > @@ -29,6 +29,8 @@ > * > * TODO > * Styles > + * - BS_COMMANDLINK > + * - BS_DEFCOMMANDLINK > * - BS_NOTIFY: is it complete? > * - BS_RIGHTBUTTON: same as BS_LEFTTEXT > * > @@ -42,6 +44,8 @@ > * - BCM_GETTEXTMARGIN > * - BCM_SETIMAGELIST > * - BCM_SETTEXTMARGIN > + * - BCM_SETSPLITINFO > + * - BCM_GETSPLITINFO > * > * Notifications > * - BCN_HOTITEMCHANGE > @@ -61,6 +65,8 @@ > * - Button_GetTextMargin > * - Button_SetImageList > * - Button_SetTextMargin > + * - Button_SetSplitInfo > + * - Button_GetSplitInfo > */ > > #include <stdarg.h> > @@ -73,6 +79,7 @@ > #include "winbase.h" > #include "wingdi.h" > #include "controls.h" > +#include "commctrl.h" > #include "win.h" > #include "user_private.h" > #include "wine/debug.h" > @@ -101,6 +108,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(button); > Hi. Patch has its own problems, but more importantly, that's not the way we want v6 controls to be implemented. We need proper separation between user32 and comctl32, with corresponding versioned classes being registered at the right time, and proper classes used based on current context.

2 3

Re: [v2 PATCH 2/3] user32/button: Use current button font to clear during WM_SETTEXT
by Dmitry Timoshkov 06 Feb '17

06 Feb '17

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > @@ -394,7 +395,9 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, > > GetClientRect(hWnd, &client); > rc = client; > + if ((hFont = get_button_font(hWnd))) hPrevFont = SelectObject(hdc, hFont); > BUTTON_CalcLabelRect(hWnd, hdc, &rc); > + if (hPrevFont) SelectObject(hdc, hPrevFont); BUTTON_CalcLabelRect() handles all styles of buttons, there is no reason to penalize every of them, only BS_TEXT style needs to have a proper font selected. -- Dmitry.

1 0

Re: [v2 PATCH 1/3] user32/button: Do not restore font after button has been painted
by Dmitry Timoshkov 06 Feb '17

06 Feb '17

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > + /* Test that original font is not selected back after painting */ > + hdc = CreateCompatibleDC(0); > + > + prevfont = SelectObject(hdc, hfont2); > + SendMessageA(hwnd, WM_PRINTCLIENT, (WPARAM)hdc, 0); > + ok(zfont == GetCurrentObject(hdc, OBJ_FONT), "button[%u]: unexpected font selected after WM_PRINTCLIENT %p, " > + "expected %p\n", i, GetCurrentObject(hdc, OBJ_FONT), zfont); The test works by a pure luck. It should check current dc font against prevfont instead of zfont. Changing zfont to DEFAULT_GUI_FONT makes the test fail because of that mistake. > + prevfont = SelectObject(hdc, hfont2); > + SendMessageA(hwnd, WM_PAINT, (WPARAM)hdc, 0); > + ok(zfont == GetCurrentObject(hdc, OBJ_FONT), "button[%u]: unexpected font selected after WM_PAINT %p, " > + "expected %p\n", i, GetCurrentObject(hdc, OBJ_FONT), zfont); Same here. -- Dmitry.

1 0

Re: [PATCH 3/3] user32: Fix groupbox rectangle calculation in the button's WM_SETTEXT handler.
by Dmitry Timoshkov 06 Feb '17

06 Feb '17

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > + /* FIXME: check other BS_* handlers */ > + if (btn_type == BS_GROUPBOX) > + InflateRect(&rc, -7, 1); /* GB_Paint does this */ How about doing what FIXME suggests? Adding some tests wouldn't hurt either. -- Dmitry.

3 5

Re: kernel32/tests: Add test for SetFileTime
by Marvin 06 Feb '17

06 Feb '17

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=28348 Your paranoid android. === w7u (32 bit file) === file.c:4321: Test failed: SetFileValidData failed 87 file.c:4324: Test failed: SetFileValidData failed 87

1 0

Re: [PATCH 1/3] user32: Always restore previously selected font in the button painting helpers.
by Nikolay Sivov 06 Feb '17

06 Feb '17

This is broken, I'll resend a fixed one.

1 0