November 2008 - Wine-commits

Tag wine-1.1.8 : Alexandre Julliard : Release 1.1.8
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: refs/tags/wine-1.1.8 Tag: 596fdcea8d6794603f7684fd203546bc710d43bf URL: http://source.winehq.org/git/wine.git/?a=tag;h=596fdcea8d6794603f7684fd2035… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 7 17:09:33 2008 +0100 Release 1.1.8

1 0

Paul Vriens : winmm/tests: Fix a test failure on Vista and W2K8.
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: 47dddefbb2ff0190232e35e2c947a31a7425eac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47dddefbb2ff0190232e35e2c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Nov 7 13:40:21 2008 +0100 winmm/tests: Fix a test failure on Vista and W2K8. --- dlls/winmm/tests/capture.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index fb02d40..f6155e9 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -359,9 +359,10 @@ static void wave_in_test_device(int device) dev_name(device),wave_in_error(rc)); rc=waveInGetDevCapsW(device,&capsW,4); - ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_NOTSUPPORTED, - "waveInGetDevCapsW(%s): MMSYSERR_NOERROR or MMSYSERR_NOTSUPPORTED " - "expected, got %s\n",dev_name(device),wave_in_error(rc)); + ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_NOTSUPPORTED || + rc==MMSYSERR_INVALPARAM, /* Vista, W2K8 */ + "waveInGetDevCapsW(%s): unexpected return value %s\n", + dev_name(device),wave_in_error(rc)); nameA=NULL; rc=waveInMessage((HWAVEIN)device, DRV_QUERYDEVICEINTERFACESIZE,

1 0

Krzysztof Kotlenga : winex11: Make pens of width = 1 scalable.
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: 1c3e81bf5e930f7c3f68b6850d1d1fbdd161847c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c3e81bf5e930f7c3f68b6850… Author: Krzysztof Kotlenga <pocek(a)users.sf.net> Date: Fri Nov 7 12:07:10 2008 +0100 winex11: Make pens of width = 1 scalable. --- dlls/winex11.drv/pen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/pen.c b/dlls/winex11.drv/pen.c index 96d9043..cd29294 100644 --- a/dlls/winex11.drv/pen.c +++ b/dlls/winex11.drv/pen.c @@ -71,7 +71,7 @@ HPEN X11DRV_SelectPen( X11DRV_PDEVICE *physDev, HPEN hpen ) physDev->pen.linejoin = logpen.lopnStyle & PS_JOIN_MASK; physDev->pen.width = logpen.lopnWidth.x; - if ((logpen.lopnStyle & PS_GEOMETRIC) || (physDev->pen.width > 1)) + if ((logpen.lopnStyle & PS_GEOMETRIC) || (physDev->pen.width >= 1)) { physDev->pen.width = X11DRV_XWStoDS( physDev, physDev->pen.width ); if (physDev->pen.width < 0) physDev->pen.width = -physDev->pen.width;

1 0

Alexandre Julliard : advapi32/tests: Avoid sizeof in traces.
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: adc09cc1b4b41daebd5fe500ff61435ec7332b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=adc09cc1b4b41daebd5fe500f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 7 13:34:11 2008 +0100 advapi32/tests: Avoid sizeof in traces. --- dlls/advapi32/tests/security.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 7e2e3f2..f8cd6b8 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -750,8 +750,7 @@ static void test_FileSecurity(void) "was expected to fail for '%s'\n", file); ok (GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetFileSecurityA " "returned %d; expected ERROR_INSUFFICIENT_BUFFER\n", GetLastError()); - ok (retSize > sizeof (SECURITY_DESCRIPTOR), "GetFileSecurityA " - "returned size %d; expected > %d\n", retSize, sizeof (SECURITY_DESCRIPTOR)); + ok (retSize > sizeof (SECURITY_DESCRIPTOR), "GetFileSecurityA returned size %d\n", retSize); sdSize = retSize; sd = HeapAlloc (GetProcessHeap (), 0, sdSize); @@ -787,8 +786,7 @@ static void test_FileSecurity(void) "was expected to fail for '%s'\n", path); ok (GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetFileSecurityA " "returned %d; expected ERROR_INSUFFICIENT_BUFFER\n", GetLastError()); - ok (retSize > sizeof (SECURITY_DESCRIPTOR), "GetFileSecurityA " - "returned size %d; expected > %d\n", retSize, sizeof (SECURITY_DESCRIPTOR)); + ok (retSize > sizeof (SECURITY_DESCRIPTOR), "GetFileSecurityA returned size %d\n", retSize); sdSize = retSize; sd = HeapAlloc (GetProcessHeap (), 0, sdSize);

1 0

Paul Vriens : user32/tests: Set last error if the menu item cannot be found .
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: 80d3604947f6aaeba5ed437753d8a59cffc0d5f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d3604947f6aaeba5ed43775… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Nov 7 11:45:38 2008 +0100 user32/tests: Set last error if the menu item cannot be found. --- dlls/user32/menu.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 928a9eb..ed93eff 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4423,8 +4423,10 @@ static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item, BOOL bypos, debug_print_menuitem("GetMenuItemInfo_common: ", menu, ""); - if (!menu) - return FALSE; + if (!menu) { + SetLastError( ERROR_MENU_ITEM_NOT_FOUND); + return FALSE; + } if( lpmii->fMask & MIIM_TYPE) { if( lpmii->fMask & ( MIIM_STRING | MIIM_FTYPE | MIIM_BITMAP)) {

1 0

Paul Vriens : user32/tests: Skip GetMenuItemInfo tests on NT4 and below.
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: 4f5460ffcfa702781d6f19fddbb39d30b35abbc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f5460ffcfa702781d6f19fdd… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Nov 7 11:46:20 2008 +0100 user32/tests: Skip GetMenuItemInfo tests on NT4 and below. --- dlls/user32/tests/menu.c | 46 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index e4c4cea..adc9410 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -57,6 +57,33 @@ static void init_function_pointers(void) #undef GET_PROC } +static BOOL correct_behavior(void) +{ + HMENU hmenu; + MENUITEMINFO info; + BOOL rc; + + hmenu = CreateMenu(); + + memset(&info, 0, sizeof(MENUITEMINFO)); + info.cbSize= sizeof(MENUITEMINFO); + SetLastError(0xdeadbeef); + rc = GetMenuItemInfo(hmenu, 0, TRUE, &info); + /* Win9x : 0xdeadbeef + * NT4 : ERROR_INVALID_PARAMETER + * >= W2K : ERROR_MENU_ITEM_NOT_FOUND + */ + if (!rc && GetLastError() != ERROR_MENU_ITEM_NOT_FOUND) + { + win_skip("NT4 and below can't handle a bigger MENUITEMINFO struct\n"); + DestroyMenu(hmenu); + return FALSE; + } + + DestroyMenu(hmenu); + return TRUE; +} + static LRESULT WINAPI menu_check_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { switch (msg) @@ -2351,13 +2378,23 @@ START_TEST(menu) { init_function_pointers(); + /* Wine defines MENUITEMINFO for W2K and above. NT4 and below can't + * handle that. + */ + if (correct_behavior()) + { + test_menu_add_string(); + test_menu_iteminfo(); + test_menu_search_bycommand(); + test_CheckMenuRadioItem(); + test_menu_resource_layout(); + test_InsertMenu(); + } + register_menu_check_class(); test_menu_locked_by_window(); test_menu_ownerdraw(); - test_menu_add_string(); - test_menu_iteminfo(); - test_menu_search_bycommand(); test_menu_bmp_and_string(); if( !pSendInput) @@ -2367,7 +2404,4 @@ START_TEST(menu) test_menu_flags(); test_menu_hilitemenuitem(); - test_CheckMenuRadioItem(); - test_menu_resource_layout(); - test_InsertMenu(); }

1 0

Paul Bryan Roberts : advapi32/tests: Simple tests of GetFileSecurity()/ SetFileSecurity().
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: fa9c9f0e4c052bbf1d828dd053b1a1a4d29400c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa9c9f0e4c052bbf1d828dd05… Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Wed Nov 5 07:01:46 2008 +0000 advapi32/tests: Simple tests of GetFileSecurity()/SetFileSecurity(). --- dlls/advapi32/tests/security.c | 105 +++++++++++++++++++++++++++++++++------- 1 files changed, 88 insertions(+), 17 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index db955cd..d3efa0b 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -87,6 +87,8 @@ static BOOL (WINAPI *pConvertSecurityDescriptorToStringSecurityDescriptorA)(PSEC SECURITY_INFORMATION, LPSTR *, PULONG ); typedef BOOL (WINAPI *fnGetFileSecurityA)(LPCSTR, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD, LPDWORD); +typedef BOOL (WINAPI *fnSetFileSecurityA)(LPCSTR, SECURITY_INFORMATION, + PSECURITY_DESCRIPTOR); static DWORD (WINAPI *pGetNamedSecurityInfoA)(LPSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION, PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*); @@ -119,6 +121,7 @@ fnMakeSelfRelativeSD pMakeSelfRelativeSD; fnConvertSidToStringSidA pConvertSidToStringSidA; fnConvertStringSidToSidA pConvertStringSidToSidA; fnGetFileSecurityA pGetFileSecurityA; +fnSetFileSecurityA pSetFileSecurityA; fnRtlAdjustPrivilege pRtlAdjustPrivilege; fnCreateWellKnownSid pCreateWellKnownSid; fnDuplicateTokenEx pDuplicateTokenEx; @@ -150,6 +153,8 @@ static void init(void) (void *)GetProcAddress(hmod, "ConvertStringSecurityDescriptorToSecurityDescriptorW" ); pConvertSecurityDescriptorToStringSecurityDescriptorA = (void *)GetProcAddress(hmod, "ConvertSecurityDescriptorToStringSecurityDescriptorA" ); + pGetFileSecurityA = (fnGetFileSecurityA)GetProcAddress(hmod, "GetFileSecurityA" ); + pSetFileSecurityA = (fnSetFileSecurityA)GetProcAddress(hmod, "SetFileSecurityA" ); pCreateWellKnownSid = (fnCreateWellKnownSid)GetProcAddress( hmod, "CreateWellKnownSid" ); pGetNamedSecurityInfoA = (void *)GetProcAddress(hmod, "GetNamedSecurityInfoA"); pMakeSelfRelativeSD = (void *)GetProcAddress(hmod, "MakeSelfRelativeSD"); @@ -694,29 +699,95 @@ static void test_luid(void) static void test_FileSecurity(void) { - char directory[MAX_PATH]; - DWORD retval, outSize; - BOOL result; - BYTE buffer[0x40]; - - pGetFileSecurityA = (fnGetFileSecurityA) - GetProcAddress( hmod, "GetFileSecurityA" ); - if( !pGetFileSecurityA ) + char wintmpdir [MAX_PATH]; + char path [MAX_PATH]; + char file [MAX_PATH]; + BOOL rc; + HANDLE fh; + DWORD sdSize; + DWORD retSize; + BYTE *sd; + SECURITY_INFORMATION const request = OWNER_SECURITY_INFORMATION + | GROUP_SECURITY_INFORMATION + | DACL_SECURITY_INFORMATION; + + if (!pGetFileSecurityA) { + win_skip ("GetFileSecurity is not available\n"); return; + } - retval = GetTempPathA(sizeof(directory), directory); - if (!retval) { - trace("GetTempPathA failed\n"); + if (!pSetFileSecurityA) { + win_skip ("SetFileSecurity is not available\n"); return; } - strcpy(directory, "\\Should not exist"); + if (!GetTempPathA (sizeof (wintmpdir), wintmpdir)) { + win_skip ("GetTempPathA failed\n"); + return; + } - SetLastError(NO_ERROR); - result = pGetFileSecurityA( directory,OWNER_SECURITY_INFORMATION,buffer,0x40,&outSize); - ok(!result, "GetFileSecurityA should fail for not existing directories/files\n"); - ok( (GetLastError() == ERROR_FILE_NOT_FOUND ) || - (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) , + /* Create a temporary directory and in it a temporary file */ + strcat (strcpy (path, wintmpdir), "rary"); + SetLastError (NO_ERROR); + rc = CreateDirectoryA (path, NULL); + ok (rc || GetLastError() == ERROR_ALREADY_EXISTS, "CreateDirectoryA " + "failed for '%s' with %d\n", path, GetLastError()); + + strcat (strcpy (file, path), "\\ess"); + SetLastError (NO_ERROR); + fh = CreateFileA (file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok (fh != INVALID_HANDLE_VALUE, "CreateFileA " + "failed for '%s' with %d\n", file, GetLastError()); + CloseHandle (fh); + + /* For the temporary file ... */ + + /* Get size needed */ + retSize = 0; + SetLastError (NO_ERROR); + rc = pGetFileSecurityA (file, request, NULL, 0, &retSize); + ok (!rc, "GetFileSecurityA " + "was expected to fail for '%s'\n", file); + ok (GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetFileSecurityA " + "returned %d; expected ERROR_INSUFFICIENT_BUFFER\n", GetLastError()); + ok (retSize > sizeof (SECURITY_DESCRIPTOR), "GetFileSecurityA " + "returned size %d; expected > %d\n", retSize, sizeof (SECURITY_DESCRIPTOR)); + + sdSize = retSize; + sd = HeapAlloc (GetProcessHeap (), 0, sdSize); + + /* Get security descriptor for real */ + retSize = 0; + SetLastError (NO_ERROR); + rc = pGetFileSecurityA (file, request, sd, sdSize, &retSize); + ok (rc, "GetFileSecurityA " + "was not expected to fail '%s'\n", file); + ok (GetLastError () == NO_ERROR, "GetFileSecurityA " + "returned %d; expected NO_ERROR\n", GetLastError ()); + ok (retSize == sdSize, "GetFileSecurityA " + "returned size %d; expected %d\n", retSize, sdSize); + + /* Use it to set security descriptor */ + SetLastError (NO_ERROR); + rc = pSetFileSecurityA (file, request, sd); + ok (rc, "SetFileSecurityA " + "was not expected to fail '%s'\n", file); + ok (GetLastError () == NO_ERROR, "SetFileSecurityA " + "returned %d; expected NO_ERROR\n", GetLastError ()); + + HeapFree (GetProcessHeap (), 0, sd); + + /* Remove temporary file and directory */ + DeleteFileA (file); + RemoveDirectoryA (path); + + /* Old test */ + strcpy (wintmpdir, "\\Should not exist"); + SetLastError (NO_ERROR); + rc = pGetFileSecurityA (wintmpdir, OWNER_SECURITY_INFORMATION, NULL, 0, &sdSize); + ok (!rc, "GetFileSecurityA should fail for not existing directories/files\n"); + ok ((GetLastError() == ERROR_FILE_NOT_FOUND ) || + (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED), "last error ERROR_FILE_NOT_FOUND / ERROR_CALL_NOT_IMPLEMENTED (98) " "expected, got %d\n", GetLastError()); }

1 0

Paul Bryan Roberts : advapi32: Add TRACE to GetFileSecurity().
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: 27037218604d3846c853bb36ded2213c208eea3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=27037218604d3846c853bb36d… Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Mon Nov 3 20:42:45 2008 +0000 advapi32: Add TRACE to GetFileSecurity(). --- dlls/advapi32/security.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index f57136d..67c410f 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1915,6 +1915,10 @@ GetFileSecurityW( LPCWSTR lpFileName, NTSTATUS status; DWORD access = 0; + TRACE("(%s,%d,%p,%d,%p)\n", debugstr_w(lpFileName), + RequestedInformation, pSecurityDescriptor, + nLength, lpnLengthNeeded); + if (RequestedInformation & (OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION| DACL_SECURITY_INFORMATION)) access |= READ_CONTROL;

1 0

Paul Bryan Roberts : server: Refactor server side implementation of GetFileSecurity().
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: d87af3dfb23dcb016a9eeaf6266d7f81976655b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d87af3dfb23dcb016a9eeaf62… Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Mon Nov 3 22:25:37 2008 +0000 server: Refactor server side implementation of GetFileSecurity(). --- server/file.c | 102 +++++++++++++++++++++++++++++--------------------------- server/file.h | 2 + 2 files changed, 55 insertions(+), 49 deletions(-) diff --git a/server/file.c b/server/file.c index 5224e85..dc93b4b 100644 --- a/server/file.c +++ b/server/file.c @@ -75,7 +75,6 @@ static void file_destroy( struct object *obj ); static int file_get_poll_events( struct fd *fd ); static void file_flush( struct fd *fd, struct event **event ); static enum server_fd_type file_get_fd_type( struct fd *fd ); -static mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ); static const struct object_ops file_ops = { @@ -291,14 +290,9 @@ static unsigned int generic_file_map_access( unsigned int access ) return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); } -static struct security_descriptor *file_get_sd( struct object *obj ) +struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID *group ) { - struct file *file = (struct file *)obj; - struct stat st; - int unix_fd; struct security_descriptor *sd; - const SID *user; - const SID *group; size_t dacl_size; ACE_HEADER *current_ace; ACCESS_ALLOWED_ACE *aaa; @@ -308,34 +302,17 @@ static struct security_descriptor *file_get_sd( struct object *obj ) const SID *world_sid = security_world_sid; const SID *local_system_sid = security_local_system_sid; - assert( obj->ops == &file_ops ); - - unix_fd = get_file_unix_fd( file ); - - if (unix_fd == -1) return obj->sd; - - if (fstat( unix_fd, &st ) == -1) - return obj->sd; - - /* mode and uid the same? if so, no need to re-generate security descriptor */ - if (obj->sd && (st.st_mode & (S_IRWXU|S_IRWXO)) == (file->mode & (S_IRWXU|S_IRWXO)) && - (st.st_uid == file->uid)) - return obj->sd; - - user = security_unix_uid_to_sid( st.st_uid ); - group = token_get_primary_group( current->process->token ); - dacl_size = sizeof(ACL) + FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + FIELD_OFFSET(SID, SubAuthority[local_system_sid->SubAuthorityCount]); - if (st.st_mode & S_IRWXU) + if (mode & S_IRWXU) dacl_size += FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]); - if ((!(st.st_mode & S_IRUSR) && (st.st_mode & (S_IRGRP|S_IROTH))) || - (!(st.st_mode & S_IWUSR) && (st.st_mode & (S_IWGRP|S_IWOTH))) || - (!(st.st_mode & S_IXUSR) && (st.st_mode & (S_IXGRP|S_IXOTH)))) + if ((!(mode & S_IRUSR) && (mode & (S_IRGRP|S_IROTH))) || + (!(mode & S_IWUSR) && (mode & (S_IWGRP|S_IWOTH))) || + (!(mode & S_IXUSR) && (mode & (S_IXGRP|S_IXOTH)))) dacl_size += FIELD_OFFSET(ACCESS_DENIED_ACE, SidStart) + FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]); - if (st.st_mode & S_IRWXO) + if (mode & S_IRWXO) dacl_size += FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + FIELD_OFFSET(SID, SubAuthority[world_sid->SubAuthorityCount]); @@ -343,7 +320,7 @@ static struct security_descriptor *file_get_sd( struct object *obj ) FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]) + FIELD_OFFSET(SID, SubAuthority[group->SubAuthorityCount]) + dacl_size ); - if (!sd) return obj->sd; + if (!sd) return sd; sd->control = SE_DACL_PRESENT; sd->owner_len = FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]); @@ -361,10 +338,10 @@ static struct security_descriptor *file_get_sd( struct object *obj ) dacl->AclRevision = ACL_REVISION; dacl->Sbz1 = 0; dacl->AclSize = dacl_size; - dacl->AceCount = 1 + (st.st_mode & S_IRWXU ? 1 : 0) + (st.st_mode & S_IRWXO ? 1 : 0); - if ((!(st.st_mode & S_IRUSR) && (st.st_mode & (S_IRGRP|S_IROTH))) || - (!(st.st_mode & S_IWUSR) && (st.st_mode & (S_IWGRP|S_IWOTH))) || - (!(st.st_mode & S_IXUSR) && (st.st_mode & (S_IXGRP|S_IXOTH)))) + dacl->AceCount = 1 + (mode & S_IRWXU ? 1 : 0) + (mode & S_IRWXO ? 1 : 0); + if ((!(mode & S_IRUSR) && (mode & (S_IRGRP|S_IROTH))) || + (!(mode & S_IWUSR) && (mode & (S_IWGRP|S_IWOTH))) || + (!(mode & S_IXUSR) && (mode & (S_IXGRP|S_IXOTH)))) dacl->AceCount++; dacl->Sbz2 = 0; @@ -379,7 +356,7 @@ static struct security_descriptor *file_get_sd( struct object *obj ) sid = (SID *)&aaa->SidStart; memcpy( sid, local_system_sid, FIELD_OFFSET(SID, SubAuthority[local_system_sid->SubAuthorityCount]) ); - if (st.st_mode & S_IRWXU) + if (mode & S_IRWXU) { /* appropriate access rights for the user */ aaa = (ACCESS_ALLOWED_ACE *)ace_next( current_ace ); @@ -389,18 +366,18 @@ static struct security_descriptor *file_get_sd( struct object *obj ) aaa->Header.AceSize = FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]); aaa->Mask = WRITE_DAC | WRITE_OWNER; - if (st.st_mode & S_IRUSR) + if (mode & S_IRUSR) aaa->Mask |= FILE_GENERIC_READ; - if (st.st_mode & S_IWUSR) + if (mode & S_IWUSR) aaa->Mask |= FILE_GENERIC_WRITE | DELETE; - if (st.st_mode & S_IXUSR) + if (mode & S_IXUSR) aaa->Mask |= FILE_GENERIC_EXECUTE; sid = (SID *)&aaa->SidStart; memcpy( sid, user, FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]) ); } - if ((!(st.st_mode & S_IRUSR) && (st.st_mode & (S_IRGRP|S_IROTH))) || - (!(st.st_mode & S_IWUSR) && (st.st_mode & (S_IWGRP|S_IWOTH))) || - (!(st.st_mode & S_IXUSR) && (st.st_mode & (S_IXGRP|S_IXOTH)))) + if ((!(mode & S_IRUSR) && (mode & (S_IRGRP|S_IROTH))) || + (!(mode & S_IWUSR) && (mode & (S_IWGRP|S_IWOTH))) || + (!(mode & S_IXUSR) && (mode & (S_IXGRP|S_IXOTH)))) { /* deny just in case the user is a member of the group */ ACCESS_DENIED_ACE *ada = (ACCESS_DENIED_ACE *)ace_next( current_ace ); @@ -410,17 +387,17 @@ static struct security_descriptor *file_get_sd( struct object *obj ) ada->Header.AceSize = FIELD_OFFSET(ACCESS_DENIED_ACE, SidStart) + FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]); ada->Mask = 0; - if (!(st.st_mode & S_IRUSR) && (st.st_mode & (S_IRGRP|S_IROTH))) + if (!(mode & S_IRUSR) && (mode & (S_IRGRP|S_IROTH))) ada->Mask |= FILE_GENERIC_READ; - if (!(st.st_mode & S_IWUSR) && (st.st_mode & (S_IWGRP|S_IROTH))) + if (!(mode & S_IWUSR) && (mode & (S_IWGRP|S_IROTH))) ada->Mask |= FILE_GENERIC_WRITE | DELETE; - if (!(st.st_mode & S_IXUSR) && (st.st_mode & (S_IXGRP|S_IXOTH))) + if (!(mode & S_IXUSR) && (mode & (S_IXGRP|S_IXOTH))) ada->Mask |= FILE_GENERIC_EXECUTE; ada->Mask &= ~STANDARD_RIGHTS_ALL; /* never deny standard rights */ sid = (SID *)&ada->SidStart; memcpy( sid, user, FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]) ); } - if (st.st_mode & S_IRWXO) + if (mode & S_IRWXO) { /* appropriate access rights for Everyone */ aaa = (ACCESS_ALLOWED_ACE *)ace_next( current_ace ); @@ -430,16 +407,43 @@ static struct security_descriptor *file_get_sd( struct object *obj ) aaa->Header.AceSize = FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + FIELD_OFFSET(SID, SubAuthority[world_sid->SubAuthorityCount]); aaa->Mask = 0; - if (st.st_mode & S_IROTH) + if (mode & S_IROTH) aaa->Mask |= FILE_GENERIC_READ; - if (st.st_mode & S_IWOTH) + if (mode & S_IWOTH) aaa->Mask |= FILE_GENERIC_WRITE | DELETE; - if (st.st_mode & S_IXOTH) + if (mode & S_IXOTH) aaa->Mask |= FILE_GENERIC_EXECUTE; sid = (SID *)&aaa->SidStart; memcpy( sid, world_sid, FIELD_OFFSET(SID, SubAuthority[world_sid->SubAuthorityCount]) ); } + return sd; +} + +static struct security_descriptor *file_get_sd( struct object *obj ) +{ + struct file *file = (struct file *)obj; + struct stat st; + int unix_fd; + struct security_descriptor *sd; + + assert( obj->ops == &file_ops ); + + unix_fd = get_file_unix_fd( file ); + + if (unix_fd == -1 || fstat( unix_fd, &st ) == -1) + return obj->sd; + + /* mode and uid the same? if so, no need to re-generate security descriptor */ + if (obj->sd && (st.st_mode & (S_IRWXU|S_IRWXO)) == (file->mode & (S_IRWXU|S_IRWXO)) && + (st.st_uid == file->uid)) + return obj->sd; + + sd = mode_to_sd( st.st_mode, + security_unix_uid_to_sid( st.st_uid ), + token_get_primary_group( current->process->token )); + if (!sd) return obj->sd; + file->mode = st.st_mode; file->uid = st.st_uid; free( obj->sd ); @@ -447,7 +451,7 @@ static struct security_descriptor *file_get_sd( struct object *obj ) return sd; } -static mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) +mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) { mode_t new_mode = 0; mode_t denied_mode = 0; diff --git a/server/file.h b/server/file.h index 26d1702..2d1d047 100644 --- a/server/file.h +++ b/server/file.h @@ -112,6 +112,8 @@ extern struct file *grab_file_unless_removable( struct file *file ); extern int grow_file( struct file *file, file_pos_t size ); extern struct file *create_temp_file( int access ); extern void file_set_error(void); +extern struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID *group ); +extern mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ); /* change notification functions */

1 0

Paul Bryan Roberts : server: Clone file_get_sd() and file_set_fd() for directories.
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: 6435a5ddabda596d1c60d94a8f99ce19be95ac6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6435a5ddabda596d1c60d94a8… Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Mon Nov 3 22:37:17 2008 +0000 server: Clone file_get_sd() and file_set_fd() for directories. --- dlls/advapi32/tests/security.c | 37 +++++++++++++++ server/change.c | 99 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 134 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d3efa0b..7e2e3f2 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -777,6 +777,43 @@ static void test_FileSecurity(void) HeapFree (GetProcessHeap (), 0, sd); + /* Repeat for the temporary directory ... */ + + /* Get size needed */ + retSize = 0; + SetLastError (NO_ERROR); + rc = pGetFileSecurityA (path, request, NULL, 0, &retSize); + ok (!rc, "GetFileSecurityA " + "was expected to fail for '%s'\n", path); + ok (GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetFileSecurityA " + "returned %d; expected ERROR_INSUFFICIENT_BUFFER\n", GetLastError()); + ok (retSize > sizeof (SECURITY_DESCRIPTOR), "GetFileSecurityA " + "returned size %d; expected > %d\n", retSize, sizeof (SECURITY_DESCRIPTOR)); + + sdSize = retSize; + sd = HeapAlloc (GetProcessHeap (), 0, sdSize); + + /* Get security descriptor for real */ + retSize = 0; + SetLastError (NO_ERROR); + rc = pGetFileSecurityA (path, request, sd, sdSize, &retSize); + ok (rc, "GetFileSecurityA " + "was not expected to fail '%s'\n", path); + ok (GetLastError () == NO_ERROR, "GetFileSecurityA " + "returned %d; expected NO_ERROR\n", GetLastError ()); + ok (retSize == sdSize, "GetFileSecurityA " + "returned size %d; expected %d\n", retSize, sdSize); + + /* Use it to set security descriptor */ + SetLastError (NO_ERROR); + rc = pSetFileSecurityA (path, request, sd); + ok (rc, "SetFileSecurityA " + "was not expected to fail '%s'\n", path); + ok (GetLastError () == NO_ERROR, "SetFileSecurityA " + "returned %d; expected NO_ERROR\n", GetLastError ()); + + HeapFree (GetProcessHeap (), 0, sd); + /* Remove temporary file and directory */ DeleteFileA (file); RemoveDirectoryA (path); diff --git a/server/change.c b/server/change.c index 2c690e0..aded849 100644 --- a/server/change.c +++ b/server/change.c @@ -44,6 +44,8 @@ #include "handle.h" #include "thread.h" #include "request.h" +#include "process.h" +#include "security.h" #include "winternl.h" /* dnotify support */ @@ -146,6 +148,8 @@ struct dir { struct object obj; /* object header */ struct fd *fd; /* file descriptor to the directory */ + mode_t mode; /* file stat.st_mode */ + uid_t uid; /* file stat.st_uid */ struct list entry; /* entry in global change notifications list */ unsigned int filter; /* notification filter */ int notified; /* SIGIO counter */ @@ -157,6 +161,9 @@ struct dir }; static struct fd *dir_get_fd( struct object *obj ); +static struct security_descriptor *dir_get_sd( struct object *obj ); +static int dir_set_sd( struct object *obj, const struct security_descriptor *sd, + unsigned int set_info ); static void dir_dump( struct object *obj, int verbose ); static void dir_destroy( struct object *obj ); @@ -172,8 +179,8 @@ static const struct object_ops dir_ops = no_signal, /* signal */ dir_get_fd, /* get_fd */ default_fd_map_access, /* map_access */ - default_get_sd, /* get_sd */ - default_set_sd, /* set_sd */ + dir_get_sd, /* get_sd */ + dir_set_sd, /* set_sd */ no_lookup_name, /* lookup_name */ no_open_file, /* open_file */ fd_close_handle, /* close_handle */ @@ -291,6 +298,94 @@ static struct fd *dir_get_fd( struct object *obj ) return (struct fd *)grab_object( dir->fd ); } +static int get_dir_unix_fd( struct dir *dir ) +{ + return get_unix_fd( dir->fd ); +} + +static struct security_descriptor *dir_get_sd( struct object *obj ) +{ + struct dir *dir = (struct dir *)obj; + int unix_fd; + struct stat st; + struct security_descriptor *sd; + assert( obj->ops == &dir_ops ); + + unix_fd = get_dir_unix_fd( dir ); + + if (unix_fd == -1 || fstat( unix_fd, &st ) == -1) + return obj->sd; + + /* mode and uid the same? if so, no need to re-generate security descriptor */ + if (obj->sd && + (st.st_mode & (S_IRWXU|S_IRWXO)) == (dir->mode & (S_IRWXU|S_IRWXO)) && + (st.st_uid == dir->uid)) + return obj->sd; + + sd = mode_to_sd( st.st_mode, + security_unix_uid_to_sid( st.st_uid ), + token_get_primary_group( current->process->token )); + if (!sd) return obj->sd; + + dir->mode = st.st_mode; + dir->uid = st.st_uid; + free( obj->sd ); + obj->sd = sd; + return sd; +} + +static int dir_set_sd( struct object *obj, const struct security_descriptor *sd, + unsigned int set_info ) +{ + struct dir *dir = (struct dir *)obj; + const SID *owner; + mode_t mode; + int unix_fd; + + assert( obj->ops == &dir_ops ); + + unix_fd = get_dir_unix_fd( dir ); + + if (unix_fd == -1) return 1; + + if (set_info & OWNER_SECURITY_INFORMATION) + { + owner = sd_get_owner( sd ); + if (!owner) + { + set_error( STATUS_INVALID_SECURITY_DESCR ); + return 0; + } + if (!obj->sd || !security_equal_sid( owner, sd_get_owner( obj->sd ) )) + { + /* FIXME: get Unix uid and call fchown */ + } + } + else if (obj->sd) + owner = sd_get_owner( obj->sd ); + else + owner = token_get_user( current->process->token ); + + if (set_info & DACL_SECURITY_INFORMATION) + { + /* keep the bits that we don't map to access rights in the ACL */ + mode = dir->mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXG); + mode |= sd_to_mode( sd, owner ); + + if (dir->mode != mode) + { + if (fchmod( unix_fd, mode ) == -1) + { + file_set_error(); + return 0; + } + + dir->mode = mode; + } + } + return 1; +} + static struct change_record *get_first_change_record( struct dir *dir ) { struct list *ptr = list_head( &dir->change_records );

1 0