August 2006 - Wine-commits - list.winehq.org

Mike McCormack : ole32: Always set pcbWritten when writing a stream.
by Alexandre Julliard 14 Aug '06

14 Aug '06

Module: wine Branch: master Commit: 8dc5bd8e2979323a3146b986f1657d6447a4e732 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8dc5bd8e2979323a3146b98… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Aug 14 14:06:53 2006 +0900 ole32: Always set pcbWritten when writing a stream. --- dlls/ole32/hglobalstream.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index 1ae7247..eb2af30 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -287,8 +287,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_ ULARGE_INTEGER newSize; ULONG bytesWritten = 0; - TRACE("(%p, %p, %ld, %p)\n", iface, - pv, cb, pcbWritten); + TRACE("(%p, %p, %ld, %p)\n", iface, pv, cb, pcbWritten); /* * If the caller is not interested in the number of bytes written, @@ -298,14 +297,10 @@ static HRESULT WINAPI HGLOBALStreamImpl_ pcbWritten = &bytesWritten; if (cb == 0) - { - return S_OK; - } - else - { - newSize.u.HighPart = 0; - newSize.u.LowPart = This->currentPosition.u.LowPart + cb; - } + goto out; + + newSize.u.HighPart = 0; + newSize.u.LowPart = This->currentPosition.u.LowPart + cb; /* * Verify if we need to grow the stream @@ -334,14 +329,15 @@ static HRESULT WINAPI HGLOBALStreamImpl_ This->currentPosition.u.LowPart+=cb; /* - * Return the number of bytes read. + * Cleanup */ - *pcbWritten = cb; + GlobalUnlock(This->supportHandle); +out: /* - * Cleanup + * Return the number of bytes read. */ - GlobalUnlock(This->supportHandle); + *pcbWritten = cb; return S_OK; }

1 0

Mike McCormack : oleaut32: Don't complain when PICTDESC-> cbSizeofstruct is 0.
by Alexandre Julliard 14 Aug '06

14 Aug '06

Module: wine Branch: master Commit: bcb3e28e2bc61fd809505df28e03e64f10aed4ac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bcb3e28e2bc61fd809505df… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Aug 14 14:07:05 2006 +0900 oleaut32: Don't complain when PICTDESC->cbSizeofstruct is 0. --- dlls/oleaut32/olepicture.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 927c85c..83ef0aa 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -308,12 +308,8 @@ static OLEPictureImpl* OLEPictureImpl_Co newObject->bIsDirty = FALSE; if (pictDesc) { - if(pictDesc->cbSizeofstruct != sizeof(PICTDESC)) { - FIXME("struct size = %d\n", pictDesc->cbSizeofstruct); - } memcpy(&newObject->desc, pictDesc, sizeof(PICTDESC)); - switch(pictDesc->picType) { case PICTYPE_BITMAP: OLEPictureImpl_SetBitmap(newObject);

1 0

Mike McCormack : oleaut32: Print an IID in the trace, not just a pointer to it.
by Alexandre Julliard 14 Aug '06

14 Aug '06

Module: wine Branch: master Commit: cbfc35602e0fad386f01b2fed4715765f6536498 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cbfc35602e0fad386f01b2f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Aug 14 14:07:14 2006 +0900 oleaut32: Print an IID in the trace, not just a pointer to it. --- dlls/oleaut32/olepicture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 83ef0aa..66a76df 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -2228,7 +2228,7 @@ HRESULT WINAPI OleCreatePictureIndirect( OLEPictureImpl* newPict = NULL; HRESULT hr = S_OK; - TRACE("(%p,%p,%d,%p)\n", lpPictDesc, riid, fOwn, ppvObj); + TRACE("(%p,%s,%d,%p)\n", lpPictDesc, debugstr_guid(riid), fOwn, ppvObj); /* * Sanity check

1 0

Hwang YunSong(황윤성) : view: Updated Korean resource.
by Alexandre Julliard 14 Aug '06

14 Aug '06

Module: wine Branch: master Commit: a0ad98a26f0e3f1a0e384a9090454bc5065f4994 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a0ad98a26f0e3f1a0e384a9… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Aug 14 08:54:37 2006 +0900 view: Updated Korean resource. --- programs/view/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/view/Ko.rc b/programs/view/Ko.rc index 90d801c..e0e64a7 100644 --- a/programs/view/Ko.rc +++ b/programs/view/Ko.rc @@ -47,7 +47,7 @@ BEGIN END POPUP "��(&I)" BEGIN - MENUITEM "&Hello", IDM_HELLO + MENUITEM "�ȳ��ϼ��(&H)", IDM_HELLO END END

1 0

Frank Richter : uxtheme: Don't back up colors etc. when a theme is already active.
by Alexandre Julliard 14 Aug '06

14 Aug '06

Module: wine Branch: master Commit: 83974b21fa2bde6fbfc066594648642ea8d39c34 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=83974b21fa2bde6fbfc0665… Author: Frank Richter <frank.richter(a)gmail.com> Date: Mon Aug 14 03:19:48 2006 +0200 uxtheme: Don't back up colors etc. when a theme is already active. --- dlls/uxtheme/system.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 4799072..347074c 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -412,7 +412,7 @@ HRESULT UXTHEME_SetActiveTheme(PTHEME_FI WCHAR tmp[2]; HRESULT hr; - if(tf) UXTHEME_BackupSystemMetrics(); + if(tf && !bThemeActive) UXTHEME_BackupSystemMetrics(); hr = MSSTYLES_SetActiveTheme(tf, TRUE); if(FAILED(hr)) return hr;

1 0

Robert Reif : advapi32: Add more SIDs to AccountLookupSid.
by Alexandre Julliard 14 Aug '06

14 Aug '06

Module: wine Branch: master Commit: 0f3cd3f22405a393d0326de924bd39e2f98deac8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0f3cd3f22405a393d0326de… Author: Robert Reif <reif(a)earthlink.net> Date: Sat Aug 12 08:00:34 2006 -0400 advapi32: Add more SIDs to AccountLookupSid. --- dlls/advapi32/security.c | 78 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 60 insertions(+), 18 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 4e54c72..4c55f56 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1,6 +1,7 @@ /* * Copyright 1999, 2000 Juergen Schmied <juergen.schmied(a)debitel.net> * Copyright 2003 CodeWeavers Inc. (Ulrich Czekalla) + * Copyright 2006 Robert Reif * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -142,6 +143,7 @@ static const WCHAR Backup_Operators[] = static const WCHAR BATCH[] = { 'B','A','T','C','H',0 }; static const WCHAR Blank[] = { 0 }; static const WCHAR BUILTIN[] = { 'B','U','I','L','T','I','N',0 }; +static const WCHAR Cert_Publishers[] = { 'C','e','r','t',' ','P','u','b','l','i','s','h','e','r','s',0 }; static const WCHAR CREATOR_GROUP[] = { 'C','R','E','A','T','O','R',' ','G','R','O','U','P',0 }; static const WCHAR CREATOR_GROUP_SERVER[] = { 'C','R','E','A','T','O','R',' ','G','R','O','U','P',' ','S','E','R','V','E','R',0 }; static const WCHAR CREATOR_OWNER[] = { 'C','R','E','A','T','O','R',' ','O','W','N','E','R',0 }; @@ -149,8 +151,15 @@ static const WCHAR CREATOR_OWNER_SERVER[ static const WCHAR DIALUP[] = { 'D','I','A','L','U','P',0 }; static const WCHAR Digest_Authentication[] = { 'D','i','g','e','s','t',' ','A','u','t','h','e','n','t','i','c','a','t','i','o','n',0 }; static const WCHAR DOMAIN[] = {'D','O','M','A','I','N',0}; +static const WCHAR Domain_Admins[] = { 'D','o','m','a','i','n',' ','A','d','m','i','n','s',0 }; +static const WCHAR Domain_Computers[] = { 'D','o','m','a','i','n',' ','C','o','m','p','u','t','e','r','s',0 }; +static const WCHAR Domain_Controllers[] = { 'D','o','m','a','i','n',' ','C','o','n','t','r','o','l','l','e','r','s',0 }; +static const WCHAR Domain_Guests[] = { 'D','o','m','a','i','n',' ','G','u','e','s','t','s',0 }; +static const WCHAR Domain_Users[] = { 'D','o','m','a','i','n',' ','U','s','e','r','s',0 }; +static const WCHAR Enterprise_Admins[] = { 'E','n','t','e','r','p','r','i','s','e',' ','A','d','m','i','n','s',0 }; static const WCHAR ENTERPRISE_DOMAIN_CONTROLLERS[] = { 'E','N','T','E','R','P','R','I','S','E',' ','D','O','M','A','I','N',' ','C','O','N','T','R','O','L','L','E','R','S',0 }; static const WCHAR Everyone[] = { 'E','v','e','r','y','o','n','e',0 }; +static const WCHAR Group_Policy_Creator_Owners[] = { 'G','r','o','u','p',' ','P','o','l','i','c','y',' ','C','r','e','a','t','o','r',' ','O','w','n','e','r','s',0 }; static const WCHAR Guest[] = { 'G','u','e','s','t',0 }; static const WCHAR Guests[] = { 'G','u','e','s','t','s',0 }; static const WCHAR INTERACTIVE[] = { 'I','N','T','E','R','A','C','T','I','V','E',0 }; @@ -170,11 +179,13 @@ static const WCHAR Power_Users[] = { 'P' static const WCHAR Pre_Windows_2000_Compatible_Access[] = { 'P','r','e','-','W','i','n','d','o','w','s',' ','2','0','0','0',' ','C','o','m','p','a','t','i','b','l','e',' ','A','c','c','e','s','s',0 }; static const WCHAR Print_Operators[] = { 'P','r','i','n','t',' ','O','p','e','r','a','t','o','r','s',0 }; static const WCHAR PROXY[] = { 'P','R','O','X','Y',0 }; +static const WCHAR RAS_and_IAS_Servers[] = { 'R','A','S',' ','a','n','d',' ','I','A','S',' ','S','e','r','v','e','r','s',0 }; static const WCHAR Remote_Desktop_Users[] = { 'R','e','m','o','t','e',' ','D','e','s','k','t','o','p',' ','U','s','e','r','s',0 }; static const WCHAR REMOTE_INTERACTIVE_LOGON[] = { 'R','E','M','O','T','E',' ','I','N','T','E','R','A','C','T','I','V','E',' ','L','O','G','O','N',0 }; static const WCHAR Replicators[] = { 'R','e','p','l','i','c','a','t','o','r','s',0 }; static const WCHAR RESTRICTED[] = { 'R','E','S','T','R','I','C','T','E','D',0 }; static const WCHAR SChannel_Authentication[] = { 'S','C','h','a','n','n','e','l',' ','A','u','t','h','e','n','t','i','c','a','t','i','o','n',0 }; +static const WCHAR Schema_Admins[] = { 'S','c','h','e','m','a',' ','A','d','m','i','n','s',0 }; static const WCHAR SELF[] = { 'S','E','L','F',0 }; static const WCHAR Server_Operators[] = { 'S','e','r','v','e','r',' ','O','p','e','r','a','t','o','r','s',0 }; static const WCHAR SERVICE[] = { 'S','E','R','V','I','C','E',0 }; @@ -218,7 +229,7 @@ static const AccountSid ACCOUNT_SIDS[] = { WinBuiltinPrintOperatorsSid, Print_Operators, BUILTIN, SidTypeAlias }, { WinBuiltinBackupOperatorsSid, Backup_Operators, BUILTIN, SidTypeAlias }, { WinBuiltinReplicatorSid, Replicators, BUILTIN, SidTypeAlias }, - { WinBuiltinPreWindows2000CompatibleAccessSid, Pre_Windows_2000_Compatible_Access, BUILTIN, SidTypeAlias }, + { WinBuiltinPreWindows2000CompatibleAccessSid, Pre_Windows_2000_Compatible_Access, BUILTIN, SidTypeAlias }, { WinBuiltinRemoteDesktopUsersSid, Remote_Desktop_Users, BUILTIN, SidTypeAlias }, { WinBuiltinNetworkConfigurationOperatorsSid, Network_Configuration_Operators, BUILTIN, SidTypeAlias }, { WinNTLMAuthenticationSid, NTML_Authentication, NT_AUTHORITY, SidTypeWellKnownGroup }, @@ -1909,8 +1920,6 @@ LookupAccountSidW( if (dm == NULL) { MAX_SID local; - MAX_SID admin; - MAX_SID guest; /* check for the local computer next */ if (ADVAPI_GetComputerSid(&local)) { @@ -1921,25 +1930,58 @@ LookupAccountSidW( result = GetComputerNameW(computer_name, &size); if (result) { - CopySid(GetSidLengthRequired(local.SubAuthorityCount), &admin, &local); - admin.SubAuthorityCount++; - admin.SubAuthority[4] = DOMAIN_USER_RID_ADMIN; - CopySid(GetSidLengthRequired(local.SubAuthorityCount), &guest, &local); - guest.SubAuthorityCount++; - guest.SubAuthority[4] = DOMAIN_USER_RID_GUEST; - if (EqualSid(sid, &local)) { dm = computer_name; ac = Blank; use = 3; - } else if (EqualSid(sid, &admin)) { - dm = computer_name; - ac = Administrator; - use = 1; - } else if (EqualSid(sid, &guest)) { - dm = computer_name; - ac = Guest; - use = 1; + } else { + local.SubAuthorityCount++; + + if (EqualPrefixSid(sid, &local)) { + dm = computer_name; + use = 1; + switch (((MAX_SID *)sid)->SubAuthority[4]) { + case DOMAIN_USER_RID_ADMIN: + ac = Administrator; + break; + case DOMAIN_USER_RID_GUEST: + ac = Guest; + break; + case DOMAIN_GROUP_RID_ADMINS: + ac = Domain_Admins; + break; + case DOMAIN_GROUP_RID_USERS: + ac = Domain_Users; + break; + case DOMAIN_GROUP_RID_GUESTS: + ac = Domain_Guests; + break; + case DOMAIN_GROUP_RID_COMPUTERS: + ac = Domain_Computers; + break; + case DOMAIN_GROUP_RID_CONTROLLERS: + ac = Domain_Controllers; + break; + case DOMAIN_GROUP_RID_CERT_ADMINS: + ac = Cert_Publishers; + break; + case DOMAIN_GROUP_RID_SCHEMA_ADMINS: + ac = Schema_Admins; + break; + case DOMAIN_GROUP_RID_ENTERPRISE_ADMINS: + ac = Enterprise_Admins; + break; + case DOMAIN_GROUP_RID_POLICY_ADMINS: + ac = Group_Policy_Creator_Owners; + break; + case DOMAIN_ALIAS_RID_RAS_SERVERS: + ac = RAS_and_IAS_Servers; + break; + default: + dm = NULL; + break; + } + } } } }

1 0

Robert Reif : advapi32: Add more LookupAccountSid tests.
by Alexandre Julliard 14 Aug '06

14 Aug '06

Module: wine Branch: master Commit: aea864ce6142d7cf381690371536a829439103fa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aea864ce6142d7cf3816903… Author: Robert Reif <reif(a)earthlink.net> Date: Sat Aug 12 08:27:57 2006 -0400 advapi32: Add more LookupAccountSid tests. --- dlls/advapi32/tests/security.c | 124 ++++++++++++++++++---------------------- 1 files changed, 56 insertions(+), 68 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 07f4855..4aa6e79 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -195,6 +195,7 @@ static void test_sid(void) LocalFree( psid ); } + trace("String SIDs:\n"); test_str_sid("AO"); test_str_sid("RU"); test_str_sid("AN"); @@ -846,6 +847,34 @@ static void test_token_attr(void) } } +typedef union _MAX_SID +{ + SID sid; + char max[SECURITY_MAX_SID_SIZE]; +} MAX_SID; + +static void test_sid_str(PSID * sid) +{ + char *str_sid; + BOOL ret = pConvertSidToStringSidA(sid, &str_sid); + ok(ret, "ConvertSidToStringSidA() failed: %ld\n", GetLastError()); + if (ret) + { + char account[MAX_PATH], domain[MAX_PATH]; + SID_NAME_USE use; + DWORD acc_size = MAX_PATH; + DWORD dom_size = MAX_PATH; + ret = LookupAccountSid(NULL, sid, account, &acc_size, domain, &dom_size, &use); + ok(ret || (!ret && (GetLastError() == ERROR_NONE_MAPPED)), + "LookupAccountSid(%s) failed: %ld\n", str_sid, GetLastError()); + if (ret) + trace(" %s %s\\%s %d\n", str_sid, domain, account, use); + else if (GetLastError() == ERROR_NONE_MAPPED) + trace(" %s Couldn't me mapped\n", str_sid); + LocalFree(str_sid); + } +} + static void test_LookupAccountSid(void) { SID_IDENTIFIER_AUTHORITY SIDAuthNT = { SECURITY_NT_AUTHORITY }; @@ -855,11 +884,7 @@ static void test_LookupAccountSid(void) SID_NAME_USE use; BOOL ret; DWORD size; - union u - { - SID sid; - char max[SECURITY_MAX_SID_SIZE]; - } max_sid; + MAX_SID max_sid; char *str_sid; int i; @@ -931,72 +956,35 @@ static void test_LookupAccountSid(void) if (info->DomainSid) { int count = *GetSidSubAuthorityCount(info->DomainSid); - int len = GetSidLengthRequired(count); - - CopySid(len, &max_sid, info->DomainSid); - - ret = pConvertSidToStringSidA(&max_sid.sid, &str_sid); - ok(ret, "ConvertSidToStringSidA() failed: %ld\n", GetLastError()); - if (ret) - { - acc_size = MAX_PATH; - dom_size = MAX_PATH; - ret = LookupAccountSid(NULL, &max_sid.sid, account, &acc_size, domain, &dom_size, &use); - ok(ret, "LookupAccountSid(%s) failed: %ld\n", str_sid, GetLastError()); - if (ret) - trace(" %s %s\\%s %d\n", str_sid, domain, account, use); - LocalFree(str_sid); - } - + CopySid(GetSidLengthRequired(count), &max_sid, info->DomainSid); + test_sid_str((PSID)&max_sid.sid); max_sid.sid.SubAuthority[count] = DOMAIN_USER_RID_ADMIN; max_sid.sid.SubAuthorityCount = count + 1; - - ret = pConvertSidToStringSidA(&max_sid.sid, &str_sid); - ok(ret, "ConvertSidToStringSidA() failed: %ld\n", GetLastError()); - if (ret) - { - acc_size = MAX_PATH; - dom_size = MAX_PATH; - ret = LookupAccountSid(NULL, &max_sid.sid, account, &acc_size, domain, &dom_size, &use); - ok(ret, "LookupAccountSid(%s) failed: %ld\n", str_sid, GetLastError()); - if (ret) - trace(" %s %s\\%s %d\n", str_sid, domain, account, use); - LocalFree(str_sid); - } - + test_sid_str((PSID)&max_sid.sid); max_sid.sid.SubAuthority[count] = DOMAIN_USER_RID_GUEST; - max_sid.sid.SubAuthorityCount = count + 1; - - ret = pConvertSidToStringSidA(&max_sid.sid, &str_sid); - ok(ret, "ConvertSidToStringSidA() failed: %ld\n", GetLastError()); - if (ret) - { - acc_size = MAX_PATH; - dom_size = MAX_PATH; - ret = LookupAccountSid(NULL, &max_sid.sid, account, &acc_size, domain, &dom_size, &use); - ok(ret, "LookupAccountSid(%s) failed: %ld\n", str_sid, GetLastError()); - if (ret) - trace(" %s %s\\%s %d\n", str_sid, domain, account, use); - LocalFree(str_sid); - } - - max_sid.sid.SubAuthority[count] = 1000; - max_sid.sid.SubAuthorityCount = count + 1; - - ret = pConvertSidToStringSidA(&max_sid.sid, &str_sid); - ok(ret, "ConvertSidToStringSidA() failed: %ld\n", GetLastError()); - if (ret) - { - acc_size = MAX_PATH; - dom_size = MAX_PATH; - ret = LookupAccountSid(NULL, &max_sid.sid, account, &acc_size, domain, &dom_size, &use); - /* this can fail if no user accounts exist */ - if (ret) - trace(" %s %s\\%s %d\n", str_sid, domain, account, use); - else - trace("LookupAccountSid(%s) failed: %ld\n", str_sid, GetLastError()); - LocalFree(str_sid); - } + test_sid_str((PSID)&max_sid.sid); + max_sid.sid.SubAuthority[count] = DOMAIN_GROUP_RID_ADMINS; + test_sid_str((PSID)&max_sid.sid); + max_sid.sid.SubAuthority[count] = DOMAIN_GROUP_RID_USERS; + test_sid_str((PSID)&max_sid.sid); + max_sid.sid.SubAuthority[count] = DOMAIN_GROUP_RID_GUESTS; + test_sid_str((PSID)&max_sid.sid); + max_sid.sid.SubAuthority[count] = DOMAIN_GROUP_RID_COMPUTERS; + test_sid_str((PSID)&max_sid.sid); + max_sid.sid.SubAuthority[count] = DOMAIN_GROUP_RID_CONTROLLERS; + test_sid_str((PSID)&max_sid.sid); + max_sid.sid.SubAuthority[count] = DOMAIN_GROUP_RID_CERT_ADMINS; + test_sid_str((PSID)&max_sid.sid); + max_sid.sid.SubAuthority[count] = DOMAIN_GROUP_RID_SCHEMA_ADMINS; + test_sid_str((PSID)&max_sid.sid); + max_sid.sid.SubAuthority[count] = DOMAIN_GROUP_RID_ENTERPRISE_ADMINS; + test_sid_str((PSID)&max_sid.sid); + max_sid.sid.SubAuthority[count] = DOMAIN_GROUP_RID_POLICY_ADMINS; + test_sid_str((PSID)&max_sid.sid); + max_sid.sid.SubAuthority[count] = DOMAIN_ALIAS_RID_RAS_SERVERS; + test_sid_str((PSID)&max_sid.sid); + max_sid.sid.SubAuthority[count] = 1000; /* first user account */ + test_sid_str((PSID)&max_sid.sid); } pLsaFreeMemory((LPVOID)info);

1 0

Robert Reif : netapi32: NetUserModalsGet bug fixes and cleanup.
by Alexandre Julliard 14 Aug '06

14 Aug '06

Module: wine Branch: master Commit: d54043c028a8fb9c7b53d9996d7b298e9181b820 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d54043c028a8fb9c7b53d99… Author: Robert Reif <reif(a)earthlink.net> Date: Sat Aug 12 18:49:37 2006 -0400 netapi32: NetUserModalsGet bug fixes and cleanup. --- dlls/netapi32/access.c | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 92341a3..128f502 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -618,10 +618,11 @@ NET_API_STATUS WINAPI NetUserModalsGet( NTSTATUS ntStatus; PSID domainIdentifier = NULL; int domainNameLen; - + ZeroMemory(&objectAttributes, sizeof(objectAttributes)); - - ntStatus = LsaOpenPolicy(NULL, &objectAttributes, + objectAttributes.Length = sizeof(objectAttributes); + + ntStatus = LsaOpenPolicy(NULL, &objectAttributes, POLICY_VIEW_LOCAL_INFORMATION, &policyHandle); if (ntStatus != STATUS_SUCCESS) @@ -630,28 +631,29 @@ NET_API_STATUS WINAPI NetUserModalsGet( LsaNtStatusToWinError(ntStatus)); return ntStatus; } - - ntStatus = LsaQueryInformationPolicy(policyHandle, + + ntStatus = LsaQueryInformationPolicy(policyHandle, PolicyAccountDomainInformation, (PVOID *)&domainInfo); if (ntStatus != STATUS_SUCCESS) { WARN("LsaQueryInformationPolicy failed with NT status %lx\n", LsaNtStatusToWinError(ntStatus)); + LsaClose(policyHandle); return ntStatus; } - + domainIdentifier = domainInfo->DomainSid; domainNameLen = lstrlenW(domainInfo->DomainName.Buffer) + 1; LsaClose(policyHandle); - + ntStatus = NetApiBufferAllocate(sizeof(USER_MODALS_INFO_2) + GetLengthSid(domainIdentifier) + domainNameLen * sizeof(WCHAR), (LPVOID *)pbuffer); - + if (ntStatus != NERR_Success) - { + { WARN("NetApiBufferAllocate() failed\n"); LsaFreeMemory(domainInfo); return ntStatus; @@ -662,7 +664,7 @@ NET_API_STATUS WINAPI NetUserModalsGet( sizeof(USER_MODALS_INFO_2)); umi->usrmod2_domain_name = (LPWSTR)(*pbuffer + sizeof(USER_MODALS_INFO_2) + GetLengthSid(domainIdentifier)); - + lstrcpynW(umi->usrmod2_domain_name, domainInfo->DomainName.Buffer, domainNameLen); @@ -670,9 +672,9 @@ NET_API_STATUS WINAPI NetUserModalsGet( domainIdentifier); LsaFreeMemory(domainInfo); - + break; - } + } case 3: /* return lockout information */ FIXME("level 3 not implemented!\n"); @@ -683,6 +685,6 @@ NET_API_STATUS WINAPI NetUserModalsGet( *pbuffer = NULL; return ERROR_INVALID_LEVEL; } - + return NERR_Success; }

1 0

Andrew Talbot : winetest: Write-strings warnings fix.
by Alexandre Julliard 14 Aug '06

14 Aug '06

Module: wine Branch: master Commit: de92ffa3b7a4a58e94703d69f0e7ce3fc8dca71c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=de92ffa3b7a4a58e94703d6… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Aug 12 22:26:52 2006 +0100 winetest: Write-strings warnings fix. --- programs/winetest/main.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index e42ba66..20c25f4 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -623,15 +623,20 @@ int WINAPI WinMain (HINSTANCE hInst, HIN cmdLine = strtok (NULL, whitespace); } if (!submit) { + static CHAR platform_windows[] = "WINETEST_PLATFORM=windows", + debug_yes[] = "WINETEST_DEBUG=1", + interactive_no[] = "WINETEST_INTERACTIVE=0", + report_success_no[] = "WINETEST_REPORT_SUCCESS=0"; + report (R_STATUS, "Starting up"); if (!running_on_visible_desktop ()) report (R_FATAL, "Tests must be run on a visible desktop"); - if (reset_env && (putenv ("WINETEST_PLATFORM=windows") || - putenv ("WINETEST_DEBUG=1") || - putenv ("WINETEST_INTERACTIVE=0") || - putenv ("WINETEST_REPORT_SUCCESS=0"))) + if (reset_env && (putenv (platform_windows) || + putenv (debug_yes) || + putenv (interactive_no) || + putenv (report_success_no))) report (R_FATAL, "Could not reset environment: %d", errno); if (!tag) {

1 0

Andrew Talbot : advapi32/tests: Write-strings warnings fix.
by Alexandre Julliard 14 Aug '06

14 Aug '06

Module: wine Branch: master Commit: b843ce55c720e141ba139b10d3b6dcaac9c5eaca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b843ce55c720e141ba139b1… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun Aug 13 09:53:29 2006 +0100 advapi32/tests: Write-strings warnings fix. --- dlls/advapi32/tests/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3663738..07f4855 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -88,7 +88,7 @@ static void init(void) hmod = GetModuleHandle("advapi32.dll"); } -static void test_str_sid(char *str_sid) +static void test_str_sid(const char *str_sid) { PSID psid; char *temp;

1 0