wine-commits April 2009

wine-commits@winehq.org

2 participants
664 discussions

Aric Stewart : advapi32: Handle fully qualified account names for well known sids in LookupAccountName .
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: 9d9a684ef6cb9bf70235594e81de1e3b0387beeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9a684ef6cb9bf70235594e8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 31 09:00:11 2009 -0500 advapi32: Handle fully qualified account names for well known sids in LookupAccountName. --- dlls/advapi32/security.c | 17 +++++++++++++++-- dlls/advapi32/tests/security.c | 7 +++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index a26e81a..f8715e0 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2651,6 +2651,8 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI DWORD nameLen; LPWSTR userName = NULL; LPCWSTR domainName; + LPCWSTR lpAccountNamePtr; + LPCWSTR lpDomainNamePtr = NULL; FIXME("%s %s %p %p %p %p %p - stub\n", debugstr_w(lpSystemName), debugstr_w(lpAccountName), Sid, cbSid, ReferencedDomainName, cchReferencedDomainName, peUse); @@ -2667,11 +2669,22 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI } /* Check well known SIDs first */ + if ((lpAccountNamePtr = strrchrW(lpAccountName,'\\'))) + { + lpAccountNamePtr++; + lpDomainNamePtr = lpAccountName; + } + else + lpAccountNamePtr = lpAccountName; for (i = 0; i < (sizeof(ACCOUNT_SIDS) / sizeof(ACCOUNT_SIDS[0])); i++) { - if (!strcmpiW(lpAccountName, ACCOUNT_SIDS[i].account) || - (ACCOUNT_SIDS[i].alias && !strcmpiW(lpAccountName, ACCOUNT_SIDS[i].alias))) + /* check domain first */ + if (lpDomainNamePtr && (strncmpiW(lpDomainNamePtr, ACCOUNT_SIDS[i].domain, strlenW(ACCOUNT_SIDS[i].domain)) || lpDomainNamePtr[strlenW(ACCOUNT_SIDS[i].domain)]!='\\')) + continue; + + if (!strcmpiW(lpAccountNamePtr, ACCOUNT_SIDS[i].account) || + (ACCOUNT_SIDS[i].alias && !strcmpiW(lpAccountNamePtr, ACCOUNT_SIDS[i].alias))) { DWORD sidLen = SECURITY_MAX_SID_SIZE; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e557c1f..f264fd8 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1982,6 +1982,13 @@ static void test_LookupAccountName(void) /* case insensitivity */ check_wellknown_name("lOCAlServICE", WinLocalServiceSid); + + /* fully qualified account names */ + check_wellknown_name("NT AUTHORITY\\LocalService", WinLocalServiceSid); + check_wellknown_name("nt authority\\Network Service", WinNetworkServiceSid); + check_wellknown_name("nt authority test\\Network Service", 0); + check_wellknown_name("Dummy\\Network Service", 0); + check_wellknown_name("ntauthority\\Network Service", 0); } static void test_security_descriptor(void)

1 0

Aric Stewart : advapi32: Modify check_well_known_name test to be more robust on more Windows platforms .
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: b540d57c3977b6b24cdadbfca7be406e5610c0c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b540d57c3977b6b24cdadbfca… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 31 08:59:54 2009 -0500 advapi32: Modify check_well_known_name test to be more robust on more Windows platforms. Thanks to Paul Vriens for pointing out the need for this. --- dlls/advapi32/tests/security.c | 76 +++++++++++++++++++++++++++------------ 1 files changed, 52 insertions(+), 24 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index dd6879d..e557c1f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1700,11 +1700,16 @@ static void get_sid_info(PSID psid, LPSTR *user, LPSTR *dom) LookupAccountSidA(NULL, psid, account, &size, domain, &dom_size, &use); } -static void check_wellknown_name(const char* name, const char* exp_account, int exp_size, SID_NAME_USE exp_use, BOOL exp_succ) +static void check_wellknown_name(const char* name, WELL_KNOWN_SID_TYPE result) { + SID_IDENTIFIER_AUTHORITY ident = { SECURITY_NT_AUTHORITY }; + PSID domainsid; + char wk_sid[SECURITY_MAX_SID_SIZE]; + DWORD cb; + DWORD sid_size, domain_size; SID_NAME_USE sid_use; - LPSTR domain, account, sid_dom; + LPSTR domain, account, sid_domain, wk_domain, wk_account; PSID psid; BOOL ret; @@ -1715,20 +1720,31 @@ static void check_wellknown_name(const char* name, const char* exp_account, int domain = HeapAlloc(GetProcessHeap(),0,domain_size); ret = LookupAccountNameA(NULL, name, psid, &sid_size, domain, &domain_size, &sid_use); - get_sid_info(psid, &account, &sid_dom); - - if (!exp_succ) + if (!result) { ok(!ret, " %s Should have failed to lookup account name\n",name); return; } + + AllocateAndInitializeSid(&ident, 6, SECURITY_NT_NON_UNIQUE, 12, 23, 34, 45, 56, 0, 0, &domainsid); + cb = sizeof(wk_sid); + if (!pCreateWellKnownSid(result, domainsid, wk_sid, &cb)) + { + win_skip("SID %i is not avalable on the system\n",result); + return; + } + + get_sid_info(psid, &account, &sid_domain); + get_sid_info(wk_sid, &wk_account, &wk_domain); + ok(ret, "Failed to lookup account name %s\n",name); ok(sid_size != 0, "sid_size was zero\n"); - ok(!lstrcmp(account, exp_account), "Expected %s , got %s\n", exp_account, account); - ok(!lstrcmp(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain); - ok(domain_size == exp_size, "Expected %i, got %d\n", exp_size, domain_size); - ok(lstrlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size); - ok(sid_use == exp_use, "Expected (%d), got %d\n", exp_use, sid_use); + + ok(EqualSid(psid,wk_sid),"(%s) Sids fail to match well known sid!\n",name); + + ok(!lstrcmp(account, wk_account), "Expected %s , got %s\n", account, wk_account); + ok(!lstrcmp(domain, wk_domain), "Expected %s, got %s\n", wk_domain, domain); + ok(sid_use == SidTypeWellKnownGroup , "Expected Use (5), got %d\n", sid_use); HeapFree(GetProcessHeap(),0,psid); HeapFree(GetProcessHeap(),0,domain); @@ -1934,26 +1950,38 @@ static void test_LookupAccountName(void) } /* Well Known names */ - check_wellknown_name("LocalService", "LOCAL SERVICE", 12, SidTypeWellKnownGroup, TRUE); - check_wellknown_name("Local Service", "LOCAL SERVICE", 12, SidTypeWellKnownGroup, TRUE); + if (!pCreateWellKnownSid) + { + win_skip("CreateWellKnownSid not available\n"); + return; + } + + if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + { + skip("Non-english locale (skipping well know name creation tests)\n"); + return; + } + + check_wellknown_name("LocalService", WinLocalServiceSid); + check_wellknown_name("Local Service", WinLocalServiceSid); /* 2 spaces */ - check_wellknown_name("Local Service", "", 0, 0, FALSE); - check_wellknown_name("NetworkService", "NETWORK SERVICE", 12, SidTypeWellKnownGroup, TRUE); - check_wellknown_name("Network Service", "NETWORK SERVICE", 12, SidTypeWellKnownGroup, TRUE); + check_wellknown_name("Local Service", 0); + check_wellknown_name("NetworkService", WinNetworkServiceSid); + check_wellknown_name("Network Service", WinNetworkServiceSid); /* example of some names where the spaces are not optional */ - check_wellknown_name("Terminal Server User", "TERMINAL SERVER USER", 12, SidTypeWellKnownGroup, TRUE); - check_wellknown_name("TerminalServer User", "", 0, 0, FALSE); - check_wellknown_name("TerminalServerUser", "", 0, 0, FALSE); - check_wellknown_name("Terminal ServerUser", "", 0, 0, FALSE); + check_wellknown_name("Terminal Server User", WinTerminalServerSid); + check_wellknown_name("TerminalServer User", 0); + check_wellknown_name("TerminalServerUser", 0); + check_wellknown_name("Terminal ServerUser", 0); - check_wellknown_name("enterprise domain controllers", "ENTERPRISE DOMAIN CONTROLLERS", 12, SidTypeWellKnownGroup, TRUE); - check_wellknown_name("enterprisedomain controllers", "", 0, 0, FALSE); - check_wellknown_name("enterprise domaincontrollers", "", 0, 0, FALSE); - check_wellknown_name("enterprisedomaincontrollers", "", 0, 0, FALSE); + check_wellknown_name("enterprise domain controllers",WinEnterpriseControllersSid); + check_wellknown_name("enterprisedomain controllers", 0); + check_wellknown_name("enterprise domaincontrollers", 0); + check_wellknown_name("enterprisedomaincontrollers", 0); /* case insensitivity */ - check_wellknown_name("lOCAlServICE", "LOCAL SERVICE", 12, SidTypeWellKnownGroup, TRUE); + check_wellknown_name("lOCAlServICE", WinLocalServiceSid); } static void test_security_descriptor(void)

1 0

Alexandre Julliard : ntdll: Define dvd_struct ourselves since it' s not consistent across platforms.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: c5dadf4739ed92d4839029078e0ef2c12d7e81b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5dadf4739ed92d4839029078… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 12:37:32 2009 +0200 ntdll: Define dvd_struct ourselves since it's not consistent across platforms. --- dlls/ntdll/cdrom.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index a967f9c..574f737 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1939,7 +1939,15 @@ static NTSTATUS DVD_GetRegion(int dev, PDVD_REGION region) static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, PDVD_LAYER_DESCRIPTOR layer) { #ifdef DVD_READ_STRUCT - dvd_struct s; + /* dvd_struct is not defined consistently across platforms */ + union + { + struct dvd_physical physical; + struct dvd_copyright copyright; + struct dvd_disckey disckey; + struct dvd_bca bca; + struct dvd_manufact manufact; + } s; if (structure->BlockByteOffset.u.HighPart || structure->BlockByteOffset.u.LowPart) FIXME(": BlockByteOffset is not handled\n"); @@ -1947,26 +1955,26 @@ static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, switch (structure->Format) { case DvdPhysicalDescriptor: - s.type = DVD_STRUCT_PHYSICAL; + s.physical.type = DVD_STRUCT_PHYSICAL; s.physical.layer_num = structure->LayerNumber; break; case DvdCopyrightDescriptor: - s.type = DVD_STRUCT_COPYRIGHT; + s.copyright.type = DVD_STRUCT_COPYRIGHT; s.copyright.layer_num = structure->LayerNumber; break; case DvdDiskKeyDescriptor: - s.type = DVD_STRUCT_DISCKEY; + s.disckey.type = DVD_STRUCT_DISCKEY; s.disckey.agid = structure->SessionId; break; case DvdBCADescriptor: - s.type = DVD_STRUCT_BCA; + s.bca.type = DVD_STRUCT_BCA; break; case DvdManufacturerDescriptor: - s.type = DVD_STRUCT_MANUFACT; + s.manufact.type = DVD_STRUCT_MANUFACT; s.manufact.layer_num = structure->LayerNumber; break;

1 0

Alexandre Julliard : ntdll: Add separate signal definitions for OpenBSD.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: 129d83fffb9b97d38098ec6bcfa479cc08c04cfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=129d83fffb9b97d38098ec6bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 12:37:05 2009 +0200 ntdll: Add separate signal definitions for OpenBSD. --- dlls/ntdll/signal_i386.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 07f68f1..502195f 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -199,7 +199,7 @@ typedef struct trapframe SIGCONTEXT; #endif /* bsdi */ -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) typedef struct sigcontext SIGCONTEXT; @@ -228,7 +228,41 @@ typedef struct sigcontext SIGCONTEXT; #define FPU_sig(context) NULL /* FIXME */ #define FPUX_sig(context) NULL /* FIXME */ -#endif /* *BSD */ +#endif /* __FreeBSD__ */ + +#ifdef __OpenBSD__ + +typedef struct sigcontext SIGCONTEXT; + +#define EAX_sig(context) ((context)->sc_eax) +#define EBX_sig(context) ((context)->sc_ebx) +#define ECX_sig(context) ((context)->sc_ecx) +#define EDX_sig(context) ((context)->sc_edx) +#define ESI_sig(context) ((context)->sc_esi) +#define EDI_sig(context) ((context)->sc_edi) +#define EBP_sig(context) ((context)->sc_ebp) + +#define CS_sig(context) ((context)->sc_cs) +#define DS_sig(context) ((context)->sc_ds) +#define ES_sig(context) ((context)->sc_es) +#define FS_sig(context) ((context)->sc_fs) +#define GS_sig(context) ((context)->sc_gs) +#define SS_sig(context) ((context)->sc_ss) + +#define TRAP_sig(context) ((context)->sc_trapno) +#define ERROR_sig(context) ((context)->sc_err) +#define EFL_sig(context) ((context)->sc_eflags) + +#define EIP_sig(context) ((context)->sc_eip) +#define ESP_sig(context) ((context)->sc_esp) + +#define FPU_sig(context) NULL /* FIXME */ +#define FPUX_sig(context) NULL /* FIXME */ + +#define T_MCHK T_MACHK +#define T_XMMFLT T_XFTRAP + +#endif /* __OpenBSD__ */ #if defined(__svr4__) || defined(_SCO_DS) || defined(__sun)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2009