February 2016 - Wine-Commits

Henri Verbeet : ddraw: Use wined3d_texture_blt() in ddraw_surface_blt_clipped().
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: 1a812eb666fc3080cae1fed329cbf931cb777040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a812eb666fc3080cae1fed32… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 29 18:48:53 2016 +0100 ddraw: Use wined3d_texture_blt() in ddraw_surface_blt_clipped(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 1296e59..ac1c140 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1389,7 +1389,8 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons struct ddraw_surface *src_surface, const RECT *src_rect_in, DWORD flags, const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter) { - struct wined3d_surface *wined3d_src_surface = src_surface ? src_surface->wined3d_surface : NULL; + struct wined3d_texture *wined3d_src_texture; + unsigned int src_sub_resource_idx; RECT src_rect, dst_rect; float scale_x, scale_y; const RECT *clip_rect; @@ -1429,10 +1430,15 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons if (IsRectEmpty(&src_rect)) return DDERR_INVALIDRECT; + + wined3d_src_texture = src_surface->wined3d_texture; + src_sub_resource_idx = src_surface->sub_resource_idx; } else { SetRect(&src_rect, 0, 0, 0, 0); + wined3d_src_texture = NULL; + src_sub_resource_idx = 0; } if (!dst_surface->clipper) @@ -1440,8 +1446,8 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons if (src_surface && src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) hr = ddraw_surface_update_frontbuffer(src_surface, &src_rect, TRUE); if (SUCCEEDED(hr)) - hr = wined3d_surface_blt(dst_surface->wined3d_surface, &dst_rect, - wined3d_src_surface, &src_rect, flags, fx, filter); + hr = wined3d_texture_blt(dst_surface->wined3d_texture, dst_surface->sub_resource_idx, &dst_rect, + wined3d_src_texture, src_sub_resource_idx, &src_rect, flags, fx, filter); if (SUCCEEDED(hr) && (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) hr = ddraw_surface_update_frontbuffer(dst_surface, &dst_rect, FALSE); @@ -1491,8 +1497,8 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons } } - if (FAILED(hr = wined3d_surface_blt(dst_surface->wined3d_surface, &clip_rect[i], - wined3d_src_surface, &src_rect_clipped, flags, fx, filter))) + if (FAILED(hr = wined3d_texture_blt(dst_surface->wined3d_texture, dst_surface->sub_resource_idx, + &clip_rect[i], wined3d_src_texture, src_sub_resource_idx, &src_rect_clipped, flags, fx, filter))) break; if (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)

1 0

Nikolay Sivov : dwrite: Use regular refcounting pattern for layout internal sink/ source interfaces.
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: 978ca1565b5465b2e6ada775843365861c5ac8f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=978ca1565b5465b2e6ada7758… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 1 14:59:11 2016 +0300 dwrite: Use regular refcounting pattern for layout internal sink/source interfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 33a1e5c..8f98c58 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3958,12 +3958,14 @@ static HRESULT WINAPI dwritetextlayout_sink_QueryInterface(IDWriteTextAnalysisSi static ULONG WINAPI dwritetextlayout_sink_AddRef(IDWriteTextAnalysisSink1 *iface) { - return 2; + struct dwrite_textlayout *layout = impl_from_IDWriteTextAnalysisSink1(iface); + return IDWriteTextLayout2_AddRef(&layout->IDWriteTextLayout2_iface); } static ULONG WINAPI dwritetextlayout_sink_Release(IDWriteTextAnalysisSink1 *iface) { - return 1; + struct dwrite_textlayout *layout = impl_from_IDWriteTextAnalysisSink1(iface); + return IDWriteTextLayout2_Release(&layout->IDWriteTextLayout2_iface); } static HRESULT WINAPI dwritetextlayout_sink_SetScriptAnalysis(IDWriteTextAnalysisSink1 *iface, @@ -4096,12 +4098,14 @@ static HRESULT WINAPI dwritetextlayout_source_QueryInterface(IDWriteTextAnalysis static ULONG WINAPI dwritetextlayout_source_AddRef(IDWriteTextAnalysisSource1 *iface) { - return 2; + struct dwrite_textlayout *layout = impl_from_IDWriteTextAnalysisSource1(iface); + return IDWriteTextLayout2_AddRef(&layout->IDWriteTextLayout2_iface); } static ULONG WINAPI dwritetextlayout_source_Release(IDWriteTextAnalysisSource1 *iface) { - return 1; + struct dwrite_textlayout *layout = impl_from_IDWriteTextAnalysisSource1(iface); + return IDWriteTextLayout2_Release(&layout->IDWriteTextLayout2_iface); } static HRESULT WINAPI dwritetextlayout_source_GetTextAtPosition(IDWriteTextAnalysisSource1 *iface,

1 0

Alex Henrie : user32: Avoid double initialization in IsDialogMessageW.
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: d9c8effbf3555f37bfbb3866b7be4a2593feeeb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9c8effbf3555f37bfbb3866b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jan 29 23:58:15 2016 -0700 user32: Avoid double initialization in IsDialogMessageW. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 8df38c9..8340850 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1174,7 +1174,7 @@ static HWND DIALOG_IdToHwnd( HWND hwndDlg, INT id ) */ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) { - INT dlgCode = 0; + INT dlgCode; if (CallMsgFilterW( msg, MSGF_DIALOGBOX )) return TRUE;

1 0

Joachim Priesner : comctl32: Fix comments explaining visibleOrder and firstVisible.
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: f0b6584da6e077ccc09a0c6ff6db768221ad0379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0b6584da6e077ccc09a0c6ff… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Fri Jan 29 22:04:10 2016 +0100 comctl32: Fix comments explaining visibleOrder and firstVisible. Hopefully this clears up the confusion between a) visible as in "all ancestors are expanded" and b) visible as in "within the part of the tree that is displayed on the screen". Also, the claim that firstVisible has visible order 0 was false. Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> Signed-off-by: Nikolay Sivov<nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 695745c..e0e9945 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -96,7 +96,7 @@ typedef struct tagTREEVIEW_INFO HTREEITEM focusedItem; /* item that was under the cursor when WM_LBUTTONDOWN was received */ HTREEITEM editItem; /* item being edited with builtin edit box */ - HTREEITEM firstVisible; /* handle to first visible item */ + HTREEITEM firstVisible; /* handle to item whose top edge is at y = 0 */ LONG maxVisibleOrder; HTREEITEM dropItem; /* handle to item selected by drag cursor */ HTREEITEM insertMarkItem; /* item after which insertion mark is placed */ @@ -162,7 +162,10 @@ typedef struct _TREEITEM /* HTREEITEM is a _TREEINFO *. */ LONG imageOffset; LONG textOffset; LONG textWidth; /* horizontal text extent for pszText */ - LONG visibleOrder; /* visible ordering, 0 is first visible item */ + LONG visibleOrder; /* Depth-first numbering of the items whose ancestors are all expanded, + corresponding to a top-to-bottom ordering in the tree view. + Each item takes up "item.iIntegral" spots in the visible order. + 0 is the root's first child. */ const TREEVIEW_INFO *infoPtr; /* tree data this item belongs to */ } TREEVIEW_ITEM;

1 0

Henri Verbeet : ddraw: Use wined3d_texture_blt() in copy_mipmap_chain().
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: f7e9604c3eb9082d3a1b0172ec7e3b21234fe7b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7e9604c3eb9082d3a1b0172e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 29 18:48:55 2016 +0100 ddraw: Use wined3d_texture_blt() in copy_mipmap_chain(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 33 ++++++++++++++++++--------------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d.spec | 1 - dlls/wined3d/wined3d_private.h | 3 +++ include/wine/wined3d.h | 3 --- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e2ed277..6c1bd49 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5950,10 +5950,10 @@ static BOOL is_mip_level_subset(struct ddraw_surface *dest, struct ddraw_surface return !dest_level && levelFound; } -static void copy_mipmap_chain(struct d3d_device *device, struct ddraw_surface *dest, +static void copy_mipmap_chain(struct d3d_device *device, struct ddraw_surface *dst, struct ddraw_surface *src, const POINT *DestPoint, const RECT *SrcRect) { - struct ddraw_surface *src_level, *dest_level; + struct ddraw_surface *dst_level, *src_level; IDirectDrawSurface7 *temp; DDSURFACEDESC2 ddsd; POINT point; @@ -5965,7 +5965,7 @@ static void copy_mipmap_chain(struct d3d_device *device, struct ddraw_surface *d /* Copy palette, if possible. */ IDirectDrawSurface7_GetPalette(&src->IDirectDrawSurface7_iface, &pal_src); - IDirectDrawSurface7_GetPalette(&dest->IDirectDrawSurface7_iface, &pal); + IDirectDrawSurface7_GetPalette(&dst->IDirectDrawSurface7_iface, &pal); if (pal_src != NULL && pal != NULL) { @@ -5985,36 +5985,37 @@ static void copy_mipmap_chain(struct d3d_device *device, struct ddraw_surface *d if (SUCCEEDED(hr)) { - IDirectDrawSurface7_SetColorKey(&dest->IDirectDrawSurface7_iface, ckeyflag, &ddckey); + IDirectDrawSurface7_SetColorKey(&dst->IDirectDrawSurface7_iface, ckeyflag, &ddckey); } } src_level = src; - dest_level = dest; + dst_level = dst; point = *DestPoint; src_rect = *SrcRect; - for (;src_level && dest_level;) + for (;src_level && dst_level;) { - if (src_level->surface_desc.dwWidth == dest_level->surface_desc.dwWidth && - src_level->surface_desc.dwHeight == dest_level->surface_desc.dwHeight) + if (src_level->surface_desc.dwWidth == dst_level->surface_desc.dwWidth + && src_level->surface_desc.dwHeight == dst_level->surface_desc.dwHeight) { UINT src_w = src_rect.right - src_rect.left; UINT src_h = src_rect.bottom - src_rect.top; RECT dst_rect = {point.x, point.y, point.x + src_w, point.y + src_h}; - if (FAILED(hr = wined3d_surface_blt(dest_level->wined3d_surface, &dst_rect, - src_level->wined3d_surface, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) + if (FAILED(hr = wined3d_texture_blt(dst_level->wined3d_texture, dst_level->sub_resource_idx, &dst_rect, + src_level->wined3d_texture, src_level->sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) ERR("Blit failed, hr %#x.\n", hr); ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; ddsd.ddsCaps.dwCaps2 = DDSCAPS2_MIPMAPSUBLEVEL; - IDirectDrawSurface7_GetAttachedSurface(&dest_level->IDirectDrawSurface7_iface, &ddsd.ddsCaps, &temp); + IDirectDrawSurface7_GetAttachedSurface(&dst_level->IDirectDrawSurface7_iface, &ddsd.ddsCaps, &temp); - if (dest_level != dest) IDirectDrawSurface7_Release(&dest_level->IDirectDrawSurface7_iface); + if (dst_level != dst) + IDirectDrawSurface7_Release(&dst_level->IDirectDrawSurface7_iface); - dest_level = unsafe_impl_from_IDirectDrawSurface7(temp); + dst_level = unsafe_impl_from_IDirectDrawSurface7(temp); } ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; @@ -6034,8 +6035,10 @@ static void copy_mipmap_chain(struct d3d_device *device, struct ddraw_surface *d src_rect.bottom = (src_rect.bottom + 1) / 2; } - if (src_level && src_level != src) IDirectDrawSurface7_Release(&src_level->IDirectDrawSurface7_iface); - if (dest_level && dest_level != dest) IDirectDrawSurface7_Release(&dest_level->IDirectDrawSurface7_iface); + if (src_level && src_level != src) + IDirectDrawSurface7_Release(&src_level->IDirectDrawSurface7_iface); + if (dst_level && dst_level != dst) + IDirectDrawSurface7_Release(&dst_level->IDirectDrawSurface7_iface); } /***************************************************************************** diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 86e5290..863eca2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5013,7 +5013,7 @@ const struct blit_shader cpu_blit = { cpu_blit_blit_surface, }; -HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, +HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c8a172f..49041bb 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -222,7 +222,6 @@ @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) -@ cdecl wined3d_surface_blt(ptr ptr ptr ptr long ptr long) @ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr) @ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4bd019f..6e06a5e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2485,6 +2485,9 @@ static inline GLuint surface_get_texture_name(const struct wined3d_surface *surf ? surface->container->texture_srgb.name : surface->container->texture_rgb.name; } +HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, + struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, + const WINEDDBLTFX *blt_fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; void surface_set_dirty(struct wined3d_surface *surface) DECLSPEC_HIDDEN; HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c502cc4..893fd67 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2472,9 +2472,6 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); -HRESULT __cdecl wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, - struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, - const WINEDDBLTFX *blt_fx, enum wined3d_texture_filter_type filter); HRESULT __cdecl wined3d_surface_get_overlay_position(const struct wined3d_surface *surface, LONG *x, LONG *y); void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface);

1 0

Alexandre Julliard : user32: Add some tests for window station and desktop object names.
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: 34d599495338763a407c36550b5b2469c16fda67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34d599495338763a407c36550… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 17:53:10 2016 +0900 user32: Add some tests for window station and desktop object names. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/winstation.c | 53 ++++++++++++++++++++++++++++++++++++++++++ dlls/user32/winstation.c | 8 +++---- server/winstation.c | 3 ++- 3 files changed, 58 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 21df249..7f87eb5 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -205,6 +205,35 @@ static void test_handles(void) else if (le == ERROR_ACCESS_DENIED) win_skip( "Not enough privileges for CreateWindowStation\n" ); + SetLastError( 0xdeadbeef ); + w2 = OpenWindowStationA( "", TRUE, WINSTA_ALL_ACCESS ); + ok( !w2, "open station succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + w2 = CreateWindowStationA( "", 0, WINSTA_ALL_ACCESS, NULL ); + ok( w2 != 0, "create station failed err %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + w3 = OpenWindowStationA( "", TRUE, WINSTA_ALL_ACCESS ); + todo_wine + ok( w3 != 0, "open station failed err %u\n", GetLastError() ); + CloseWindowStation( w3 ); + CloseWindowStation( w2 ); + + SetLastError( 0xdeadbeef ); + w2 = CreateWindowStationA( "foo\\bar", 0, WINSTA_ALL_ACCESS, NULL ); + ok( !w2, "create station succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_PATH_NOT_FOUND || GetLastError() == ERROR_ACCESS_DENIED, + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + w2 = OpenWindowStationA( "foo\\bar", TRUE, WINSTA_ALL_ACCESS ); + ok( !w2, "create station succeeded\n" ); + ok( GetLastError() == ERROR_PATH_NOT_FOUND, "wrong error %u\n", GetLastError() ); + /* desktops */ d1 = GetThreadDesktop(GetCurrentThreadId()); initial_desktop = d1; @@ -239,6 +268,30 @@ static void test_handles(void) d2 = OpenDesktopA( "dummy name", 0, TRUE, DESKTOP_ALL_ACCESS ); ok( !d2, "open dummy desktop succeeded\n" ); + SetLastError( 0xdeadbeef ); + d2 = CreateDesktopA( "", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); + todo_wine + ok( !d2, "create empty desktop succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + d2 = OpenDesktopA( "", 0, TRUE, DESKTOP_ALL_ACCESS ); + ok( !d2, "open mepty desktop succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + d2 = CreateDesktopA( "foo\\bar", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); + ok( !d2, "create desktop succeeded\n" ); + ok( GetLastError() == ERROR_BAD_PATHNAME, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + d2 = OpenDesktopA( "foo\\bar", 0, TRUE, DESKTOP_ALL_ACCESS ); + ok( !d2, "open desktop succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_BAD_PATHNAME, "wrong error %u\n", GetLastError() ); + d2 = CreateDesktopA( "foobar", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); ok( d2 != 0, "create foobar desktop failed\n" ); SetLastError( 0xdeadbeef ); diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 4e431b5..61add76 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -118,8 +118,7 @@ HWINSTA WINAPI CreateWindowStationW( LPCWSTR name, DWORD reserved, ACCESS_MASK a ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); req->rootdir = wine_server_obj_handle( get_winstations_dir_handle() ); wine_server_add_data( req, name, len * sizeof(WCHAR) ); - /* it doesn't seem to set last error */ - wine_server_call( req ); + wine_server_call_err( req ); ret = wine_server_ptr_handle( reply->handle ); } SERVER_END_REQ; @@ -316,8 +315,7 @@ HDESK WINAPI CreateDesktopW( LPCWSTR name, LPCWSTR device, LPDEVMODEW devmode, req->attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); wine_server_add_data( req, name, len * sizeof(WCHAR) ); - /* it doesn't seem to set last error */ - wine_server_call( req ); + wine_server_call_err( req ); ret = wine_server_ptr_handle( reply->handle ); } SERVER_END_REQ; @@ -359,7 +357,7 @@ HDESK open_winstation_desktop( HWINSTA hwinsta, LPCWSTR name, DWORD flags, BOOL req->access = access; req->attributes = OBJ_CASE_INSENSITIVE | (inherit ? OBJ_INHERIT : 0); wine_server_add_data( req, name, len * sizeof(WCHAR) ); - if (!wine_server_call( req )) ret = wine_server_ptr_handle( reply->handle ); + if (!wine_server_call_err( req )) ret = wine_server_ptr_handle( reply->handle ); } SERVER_END_REQ; return ret; diff --git a/server/winstation.c b/server/winstation.c index b1ebe3c..00f0e9b 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -191,7 +191,7 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned if (memchrW( name->str, '\\', name->len / sizeof(WCHAR) )) /* no backslash allowed in name */ { - set_error( STATUS_INVALID_PARAMETER ); + set_error( STATUS_OBJECT_PATH_SYNTAX_BAD ); return NULL; } @@ -213,6 +213,7 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned list_add_tail( &winstation->desktops, &desktop->entry ); list_init( &desktop->hotkeys ); } + else clear_error(); } return desktop; }

1 0

Alexandre Julliard : ntdll: Add tests for the length of the object attributes structure.
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: 6fe37f35bfdf58fcef4bc23154db11f7db56b43c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fe37f35bfdf58fcef4bc2315… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 30 00:30:25 2016 +0900 ntdll: Add tests for the length of the object attributes structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/reg.c | 1 - dlls/ntdll/sync.c | 4 +++- dlls/ntdll/tests/file.c | 19 ---------------- dlls/ntdll/tests/om.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 63 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index bf786f4..77126de 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -129,7 +129,6 @@ NTSTATUS WINAPI NtOpenKeyEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_AT NTSTATUS ret; if (!retkey || !attr || !attr->ObjectName) return STATUS_ACCESS_VIOLATION; - if (attr->Length > sizeof(OBJECT_ATTRIBUTES)) return STATUS_INVALID_PARAMETER; if ((ret = validate_open_object_attributes( attr ))) return ret; TRACE( "(%p,%s,%x,%p)\n", attr->RootDirectory, diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index aa58442..c88221e 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -88,6 +88,8 @@ NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_a if (!attr) return STATUS_SUCCESS; + if (attr->Length != sizeof(*attr)) return STATUS_INVALID_PARAMETER; + if ((sd = attr->SecurityDescriptor)) { len += sizeof(struct security_descriptor); @@ -153,7 +155,7 @@ NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_a NTSTATUS validate_open_object_attributes( const OBJECT_ATTRIBUTES *attr ) { - if (!attr) return STATUS_INVALID_PARAMETER; + if (!attr || attr->Length != sizeof(*attr)) return STATUS_INVALID_PARAMETER; if (attr->ObjectName) { diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 71e1d7a..649b6b4 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1139,25 +1139,6 @@ static void nt_mailslot_test(void) if ( rc == STATUS_SUCCESS ) pNtClose(hslot); /* - * Test that the length field is checked properly - */ - attr.Length = 0; - rc = pNtCreateMailslotFile(&hslot, DesiredAccess, - &attr, &IoStatusBlock, CreateOptions, MailslotQuota, MaxMessageSize, - &TimeOut); - todo_wine ok( rc == STATUS_INVALID_PARAMETER, "rc = %x not c000000d STATUS_INVALID_PARAMETER\n", rc); - - if (rc == STATUS_SUCCESS) pNtClose(hslot); - - attr.Length = sizeof(OBJECT_ATTRIBUTES)+1; - rc = pNtCreateMailslotFile(&hslot, DesiredAccess, - &attr, &IoStatusBlock, CreateOptions, MailslotQuota, MaxMessageSize, - &TimeOut); - todo_wine ok( rc == STATUS_INVALID_PARAMETER, "rc = %x not c000000d STATUS_INVALID_PARAMETER\n", rc); - - if (rc == STATUS_SUCCESS) pNtClose(hslot); - - /* * Test a valid call */ InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index ebf09ec..c6794cc 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -587,6 +587,16 @@ static void test_name_limits(void) str.Length = 67; test_all_kernel_objects( __LINE__, &attr2, STATUS_OBJECT_NAME_INVALID, STATUS_OBJECT_NAME_INVALID ); + str.Length = 128; + for (attr.Length = 0; attr.Length <= 2 * sizeof(attr); attr.Length++) + { + if (attr.Length == sizeof(attr)) + test_all_kernel_objects( __LINE__, &attr, STATUS_SUCCESS, STATUS_SUCCESS ); + else + test_all_kernel_objects( __LINE__, &attr, STATUS_INVALID_PARAMETER, STATUS_INVALID_PARAMETER ); + } + attr.Length = sizeof(attr); + str.Length = 65532; test_all_kernel_objects( __LINE__, &attr, STATUS_SUCCESS, STATUS_SUCCESS ); @@ -719,6 +729,20 @@ static void test_name_limits(void) status = pNtCreateNamedPipeFile( &ret, GENERIC_ALL, &attr2, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout ); ok( status == STATUS_OBJECT_NAME_INVALID, "%u: NtCreateNamedPipeFile failed %x\n", str.Length, status ); + str.Length = 128; + for (attr.Length = 0; attr.Length <= 2 * sizeof(attr); attr.Length++) + { + status = pNtCreateNamedPipeFile( &ret, GENERIC_ALL, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout ); + if (attr.Length == sizeof(attr)) + { + ok( status == STATUS_SUCCESS, "%u: NtCreateNamedPipeFile failed %x\n", str.Length, status ); + pNtClose( ret ); + } + else ok( status == STATUS_INVALID_PARAMETER, + "%u: NtCreateNamedPipeFile failed %x\n", str.Length, status ); + } + attr.Length = sizeof(attr); str.Length = 65532; status = pNtCreateNamedPipeFile( &ret, GENERIC_ALL, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout ); @@ -754,6 +778,19 @@ static void test_name_limits(void) str.Length = 67; status = pNtCreateMailslotFile( &ret, GENERIC_ALL, &attr2, &iosb, 0, 0, 0, NULL ); ok( status == STATUS_OBJECT_NAME_INVALID, "%u: NtCreateMailslotFile failed %x\n", str.Length, status ); + str.Length = 128; + for (attr.Length = 0; attr.Length <= 2 * sizeof(attr); attr.Length++) + { + status = pNtCreateMailslotFile( &ret, GENERIC_ALL, &attr, &iosb, 0, 0, 0, NULL ); + if (attr.Length == sizeof(attr)) + { + ok( status == STATUS_SUCCESS, "%u: NtCreateMailslotFile failed %x\n", str.Length, status ); + pNtClose( ret ); + } + else ok( status == STATUS_INVALID_PARAMETER, + "%u: NtCreateMailslotFile failed %x\n", str.Length, status ); + } + attr.Length = sizeof(attr); str.Length = 65532; status = pNtCreateMailslotFile( &ret, GENERIC_ALL, &attr, &iosb, 0, 0, 0, NULL ); ok( status == STATUS_SUCCESS, "%u: NtCreateMailslotFile failed %x\n", str.Length, status ); @@ -810,6 +847,29 @@ static void test_name_limits(void) pNtClose( ret2 ); pNtDeleteKey( ret ); pNtClose( ret ); + + str.Length = sizeof(registryW) + 256 * sizeof(WCHAR); + for (attr.Length = 0; attr.Length <= 2 * sizeof(attr); attr.Length++) + { + if (attr.Length == sizeof(attr)) + { + status = pNtCreateKey( &ret, GENERIC_ALL, &attr, 0, NULL, 0, NULL ); + ok( status == STATUS_SUCCESS, "%u: NtCreateKey failed %x\n", str.Length, status ); + status = pNtOpenKey( &ret2, KEY_READ, &attr ); + ok( status == STATUS_SUCCESS, "%u: NtOpenKey failed %x\n", str.Length, status ); + pNtClose( ret2 ); + pNtDeleteKey( ret ); + pNtClose( ret ); + } + else + { + status = pNtCreateKey( &ret, GENERIC_ALL, &attr, 0, NULL, 0, NULL ); + ok( status == STATUS_INVALID_PARAMETER, "%u: NtCreateKey failed %x\n", str.Length, status ); + status = pNtOpenKey( &ret2, KEY_READ, &attr ); + ok( status == STATUS_INVALID_PARAMETER, "%u: NtOpenKey failed %x\n", str.Length, status ); + } + } + attr.Length = sizeof(attr); } str.Length = sizeof(registryW) + 256 * sizeof(WCHAR) + 1; status = pNtCreateKey( &ret, GENERIC_ALL, &attr, 0, NULL, 0, NULL );

1 0

Alexandre Julliard : ntdll/tests: Add a helper function to run tests across all kernel object types.
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: b93c78dc6c28b0eba0170ff3178c0df083a35eac URL: http://source.winehq.org/git/wine.git/?a=commit;h=b93c78dc6c28b0eba0170ff31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 30 00:29:01 2016 +0900 ntdll/tests: Add a helper function to run tests across all kernel object types. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 269 +++++++++++++++----------------------------------- 1 file changed, 79 insertions(+), 190 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b93c78dc6c28b0eba0170…

1 0

Nikolay Sivov : dwrite: Implement GetLocaleName() for layout analysis source.
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: da7c3ef578ad06e1063146583b5aafe44a27f454 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7c3ef578ad06e1063146583… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 1 14:59:12 2016 +0300 dwrite: Implement GetLocaleName() for layout analysis source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 8f98c58..8847c97 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -4143,8 +4143,29 @@ static DWRITE_READING_DIRECTION WINAPI dwritetextlayout_source_GetParagraphReadi static HRESULT WINAPI dwritetextlayout_source_GetLocaleName(IDWriteTextAnalysisSource1 *iface, UINT32 position, UINT32* text_len, WCHAR const** locale) { - FIXME("%u %p %p: stub\n", position, text_len, locale); - return E_NOTIMPL; + struct dwrite_textlayout *layout = impl_from_IDWriteTextAnalysisSource1(iface); + struct layout_range *range = get_layout_range_by_pos(layout, position); + + if (position < layout->len) { + struct layout_range *next; + + *locale = range->locale; + *text_len = range->h.range.length - position; + + next = LIST_ENTRY(list_next(&layout->ranges, &range->h.entry), struct layout_range, h.entry); + while (next && next->h.range.startPosition < layout->len && !strcmpW(range->locale, next->locale)) { + *text_len += next->h.range.length; + next = LIST_ENTRY(list_next(&layout->ranges, &next->h.entry), struct layout_range, h.entry); + } + + *text_len = min(*text_len, layout->len - position); + } + else { + *locale = NULL; + *text_len = 0; + } + + return S_OK; } static HRESULT WINAPI dwritetextlayout_source_GetNumberSubstitution(IDWriteTextAnalysisSource1 *iface,

1 0

Joachim Priesner : comctl32: Treeview: Fix crash when deleting the first visible item while bRedraw == false.
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: 4c799937f6a964612fce90d9492c5c2d5d2516e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c799937f6a964612fce90d94… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Sun Jan 31 18:52:07 2016 +0100 comctl32: Treeview: Fix crash when deleting the first visible item while bRedraw == false. Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 33 +++++++++++++++++++++++++++++++++ dlls/comctl32/treeview.c | 4 +++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 92504c1..bd030d6 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1878,8 +1878,13 @@ static void test_delete_items(void) { const struct message *msg; HWND hTree; + HTREEITEM hItem1, hItem2; + TVINSERTSTRUCTA ins; INT ret; + static CHAR item1[] = "Item 1"; + static CHAR item2[] = "Item 2"; + hTree = create_treeview_control(0); fill_tree(hTree); @@ -1901,6 +1906,34 @@ static void test_delete_items(void) ok(ret == 0, "got %d\n", ret); DestroyWindow(hTree); + + /* Regression test for a crash when deleting the first visible item while bRedraw == false. */ + hTree = create_treeview_control(0); + + ins.hParent = TVI_ROOT; + ins.hInsertAfter = TVI_ROOT; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = item1; + hItem1 = TreeView_InsertItemA(hTree, &ins); + ok(hItem1 != NULL, "InsertItem failed\n"); + + ins.hParent = TVI_ROOT; + ins.hInsertAfter = hItem1; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = item2; + hItem2 = TreeView_InsertItemA(hTree, &ins); + ok(hItem2 != NULL, "InsertItem failed\n"); + + ret = SendMessageA(hTree, WM_SETREDRAW, FALSE, 0); + ok(ret == 0, "got %d\n", ret); + + ret = SendMessageA(hTree, TVM_DELETEITEM, 0, (LPARAM)hItem1); + ok(ret == TRUE, "got %d\n", ret); + + ret = SendMessageA(hTree, WM_SETREDRAW, TRUE, 0); + ok(ret == 0, "got %d\n", ret); + + DestroyWindow(hTree); } static void test_cchildren(void) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index e0e9945..5938b29 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1580,11 +1580,13 @@ TREEVIEW_DeleteItem(TREEVIEW_INFO *infoPtr, HTREEITEM item) TREEVIEW_VerifyTree(infoPtr); + if (visible) + TREEVIEW_SetFirstVisible(infoPtr, newFirstVisible, TRUE); + if (!infoPtr->bRedraw) return TRUE; if (visible) { - TREEVIEW_SetFirstVisible(infoPtr, newFirstVisible, TRUE); TREEVIEW_RecalculateVisibleOrder(infoPtr, prev); TREEVIEW_UpdateScrollBars(infoPtr); TREEVIEW_Invalidate(infoPtr, NULL);

1 0