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

Józef Kucia : d3d11: Add ID3D11Device stub interface.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: 2d13e0f10c4383cdc2a57e8849cea3afb1de8d36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d13e0f10c4383cdc2a57e884… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 21 00:07:52 2015 +0200 d3d11: Add ID3D11Device stub interface. --- dlls/d3d10core/d3d10core_private.h | 2 + dlls/d3d10core/device.c | 411 +++++++++++++++++++++++++++++++++++++ dlls/dxgi/tests/device.c | 2 +- 3 files changed, 414 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d13e0f10c4383cdc2a57…

1 0

Sebastian Lackner : server: Implement open_file_object for rootdir pointing to file object.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: ec851647e2a65f9f2c7e20091f44a9e7b95da855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec851647e2a65f9f2c7e20091… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 21 07:26:44 2015 +0200 server: Implement open_file_object for rootdir pointing to file object. --- dlls/ntdll/tests/file.c | 16 ++++++++-------- server/fd.c | 29 ++++++++++++++++++++--------- server/file.c | 23 ++++++++++++++++++++++- server/file.h | 1 + 4 files changed, 51 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 4f58788..d68be15 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -466,8 +466,8 @@ static void open_file_test(void) attr.ObjectName = &nameW; status = pNtOpenFile( &root, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT ); - todo_wine ok( status == STATUS_OBJECT_PATH_NOT_FOUND, - "expected STATUS_OBJECT_PATH_NOT_FOUND, got %08x\n", status ); + ok( status == STATUS_OBJECT_PATH_NOT_FOUND, + "expected STATUS_OBJECT_PATH_NOT_FOUND, got %08x\n", status ); nameW.Length = 0; nameW.Buffer = NULL; @@ -475,24 +475,24 @@ static void open_file_test(void) attr.ObjectName = &nameW; status = pNtOpenFile( &root, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT ); - todo_wine ok( !status, "open %s failed %x\n", wine_dbgstr_w(tmpfile), status ); + ok( !status, "open %s failed %x\n", wine_dbgstr_w(tmpfile), status ); numbytes = SetFilePointer( file, 0, 0, FILE_CURRENT ); ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %u\n", numbytes ); numbytes = SetFilePointer( root, 0, 0, FILE_CURRENT ); - todo_wine ok( numbytes == 0, "SetFilePointer returned %u\n", numbytes ); + ok( numbytes == 0, "SetFilePointer returned %u\n", numbytes ); numbytes = 0xdeadbeef; memset( data, 0, sizeof(data) ); ret = ReadFile( root, data, sizeof(data), &numbytes, NULL ); - todo_wine ok( ret, "ReadFile failed with error %u\n", GetLastError() ); - todo_wine ok( numbytes == sizeof(testdata) - 1, "failed to read all data\n" ); - todo_wine ok( !memcmp( data, testdata, sizeof(testdata) - 1 ), "testdata doesn't match\n" ); + ok( ret, "ReadFile failed with error %u\n", GetLastError() ); + ok( numbytes == sizeof(testdata) - 1, "failed to read all data\n" ); + ok( !memcmp( data, testdata, sizeof(testdata) - 1 ), "testdata doesn't match\n" ); numbytes = SetFilePointer( file, 0, 0, FILE_CURRENT ); ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %u\n", numbytes ); numbytes = SetFilePointer( root, 0, 0, FILE_CURRENT ); - todo_wine ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %u\n", numbytes ); + ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %u\n", numbytes ); CloseHandle( file ); CloseHandle( root ); diff --git a/server/fd.c b/server/fd.c index 86dc128..fef4827 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1717,7 +1717,7 @@ void set_fd_user( struct fd *fd, const struct fd_ops *user_ops, struct object *u fd->user = user; } -static char *dup_fd_name( struct fd *root, const char *name ) +char *dup_fd_name( struct fd *root, const char *name ) { char *ret; @@ -2386,19 +2386,30 @@ DECL_HANDLER(open_file_object) get_req_unicode_str( &name ); if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) - return; - - if ((obj = open_object_dir( root, &name, req->attributes, NULL ))) { - if ((result = obj->ops->open_file( obj, req->access, req->sharing, req->options ))) + if (get_error() != STATUS_OBJECT_TYPE_MISMATCH) return; + if (!(obj = (struct object *)get_file_obj( current->process, req->rootdir, 0 ))) return; + if (name.len) { - reply->handle = alloc_handle( current->process, result, req->access, req->attributes ); - release_object( result ); + release_object( obj ); + set_error( STATUS_OBJECT_PATH_NOT_FOUND ); + return; } - release_object( obj ); + clear_error(); + } + else + { + obj = open_object_dir( root, &name, req->attributes, NULL ); + if (root) release_object( root ); + if (!obj) return; } - if (root) release_object( root ); + if ((result = obj->ops->open_file( obj, req->access, req->sharing, req->options ))) + { + reply->handle = alloc_handle( current->process, result, req->access, req->attributes ); + release_object( result ); + } + release_object( obj ); } /* get the Unix name from a file handle */ diff --git a/server/file.c b/server/file.c index e70304f..a07ca16 100644 --- a/server/file.c +++ b/server/file.c @@ -68,6 +68,8 @@ static struct object_type *file_get_type( struct object *obj ); static struct fd *file_get_fd( struct object *obj ); static struct security_descriptor *file_get_sd( struct object *obj ); static int file_set_sd( struct object *obj, const struct security_descriptor *sd, unsigned int set_info ); +static struct object *file_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ); static void file_destroy( struct object *obj ); static int file_get_poll_events( struct fd *fd ); @@ -89,7 +91,7 @@ static const struct object_ops file_ops = file_get_sd, /* get_sd */ file_set_sd, /* set_sd */ no_lookup_name, /* lookup_name */ - no_open_file, /* open_file */ + file_open_file, /* open_file */ fd_close_handle, /* close_handle */ file_destroy /* destroy */ }; @@ -605,6 +607,25 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd return 1; } +static struct object *file_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ) +{ + struct file *file = (struct file *)obj; + struct object *new_file = NULL; + char *unix_name; + + assert( obj->ops == &file_ops ); + + if ((unix_name = dup_fd_name( file->fd, "" ))) + { + new_file = create_file( NULL, unix_name, strlen(unix_name), access, + sharing, FILE_OPEN, options, 0, NULL ); + free( unix_name ); + } + else set_error( STATUS_OBJECT_TYPE_MISMATCH ); + return new_file; +} + static void file_destroy( struct object *obj ) { struct file *file = (struct file *)obj; diff --git a/server/file.h b/server/file.h index b5e0ca7..b59de1c 100644 --- a/server/file.h +++ b/server/file.h @@ -81,6 +81,7 @@ extern void unlock_fd( struct fd *fd, file_pos_t offset, file_pos_t count ); extern void allow_fd_caching( struct fd *fd ); extern void set_fd_signaled( struct fd *fd, int signaled ); extern int is_fd_signaled( struct fd *fd ); +extern char *dup_fd_name( struct fd *root, const char *name ); extern int default_fd_signaled( struct object *obj, struct wait_queue_entry *entry ); extern unsigned int default_fd_map_access( struct object *obj, unsigned int access );

1 0

Andrew Eikum : xaudio2: Stub IXAudio2SourceVoice.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: 63f3a70d56e573fa327f1d9eb8b0040ed48e27c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63f3a70d56e573fa327f1d9eb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Aug 20 15:06:18 2015 -0500 xaudio2: Stub IXAudio2SourceVoice. --- dlls/xaudio2_7/xaudio_dll.c | 661 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 657 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63f3a70d56e573fa327f1…

1 0

Nikolay Sivov : dwrite/tests: Fix layout test failure on Win10.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: 8dd0738b1ca3fb8f75301edde9d8c078f810cbd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd0738b1ca3fb8f75301edde… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 20 20:33:29 2015 +0300 dwrite/tests: Fix layout test failure on Win10. --- dlls/dwrite/tests/layout.c | 2 +- include/dwrite.idl | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 9e2aaea..67d49d1 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -975,7 +975,7 @@ if (0) /* crashes on native */ hr = IDWriteTextFormat_SetLineSpacing(format, DWRITE_LINE_SPACING_METHOD_DEFAULT, -10.0, 0.0); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - hr = IDWriteTextFormat_SetLineSpacing(format, DWRITE_LINE_SPACING_METHOD_UNIFORM+1, 0.0, 0.0); + hr = IDWriteTextFormat_SetLineSpacing(format, DWRITE_LINE_SPACING_METHOD_PROPORTIONAL+1, 0.0, 0.0); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = IDWriteTextFormat_SetTrimming(format, &trimming, NULL); diff --git a/include/dwrite.idl b/include/dwrite.idl index bb41b4f..f8644ba 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -219,7 +219,8 @@ typedef enum DWRITE_BREAK_CONDITION typedef enum DWRITE_LINE_SPACING_METHOD { DWRITE_LINE_SPACING_METHOD_DEFAULT, - DWRITE_LINE_SPACING_METHOD_UNIFORM + DWRITE_LINE_SPACING_METHOD_UNIFORM, + DWRITE_LINE_SPACING_METHOD_PROPORTIONAL } DWRITE_LINE_SPACING_METHOD; cpp_quote("#define DWRITE_MAKE_OPENTYPE_TAG(a,b,c,d) ( \\")

1 0

Dmitry Timoshkov : server: For querying thread information demand THREAD_QUERY_LIMITED_INFORMATION access.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: 3bed65b5a94414b3921f6cdea1bf2515614356eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bed65b5a94414b3921f6cdea… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 21 12:14:23 2015 +0800 server: For querying thread information demand THREAD_QUERY_LIMITED_INFORMATION access. --- dlls/kernel32/tests/thread.c | 7 ++++++- server/thread.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 4cf8577..0d1f4a6 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1750,14 +1750,19 @@ static void test_thread_info(void) switch (i) { case ThreadBasicInformation: - case ThreadTimes: case ThreadAmILastThread: case ThreadPriorityBoost: + ok(status == STATUS_SUCCESS, "for info %u expected STATUS_SUCCESS, got %08x (ret_len %u)\n", i, status, ret_len); + break; + + case ThreadTimes: todo_wine ok(status == STATUS_SUCCESS, "for info %u expected STATUS_SUCCESS, got %08x (ret_len %u)\n", i, status, ret_len); break; case ThreadDescriptorTableEntry: + case ThreadAffinityMask: + case ThreadQuerySetWin32StartAddress: todo_wine ok(status == STATUS_ACCESS_DENIED, "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); break; diff --git a/server/thread.c b/server/thread.c index 9df2da6..6383000 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1372,7 +1372,7 @@ DECL_HANDLER(get_thread_info) obj_handle_t handle = req->handle; if (!handle) thread = get_thread_from_id( req->tid_in ); - else thread = get_thread_from_handle( req->handle, THREAD_QUERY_INFORMATION ); + else thread = get_thread_from_handle( req->handle, THREAD_QUERY_LIMITED_INFORMATION ); if (thread) {

1 0

Andrew Eikum : xaudio2: Implement IXAudio27::Initialize.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: 7a23b9f0f85f652c8d01a0296455e07322268dac URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a23b9f0f85f652c8d01a0296… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Aug 20 15:02:52 2015 -0500 xaudio2: Implement IXAudio27::Initialize. --- dlls/xaudio2_7/xaudio_dll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index b13436c..03909bd 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -297,7 +297,7 @@ static HRESULT WINAPI XA27_Initialize(IXAudio27 *iface, UINT32 flags, { IXAudio2Impl *This = impl_from_IXAudio27(iface); TRACE("(%p)->(0x%x, 0x%x)\n", This, flags, processor); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI XA27_RegisterForCallbacks(IXAudio27 *iface,

1 0

Nikolay Sivov : dwrite/tests: Fix analyzer test failures on Win10.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: 4c12157c345ac6a77991e4fef332f6da3dbc0609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c12157c345ac6a77991e4fef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 20 20:33:58 2015 +0300 dwrite/tests: Fix analyzer test failures on Win10. --- dlls/dwrite/tests/analyzer.c | 50 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 402787f..cee9934 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1197,6 +1197,35 @@ static void test_numbersubstitution(void) IDWriteNumberSubstitution_Release(substitution); } +static void get_fontface_glyphs(IDWriteFontFace *fontface, const WCHAR *str, UINT16 *glyphs) +{ + while (*str) { + UINT32 codepoint = *str; + HRESULT hr; + + hr = IDWriteFontFace_GetGlyphIndices(fontface, &codepoint, 1, glyphs++); + ok(hr == S_OK, "got 0x%08x\n", hr); + str++; + } +} + +static void get_fontface_advances(IDWriteFontFace *fontface, FLOAT emsize, const UINT16 *glyphs, FLOAT *advances, UINT32 count) +{ + DWRITE_FONT_METRICS fontmetrics; + UINT32 i; + + IDWriteFontFace_GetMetrics(fontface, &fontmetrics); + for (i = 0; i < count; i++) { + DWRITE_GLYPH_METRICS metrics; + HRESULT hr; + + hr = IDWriteFontFace_GetDesignGlyphMetrics(fontface, glyphs + i, 1, &metrics, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + advances[i] = (FLOAT)metrics.advanceWidth * emsize / (FLOAT)fontmetrics.designUnitsPerEm; + } +} + static void test_GetGlyphs(void) { static const WCHAR test1W[] = {'<','B',' ','C',0}; @@ -1205,6 +1234,7 @@ static void test_GetGlyphs(void) DWRITE_SHAPING_GLYPH_PROPERTIES shapingprops[20]; DWRITE_SHAPING_TEXT_PROPERTIES props[20]; UINT32 maxglyphcount, actual_count; + FLOAT advances[10], advances2[10]; IDWriteTextAnalyzer *analyzer; IDWriteFontFace *fontface; DWRITE_SCRIPT_ANALYSIS sa; @@ -1212,7 +1242,6 @@ static void test_GetGlyphs(void) UINT16 clustermap[10]; UINT16 glyphs1[10]; UINT16 glyphs2[10]; - FLOAT advances[10]; HRESULT hr; hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); @@ -1275,13 +1304,16 @@ if (0) { ok(glyphs1[0] != glyphs2[0], "got %d\n", glyphs1[0]); /* embedded control codes, with unknown script id 0 */ + get_fontface_glyphs(fontface, test3W, glyphs2); + get_fontface_advances(fontface, 10.0, glyphs2, advances2, 2); + actual_count = 0; hr = IDWriteTextAnalyzer_GetGlyphs(analyzer, test3W, lstrlenW(test3W), fontface, FALSE, TRUE, &sa, NULL, NULL, NULL, NULL, 0, maxglyphcount, clustermap, props, glyphs1, shapingprops, &actual_count); ok(hr == S_OK, "got 0x%08x\n", hr); ok(actual_count == 2, "got %d\n", actual_count); - ok(glyphs1[0] == 0, "got %d\n", glyphs1[0]); - ok(glyphs1[1] == 0, "got %d\n", glyphs1[1]); + ok(glyphs1[0] == glyphs2[0], "got %u, expected %u\n", glyphs1[0], glyphs2[0]); + ok(glyphs1[1] == glyphs2[1], "got %u, expected %u\n", glyphs1[1], glyphs2[1]); ok(shapingprops[0].isClusterStart == 1, "got %d\n", shapingprops[0].isClusterStart); ok(shapingprops[0].isZeroWidthSpace == 0, "got %d\n", shapingprops[0].isZeroWidthSpace); ok(shapingprops[1].isClusterStart == 1, "got %d\n", shapingprops[1].isClusterStart); @@ -1294,8 +1326,8 @@ if (0) { glyphs1, shapingprops, actual_count, fontface, 10.0, FALSE, FALSE, &sa, NULL, NULL, NULL, 0, advances, offsets); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(advances[0] == 10.0, "got %.2f\n", advances[0]); - ok(advances[1] == 10.0, "got %.2f\n", advances[1]); + ok(advances[0] == advances2[0], "got %.2f, expected %.2f\n", advances[0], advances2[0]); + ok(advances[1] == advances2[1], "got %.2f, expected %.2f\n", advances[1], advances2[1]); /* embedded control codes with proper script */ sa.script = 0; @@ -1306,8 +1338,8 @@ if (0) { NULL, NULL, NULL, 0, maxglyphcount, clustermap, props, glyphs1, shapingprops, &actual_count); ok(hr == S_OK, "got 0x%08x\n", hr); ok(actual_count == 2, "got %d\n", actual_count); - ok(glyphs1[0] == 0, "got %d\n", glyphs1[0]); - ok(glyphs1[1] == 0, "got %d\n", glyphs1[1]); + ok(glyphs1[0] == glyphs2[0], "got %u, expected %u\n", glyphs1[0], glyphs2[0]); + ok(glyphs1[1] == glyphs2[1], "got %u, expected %u\n", glyphs1[1], glyphs2[1]); ok(shapingprops[0].isClusterStart == 1, "got %d\n", shapingprops[0].isClusterStart); ok(shapingprops[0].isZeroWidthSpace == 0, "got %d\n", shapingprops[0].isZeroWidthSpace); ok(shapingprops[1].isClusterStart == 1, "got %d\n", shapingprops[1].isClusterStart); @@ -1320,8 +1352,8 @@ if (0) { glyphs1, shapingprops, actual_count, fontface, 10.0, FALSE, FALSE, &sa, NULL, NULL, NULL, 0, advances, offsets); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(advances[0] == 10.0, "got %.2f\n", advances[0]); - ok(advances[1] == 10.0, "got %.2f\n", advances[1]); + ok(advances[0] == advances2[0], "got %.2f, expected %.2f\n", advances[0], advances2[0]); + ok(advances[1] == advances2[1], "got %.2f, expected %.2f\n", advances[1], advances2[1]); IDWriteTextAnalyzer_Release(analyzer); IDWriteFontFace_Release(fontface);

1 0

Alistair Leslie-Hughes : include: Add more WELL_KNOWN_SID_TYPE values.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: 0174a6fc1de85d18119f458ea977d39adf0158e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0174a6fc1de85d18119f458ea… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 19 13:08:09 2015 +1000 include: Add more WELL_KNOWN_SID_TYPE values. --- include/winnt.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index a1116bd..93e216f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4301,6 +4301,31 @@ typedef enum { WinLocalLogonSid = 80, WinConsoleLogonSid = 81, WinThisOrganizationCertificateSid = 82, + WinApplicationPackageAuthoritySid = 83, + WinBuiltinAnyPackageSid = 84, + WinCapabilityInternetClientSid = 85, + WinCapabilityInternetClientServerSid = 86, + WinCapabilityPrivateNetworkClientServerSid = 87, + WinCapabilityPicturesLibrarySid = 88, + WinCapabilityVideosLibrarySid = 89, + WinCapabilityMusicLibrarySid = 90, + WinCapabilityDocumentsLibrarySid = 91, + WinCapabilitySharedUserCertificatesSid = 92, + WinCapabilityEnterpriseAuthenticationSid = 93, + WinCapabilityRemovableStorageSid = 94, + WinBuiltinRDSRemoteAccessServersSid = 95, + WinBuiltinRDSEndpointServersSid = 96, + WinBuiltinRDSManagementServersSid = 97, + WinUserModeDriversSid = 98, + WinBuiltinHyperVAdminsSid = 99, + WinAccountCloneableControllersSid = 100, + WinBuiltinAccessControlAssistanceOperatorsSid = 101, + WinBuiltinRemoteManagementUsersSid = 102, + WinAuthenticationAuthorityAssertedSid = 103, + WinAuthenticationServiceAssertedSid = 104, + WinLocalAccountSid = 105, + WinLocalAccountAndAdministratorSid = 106, + WinAccountProtectedUsersSid = 107, } WELL_KNOWN_SID_TYPE; /*

1 0

Dmitry Timoshkov : server: For querying process information demand PROCESS_QUERY_LIMITED_INFORMATION access.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: 1d2241eca3b3c19855dea1db017305b1e6113c0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d2241eca3b3c19855dea1db0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 21 12:14:19 2015 +0800 server: For querying process information demand PROCESS_QUERY_LIMITED_INFORMATION access. --- dlls/kernel32/tests/process.c | 12 +++++++----- server/process.c | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 443feb9..8447323 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2901,13 +2901,8 @@ static void test_process_info(void) case ProcessTimes: case ProcessPriorityClass: case ProcessPriorityBoost: - case ProcessImageFileName: case ProcessLUIDDeviceMapsEnabled: case 33 /* ProcessIoPriority */: -todo_wine - ok(status == STATUS_SUCCESS, "for info %u expected STATUS_SUCCESS, got %08x (ret_len %u)\n", i, status, ret_len); - break; - case ProcessIoCounters: case ProcessVmCounters: case ProcessWow64Information: @@ -2916,6 +2911,11 @@ todo_wine ok(status == STATUS_SUCCESS, "for info %u expected STATUS_SUCCESS, got %08x (ret_len %u)\n", i, status, ret_len); break; + case ProcessImageFileName: +todo_wine + ok(status == STATUS_SUCCESS, "for info %u expected STATUS_SUCCESS, got %08x (ret_len %u)\n", i, status, ret_len); + break; + case ProcessAffinityMask: case ProcessBreakOnTermination: ok(status == STATUS_ACCESS_DENIED /* before win8 */ || status == STATUS_SUCCESS /* win8 is less strict */, @@ -2928,6 +2928,8 @@ todo_wine break; case ProcessExecuteFlags: + case ProcessDebugPort: + case ProcessDebugFlags: todo_wine ok(status == STATUS_ACCESS_DENIED, "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); break; diff --git a/server/process.c b/server/process.c index a02493a..d4c8adf 100644 --- a/server/process.c +++ b/server/process.c @@ -1343,7 +1343,7 @@ DECL_HANDLER(get_process_info) { struct process *process; - if ((process = get_process_from_handle( req->handle, PROCESS_QUERY_INFORMATION ))) + if ((process = get_process_from_handle( req->handle, PROCESS_QUERY_LIMITED_INFORMATION ))) { reply->pid = get_process_id( process ); reply->ppid = process->parent ? get_process_id( process->parent ) : 0;

1 0

Dmitry Timoshkov : server: Add implicit THREAD_[QUERY|SET] _LIMITED_INFORMATION access.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: 93e8bea2bd9cf06faebdd0407dacde6c46b98a63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93e8bea2bd9cf06faebdd0407… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 21 12:14:15 2015 +0800 server: Add implicit THREAD_[QUERY|SET]_LIMITED_INFORMATION access. --- server/thread.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/server/thread.c b/server/thread.c index e1696ba..9df2da6 100644 --- a/server/thread.c +++ b/server/thread.c @@ -338,11 +338,15 @@ static int thread_signaled( struct object *obj, struct wait_queue_entry *entry ) static unsigned int thread_map_access( struct object *obj, unsigned int access ) { - if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | THREAD_QUERY_INFORMATION | THREAD_GET_CONTEXT | THREAD_QUERY_LIMITED_INFORMATION; + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | THREAD_QUERY_INFORMATION | THREAD_GET_CONTEXT; if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | THREAD_SET_INFORMATION | THREAD_SET_CONTEXT | - THREAD_TERMINATE | THREAD_SUSPEND_RESUME | THREAD_SET_LIMITED_INFORMATION; + THREAD_TERMINATE | THREAD_SUSPEND_RESUME; if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | THREAD_QUERY_LIMITED_INFORMATION; if (access & GENERIC_ALL) access |= THREAD_ALL_ACCESS; + + if (access & THREAD_QUERY_INFORMATION) access |= THREAD_QUERY_LIMITED_INFORMATION; + if (access & THREAD_SET_INFORMATION) access |= THREAD_SET_LIMITED_INFORMATION; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); }

1 0