October 2007 - Wine-Commits

Rob Shearman : server: Owner and group SIDs in security descriptors are optional in many server calls .
by Alexandre Julliard Oct. 16, 2007

Oct. 16, 2007

Module: wine Branch: master Commit: 3f4c2670286c7fbca7a746173d99309c79699cf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f4c2670286c7fbca7a746173… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 16 10:19:21 2007 +0100 server: Owner and group SIDs in security descriptors are optional in many server calls. So print "<not present>" when they aren't provided instead of "<invalid sid>". --- server/trace.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/server/trace.c b/server/trace.c index 4471d6f..e0a2e96 100644 --- a/server/trace.c +++ b/server/trace.c @@ -711,12 +711,18 @@ static void dump_inline_security_descriptor( const struct security_descriptor *s fprintf( stderr, ",owner=" ); if ((sd->owner_len > FIELD_OFFSET(SID, SubAuthority[255])) || (offset + sd->owner_len > size)) return; - dump_inline_sid( (const SID *)((const char *)sd + offset), sd->owner_len ); + if (sd->owner_len) + dump_inline_sid( (const SID *)((const char *)sd + offset), sd->owner_len ); + else + fprintf( stderr, "<not present>" ); offset += sd->owner_len; fprintf( stderr, ",group=" ); if ((sd->group_len > FIELD_OFFSET(SID, SubAuthority[255])) || (offset + sd->group_len > size)) return; - dump_inline_sid( (const SID *)((const char *)sd + offset), sd->group_len ); + if (sd->group_len) + dump_inline_sid( (const SID *)((const char *)sd + offset), sd->group_len ); + else + fprintf( stderr, "<not present>" ); offset += sd->group_len; fprintf( stderr, ",sacl=" ); if ((sd->sacl_len >= MAX_ACL_LEN) || (offset + sd->sacl_len > size))

1 0

Rob Shearman : advapi32: Add tests for AccessCheck with NULL DACLs and blank DACLs.
by Alexandre Julliard Oct. 16, 2007

Oct. 16, 2007

Module: wine Branch: master Commit: d1a3e2ede58865f159340cb254a0a9637358b4a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1a3e2ede58865f159340cb25… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 16 09:50:15 2007 +0100 advapi32: Add tests for AccessCheck with NULL DACLs and blank DACLs. --- dlls/advapi32/tests/security.c | 46 ++++++++++++++++++++++++++++++++++----- 1 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 15fdf49..4c7b7bf 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -735,12 +735,6 @@ static void test_AccessCheck(void) DOMAIN_ALIAS_RID_USERS, 0, 0, 0, 0, 0, 0, &UsersSid); ok(res, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); - res = AddAccessAllowedAce(Acl, ACL_REVISION, KEY_READ, EveryoneSid); - ok(res, "AddAccessAllowedAceEx failed with error %d\n", GetLastError()); - - res = AddAccessDeniedAce(Acl, ACL_REVISION, KEY_SET_VALUE, AdminSid); - ok(res, "AddAccessDeniedAce failed with error %d\n", GetLastError()); - SecurityDescriptor = HeapAlloc(GetProcessHeap(), 0, SECURITY_DESCRIPTOR_MIN_LENGTH); res = InitializeSecurityDescriptor(SecurityDescriptor, SECURITY_DESCRIPTOR_REVISION); @@ -788,6 +782,46 @@ static void test_AccessCheck(void) ok(Access == 0xdeadbeef && AccessStatus == 0xdeadbeef, "Access and/or AccessStatus were changed!\n"); + /* sd with no dacl present */ + ret = SetSecurityDescriptorDacl(SecurityDescriptor, FALSE, NULL, FALSE); + todo_wine + ok(ret, "SetSecurityDescriptorDacl failed with error %d\n", GetLastError()); + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + ok(ret, "AccessCheck failed with error %d\n", GetLastError()); + ok(AccessStatus && (Access == KEY_READ), + "AccessCheck failed to grant access with error %d\n", + GetLastError()); + + /* sd with NULL dacl */ + ret = SetSecurityDescriptorDacl(SecurityDescriptor, TRUE, NULL, FALSE); + ok(ret, "SetSecurityDescriptorDacl failed with error %d\n", GetLastError()); + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + ok(ret, "AccessCheck failed with error %d\n", GetLastError()); + todo_wine + ok(AccessStatus && (Access == KEY_READ), + "AccessCheck failed to grant access with error %d\n", + GetLastError()); + + /* sd with blank dacl */ + ret = SetSecurityDescriptorDacl(SecurityDescriptor, TRUE, Acl, FALSE); + ok(ret, "SetSecurityDescriptorDacl failed with error %d\n", GetLastError()); + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + ok(ret, "AccessCheck failed with error %d\n", GetLastError()); + err = GetLastError(); + ok(!AccessStatus && err == ERROR_ACCESS_DENIED, "AccessCheck should have failed " + "with ERROR_ACCESS_DENIED, instead of %d\n", err); + ok(!Access, "Should have failed to grant any access, got 0x%08x\n", Access); + + res = AddAccessAllowedAce(Acl, ACL_REVISION, KEY_READ, EveryoneSid); + ok(res, "AddAccessAllowedAceEx failed with error %d\n", GetLastError()); + + res = AddAccessDeniedAce(Acl, ACL_REVISION, KEY_SET_VALUE, AdminSid); + ok(res, "AddAccessDeniedAce failed with error %d\n", GetLastError()); + + /* sd with dacl */ ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); ok(ret, "AccessCheck failed with error %d\n", GetLastError());

1 0

Rob Shearman : ntdll: Fix the return code from RtlSetDaclSecurityDescriptor when daclpresent is FALSE .
by Alexandre Julliard Oct. 16, 2007

Oct. 16, 2007

Module: wine Branch: master Commit: a006b060800c7d41c7509cd7ae3ad72b06b966b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a006b060800c7d41c7509cd7a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 16 09:50:28 2007 +0100 ntdll: Fix the return code from RtlSetDaclSecurityDescriptor when daclpresent is FALSE. --- dlls/advapi32/tests/security.c | 1 - dlls/ntdll/sec.c | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4c7b7bf..0fbd3f9 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -784,7 +784,6 @@ static void test_AccessCheck(void) /* sd with no dacl present */ ret = SetSecurityDescriptorDacl(SecurityDescriptor, FALSE, NULL, FALSE); - todo_wine ok(ret, "SetSecurityDescriptorDacl failed with error %d\n", GetLastError()); ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index e4f6ddc..89d23df 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -626,8 +626,9 @@ NTSTATUS WINAPI RtlSetDaclSecurityDescriptor ( return STATUS_INVALID_SECURITY_DESCR; if (!daclpresent) - { lpsd->Control &= ~SE_DACL_PRESENT; - return TRUE; + { + lpsd->Control &= ~SE_DACL_PRESENT; + return STATUS_SUCCESS; } lpsd->Control |= SE_DACL_PRESENT;

1 0

Rob Shearman : ntdll: Fix NtAccessCheck for NULL, but present SACLs and DACLs.
by Alexandre Julliard Oct. 16, 2007

Oct. 16, 2007

Module: wine Branch: master Commit: a9ffa82c6d9d90e1cbc0531cc329eca94c6884ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9ffa82c6d9d90e1cbc0531cc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 16 09:49:53 2007 +0100 ntdll: Fix NtAccessCheck for NULL, but present SACLs and DACLs. --- dlls/ntdll/sec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index e827efa..e4f6ddc 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1538,9 +1538,9 @@ NtAccessCheck( RtlGetGroupSecurityDescriptor( SecurityDescriptor, &group, &defaulted ); sd.group_len = RtlLengthSid( group ); RtlGetSaclSecurityDescriptor( SecurityDescriptor, &present, &sacl, &defaulted ); - sd.sacl_len = (present ? sacl->AclSize : 0); + sd.sacl_len = ((present && sacl) ? sacl->AclSize : 0); RtlGetDaclSecurityDescriptor( SecurityDescriptor, &present, &dacl, &defaulted ); - sd.dacl_len = (present ? dacl->AclSize : 0); + sd.dacl_len = ((present && dacl) ? dacl->AclSize : 0); wine_server_add_data( req, &sd, sizeof(sd) ); wine_server_add_data( req, owner, sd.owner_len );

1 0

Dan Hipschman : widl: Output the correct value for TableSize in ProxyFileInfo.
by Alexandre Julliard Oct. 16, 2007

Oct. 16, 2007

Module: wine Branch: master Commit: ebfbec6e5c29db673d00eaf16ce14981b950b312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebfbec6e5c29db673d00eaf16… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Oct 15 18:07:52 2007 -0700 widl: Output the correct value for TableSize in ProxyFileInfo. --- tools/widl/proxy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 65bb1fa..5354c27 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -661,7 +661,7 @@ void write_proxies(ifref_list_t *ifaces) c = 0; if (ifaces) LIST_FOR_EACH_ENTRY( cur, ifaces, ifref_t, entry ) - if(cur->iface->ref) + if(cur->iface->ref && cur->iface->funcs && need_proxy(cur->iface)) { fprintf(proxy, " if (!_%s_CHECK_IID(%d))\n", file_id, c); fprintf(proxy, " {\n");

1 0

Mikolaj Zalewski : comdlg32: NULL name in PRINTDLG_SetUpPrinterListComboA is correct so don' t print a FIXME.
by Alexandre Julliard Oct. 16, 2007

Oct. 16, 2007

Module: wine Branch: master Commit: cdcdbe9b68daa443c63310aa0b08d86f3d11faca URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdcdbe9b68daa443c63310aa0… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Mon Oct 15 18:42:42 2007 -0700 comdlg32: NULL name in PRINTDLG_SetUpPrinterListComboA is correct so don't print a FIXME. --- dlls/comdlg32/printdlg.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 8e334c3..490a794 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -133,8 +133,9 @@ INT PRINTDLG_SetUpPrinterListComboA(HWND hDlg, UINT id, LPCSTR name) char buf[260]; DWORD dwBufLen = sizeof(buf); - FIXME("Can't find '%s' in printer list so trying to find default\n", - name); + if (name != NULL) + WARN("Can't find %s in printer list so trying to find default\n", + debugstr_a(name)); if(!GetDefaultPrinterA(buf, &dwBufLen)) return num; i = SendDlgItemMessageA(hDlg, id, CB_FINDSTRINGEXACT, -1, (LPARAM)buf); @@ -165,8 +166,9 @@ static INT PRINTDLG_SetUpPrinterListComboW(HWND hDlg, UINT id, LPCWSTR name) (LPARAM)name)) == CB_ERR) { WCHAR buf[260]; DWORD dwBufLen = sizeof(buf)/sizeof(buf[0]); - TRACE("Can't find '%s' in printer list so trying to find default\n", - debugstr_w(name)); + if (name != NULL) + WARN("Can't find %s in printer list so trying to find default\n", + debugstr_w(name)); if(!GetDefaultPrinterW(buf, &dwBufLen)) return num; i = SendDlgItemMessageW(hDlg, id, CB_FINDSTRINGEXACT, -1, (LPARAM)buf);

1 0

Daniel Nylander : tools: Add Swedish name to .desktop file.
by Alexandre Julliard Oct. 16, 2007

Oct. 16, 2007

Module: wine Branch: master Commit: 492ee4e39cd378af766ae7f6d7137b5932634676 URL: http://source.winehq.org/git/wine.git/?a=commit;h=492ee4e39cd378af766ae7f6d… Author: Daniel Nylander <po(a)danielnylander.se> Date: Mon Oct 15 22:28:06 2007 +0200 tools: Add Swedish name to .desktop file. --- tools/wine.desktop | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index 6818b88..8d528db 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -2,6 +2,7 @@ Type=Application Name=Wine Windows Emulator Name[de]=Wine Windows-Emulator +Name[sv]=Windows-emulatorn Wine Name[ru]=Wine Эмулятор Windows Exec=wine %f MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-zip-compressed;application/x-executable;

1 0

James Hawkins : msi: Only double the returned size when szValueBuf is NULL.
by Alexandre Julliard Oct. 16, 2007

Oct. 16, 2007

Module: wine Branch: master Commit: 0e2db26fa3c16ccf2c4460ad39b544d9c358ec88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e2db26fa3c16ccf2c4460ad3… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Oct 15 22:25:16 2007 -0500 msi: Only double the returned size when szValueBuf is NULL. --- dlls/msi/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index bb473cd..e9b6309 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1477,7 +1477,7 @@ static UINT MSI_GetProperty( MSIHANDLE handle, LPCWSTR name, r = msi_strcpy_to_awstring( value, szValueBuf, pchValueBuf ); /* Bug required by Adobe installers */ - if (!szValueBuf->unicode) + if (!szValueBuf->unicode && !szValueBuf->str.a) *pchValueBuf *= sizeof(WCHAR); done:

1 0

Alexandre Julliard : progman: Remove the obsolete Xx.rc file.
by Alexandre Julliard Oct. 16, 2007

Oct. 16, 2007

Module: wine Branch: master Commit: d4ea51ddc941df92fc3f33d7a870e47dddb5d388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4ea51ddc941df92fc3f33d7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 16 12:45:07 2007 +0200 progman: Remove the obsolete Xx.rc file. --- programs/progman/Xx.rc | 312 ------------------------------------------------ 1 files changed, 0 insertions(+), 312 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d4ea51ddc941df92fc3f3…

1 0

Daniel Nylander : shdoclc: Update Swedish translation.
by Alexandre Julliard Oct. 16, 2007

Oct. 16, 2007

Module: wine Branch: master Commit: 47937b3ec1b90bcd360dc8f497d0d225f7c3a556 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47937b3ec1b90bcd360dc8f49… Author: Daniel Nylander <po(a)danielnylander.se> Date: Mon Oct 15 22:23:53 2007 +0200 shdoclc: Update Swedish translation. --- dlls/shdoclc/Sv.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shdoclc/Sv.rc b/dlls/shdoclc/Sv.rc index 91e2e22..af593c4 100644 --- a/dlls/shdoclc/Sv.rc +++ b/dlls/shdoclc/Sv.rc @@ -44,7 +44,7 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "Upp&datera", _IDM_REFRESH MENUITEM SEPARATOR MENUITEM SEPARATOR - MENUITEM "&Egenskapar", IDM_PROPERTIES + MENUITEM "&Egenskaper", IDM_PROPERTIES } POPUP "Bild" @@ -198,12 +198,12 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "Dump DisplayTree", IDM_DUMPDISPLAYTREE MENUITEM "Dump FormatCaches", IDM_DUMPFORMATCACHES MENUITEM "Dump LayoutRects", IDM_DUMPLAYOUTRECTS - MENUITEM "Memory Monitor", IDM_MEMORYMONITOR - MENUITEM "Performance Meters", IDM_PERFORMANCEMETERS - MENUITEM "Save HTML", IDM_SAVEHTML + MENUITEM "Minnesm�tare", IDM_MEMORYMONITOR + MENUITEM "Prestandam�tare", IDM_PERFORMANCEMETERS + MENUITEM "Spara HTML", IDM_SAVEHTML MENUITEM SEPARATOR - MENUITEM "&Browse View", IDM_BROWSEMODE - MENUITEM "&Edit View", IDM_EDITMODE + MENUITEM "&Bl�ddra vy", IDM_BROWSEMODE + MENUITEM "R&edigera vy", IDM_EDITMODE } POPUP "Vertikal rullningslist"

1 0