wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Maarten Lankhorst : include: Add audiosessiontypes header.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: ffbefc6e04f61629ba2ba4725af871d6dafd9395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffbefc6e04f61629ba2ba4725… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 10 09:16:33 2009 +0100 include: Add audiosessiontypes header. --- include/Makefile.in | 1 + include/audiosessiontypes.h | 48 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 83e4358..f8c2b3d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -106,6 +106,7 @@ SRCDIR_INCLUDES = \ af_irda.h \ appmgmt.h \ audevcod.h \ + audiosessiontypes.h \ aviriff.h \ axcore.idl \ axextend.idl \ diff --git a/include/audiosessiontypes.h b/include/audiosessiontypes.h new file mode 100644 index 0000000..b9435f1 --- /dev/null +++ b/include/audiosessiontypes.h @@ -0,0 +1,48 @@ + +/* + * Core Audio audio session types definitions + * + * Copyright 2009 Maarten Lankhorst + * + * 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 + * + */ + +#ifndef __AUDIOSESSIONTYPES__ +#define __AUDIOSESSIONTYPES__ + +typedef enum _AUDCLNT_SHAREMODE +{ + AUDCLNT_SHAREMODE_SHARED, + AUDCLNT_SHAREMODE_EXCLUSIVE, +} AUDCLNT_SHAREMODE; + +#define AUDCLNT_STREAMFLAGS_CROSSPROCESS 0x00010000 +#define AUDCLNT_STREAMFLAGS_LOOPBACK 0x00020000 +#define AUDCLNT_STREAMFLAGS_EVENTCALLBACK 0x00040000 +#define AUDCLNT_STREAMFLAGS_NOPERSIST 0x00080000 +#define AUDCLNT_STREAMFLAGS_RATEADJUST 0x00100000 +#define AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED 0x10000000 +#define AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE 0x20000000 +#define AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED 0x40000000 + +typedef enum _AudioSessionState +{ + AudioSessionStateInactive = 0, + AudioSessionStateActive, + AudioSessionStateExpired, +} AudioSessionState; + +#endif

1 0

Rob Shearman : rpcrt4: Support multiple interfaces and transfer syntaxes in bind and bind ack messages .
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 59ba6d2573532c15e2487bbc86f6bb93022c1d38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ba6d2573532c15e2487bbc8… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Nov 10 23:05:07 2009 +0000 rpcrt4: Support multiple interfaces and transfer syntaxes in bind and bind ack messages. --- dlls/rpcrt4/rpc_assoc.c | 7 +- dlls/rpcrt4/rpc_defs.h | 87 ++++++++++++++++------------ dlls/rpcrt4/rpc_message.c | 38 ++++++------- dlls/rpcrt4/rpc_message.h | 4 +- dlls/rpcrt4/rpc_server.c | 140 ++++++++++++++++++++++++++++++++++----------- 5 files changed, 181 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59ba6d2573532c15e2487…

1 0

Rob Shearman : rpcrt4: The get_ranged_enum test doesn't work on Windows, so don't execute it for the moment.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 7e52896b841cc117249f0507486ff9f29e0eaaf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e52896b841cc117249f05074… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Nov 10 23:04:03 2009 +0000 rpcrt4: The get_ranged_enum test doesn't work on Windows, so don't execute it for the moment. --- dlls/rpcrt4/tests/server.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 1205ea4..42753ac 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -775,7 +775,6 @@ basic_tests(void) wstr_struct_t ws = {wstring}; str_t str; se_t se; - renum_t re; ok(int_return() == INT_CODE, "RPC int_return\n"); @@ -888,9 +887,6 @@ basic_tests(void) ok(x == 0, "echo_ranged_int() returned %d instead of 0\n", x); x = echo_ranged_int(100); ok(x == 100, "echo_ranged_int() returned %d instead of 100\n", x); - - get_ranged_enum(&re); - ok(re == RE3, "get_ranged_enum() returned %d instead of RE3\n", re); } static void

1 0

Rob Shearman : advapi32: Use a duplicate of the process token if a NULL token is passed into CheckTokenMembership and there is no thread token .
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 1802a5b9baa8a88bc0a6cf7af4778e9acbaece17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1802a5b9baa8a88bc0a6cf7af… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Nov 10 23:03:10 2009 +0000 advapi32: Use a duplicate of the process token if a NULL token is passed into CheckTokenMembership and there is no thread token. --- dlls/advapi32/security.c | 43 +++++++++++++++++++++++++++------------- dlls/advapi32/tests/security.c | 4 +++ 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index db7d028..7dd39a4 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -625,8 +625,10 @@ BOOL WINAPI CheckTokenMembership( HANDLE token, PSID sid_to_check, PBOOL is_member ) { - PTOKEN_GROUPS token_groups; + PTOKEN_GROUPS token_groups = NULL; + HANDLE thread_token = NULL; DWORD size, i; + BOOL ret; TRACE("(%p %s %p)\n", token, debugstr_sid(sid_to_check), is_member); @@ -634,26 +636,37 @@ CheckTokenMembership( HANDLE token, PSID sid_to_check, if (!token) { - if (!OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, TRUE, &token)) - return FALSE; + if (!OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, TRUE, &thread_token)) + { + HANDLE process_token; + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE, &process_token); + if (!ret) + goto exit; + ret = DuplicateTokenEx(process_token, TOKEN_QUERY, + NULL, SecurityImpersonation, TokenImpersonation, + &thread_token); + CloseHandle(process_token); + if (!ret) + goto exit; + } + token = thread_token; } - if (!GetTokenInformation(token, TokenGroups, NULL, 0, &size)) - { - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) - return FALSE; - } + ret = GetTokenInformation(token, TokenGroups, NULL, 0, &size); + if (!ret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) + goto exit; token_groups = HeapAlloc(GetProcessHeap(), 0, size); if (!token_groups) - return FALSE; - - if (!GetTokenInformation(token, TokenGroups, token_groups, size, &size)) { - HeapFree(GetProcessHeap(), 0, token_groups); - return FALSE; + ret = FALSE; + goto exit; } + ret = GetTokenInformation(token, TokenGroups, token_groups, size, &size); + if (!ret) + goto exit; + for (i = 0; i < token_groups->GroupCount; i++) { TRACE("Groups[%d]: {0x%x, %s}\n", i, @@ -668,9 +681,11 @@ CheckTokenMembership( HANDLE token, PSID sid_to_check, } } +exit: HeapFree(GetProcessHeap(), 0, token_groups); + if (thread_token != NULL) CloseHandle(thread_token); - return TRUE; + return ret; } /****************************************************************************** diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index eaa9e2c..b71d64f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3249,6 +3249,10 @@ static void test_CheckTokenMembership(void) ok(ret, "CheckTokenMembership failed with error %d\n", GetLastError()); ok(is_member, "CheckTokenMembership should have detected sid as member\n"); + ret = pCheckTokenMembership(NULL, token_groups->Groups[i].Sid, &is_member); + ok(ret, "CheckTokenMembership failed with error %d\n", GetLastError()); + ok(is_member, "CheckTokenMembership should have detected sid as member\n"); + ret = pCheckTokenMembership(process_token, token_groups->Groups[i].Sid, &is_member); todo_wine { ok(!ret && GetLastError() == ERROR_NO_IMPERSONATION_TOKEN,

1 0

Juan Lang : crypt32: Fix test failures on multiple Windows versions.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: d7c9bd13a245f9241c82a2d7d1742aa081ca4b7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7c9bd13a245f9241c82a2d7d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 10 14:53:10 2009 -0800 crypt32: Fix test failures on multiple Windows versions. --- dlls/crypt32/tests/chain.c | 63 +++++++++++++++++++------------------------ 1 files changed, 28 insertions(+), 35 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 00adab6..eb1fac0 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2456,8 +2456,7 @@ static CONST_DATA_BLOB chain20[] = { }; static const CERT_TRUST_STATUS elementStatus20[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | - CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, + { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus20[] = { @@ -2481,8 +2480,7 @@ static CONST_DATA_BLOB chain22[] = { }; static const CERT_TRUST_STATUS elementStatus22[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | - CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, + { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus22[] = { @@ -2494,8 +2492,7 @@ static CONST_DATA_BLOB chain23[] = { }; static const CERT_TRUST_STATUS elementStatus23[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | - CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, + { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus23[] = { @@ -2507,8 +2504,7 @@ static CONST_DATA_BLOB chain24[] = { }; static const CERT_TRUST_STATUS elementStatus24[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | - CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, + { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus24[] = { @@ -2520,8 +2516,7 @@ static CONST_DATA_BLOB chain25[] = { }; static const CERT_TRUST_STATUS elementStatus25[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | - CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, + { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus25[] = { @@ -2533,8 +2528,7 @@ static CONST_DATA_BLOB chain26[] = { }; static const CERT_TRUST_STATUS elementStatus26[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | - CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, + { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus26[] = { @@ -2559,8 +2553,7 @@ static CONST_DATA_BLOB chain28[] = { }; static const CERT_TRUST_STATUS elementStatus28[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | - CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, + { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus28[] = { @@ -2739,13 +2732,13 @@ static ChainCheck chainCheck[] = { 1, simpleStatus19 }, 0 }, { { sizeof(chain20) / sizeof(chain20[0]), chain20 }, - { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, + { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | - CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 }, 1, simpleStatus20 }, - TODO_ERROR }, + 0 }, { { sizeof(chain21) / sizeof(chain21[0]), chain21 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, @@ -2755,45 +2748,45 @@ static ChainCheck chainCheck[] = { 1, simpleStatus21 }, 0 }, { { sizeof(chain22) / sizeof(chain22[0]), chain22 }, - { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, + { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | - CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 }, 1, simpleStatus22 }, - TODO_ERROR }, + 0 }, { { sizeof(chain23) / sizeof(chain23[0]), chain23 }, - { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, + { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | - CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 }, 1, simpleStatus23 }, - TODO_ERROR }, + 0 }, { { sizeof(chain24) / sizeof(chain24[0]), chain24 }, - { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, + { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | - CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 }, 1, simpleStatus24 }, - TODO_ERROR }, + 0 }, { { sizeof(chain25) / sizeof(chain25[0]), chain25 }, - { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, + { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | - CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 }, 1, simpleStatus25 }, - TODO_ERROR }, + 0 }, { { sizeof(chain26) / sizeof(chain26[0]), chain26 }, - { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, + { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | - CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 }, 1, simpleStatus26 }, - TODO_ERROR }, + 0 }, { { sizeof(chain27) / sizeof(chain27[0]), chain27 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, CERT_TRUST_HAS_PREFERRED_ISSUER }, @@ -2802,13 +2795,13 @@ static ChainCheck chainCheck[] = { 1, simpleStatus27 }, 0 }, { { sizeof(chain28) / sizeof(chain28[0]), chain28 }, - { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, + { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | - CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 }, 1, simpleStatus28 }, - TODO_ERROR }, + 0 }, { { sizeof(selfSignedChain) / sizeof(selfSignedChain[0]), selfSignedChain }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_NOT_TIME_VALID | CERT_TRUST_IS_UNTRUSTED_ROOT, 0 },

1 0

Rob Shearman : advapi32: Fix CheckTokenMembership test on Windows.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 9b3b9a1060231cbe3c65d6edb06bc06275a58e7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b3b9a1060231cbe3c65d6edb… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Nov 10 23:01:51 2009 +0000 advapi32: Fix CheckTokenMembership test on Windows. --- dlls/advapi32/tests/security.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b8d6e19..eaa9e2c 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3206,7 +3206,7 @@ static void test_CheckTokenMembership(void) { PTOKEN_GROUPS token_groups; DWORD size; - HANDLE token; + HANDLE process_token, token; BOOL is_member; BOOL ret; DWORD i; @@ -3216,9 +3216,12 @@ static void test_CheckTokenMembership(void) win_skip("CheckTokenMembership is not available\n"); return; } - ret = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE|TOKEN_QUERY, &process_token); ok(ret, "OpenProcessToken failed with error %d\n", GetLastError()); + ret = DuplicateToken(process_token, SecurityImpersonation, &token); + ok(ret, "DuplicateToken failed with error %d\n", GetLastError()); + /* groups */ ret = GetTokenInformation(token, TokenGroups, NULL, 0, &size); ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, @@ -3244,10 +3247,19 @@ static void test_CheckTokenMembership(void) ret = pCheckTokenMembership(token, token_groups->Groups[i].Sid, &is_member); ok(ret, "CheckTokenMembership failed with error %d\n", GetLastError()); - ok(is_member, "CheckTokenMembership should have detected sid as member"); + ok(is_member, "CheckTokenMembership should have detected sid as member\n"); + + ret = pCheckTokenMembership(process_token, token_groups->Groups[i].Sid, &is_member); +todo_wine { + ok(!ret && GetLastError() == ERROR_NO_IMPERSONATION_TOKEN, + "CheckTokenMembership with process token %s with error %d\n", + ret ? "succeeded" : "failed", GetLastError()); + ok(!is_member, "CheckTokenMembership should have cleared is_member\n"); +} HeapFree(GetProcessHeap(), 0, token_groups); CloseHandle(token); + CloseHandle(process_token); } START_TEST(security)

1 0

Juan Lang : crypt32: Correct error when a matching name constraint is found .
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 300d5fe5c4500f9fdd579ebdab7b3a7a8db1d65d URL: http://source.winehq.org/git/wine.git/?a=commit;h=300d5fe5c4500f9fdd579ebda… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 10 14:40:01 2009 -0800 crypt32: Correct error when a matching name constraint is found. --- dlls/crypt32/chain.c | 3 +-- dlls/crypt32/tests/chain.c | 27 +++++++++++++++++---------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index a6fc9ff..54bff75 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -698,8 +698,7 @@ static void CRYPT_CheckNameConstraints( for (i = 0; i < nameConstraints->cPermittedSubtree; i++) CRYPT_FindMatchingNameEntry( &nameConstraints->rgPermittedSubtree[i].Base, subjectName, - trustErrorStatus, - CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + trustErrorStatus, 0, CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT); LocalFree(subjectName); } diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 2209e1f..00adab6 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2444,7 +2444,7 @@ static CONST_DATA_BLOB chain19[] = { }; static const CERT_TRUST_STATUS elementStatus19[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + { CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus19[] = { @@ -2469,7 +2469,7 @@ static CONST_DATA_BLOB chain21[] = { }; static const CERT_TRUST_STATUS elementStatus21[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + { CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus21[] = { @@ -2725,11 +2725,17 @@ static ChainCheck chainCheck[] = { { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, 0 }, 1, simpleStatus18 }, 0 }, + /* Older versions of crypt32 set CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT + * even though the constraint and alt name match. + * They also do not set CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS, since they + * incorrectly find a name constraint error. + */ { { sizeof(chain19) / sizeof(chain19[0]), chain19 }, - { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, - CERT_TRUST_HAS_PREFERRED_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT | - CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, 0 }, + { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + CERT_TRUST_HAS_PREFERRED_ISSUER | CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS + }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus19 }, 0 }, { { sizeof(chain20) / sizeof(chain20[0]), chain20 }, @@ -2741,10 +2747,11 @@ static ChainCheck chainCheck[] = { 1, simpleStatus20 }, TODO_ERROR }, { { sizeof(chain21) / sizeof(chain21[0]), chain21 }, - { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, - CERT_TRUST_HAS_PREFERRED_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT | - CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, 0 }, + { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + CERT_TRUST_HAS_PREFERRED_ISSUER | CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS + }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus21 }, 0 }, { { sizeof(chain22) / sizeof(chain22[0]), chain22 },

1 0

Juan Lang : crypt32: Stop reading a serialized store if a non-context prop ID appears before a context prop ID .
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 0cf2e6fae6276fe6a3ed56d7f07e910752a87aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf2e6fae6276fe6a3ed56d7f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 10 12:57:54 2009 -0800 crypt32: Stop reading a serialized store if a non-context prop ID appears before a context prop ID. --- dlls/crypt32/serialize.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index b502110..0c366bf 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -499,8 +499,18 @@ static BOOL CRYPT_ReadSerializedStore(void *handle, CERT_STORE_ADD_NEW, &context); } else - ret = CRYPT_ReadContextProp(contextInterface, - context, &propHdr, buf, read); + { + if (!contextInterface) + { + WARN("prop id %d before a context id\n", + propHdr.propID); + ret = FALSE; + } + else + ret = CRYPT_ReadContextProp( + contextInterface, context, &propHdr, buf, + read); + } } } else

1 0

Vincent Povirk : ole32: Add tests for IStorage_RenameElement.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: bc3fa10773a42725fd379bc8eaafdba8138090cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc3fa10773a42725fd379bc8e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 10 14:09:19 2009 -0600 ole32: Add tests for IStorage_RenameElement. --- dlls/ole32/tests/storage32.c | 81 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 480fa17..e4783e8 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1044,6 +1044,7 @@ static void test_substorage_share(void) HRESULT r; static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + static const WCHAR othername[] = { 'N','E','W','N','A','M','E',0 }; DeleteFileA(filenameA); @@ -1070,6 +1071,11 @@ static void test_substorage_share(void) if (r == S_OK) IStorage_Release(stg3); + /* cannot rename the storage while it's open */ + r = IStorage_RenameElement(stg, stgname, othername); + todo_wine ok(r==STG_E_ACCESSDENIED, "IStorage->RenameElement should fail %08x\n", r); + if (SUCCEEDED(r)) IStorage_RenameElement(stg, othername, stgname); + #if 0 /* This crashes on Wine. */ @@ -1105,6 +1111,11 @@ static void test_substorage_share(void) if (r == S_OK) IStorage_Release(stm2); + /* cannot rename the stream while it's open */ + r = IStorage_RenameElement(stg, stmname, othername); + todo_wine ok(r==STG_E_ACCESSDENIED, "IStorage->RenameElement should fail %08x\n", r); + if (SUCCEEDED(r)) IStorage_RenameElement(stg, othername, stmname); + /* destroying an object while it's open invalidates it */ r = IStorage_DestroyElement(stg, stmname); ok(r==S_OK, "IStorage->DestroyElement failed, hr=%08x\n", r); @@ -2319,6 +2330,75 @@ cleanup: DeleteFileW(file2_name); } +static void test_rename(void) +{ + IStorage *stg, *stg2; + IStream *stm; + HRESULT r; + static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; + static const WCHAR stgname2[] = { 'S','T','G',0 }; + static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + static const WCHAR stmname2[] = { 'E','N','T','S',0 }; + + DeleteFileA(filenameA); + + /* create the file */ + r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | + STGM_READWRITE, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + + /* create a substorage */ + r = IStorage_CreateStorage(stg, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg2); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + /* create a stream in the substorage */ + r = IStorage_CreateStream(stg2, stmname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); + ok(r==S_OK, "IStorage->CreateStream failed, hr=%08x\n", r); + IStream_Release(stm); + + /* rename the stream */ + r = IStorage_RenameElement(stg2, stmname, stmname2); + ok(r==S_OK, "IStorage->RenameElement failed, hr=%08x\n", r); + + /* cannot open stream with old name */ + r = IStorage_OpenStream(stg2, stmname, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stm); + ok(r==STG_E_FILENOTFOUND, "IStorage_OpenStream should fail, hr=%08x\n", r); + if (SUCCEEDED(r)) IStream_Release(stm); + + /* can open stream with new name */ + r = IStorage_OpenStream(stg2, stmname2, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stm); + ok(r==S_OK, "IStorage_OpenStream failed, hr=%08x\n", r); + if (SUCCEEDED(r)) IStream_Release(stm); + + IStorage_Release(stg2); + + /* rename the storage */ + IStorage_RenameElement(stg, stgname, stgname2); + + /* cannot open storage with old name */ + r = IStorage_OpenStorage(stg, stgname, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, NULL, 0, &stg2); + ok(r==STG_E_FILENOTFOUND, "IStorage_OpenStream should fail, hr=%08x\n", r); + if (SUCCEEDED(r)) IStorage_Release(stg2); + + /* can open storage with new name */ + r = IStorage_OpenStorage(stg, stgname2, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, NULL, 0, &stg2); + ok(r==S_OK, "IStorage_OpenStream should fail, hr=%08x\n", r); + if (SUCCEEDED(r)) + { + /* opened storage still has the stream */ + r = IStorage_OpenStream(stg2, stmname2, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stm); + ok(r==S_OK, "IStorage_OpenStream failed, hr=%08x\n", r); + if (SUCCEEDED(r)) IStream_Release(stm); + + IStorage_Release(stg2); + } + + IStorage_Release(stg); + + r = DeleteFileA(filenameA); + ok( r == TRUE, "deleted file\n"); +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -2354,4 +2434,5 @@ START_TEST(storage32) test_copyto_snbexclusions(); test_copyto_iidexclusions_storage(); test_copyto_iidexclusions_stream(); + test_rename(); }

1 0

Vincent Povirk : ole32: Simplify RenameElement by using the same entry in the file.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 87ed7d9b8b3c73a42e5583372975805089b6c070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87ed7d9b8b3c73a42e5583372… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 2 12:48:02 2009 -0600 ole32: Simplify RenameElement by using the same entry in the file. --- dlls/ole32/storage32.c | 86 +++++------------------------------------------ 1 files changed, 10 insertions(+), 76 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 1a4ac90..e5b0717 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -686,10 +686,6 @@ end: * This method will rename the specified element. * * See Windows documentation for more details on IStorage methods. - * - * Implementation notes: The method used to rename consists of creating a clone - * of the deleted StgProperty object setting it with the new name and to - * perform a DestroyElement of the old StgProperty. */ static HRESULT WINAPI StorageBaseImpl_RenameElement( IStorage* iface, @@ -726,81 +722,19 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( if (foundPropertyIndex != PROPERTY_NULL) { - StgProperty renamedProperty; - ULONG renamedPropertyIndex; - - /* - * Setup a new property for the renamed property - */ - renamedProperty.sizeOfNameString = - ( lstrlenW(pwcsNewName)+1 ) * sizeof(WCHAR); - - if (renamedProperty.sizeOfNameString > PROPERTY_NAME_BUFFER_LEN) - return STG_E_INVALIDNAME; - - strcpyW(renamedProperty.name, pwcsNewName); - - renamedProperty.propertyType = currentProperty.propertyType; - renamedProperty.startingBlock = currentProperty.startingBlock; - renamedProperty.size.u.LowPart = currentProperty.size.u.LowPart; - renamedProperty.size.u.HighPart = currentProperty.size.u.HighPart; - - renamedProperty.leftChild = PROPERTY_NULL; - renamedProperty.rightChild = PROPERTY_NULL; - - /* - * Bring the dirProperty link in case it is a storage and in which - * case the renamed storage elements don't require to be reorganized. - */ - renamedProperty.dirProperty = currentProperty.dirProperty; - - /* call CoFileTime to get the current time - renamedProperty.ctime - renamedProperty.mtime - renamedProperty.propertyUniqueID - */ + /* Remove the element from its current position in the tree */ + removeFromTree(This->ancestorStorage, This->rootPropertySetIndex, + foundPropertyIndex); - /* - * Save the new property into a new property spot - */ - createDirEntry(This->ancestorStorage, &renamedProperty, &renamedPropertyIndex); + /* Change the name of the element */ + strcpyW(currentProperty.name, pwcsNewName); - /* - * Find a spot in the property chain for our newly created property. - */ - insertIntoTree( - This->ancestorStorage, - This->rootPropertySetIndex, - renamedPropertyIndex); - - /* - * At this point the renamed property has been inserted in the tree, - * now, before Destroying the old property we must zero its dirProperty - * otherwise the DestroyProperty below will zap it all and we do not want - * this to happen. - * Also, we fake that the old property is a storage so the DestroyProperty - * will not do a SetSize(0) on the stream data. - * - * This means that we need to tweak the StgProperty if it is a stream or a - * non empty storage. - */ - StorageImpl_ReadProperty(This->ancestorStorage, - foundPropertyIndex, - &currentProperty); - - currentProperty.dirProperty = PROPERTY_NULL; - currentProperty.propertyType = PROPTYPE_STORAGE; - StorageImpl_WriteProperty( - This->ancestorStorage, - foundPropertyIndex, - &currentProperty); - - /* - * Invoke Destroy to get rid of the ole property and automatically redo - * the linking of its previous and next members... - */ - IStorage_DestroyElement(iface, pwcsOldName); + StorageImpl_WriteProperty(This->ancestorStorage, foundPropertyIndex, + &currentProperty); + /* Insert the element in a new position in the tree */ + insertIntoTree(This->ancestorStorage, This->rootPropertySetIndex, + foundPropertyIndex); } else {

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
91
Older →

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 November 2009