September 2007 - Wine-commits

Mikolaj Zalewski : advapi32/ntdll: GetSecurityDescriptorOwner/ Group should fill isDefaulted also for NULL sids.
by Alexandre Julliard 28 Sep '07

28 Sep '07

Module: wine Branch: master Commit: 611f57bc20bc4acc2dc6ff902eeffc2d9f5ff2bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=611f57bc20bc4acc2dc6ff902… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Thu Sep 27 10:36:58 2007 -0700 advapi32/ntdll: GetSecurityDescriptorOwner/Group should fill isDefaulted also for NULL sids. --- dlls/advapi32/tests/security.c | 6 +++--- dlls/ntdll/sec.c | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 2e671df..15fc86e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1460,7 +1460,7 @@ static void test_security_descriptor(void) InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION); ok(GetSecurityDescriptorOwner(&sd, &psid, &isDefault), "GetSecurityDescriptorOwner failed\n"); expect_eq(psid, NULL, PSID, "%p"); - todo_wine expect_eq(isDefault, FALSE, BOOL, "%d"); + expect_eq(isDefault, FALSE, BOOL, "%d"); sd.Control |= SE_DACL_PRESENT | SE_SACL_PRESENT; SetLastError(0xdeadbeef); @@ -1473,10 +1473,10 @@ static void test_security_descriptor(void) expect_eq(MakeSelfRelativeSD(&sd, buf, &size), TRUE, BOOL, "%d"); ok(GetSecurityDescriptorOwner(&sd, &psid, &isDefault), "GetSecurityDescriptorOwner failed\n"); expect_eq(psid, NULL, PSID, "%p"); - todo_wine expect_eq(isDefault, FALSE, BOOL, "%d"); + expect_eq(isDefault, FALSE, BOOL, "%d"); ok(GetSecurityDescriptorGroup(&sd, &psid, &isDefault), "GetSecurityDescriptorOwner failed\n"); expect_eq(psid, NULL, PSID, "%p"); - todo_wine expect_eq(isDefault, FALSE, BOOL, "%d"); + expect_eq(isDefault, FALSE, BOOL, "%d"); ok(GetSecurityDescriptorDacl(&sd, &isPresent, &pacl, &isDefault), "GetSecurityDescriptorOwner failed\n"); expect_eq(isPresent, TRUE, BOOL, "%d"); expect_eq(psid, NULL, PSID, "%p"); diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 38ab402..e827efa 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -713,6 +713,11 @@ NTSTATUS WINAPI RtlGetOwnerSecurityDescriptor( if ( !lpsd || !Owner || !OwnerDefaulted ) return STATUS_INVALID_PARAMETER; + if ( lpsd->Control & SE_OWNER_DEFAULTED ) + *OwnerDefaulted = TRUE; + else + *OwnerDefaulted = FALSE; + if (lpsd->Owner != NULL) { if (lpsd->Control & SE_SELF_RELATIVE) @@ -720,10 +725,6 @@ NTSTATUS WINAPI RtlGetOwnerSecurityDescriptor( else *Owner = lpsd->Owner; - if ( lpsd->Control & SE_OWNER_DEFAULTED ) - *OwnerDefaulted = TRUE; - else - *OwnerDefaulted = FALSE; } else *Owner = NULL; @@ -790,17 +791,17 @@ NTSTATUS WINAPI RtlGetGroupSecurityDescriptor( if ( !lpsd || !Group || !GroupDefaulted ) return STATUS_INVALID_PARAMETER; + if ( lpsd->Control & SE_GROUP_DEFAULTED ) + *GroupDefaulted = TRUE; + else + *GroupDefaulted = FALSE; + if (lpsd->Group != NULL) { if (lpsd->Control & SE_SELF_RELATIVE) *Group = (PSID)((LPBYTE)lpsd + (ULONG_PTR)lpsd->Group); else *Group = lpsd->Group; - - if ( lpsd->Control & SE_GROUP_DEFAULTED ) - *GroupDefaulted = TRUE; - else - *GroupDefaulted = FALSE; } else *Group = NULL;

1 0

Mikolaj Zalewski : advapi32: Make ConvertStringSecurityDescriptorToSecurityDescriptor write the ACL.
by Alexandre Julliard 28 Sep '07

28 Sep '07

Module: wine Branch: master Commit: 8188ce6fb116b4516c214c08c5956d9347af896f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8188ce6fb116b4516c214c08c… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Thu Sep 27 11:44:51 2007 -0700 advapi32: Make ConvertStringSecurityDescriptorToSecurityDescriptor write the ACL. --- dlls/advapi32/security.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 31ee263..ac189de 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3239,6 +3239,8 @@ static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, DWORD val; DWORD sidlen; DWORD length = sizeof(ACL); + DWORD acesize = 0; + DWORD acecount = 0; PACCESS_ALLOWED_ACE pAce = NULL; /* pointer to current ACE */ TRACE("%s\n", debugstr_w(StringAcl)); @@ -3308,10 +3310,32 @@ static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, goto lerr; StringAcl++; - length += sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + sidlen; + acesize = sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + sidlen; + length += acesize; + if (pAce) + { + pAce->Header.AceSize = acesize; + pAce = (PACCESS_ALLOWED_ACE)((LPBYTE)pAce + acesize); + } + acecount++; } *cBytes = length; + + if (length > 0xffff) + { + ERR("ACL too large\n"); + goto lerr; + } + + if (pAcl) + { + pAcl->AclRevision = ACL_REVISION; + pAcl->Sbz1 = 0; + pAcl->AclSize = length; + pAcl->AceCount = acecount++; + pAcl->Sbz2 = 0; + } return TRUE; lerr:

1 0

Mikolaj Zalewski : advapi32: In ConvertStringSecurityDescriptorToSecurityDescriptor "AU" should be checked before "A" (with testcase).
by Alexandre Julliard 28 Sep '07

28 Sep '07

Module: wine Branch: master Commit: 0590dc9b5c096c66996692888063ae5f7784159b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0590dc9b5c096c66996692888… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Thu Sep 27 11:55:11 2007 -0700 advapi32: In ConvertStringSecurityDescriptorToSecurityDescriptor "AU" should be checked before "A" (with testcase). --- dlls/advapi32/security.c | 2 +- dlls/advapi32/tests/security.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index ac189de..5b2f7dd 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3070,9 +3070,9 @@ static DWORD ParseAclStringFlags(LPCWSTR* StringAcl) */ static const ACEFLAG AceType[] = { - { SDDL_ACCESS_ALLOWED, ACCESS_ALLOWED_ACE_TYPE }, { SDDL_ALARM, SYSTEM_ALARM_ACE_TYPE }, { SDDL_AUDIT, SYSTEM_AUDIT_ACE_TYPE }, + { SDDL_ACCESS_ALLOWED, ACCESS_ALLOWED_ACE_TYPE }, { SDDL_ACCESS_DENIED, ACCESS_DENIED_ACE_TYPE }, /* { SDDL_OBJECT_ACCESS_ALLOWED, ACCESS_ALLOWED_OBJECT_ACE_TYPE }, diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 15fc86e..9c98f09 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1922,6 +1922,11 @@ static void test_ConvertStringSecurityDescriptor(void) "D:(A;;0xFFFFFFFF;;;WD)", SDDL_REVISION_1, &pSD, NULL); ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); LocalFree(pSD); + SetLastError(0xdeadbeef); + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( + "S:(AU;;0xFFFFFFFF;;;WD)", SDDL_REVISION_1, &pSD, NULL); + ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); + LocalFree(pSD); /* test ACE string access right error case */ SetLastError(0xdeadbeef);

1 0

Mikolaj Zalewski : msi: Add some already implemented function to the spec file.
by Alexandre Julliard 28 Sep '07

28 Sep '07

Module: wine Branch: master Commit: cf84cbac5b5b6b3c9a7da10061c7300b7ede5d5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf84cbac5b5b6b3c9a7da1006… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Thu Sep 27 14:58:10 2007 -0700 msi: Add some already implemented function to the spec file. --- dlls/msi/msi.spec | 8 ++++---- dlls/msi/source.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 2874b71..fd95d8f 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -249,7 +249,7 @@ 253 stub MsiDeterminePatchSequenceA 254 stub MsiDeterminePatchSequenceW 255 stub MsiSourceListAddSourceExA -256 stub MsiSourceListAddSourceExW +256 stdcall MsiSourceListAddSourceExW(wstr wstr long long wstr long) 257 stub MsiSourceListClearSourceA 258 stub MsiSourceListClearSourceW 259 stub MsiSourceListClearAllExA @@ -259,15 +259,15 @@ 263 stdcall MsiSourceListEnumSourcesA(str str long long long ptr ptr) 264 stub MsiSourceListEnumSourcesW 265 stdcall MsiSourceListGetInfoA(str str long long str ptr ptr) -266 stub MsiSourceListGetInfoW +266 stdcall MsiSourceListGetInfoW(wstr wstr long long wstr ptr ptr) 267 stub MsiSourceListSetInfoA -268 stub MsiSourceListSetInfoW +268 stdcall MsiSourceListSetInfoW(wstr wstr long long wstr wstr) 269 stub MsiEnumPatchesExA 270 stub MsiEnumPatchesExW 271 stub MsiSourceListEnumMediaDisksA 272 stub MsiSourceListEnumMediaDisksW 273 stub MsiSourceListAddMediaDiskA -274 stub MsiSourceListAddMediaDiskW +274 stdcall MsiSourceListAddMediaDiskW(wstr wstr long long long wstr wstr) 275 stub MsiSourceListClearMediaDiskA 276 stub MsiSourceListClearMediaDiskW 277 stub MsiDetermineApplicablePatchesA diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 69f10f3..660998f 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -721,7 +721,7 @@ UINT WINAPI MsiSourceListAddMediaDiskW(LPCWSTR szProduct, LPCWSTR szUserSid, } /****************************************************************** - * MsiSourceListAddSourceExA (MSI.@) + * MsiSourceListClearAllA (MSI.@) */ UINT WINAPI MsiSourceListClearAllA( LPCSTR szProduct, LPCSTR szUserName, DWORD dwReserved ) { @@ -730,7 +730,7 @@ UINT WINAPI MsiSourceListClearAllA( LPCSTR szProduct, LPCSTR szUserName, DWORD d } /****************************************************************** - * MsiSourceListAddSourceExW (MSI.@) + * MsiSourceListClearAllW (MSI.@) */ UINT WINAPI MsiSourceListClearAllW( LPCWSTR szProduct, LPCWSTR szUserName, DWORD dwReserved ) {

1 0

Mikolaj Zalewski : advapi32/ntdll: MakeRelativeSD should preserve NULL pointers (with testcase).
by Alexandre Julliard 28 Sep '07

28 Sep '07

Module: wine Branch: master Commit: 3c51b2c64521cebfc7a03fe96b74974bf94f94b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c51b2c64521cebfc7a03fe96… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Thu Sep 27 10:34:53 2007 -0700 advapi32/ntdll: MakeRelativeSD should preserve NULL pointers (with testcase). --- dlls/advapi32/tests/security.c | 46 ++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/sec.c | 36 +++++++++++++++++++++--------- 2 files changed, 71 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index c4b9ed4..2e671df 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -35,6 +35,8 @@ #include "wine/test.h" +#define expect_eq(expr, value, type, format) { type ret = expr; ok((value) == ret, #expr " expected " format " got " format "\n", (value), (ret)); } + typedef VOID (WINAPI *fnBuildTrusteeWithSidA)( PTRUSTEEA pTrustee, PSID pSid ); typedef VOID (WINAPI *fnBuildTrusteeWithNameA)( PTRUSTEEA pTrustee, LPSTR pName ); typedef VOID (WINAPI *fnBuildTrusteeWithObjectsAndNameA)( PTRUSTEEA pTrustee, @@ -49,6 +51,7 @@ typedef VOID (WINAPI *fnBuildTrusteeWithObjectsAndSidA)( PTRUSTEEA pTrustee, GUID* pInheritedObjectGuid, PSID pSid ); typedef LPSTR (WINAPI *fnGetTrusteeNameA)( PTRUSTEEA pTrustee ); +typedef BOOL (WINAPI *fnMakeSelfRelativeSD)( PSECURITY_DESCRIPTOR, PSECURITY_DESCRIPTOR, LPDWORD ); typedef BOOL (WINAPI *fnConvertSidToStringSidA)( PSID pSid, LPSTR *str ); typedef BOOL (WINAPI *fnConvertStringSidToSidA)( LPCSTR str, PSID pSid ); static BOOL (WINAPI *pConvertStringSecurityDescriptorToSecurityDescriptorA)(LPCSTR, DWORD, @@ -81,6 +84,7 @@ fnBuildTrusteeWithNameA pBuildTrusteeWithNameA; fnBuildTrusteeWithObjectsAndNameA pBuildTrusteeWithObjectsAndNameA; fnBuildTrusteeWithObjectsAndSidA pBuildTrusteeWithObjectsAndSidA; fnGetTrusteeNameA pGetTrusteeNameA; +fnMakeSelfRelativeSD pMakeSelfRelativeSD; fnConvertSidToStringSidA pConvertSidToStringSidA; fnConvertStringSidToSidA pConvertStringSidToSidA; fnGetFileSecurityA pGetFileSecurityA; @@ -110,6 +114,7 @@ static void init(void) (void *)GetProcAddress(hmod, "ConvertStringSecurityDescriptorToSecurityDescriptorA" ); pConvertSecurityDescriptorToStringSecurityDescriptorA = (void *)GetProcAddress(hmod, "ConvertSecurityDescriptorToStringSecurityDescriptorA" ); + pMakeSelfRelativeSD = (void *)GetProcAddress(hmod, "MakeSelfRelativeSD"); pGetNamedSecurityInfoA = (void *)GetProcAddress(hmod, "GetNamedSecurityInfoA"); pSetEntriesInAclW = (void *)GetProcAddress(hmod, "SetEntriesInAclW"); @@ -1443,6 +1448,46 @@ static void test_LookupAccountName(void) HeapFree(GetProcessHeap(), 0, domain); } +static void test_security_descriptor(void) +{ + SECURITY_DESCRIPTOR sd; + char buf[8192]; + DWORD size; + BOOL isDefault, isPresent; + PACL pacl; + PSID psid; + + InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION); + ok(GetSecurityDescriptorOwner(&sd, &psid, &isDefault), "GetSecurityDescriptorOwner failed\n"); + expect_eq(psid, NULL, PSID, "%p"); + todo_wine expect_eq(isDefault, FALSE, BOOL, "%d"); + sd.Control |= SE_DACL_PRESENT | SE_SACL_PRESENT; + + SetLastError(0xdeadbeef); + size = 5; + expect_eq(MakeSelfRelativeSD(&sd, buf, &size), FALSE, BOOL, "%d"); + expect_eq(GetLastError(), ERROR_INSUFFICIENT_BUFFER, DWORD, "%u"); + ok(size > 5, "Size not increased\n"); + if (size <= 8192) + { + expect_eq(MakeSelfRelativeSD(&sd, buf, &size), TRUE, BOOL, "%d"); + ok(GetSecurityDescriptorOwner(&sd, &psid, &isDefault), "GetSecurityDescriptorOwner failed\n"); + expect_eq(psid, NULL, PSID, "%p"); + todo_wine expect_eq(isDefault, FALSE, BOOL, "%d"); + ok(GetSecurityDescriptorGroup(&sd, &psid, &isDefault), "GetSecurityDescriptorOwner failed\n"); + expect_eq(psid, NULL, PSID, "%p"); + todo_wine expect_eq(isDefault, FALSE, BOOL, "%d"); + ok(GetSecurityDescriptorDacl(&sd, &isPresent, &pacl, &isDefault), "GetSecurityDescriptorOwner failed\n"); + expect_eq(isPresent, TRUE, BOOL, "%d"); + expect_eq(psid, NULL, PSID, "%p"); + expect_eq(isDefault, FALSE, BOOL, "%d"); + ok(GetSecurityDescriptorSacl(&sd, &isPresent, &pacl, &isDefault), "GetSecurityDescriptorOwner failed\n"); + expect_eq(isPresent, TRUE, BOOL, "%d"); + expect_eq(psid, NULL, PSID, "%p"); + expect_eq(isDefault, FALSE, BOOL, "%d"); + } +} + #define TEST_GRANTED_ACCESS(a,b) test_granted_access(a,b,__LINE__) static void test_granted_access(HANDLE handle, ACCESS_MASK access, int line) { @@ -2017,6 +2062,7 @@ START_TEST(security) test_token_attr(); test_LookupAccountSid(); test_LookupAccountName(); + test_security_descriptor(); test_process_security(); test_impersonation_level(); test_SetEntriesInAcl(); diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 0eaa9fe..38ab402 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -848,30 +848,44 @@ NTSTATUS WINAPI RtlMakeSelfRelativeSD( pRel->Control = pAbs->Control | SE_SELF_RELATIVE; offsetRel = sizeof(SECURITY_DESCRIPTOR); - pRel->Owner = (PSID) offsetRel; - length = RtlLengthSid(pAbs->Owner); - memcpy((LPBYTE)pRel + offsetRel, pAbs->Owner, length); - - offsetRel += length; - pRel->Group = (PSID) offsetRel; - length = RtlLengthSid(pAbs->Group); - memcpy((LPBYTE)pRel + offsetRel, pAbs->Group, length); + if (pAbs->Owner) + { + pRel->Owner = (PSID) offsetRel; + length = RtlLengthSid(pAbs->Owner); + memcpy((LPBYTE)pRel + offsetRel, pAbs->Owner, length); + offsetRel += length; + } + else + { + pRel->Owner = NULL; + } - if (pRel->Control & SE_SACL_PRESENT) + if (pAbs->Group) { + pRel->Group = (PSID) offsetRel; + length = RtlLengthSid(pAbs->Group); + memcpy((LPBYTE)pRel + offsetRel, pAbs->Group, length); offsetRel += length; + } + else + { + pRel->Group = NULL; + } + + if (pAbs->Sacl) + { pRel->Sacl = (PACL) offsetRel; length = pAbs->Sacl->AclSize; memcpy((LPBYTE)pRel + offsetRel, pAbs->Sacl, length); + offsetRel += length; } else { pRel->Sacl = NULL; } - if (pRel->Control & SE_DACL_PRESENT) + if (pAbs->Dacl) { - offsetRel += length; pRel->Dacl = (PACL) offsetRel; length = pAbs->Dacl->AclSize; memcpy((LPBYTE)pRel + offsetRel, pAbs->Dacl, length);

1 0

Rob Shearman : widl: Write prototypes for context handle rundown rountines into generated header files .
by Alexandre Julliard 28 Sep '07

28 Sep '07

Module: wine Branch: master Commit: a2fedc376964e0eec04386f7556198c853052e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2fedc376964e0eec04386f75… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Sep 27 17:38:13 2007 -0700 widl: Write prototypes for context handle rundown rountines into generated header files. --- tools/widl/header.c | 37 +++++++++++++++++++++++++++++++++---- tools/widl/header.h | 1 + tools/widl/parser.y | 2 +- tools/widl/widl.c | 1 + tools/widl/widltypes.h | 4 +++- 5 files changed, 39 insertions(+), 6 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 971b30f..ded4c18 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -38,6 +38,8 @@ #include "header.h" static int indentation = 0; +user_type_list_t user_type_list = LIST_INIT(user_type_list); +static context_handle_list_t context_handle_list = LIST_INIT(context_handle_list); static void indent(FILE *h, int delta) { @@ -286,8 +288,6 @@ void write_type(FILE *h, type_t *t, int is_field, const char *fmt, ...) write_type_right(h, t, is_field); } -user_type_list_t user_type_list = LIST_INIT(user_type_list); - static int user_type_registered(const char *name) { user_type_t *ut; @@ -297,7 +297,16 @@ static int user_type_registered(const char *name) return 0; } -void check_for_user_types(const var_list_t *list) +static int context_handle_registered(const char *name) +{ + context_handle_t *ch; + LIST_FOR_EACH_ENTRY(ch, &context_handle_list, context_handle_t, entry) + if (!strcmp(name, ch->name)) + return 1; + return 0; +} + +void check_for_user_types_and_context_handles(const var_list_t *list) { const var_t *v; @@ -309,6 +318,16 @@ void check_for_user_types(const var_list_t *list) const char *name = type->name; if (type->user_types_registered) continue; type->user_types_registered = 1; + if (is_attr(type->attrs, ATTR_CONTEXTHANDLE)) { + if (!context_handle_registered(name)) + { + context_handle_t *ch = xmalloc(sizeof(*ch)); + ch->name = xstrdup(name); + list_add_tail(&context_handle_list, &ch->entry); + } + /* don't carry on parsing fields within this type */ + break; + } if (is_attr(type->attrs, ATTR_WIREMARSHAL)) { if (!user_type_registered(name)) { @@ -322,7 +341,7 @@ void check_for_user_types(const var_list_t *list) } else { - check_for_user_types(type->fields); + check_for_user_types_and_context_handles(type->fields); } } } @@ -341,6 +360,16 @@ void write_user_types(void) } } +void write_context_handle_rundowns(void) +{ + context_handle_t *ch; + LIST_FOR_EACH_ENTRY(ch, &context_handle_list, context_handle_t, entry) + { + const char *name = ch->name; + fprintf(header, "void __RPC_USER %s_rundown(%s);\n", name, name); + } +} + void write_typedef(type_t *type) { fprintf(header, "typedef "); diff --git a/tools/widl/header.h b/tools/widl/header.h index 54655a2..19a90a3 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -52,6 +52,7 @@ extern void write_constdef(const var_t *v); extern void write_externdef(const var_t *v); extern void write_library(const char *name, const attr_list_t *attr); extern void write_user_types(void); +extern void write_context_handle_rundowns(void); extern const var_t* get_explicit_handle_var(const func_t* func); extern int has_out_arg_or_return(const func_t *func); extern void write_guid(FILE *f, const char *guid_prefix, const char *name, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 17dd700..c4fc2c9 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2021,6 +2021,6 @@ static void check_all_user_types(ifref_list_t *ifrefs) { const func_list_t *fs = ifref->iface->funcs; if (fs) LIST_FOR_EACH_ENTRY(f, fs, const func_t, entry) - check_for_user_types(f->args); + check_for_user_types_and_context_handles(f->args); } } diff --git a/tools/widl/widl.c b/tools/widl/widl.c index ca88958..c5e9d40 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -409,6 +409,7 @@ int main(int argc,char *argv[]) fprintf(header, "/* Begin additional prototypes for all interfaces */\n"); fprintf(header, "\n"); write_user_types(); + write_context_handle_rundowns(); fprintf(header, "\n"); fprintf(header, "/* End additional prototypes */\n"); fprintf(header, "\n"); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 2b1aaa9..5dc634c 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -47,6 +47,7 @@ typedef struct _importlib_t importlib_t; typedef struct _importinfo_t importinfo_t; typedef struct _typelib_t typelib_t; typedef struct _user_type_t user_type_t; +typedef struct _user_type_t context_handle_t; typedef struct list attr_list_t; typedef struct list str_list_t; @@ -57,6 +58,7 @@ typedef struct list pident_list_t; typedef struct list ifref_list_t; typedef struct list array_dims_t; typedef struct list user_type_list_t; +typedef struct list context_handle_list_t; enum attr_type { @@ -306,7 +308,7 @@ struct _user_type_t { }; extern user_type_list_t user_type_list; -void check_for_user_types(const var_list_t *list); +void check_for_user_types_and_context_handles(const var_list_t *list); void init_types(void);

1 0

Rob Shearman : widl: Generate client and server code for using context handles.
by Alexandre Julliard 28 Sep '07

28 Sep '07

Module: wine Branch: master Commit: 2055e636aecbb0c54c5febd4510af9471903eda2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2055e636aecbb0c54c5febd45… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Sep 27 17:38:27 2007 -0700 widl: Generate client and server code for using context handles. --- tools/widl/header.h | 9 +++ tools/widl/server.c | 17 +++++-- tools/widl/typegen.c | 140 +++++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 143 insertions(+), 23 deletions(-) diff --git a/tools/widl/header.h b/tools/widl/header.h index 19a90a3..3c6a124 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -73,4 +73,13 @@ static inline int is_string_type(const attr_list_t *attrs, const type_t *type) return is_attr(attrs, ATTR_STRING) && (last_ptr(type) || last_array(type)); } +static inline int is_context_handle(const type_t *type) +{ + const type_t *t; + for (t = type; is_ptr(t); t = t->ref) + if (is_attr(t->attrs, ATTR_CONTEXTHANDLE)) + return 1; + return 0; +} + #endif diff --git a/tools/widl/server.c b/tools/widl/server.c index fd94c9a..f708d25 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -184,10 +184,19 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) first_arg = 0; else fprintf(server, ",\n"); - print_server(""); - if (var->type->declarray) - fprintf(server, "*"); - write_name(server, var); + if (is_context_handle(var->type)) + { + print_server("("); + write_type_left(server, var->type); + fprintf(server, ")%sNDRSContextValue(%s)", is_ptr(var->type) ? "" : "*", var->name); + } + else + { + print_server(""); + if (var->type->declarray) + fprintf(server, "*"); + write_name(server, var); + } } fprintf(server, ");\n"); indent--; diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index c2e16e5..88bb7c9 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -216,6 +216,16 @@ static int is_embedded_complex(const type_t *type) || (is_ptr(type) && type->ref->type == RPC_FC_IP); } +static const char *get_context_handle_type_name(const type_t *type) +{ + const type_t *t; + for (t = type; is_ptr(t); t = t->ref) + if (is_attr(t->attrs, ATTR_CONTEXTHANDLE)) + return t->name; + assert(0); + return NULL; +} + static int compare_expr(const expr_t *a, const expr_t *b) { int ret; @@ -1933,6 +1943,50 @@ static size_t write_ip_tfs(FILE *file, const attr_list_t *attrs, type_t *type, return start_offset; } +static size_t write_contexthandle_tfs(FILE *file, const type_t *type, + const var_t *var, + unsigned int *typeformat_offset) +{ + size_t start_offset = *typeformat_offset; + unsigned char flags = 0x08 /* strict */; + + if (is_ptr(type)) + { + flags |= 0x80; + if (type->type != RPC_FC_RP) + flags |= 0x01; + } + if (is_attr(var->attrs, ATTR_IN)) + flags |= 0x40; + if (is_attr(var->attrs, ATTR_OUT)) + flags |= 0x20; + + WRITE_FCTYPE(file, FC_BIND_CONTEXT, *typeformat_offset); + print_file(file, 2, "0x%x,\t/* Context flags: ", flags); + if (((flags & 0x21) != 0x21) && (flags & 0x01)) + print_file(file, 0, "can't be null, "); + if (flags & 0x02) + print_file(file, 0, "serialize, "); + if (flags & 0x04) + print_file(file, 0, "no serialize, "); + if (flags & 0x08) + print_file(file, 0, "strict, "); + if ((flags & 0x21) == 0x20) + print_file(file, 0, "out, "); + if ((flags & 0x21) == 0x21) + print_file(file, 0, "return, "); + if (flags & 0x40) + print_file(file, 0, "in, "); + if (flags & 0x80) + print_file(file, 0, "via ptr, "); + print_file(file, 0, "*/\n"); + print_file(file, 2, "0, /* FIXME: rundown routine index*/\n"); + print_file(file, 2, "0, /* FIXME: param num */\n"); + *typeformat_offset += 4; + + return start_offset; +} + static int get_ptr_attr(const type_t *t, int def_type) { while (TRUE) @@ -1953,6 +2007,9 @@ static size_t write_typeformatstring_var(FILE *file, int indent, const func_t *f int pointer_type; size_t offset; + if (is_context_handle(type)) + return write_contexthandle_tfs(file, type, var, typeformat_offset); + if (is_user_type(type)) { write_user_tfs(file, type, typeformat_offset); @@ -2295,12 +2352,20 @@ static unsigned int get_required_buffer_size(const var_t *var, unsigned int *ali { int in_attr = is_attr(var->attrs, ATTR_IN); int out_attr = is_attr(var->attrs, ATTR_OUT); + const type_t *t; if (!in_attr && !out_attr) in_attr = 1; *alignment = 0; + for (t = var->type; is_ptr(t); t = t->ref) + if (is_attr(t->attrs, ATTR_CONTEXTHANDLE)) + { + *alignment = 4; + return 20; + } + if (pass == PASS_OUT) { if (out_attr && is_ptr(var->type)) @@ -2579,7 +2644,39 @@ void write_remoting_arguments(FILE *file, int indent, const func_t *func, rtype = type->type; - if (is_user_type(var->type)) + if (is_context_handle(type)) + { + if (phase == PHASE_MARSHAL) + { + if (pass == PASS_IN) + { + print_file(file, indent, "NdrClientContextMarshall(\n"); + print_file(file, indent + 1, "&_StubMsg,\n"); + print_file(file, indent + 1, "(NDR_CCONTEXT)%s%s,\n", is_ptr(type) ? "*" : "", var->name); + print_file(file, indent + 1, "%s);\n", in_attr && out_attr ? "1" : "0"); + } + else + { + print_file(file, indent, "NdrServerContextMarshall(\n"); + print_file(file, indent + 1, "&_StubMsg,\n"); + print_file(file, indent + 1, "(NDR_SCONTEXT)%s,\n", var->name); + print_file(file, indent + 1, "(NDR_RUNDOWN)%s_rundown);\n", get_context_handle_type_name(var->type)); + } + } + else if (phase == PHASE_UNMARSHAL) + { + if (pass == PASS_OUT) + { + print_file(file, indent, "NdrClientContextUnmarshall(\n"); + print_file(file, indent + 1, "&_StubMsg,\n"); + print_file(file, indent + 1, "(NDR_CCONTEXT *)%s,\n", var->name); + print_file(file, indent + 1, "_Handle);\n"); + } + else + print_file(file, indent, "%s = NdrServerContextUnmarshall(&_StubMsg);\n", var->name); + } + } + else if (is_user_type(var->type)) { print_phase_function(file, indent, "UserMarshal", phase, var, start_offset); } @@ -2906,28 +3003,33 @@ void declare_stub_args( FILE *file, int indent, const func_t *func ) if (!out_attr && !in_attr) in_attr = 1; - if (!in_attr && !var->type->size_is && !is_string) + if (is_context_handle(var->type)) + print_file(file, indent, "NDR_SCONTEXT %s;\n", var->name); + else { + if (!in_attr && !var->type->size_is && !is_string) + { + print_file(file, indent, ""); + write_type(file, var->type->ref, FALSE, "_W%u", i++); + fprintf(file, ";\n"); + } + print_file(file, indent, ""); - write_type(file, var->type->ref, FALSE, "_W%u", i++); + write_type_left(file, var->type); + fprintf(file, " "); + if (var->type->declarray) { + fprintf(file, "( *"); + write_name(file, var); + fprintf(file, " )"); + } else + write_name(file, var); + write_type_right(file, var->type, FALSE); fprintf(file, ";\n"); - } - - print_file(file, indent, ""); - write_type_left(file, var->type); - fprintf(file, " "); - if (var->type->declarray) { - fprintf(file, "( *"); - write_name(file, var); - fprintf(file, " )"); - } else - write_name(file, var); - write_type_right(file, var->type, FALSE); - fprintf(file, ";\n"); - if (decl_indirect(var->type)) - print_file(file, indent, "void *_p_%s = &%s;\n", - var->name, var->name); + if (decl_indirect(var->type)) + print_file(file, indent, "void *_p_%s = &%s;\n", + var->name, var->name); + } } }

1 0

Alex Villacís Lasso : riched20: Minimal fix for WM_SETTEXT without ES_MULTILINE style.
by Alexandre Julliard 28 Sep '07

28 Sep '07

Module: wine Branch: master Commit: 63b12f8602f722e425b41f75d9ad3f55656539fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=63b12f8602f722e425b41f75d… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Thu Sep 27 18:17:48 2007 -0500 riched20: Minimal fix for WM_SETTEXT without ES_MULTILINE style. --- dlls/riched20/editor.c | 12 +++++++++++- dlls/riched20/tests/editor.c | 15 +++++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index fcfe03a..81fe9b2 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1908,8 +1908,18 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, TRACE("WM_SETTEXT - %s\n", debugstr_w(wszText)); /* debugstr_w() */ if (lstrlenW(wszText) > 0) { + int len = -1; + /* uses default style! */ - ME_InsertTextFromCursor(editor, 0, wszText, -1, editor->pBuffer->pDefaultStyle); + if (!(GetWindowLongW(hWnd, GWL_STYLE) & ES_MULTILINE)) + { + WCHAR * p; + + p = wszText; + while (*p != '\0' && *p != '\r' && *p != '\n') p++; + len = p - wszText; + } + ME_InsertTextFromCursor(editor, 0, wszText, len, editor->pBuffer->pDefaultStyle); } ME_EndToUnicode(unicode, wszText); } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index de36d6e..5375d30 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -2064,6 +2064,9 @@ static void test_EM_GETTEXTLENGTHEX(void) HWND hwnd; GETTEXTLENGTHEX gtl; int ret; + const char * test_string = "a\nb\n\n\r\n"; + const char * test_string_after = "a"; + char buffer[64] = {0}; /* single line */ hwnd = CreateWindowExA(0, "RichEdit20W", NULL, WS_POPUP, @@ -2080,17 +2083,21 @@ static void test_EM_GETTEXTLENGTHEX(void) ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); ok(ret == 0, "ret %d\n",ret); - SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) "a\nb\n\n\r\n"); + SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) test_string); gtl.flags = GTL_NUMCHARS | GTL_PRECISE | GTL_USECRLF; gtl.codepage = CP_ACP; ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); - todo_wine ok(ret == 1, "ret %d\n",ret); + ok(ret == 1, "ret %d\n",ret); gtl.flags = GTL_NUMCHARS | GTL_PRECISE; gtl.codepage = CP_ACP; ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); - todo_wine ok(ret == 1, "ret %d\n",ret); + ok(ret == 1, "ret %d\n",ret); + + SendMessage(hwnd, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + ret = strcmp(buffer, test_string_after); + ok(ret == 0, "WM_GETTEXT recovered incorrect string!\n"); DestroyWindow(hwnd); @@ -2109,7 +2116,7 @@ static void test_EM_GETTEXTLENGTHEX(void) ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); ok(ret == 0, "ret %d\n",ret); - SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) "a\nb\n\n\r\n"); + SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) test_string); gtl.flags = GTL_NUMCHARS | GTL_PRECISE | GTL_USECRLF; gtl.codepage = CP_ACP;

1 0

Juan Lang : crypt32: Support PKCS messages wrapped in a PKCS content info in CryptQueryObject.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: f8ff1c32370735894ae2932e9bed22aad15f87bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8ff1c32370735894ae2932e9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 27 10:01:30 2007 -0700 crypt32: Support PKCS messages wrapped in a PKCS content info in CryptQueryObject. --- dlls/crypt32/object.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 49 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 156b3df..a8d4410 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -299,7 +299,55 @@ static BOOL CRYPT_QueryMessageObject(DWORD dwObjectType, const void *pvObject, return FALSE; ret = FALSE; - if (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED) + /* Try it first as a PKCS content info */ + if ((dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED) || + (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_PKCS7_UNSIGNED)) + { + msg = CryptMsgOpenToDecode(encodingType, 0, 0, 0, NULL, NULL); + if (msg) + { + ret = CryptMsgUpdate(msg, blob->pbData, blob->cbData, TRUE); + if (ret) + { + DWORD type, len = sizeof(type); + + ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, &type, &len); + if (ret) + { + if ((dwExpectedContentTypeFlags & + CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED)) + { + if (type != CMSG_SIGNED) + { + SetLastError(ERROR_INVALID_DATA); + ret = FALSE; + } + else if (pdwContentType) + *pdwContentType = CERT_QUERY_CONTENT_PKCS7_SIGNED; + } + else if ((dwExpectedContentTypeFlags & + CERT_QUERY_CONTENT_FLAG_PKCS7_UNSIGNED)) + { + if (type != CMSG_DATA) + { + SetLastError(ERROR_INVALID_DATA); + ret = FALSE; + } + else if (pdwContentType) + *pdwContentType = CERT_QUERY_CONTENT_PKCS7_UNSIGNED; + } + } + } + if (!ret) + { + CryptMsgClose(msg); + msg = NULL; + } + } + } + /* Failing that, try explicitly typed messages */ + if (!ret && + (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED)) { msg = CryptMsgOpenToDecode(encodingType, 0, CMSG_SIGNED, 0, NULL, NULL); if (msg)

1 0

Stefan Leichter : ole32: Added version resource for ole2nls.dll.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: 71d70f0fa1e4d561a495104e24ec2aa3c559f6d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d70f0fa1e4d561a495104e2… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Sep 27 18:02:50 2007 +0200 ole32: Added version resource for ole2nls.dll. --- .gitignore | 1 + dlls/ole32/Makefile.in | 8 ++++++++ dlls/ole32/version16.rc | 23 +++++++++++++++++++++++ 3 files changed, 32 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 0b512ca..1e13081 100644 --- a/.gitignore +++ b/.gitignore @@ -322,6 +322,7 @@ dlls/ole32/ole32res.res dlls/ole32/tests/*.ok dlls/ole32/tests/ole32_crosstest.exe dlls/ole32/tests/testlist.c +dlls/ole32/version16.res dlls/oleacc/liboleacc.def dlls/oleaut32/liboleaut32.def dlls/oleaut32/oleaut32.res diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index 61a0472..d6e9eef 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -62,6 +62,8 @@ SPEC_SRCS16 = \ RC_SRCS = ole32res.rc +RC_SRCS16 = version16.rc + IDL_H_SRCS = \ dcom.idl @@ -70,4 +72,10 @@ IDL_C_SRCS = \ @MAKE_DLL_RULES@ +ole2nls.spec.o: ole2nls.spec version16.res + $(WINEBUILD) $(WINEBUILDFLAGS) --dll -o $@ --dll-name ole2nls --main-module $(MODULE) --res version16.res --export $(SRCDIR)/ole2nls.spec + +version16.res: version16.rc + $(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/version16.rc + @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/ole32/version16.rc b/dlls/ole32/version16.rc new file mode 100644 index 0000000..ee94ef9 --- /dev/null +++ b/dlls/ole32/version16.rc @@ -0,0 +1,23 @@ +/* + * Copyright 2007 Stefan Leichter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEVERSION_STR "2.10.3050.1" +#define WINE_FILEDESCRIPTION_STR "Wine OLE dll" +#define WINE_FILENAME_STR "OLE2NLS.DLL" + +#include "wine/wine_common_ver.rc"

1 0