February 2016 - Wine-commits

Henri Verbeet : wined3d: Use wined3d_texture_get_pitch() in wined3d_surface_map().
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 4155c22e25464f4aa6fa121a786b34d748664bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4155c22e25464f4aa6fa121a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 19:30:00 2016 +0100 wined3d: Use wined3d_texture_get_pitch() in wined3d_surface_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 95ee255..45cefca 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2414,10 +2414,15 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ } if (fmt_flags & WINED3DFMT_FLAG_BROKEN_PITCH) + { map_desc->row_pitch = surface->resource.width * format->byte_count; + map_desc->slice_pitch = surface->resource.height * map_desc->row_pitch; + } else - map_desc->row_pitch = wined3d_surface_get_pitch(surface); - map_desc->slice_pitch = surface->resource.height * map_desc->row_pitch; + { + wined3d_texture_get_pitch(surface->container, surface->texture_level, + &map_desc->row_pitch, &map_desc->slice_pitch); + } if (!box) {

1 0

Michael Müller : include: Add definitions for Win8 pseudo handles.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: e7bbca8fcc5f460c5b7dc43cfaca661bc802f413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7bbca8fcc5f460c5b7dc43cf… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 10 22:22:30 2016 +0100 include: Add definitions for Win8 pseudo handles. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index f35391d..89f27c9 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2973,6 +2973,10 @@ WINBASEAPI VOID WINAPI SetLastError(DWORD); #define GetCurrentThread() ((HANDLE)~(ULONG_PTR)1) #endif +#define GetCurrentProcessToken() ((HANDLE)~(ULONG_PTR)3) +#define GetCurrentThreadToken() ((HANDLE)~(ULONG_PTR)4) +#define GetCurrentThreadEffectiveToken() ((HANDLE)~(ULONG_PTR)5) + /* WinMain(entry point) must be declared in winbase.h. */ /* If this is not declared, we cannot compile many sources written with C++. */ int WINAPI WinMain(HINSTANCE,HINSTANCE,LPSTR,int);

1 0

Michael Müller : server: Add support for Win8 pseudo handles.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 18a8636ebee7c02d1a777eaf2ce287d92607a145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18a8636ebee7c02d1a777eaf2… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 10 22:22:45 2016 +0100 server: Add support for Win8 pseudo handles. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/handle.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/handle.c b/server/handle.c index 15e5670..3b0d033 100644 --- a/server/handle.c +++ b/server/handle.c @@ -405,6 +405,12 @@ static inline struct object *get_magic_handle( obj_handle_t handle ) { switch(handle) { + case 0xfffffffa: /* current thread impersonation token pseudo-handle */ + return (struct object *)thread_get_impersonation_token( current ); + case 0xfffffffb: /* current thread token pseudo-handle */ + return (struct object *)current->token; + case 0xfffffffc: /* current process token pseudo-handle */ + return (struct object *)current->process->token; case 0xfffffffe: /* current thread pseudo-handle */ return &current->obj; case 0x7fffffff: /* current process pseudo-handle */

1 0

Michael Müller : advapi32/tests: Add tests for Win8 pseudo handles.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: c937cf6ad272ce0e7d95ac8a2cd2fbd875f0d4fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c937cf6ad272ce0e7d95ac8a2… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 10 22:23:16 2016 +0100 advapi32/tests: Add tests for Win8 pseudo handles. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 498d19a..8dafb08 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6103,6 +6103,57 @@ static void test_GetSidIdentifierAuthority(void) ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); } +static void test_pseudo_tokens(void) +{ + TOKEN_STATISTICS statistics1, statistics2; + HANDLE token; + DWORD retlen; + BOOL ret; + + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); + ok(ret, "OpenProcessToken failed with error %u\n", GetLastError()); + memset(&statistics1, 0x11, sizeof(statistics1)); + ret = GetTokenInformation(token, TokenStatistics, &statistics1, sizeof(statistics1), &retlen); + ok(ret, "GetTokenInformation failed with %u\n", GetLastError()); + CloseHandle(token); + + /* test GetCurrentProcessToken() */ + SetLastError(0xdeadbeef); + memset(&statistics2, 0x22, sizeof(statistics2)); + ret = GetTokenInformation(GetCurrentProcessToken(), TokenStatistics, + &statistics2, sizeof(statistics2), &retlen); + ok(ret || broken(GetLastError() == ERROR_INVALID_HANDLE), + "GetTokenInformation failed with %u\n", GetLastError()); + if (ret) + ok(!memcmp(&statistics1, &statistics2, sizeof(statistics1)), "Token statistics do not match\n"); + else + win_skip("CurrentProcessToken not supported, skipping test\n"); + + /* test GetCurrentThreadEffectiveToken() */ + SetLastError(0xdeadbeef); + memset(&statistics2, 0x22, sizeof(statistics2)); + ret = GetTokenInformation(GetCurrentThreadEffectiveToken(), TokenStatistics, + &statistics2, sizeof(statistics2), &retlen); + ok(ret || broken(GetLastError() == ERROR_INVALID_HANDLE), + "GetTokenInformation failed with %u\n", GetLastError()); + if (ret) + ok(!memcmp(&statistics1, &statistics2, sizeof(statistics1)), "Token statistics do not match\n"); + else + win_skip("CurrentThreadEffectiveToken not supported, skipping test\n"); + + SetLastError(0xdeadbeef); + ret = OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, TRUE, &token); + ok(!ret, "OpenThreadToken should have failed\n"); + ok(GetLastError() == ERROR_NO_TOKEN, "Expected ERROR_NO_TOKEN, got %u\n", GetLastError()); + + /* test GetCurrentThreadToken() */ + SetLastError(0xdeadbeef); + ret = GetTokenInformation(GetCurrentThreadToken(), TokenStatistics, + &statistics2, sizeof(statistics2), &retlen); + todo_wine ok(GetLastError() == ERROR_NO_TOKEN || broken(GetLastError() == ERROR_INVALID_HANDLE), + "Expected ERROR_NO_TOKEN, got %u\n", GetLastError()); +} + START_TEST(security) { init(); @@ -6148,4 +6199,5 @@ START_TEST(security) test_AddAce(); test_system_security_access(); test_GetSidIdentifierAuthority(); + test_pseudo_tokens(); }

1 0

Vincent Povirk : gdiplus/tests: Add test for GdipWidenPath.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: b9e58dd7cc7281cdad65f6404b8bc62cef1cbda2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9e58dd7cc7281cdad65f6404… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 10 16:02:47 2016 -0600 gdiplus/tests: Add test for GdipWidenPath. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphicspath.c | 57 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 6d4171c..aa44911 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1055,6 +1055,62 @@ static void test_flatten(void) GdipDeletePath(path); } +static path_test_t widenline_path[] = { + {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ + {50.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ + {50.0, 15.0, PathPointTypeLine, 0, 0}, /*2*/ + {5.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0} /*3*/ + }; + +static void test_widen(void) +{ + GpStatus status; + GpPath *path; + GpPen *pen; + GpMatrix *m; + + status = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, status); + status = GdipCreatePen1(0xffffffff, 10.0, UnitPixel, &pen); + expect(Ok, status); + status = GdipCreateMatrix(&m); + expect(Ok, status); + + /* NULL arguments */ + status = GdipAddPathLine(path, 5.0, 10.0, 50.0, 10.0); + expect(Ok, status); + status = GdipWidenPath(NULL, NULL, NULL, 0.0); + expect(InvalidParameter, status); + status = GdipWidenPath(path, pen, m, 0.0); + expect(Ok, status); + status = GdipWidenPath(path, pen, NULL, 1.0); + expect(Ok, status); + status = GdipWidenPath(path, NULL, m, 1.0); + expect(InvalidParameter, status); + status = GdipWidenPath(NULL, pen, m, 1.0); + expect(InvalidParameter, status); + + /* widen empty path */ + status = GdipResetPath(path); + expect(Ok, status); + status = GdipWidenPath(path, pen, m, 1.0); + expect(OutOfMemory, status); + + /* horizontal line */ + status = GdipResetPath(path); + expect(Ok, status); + status = GdipAddPathLine(path, 5.0, 10.0, 50.0, 10.0); + expect(Ok, status); + + status = GdipWidenPath(path, pen, m, 1.0); + expect(Ok, status); + ok_path(path, widenline_path, sizeof(widenline_path)/sizeof(path_test_t), FALSE); + + GdipDeleteMatrix(m); + GdipDeletePen(pen); + GdipDeletePath(path); +} + static void test_isvisible(void) { GpPath *path; @@ -1163,6 +1219,7 @@ START_TEST(graphicspath) test_reverse(); test_addpie(); test_flatten(); + test_widen(); test_isvisible(); test_empty_rect();

1 0

Nikolay Sivov : dwrite: Add support for PFM files in Analyze().
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 38a99b2f25faf2bf483d59b10a780ad7d842042c URL: http://source.winehq.org/git/wine.git/?a=commit;h=38a99b2f25faf2bf483d59b10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 11 04:50:07 2016 +0300 dwrite: Add support for PFM files in Analyze(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index a913dc9..5b29c21 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -811,6 +811,16 @@ static HRESULT opentype_otf_analyzer(IDWriteFontFileStream *stream, UINT32 *font static HRESULT opentype_type1_analyzer(IDWriteFontFileStream *stream, UINT32 *font_count, DWRITE_FONT_FILE_TYPE *file_type, DWRITE_FONT_FACE_TYPE *face_type) { +#include "pshpack1.h" + /* Specified in Adobe TechNote #5178 */ + struct pfm_header { + WORD dfVersion; + DWORD dfSize; + char data0[95]; + DWORD dfDevice; + char data1[12]; + }; +#include "poppack.h" struct type1_header { WORD tag; char data[14]; @@ -834,6 +844,44 @@ static HRESULT opentype_type1_analyzer(IDWriteFontFileStream *stream, UINT32 *fo IDWriteFontFileStream_ReleaseFileFragment(stream, context); + /* let's see if it's a .pfm metrics file */ + if (*file_type == DWRITE_FONT_FILE_TYPE_UNKNOWN) { + const struct pfm_header *pfm_header; + UINT64 filesize; + DWORD offset; + BOOL header_checked; + + hr = IDWriteFontFileStream_GetFileSize(stream, &filesize); + if (FAILED(hr)) + return hr; + + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&pfm_header, 0, sizeof(*pfm_header), &context); + if (FAILED(hr)) + return hr; + + offset = pfm_header->dfDevice; + header_checked = pfm_header->dfVersion == 0x100 && pfm_header->dfSize == filesize; + IDWriteFontFileStream_ReleaseFileFragment(stream, context); + + /* as a last test check static string in PostScript information section */ + if (header_checked) { + static const char postscript[] = "PostScript"; + char *devtype_name; + + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&devtype_name, offset, sizeof(postscript), &context); + if (FAILED(hr)) + return hr; + + if (!memcmp(devtype_name, postscript, sizeof(postscript))) { + *font_count = 1; + *file_type = DWRITE_FONT_FILE_TYPE_TYPE1_PFM; + *face_type = DWRITE_FONT_FACE_TYPE_TYPE1; + } + + IDWriteFontFileStream_ReleaseFileFragment(stream, context); + } + } + return *file_type != DWRITE_FONT_FILE_TYPE_UNKNOWN ? S_OK : S_FALSE; }

1 0

Nikolay Sivov : gdi32/tests: Simplify tests using todo_wine_if().
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 10437c027fa6527f2f0609951aa100b06c805a48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10437c027fa6527f2f0609951… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 11 05:02:14 2016 +0300 gdi32/tests: Simplify tests using todo_wine_if(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dc.c | 28 +++++----------------------- dlls/gdi32/tests/dib.c | 5 +---- dlls/gdi32/tests/font.c | 49 +++++++++++++++++-------------------------------- dlls/gdi32/tests/path.c | 10 ++-------- 4 files changed, 25 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10437c027fa6527f2f060…

1 0

Jacek Caban : winetest: Added hello.php, a copy of hello.html that avoids caching.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: tools Branch: master Commit: be8034671e4a9849a8a32f49221dd50c421c6900 URL: http://source.winehq.org/git/tools.git/?a=commit;h=be8034671e4a9849a8a32f49… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 11 15:20:24 2016 +0100 winetest: Added hello.php, a copy of hello.html that avoids caching. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/tests/hello.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/winetest/tests/hello.php b/winetest/tests/hello.php new file mode 100644 index 0000000..bed858b --- /dev/null +++ b/winetest/tests/hello.php @@ -0,0 +1,4 @@ +<html><body> +<h1>Hello world!</h1> +This is a test page for the Wine regression test suite. +</body></html>

1 0

Hans Leidekker : webservices: Implement WS_MOVE_TO_CHILD_ELEMENT in the reader.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: 5c4a061f394314d7cdf2e309187e2a38cba4aa3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4a061f394314d7cdf2e3091… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 10 15:02:05 2016 +0100 webservices: Implement WS_MOVE_TO_CHILD_ELEMENT in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 19aa1af..5b0217f 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1380,6 +1380,31 @@ static BOOL move_to_prev_element( struct reader *reader ) return FALSE; } +static BOOL move_to_child_element( struct reader *reader ) +{ + struct list *ptr; + struct node *node; + + if (!(ptr = list_head( &reader->current->children ))) return FALSE; + node = LIST_ENTRY( ptr, struct node, entry ); + if (node->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + { + reader->current = node; + return TRUE; + } + while ((ptr = list_next( &reader->current->children, &node->entry ))) + { + struct node *next = LIST_ENTRY( ptr, struct node, entry ); + if (next->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + { + reader->current = next; + return TRUE; + } + node = next; + } + return FALSE; +} + static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found ) { struct list *ptr; @@ -1405,6 +1430,10 @@ static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found success = move_to_prev_element( reader ); break; + case WS_MOVE_TO_CHILD_ELEMENT: + success = move_to_child_element( reader ); + break; + case WS_MOVE_TO_FIRST_NODE: if ((ptr = list_head( &reader->current->parent->children ))) {

1 0

Hans Leidekker : webservices: Implement WS_MOVE_TO_END_ELEMENT in the reader.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: 88e53782e8a48108618935f0b7539846fcd638a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88e53782e8a48108618935f0b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 10 15:02:06 2016 +0100 webservices: Implement WS_MOVE_TO_END_ELEMENT in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 5b0217f..1979ad7 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1405,6 +1405,25 @@ static BOOL move_to_child_element( struct reader *reader ) return FALSE; } +static BOOL move_to_end_element( struct reader *reader ) +{ + struct list *ptr; + struct node *node = reader->current; + + if (node->hdr.node.nodeType != WS_XML_NODE_TYPE_ELEMENT) return FALSE; + + if ((ptr = list_tail( &node->children ))) + { + struct node *tail = LIST_ENTRY( ptr, struct node, entry ); + if (tail->hdr.node.nodeType == WS_XML_NODE_TYPE_END_ELEMENT) + { + reader->current = tail; + return TRUE; + } + } + return FALSE; +} + static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found ) { struct list *ptr; @@ -1434,6 +1453,10 @@ static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found success = move_to_child_element( reader ); break; + case WS_MOVE_TO_END_ELEMENT: + success = move_to_end_element( reader ); + break; + case WS_MOVE_TO_FIRST_NODE: if ((ptr = list_head( &reader->current->parent->children ))) {

1 0