wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

Michael Stefaniuc : dmloader: Simplify the module refcount handling.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 989f39ef325385301ed9f3e7d45e55573ee7ef7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=989f39ef325385301ed9f3e7d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 2 10:28:16 2011 +0200 dmloader: Simplify the module refcount handling. --- dlls/dmloader/container.c | 9 +++------ dlls/dmloader/dmloader_main.c | 21 ++++++++------------- dlls/dmloader/dmloader_private.h | 5 +++-- dlls/dmloader/loader.c | 11 ++++------- 4 files changed, 18 insertions(+), 28 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index a267816..3bee753 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -68,9 +68,7 @@ static HRESULT DMUSIC_DestroyDirectMusicContainerImpl (LPDIRECTMUSICCONTAINER if IStream_Release (This->pStream); /* FIXME: release allocated entries */ - - /* decrease number of instances */ - InterlockedDecrement (&dwDirectMusicContainer); + unlock_module(); return S_OK; } @@ -924,8 +922,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicContainerImpl (LPCGUID lpcGUID, LPVOID* p obj->pContainedObjects = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(struct list)); list_init (obj->pContainedObjects); - /* increase number of instances */ - InterlockedIncrement (&dwDirectMusicContainer); - + lock_module(); + return IDirectMusicContainerImpl_IDirectMusicContainer_QueryInterface ((LPDIRECTMUSICCONTAINER)&obj->ContainerVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmloader/dmloader_main.c b/dlls/dmloader/dmloader_main.c index 80e115e..95a3936 100644 --- a/dlls/dmloader/dmloader_main.c +++ b/dlls/dmloader/dmloader_main.c @@ -23,8 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmloader); static HINSTANCE instance; -LONG dwDirectMusicContainer = 0; -LONG dwDirectMusicLoader = 0; +LONG module_ref = 0; typedef struct { IClassFactory IClassFactory_iface; @@ -61,14 +60,14 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) { - InterlockedIncrement(&dwDirectMusicLoader); + lock_module(); return 2; /* non-heap based object */ } static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) { - InterlockedDecrement(&dwDirectMusicLoader); + unlock_module(); return 1; /* non-heap based object */ } @@ -88,9 +87,9 @@ static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) TRACE("(%d)\n", dolock); if (dolock) - InterlockedIncrement(&dwDirectMusicLoader); + lock_module(); else - InterlockedDecrement(&dwDirectMusicLoader); + unlock_module(); return S_OK; } @@ -127,14 +126,10 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { */ HRESULT WINAPI DllCanUnloadNow (void) { - TRACE("(void)\n"); - /* if there are no instances left, it's safe to release */ - if (!dwDirectMusicContainer && !dwDirectMusicLoader) - return S_OK; - else - return S_FALSE; -} + TRACE("() ref=%d\n", module_ref); + return module_ref ? S_FALSE : S_OK; +} /****************************************************************** * DllGetClassObject (DMLOADER.@) diff --git a/dlls/dmloader/dmloader_private.h b/dlls/dmloader/dmloader_private.h index d8e520b..a6de708 100644 --- a/dlls/dmloader/dmloader_private.h +++ b/dlls/dmloader/dmloader_private.h @@ -45,8 +45,9 @@ #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) /* dmloader.dll global (for DllCanUnloadNow) */ -extern LONG dwDirectMusicLoader DECLSPEC_HIDDEN; /* number of DirectMusicLoader(CF) instances */ -extern LONG dwDirectMusicContainer DECLSPEC_HIDDEN; /* number of DirectMusicContainer(CF) instances */ +extern LONG module_ref DECLSPEC_HIDDEN; +static inline void lock_module(void) { InterlockedIncrement( &module_ref ); } +static inline void unlock_module(void) { InterlockedDecrement( &module_ref ); } /***************************************************************************** * Interfaces diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 0e9748d..e83444d 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -104,11 +104,9 @@ static ULONG WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_Release (LPDIRECTM /*This->CritSect.DebugInfo->Spare[0] = 0; DeleteCriticalSection (&This->CritSect); */ HeapFree (GetProcessHeap(), 0, This); - - /* decrease number of instances */ - InterlockedDecrement (&dwDirectMusicLoader); + unlock_module(); } - + return dwRef; } @@ -895,9 +893,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderImpl (LPCGUID lpcGUID, LPVOID *ppob pDefaultDLSEntry->bInvalidDefaultDLS = TRUE; } - /* increase number of instances */ - InterlockedIncrement (&dwDirectMusicLoader); - + lock_module(); + return IDirectMusicLoaderImpl_IDirectMusicLoader_QueryInterface ((LPDIRECTMUSICLOADER8)obj, lpcGUID, ppobj); }

1 0

Michael Stefaniuc : dmloader: Merge and simplify the IClassFactory implementations.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 98a36f46947bcc8baa402449f63c59c910e7c27b URL: http://source.winehq.org/git/wine.git/?a=commit;h=98a36f46947bcc8baa402449f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 2 10:25:52 2011 +0200 dmloader: Merge and simplify the IClassFactory implementations. --- dlls/dmloader/Makefile.in | 1 - dlls/dmloader/classfactory.c | 200 -------------------------------------- dlls/dmloader/dmloader_main.c | 95 +++++++++++++++++- dlls/dmloader/dmloader_private.h | 21 ---- 4 files changed, 90 insertions(+), 227 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=98a36f46947bcc8baa402…

1 0

Hans Leidekker : msi: Avoid a crash in ControlEvent_SetTargetPath.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: cf4aec0cbd7333dc0662055bb394f4f24c77c627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf4aec0cbd7333dc0662055bb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 2 09:24:05 2011 +0200 msi: Avoid a crash in ControlEvent_SetTargetPath. --- dlls/msi/events.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/msi/events.c b/dlls/msi/events.c index 3047d1d..2c0431d 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -215,18 +215,19 @@ static UINT ControlEvent_AddSource( MSIPACKAGE *package, LPCWSTR argument, msi_d static UINT ControlEvent_SetTargetPath(MSIPACKAGE* package, LPCWSTR argument, msi_dialog* dialog) { + static const WCHAR szSelectionPath[] = {'S','e','l','e','c','t','i','o','n','P','a','t','h',0}; LPWSTR path = msi_dup_property( package->db, argument ); MSIRECORD *rec = MSI_CreateRecord( 1 ); - UINT r; - - static const WCHAR szSelectionPath[] = {'S','e','l','e','c','t','i','o','n','P','a','t','h',0}; + UINT r = ERROR_SUCCESS; MSI_RecordSetStringW( rec, 1, path ); ControlEvent_FireSubscribedEvent( package, szSelectionPath, rec ); - - /* failure to set the path halts the executing of control events */ - r = MSI_SetTargetPathW(package, argument, path); - msi_free(path); + if (path) + { + /* failure to set the path halts the executing of control events */ + r = MSI_SetTargetPathW(package, argument, path); + msi_free(path); + } msi_free(&rec->hdr); return r; }

1 0

Hans Leidekker : winhttp: Verify parameter types in IWinHttpRequest:: SetProxy.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: cfe4c56624c2c853d5ccdd226f6a12df60abf579 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfe4c56624c2c853d5ccdd226… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 2 09:23:50 2011 +0200 winhttp: Verify parameter types in IWinHttpRequest::SetProxy. --- dlls/winhttp/request.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2a70a87..97d10a3 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2414,8 +2414,8 @@ static HRESULT WINAPI winhttp_request_SetProxy( case HTTPREQUEST_PROXYSETTING_PROXY: request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; - request->proxy.lpszProxy = strdupW( V_BSTR( &proxy_server ) ); - request->proxy.lpszProxyBypass = strdupW( V_BSTR( &bypass_list ) ); + if (V_VT( &proxy_server ) == VT_BSTR) request->proxy.lpszProxy = strdupW( V_BSTR( &proxy_server ) ); + if (V_VT( &bypass_list ) == VT_BSTR) request->proxy.lpszProxyBypass = strdupW( V_BSTR( &bypass_list ) ); break; default:

1 0

Hans Leidekker : winhttp: Implement IWinHttpRequest::SetAutoLogonPolicy.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 40bf74107faa7f307e7c014a27c026be2471c673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40bf74107faa7f307e7c014a2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 2 09:23:35 2011 +0200 winhttp: Implement IWinHttpRequest::SetAutoLogonPolicy. --- dlls/winhttp/request.c | 30 ++++++++++++++++++++++++++++-- dlls/winhttp/tests/winhttp.c | 15 +++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 633d8e8..2a70a87 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2174,6 +2174,7 @@ struct winhttp_request DWORD bytes_available; DWORD bytes_read; DWORD error; + DWORD logon_policy; LONG resolve_timeout; LONG connect_timeout; LONG send_timeout; @@ -2845,6 +2846,11 @@ static HRESULT request_send( struct winhttp_request *request ) { return HRESULT_FROM_WIN32( get_last_error() ); } + if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_AUTOLOGON_POLICY, &request->logon_policy, + sizeof(request->logon_policy) )) + { + return HRESULT_FROM_WIN32( get_last_error() ); + } if (!WinHttpSetTimeouts( request->hrequest, request->resolve_timeout, request->connect_timeout, @@ -3241,8 +3247,28 @@ static HRESULT WINAPI winhttp_request_SetAutoLogonPolicy( IWinHttpRequest *iface, WinHttpRequestAutoLogonPolicy policy ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + HRESULT hr = S_OK; + + TRACE("%p, %u\n", request, policy ); + + EnterCriticalSection( &request->cs ); + switch (policy) + { + case AutoLogonPolicy_Always: + request->logon_policy = WINHTTP_AUTOLOGON_SECURITY_LEVEL_LOW; + break; + case AutoLogonPolicy_OnlyIfBypassProxy: + request->logon_policy = WINHTTP_AUTOLOGON_SECURITY_LEVEL_MEDIUM; + break; + case AutoLogonPolicy_Never: + request->logon_policy = WINHTTP_AUTOLOGON_SECURITY_LEVEL_HIGH; + break; + default: hr = E_INVALIDARG; + break; + } + LeaveCriticalSection( &request->cs ); + return hr; } static const struct IWinHttpRequestVtbl winhttp_request_vtbl = diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index b450df7..a662ef8 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2265,6 +2265,12 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_SetRequestHeader( req, date, today ); ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %08x\n", hr ); + hr = IWinHttpRequest_SetAutoLogonPolicy( req, 0xdeadbeef ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetAutoLogonPolicy( req, AutoLogonPolicy_OnlyIfBypassProxy ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( method ); method = SysAllocString( method1W ); SysFreeString( url ); @@ -2335,6 +2341,9 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_SetRequestHeader( req, date, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + hr = IWinHttpRequest_SetAutoLogonPolicy( req, AutoLogonPolicy_OnlyIfBypassProxy ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IWinHttpRequest_Send( req, empty ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2396,6 +2405,9 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_SetRequestHeader( req, date, today ); ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND ), "got %08x\n", hr ); + hr = IWinHttpRequest_SetAutoLogonPolicy( req, AutoLogonPolicy_OnlyIfBypassProxy ); + ok( hr == S_OK, "got %08x\n", hr ); + VariantInit( &timeout ); V_VT( &timeout ) = VT_I4; V_I4( &timeout ) = 10; @@ -2457,6 +2469,9 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_SetRequestHeader( req, date, today ); ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND ), "got %08x\n", hr ); + hr = IWinHttpRequest_SetAutoLogonPolicy( req, AutoLogonPolicy_OnlyIfBypassProxy ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IWinHttpRequest_Send( req, empty ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Hans Leidekker : winhttp: Execute asynchronous requests in a separate thread.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: e5b8c497efe243a11e447c382a45a51f8b278e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5b8c497efe243a11e447c382… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 2 09:23:20 2011 +0200 winhttp: Execute asynchronous requests in a separate thread. --- dlls/winhttp/Makefile.in | 4 +- dlls/winhttp/request.c | 539 ++++++++++++++++++++++++++-------------------- 2 files changed, 302 insertions(+), 241 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5b8c497efe243a11e447…

1 0

Hans Leidekker : winhttp: Protect access to the request object with a critical section.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 916e3c1cc4c65064f9352eb9b0915d40e24f5781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=916e3c1cc4c65064f9352eb9b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 2 09:22:58 2011 +0200 winhttp: Protect access to the request object with a critical section. --- dlls/winhttp/request.c | 282 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 201 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=916e3c1cc4c65064f9352…

1 0

Nikolay Sivov : advapi32: Basic test for CreateRestrictedToken.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 3dc6226519655696f5dc94e8c28aa5ecb4fb5f63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc6226519655696f5dc94e8c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 2 11:09:18 2011 +0400 advapi32: Basic test for CreateRestrictedToken. --- dlls/advapi32/tests/security.c | 95 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 931f912..a21989c 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -115,6 +115,8 @@ static DWORD (WINAPI *pGetSecurityInfo)(HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMA PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*); static NTSTATUS (WINAPI *pNtAccessCheck)(PSECURITY_DESCRIPTOR, HANDLE, ACCESS_MASK, PGENERIC_MAPPING, PPRIVILEGE_SET, PULONG, PULONG, NTSTATUS*); +static BOOL (WINAPI *pCreateRestrictedToken)(HANDLE, DWORD, DWORD, PSID_AND_ATTRIBUTES, DWORD, + PLUID_AND_ATTRIBUTES, DWORD, PSID_AND_ATTRIBUTES, PHANDLE); static HMODULE hmod; static int myARGC; @@ -157,6 +159,7 @@ static void init(void) pSetEntriesInAclA = (void *)GetProcAddress(hmod, "SetEntriesInAclA"); pSetSecurityDescriptorControl = (void *)GetProcAddress(hmod, "SetSecurityDescriptorControl"); pGetSecurityInfo = (void *)GetProcAddress(hmod, "GetSecurityInfo"); + pCreateRestrictedToken = (void *)GetProcAddress(hmod, "CreateRestrictedToken"); myARGC = winetest_get_mainargs( &myARGV ); } @@ -3868,6 +3871,97 @@ static void test_GetUserNameW(void) ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); } +static void test_CreateRestrictedToken(void) +{ + HANDLE process_token, token, r_token; + PTOKEN_GROUPS token_groups, groups2; + SID_AND_ATTRIBUTES sattr; + BOOL is_member; + DWORD size; + BOOL ret; + DWORD i, j; + + if (!pCreateRestrictedToken) + { + win_skip("CreateRestrictedToken is not available\n"); + return; + } + + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE|TOKEN_QUERY, &process_token); + ok(ret, "got error %d\n", GetLastError()); + + ret = DuplicateTokenEx(process_token, TOKEN_DUPLICATE|TOKEN_ADJUST_GROUPS|TOKEN_QUERY, + NULL, SecurityImpersonation, TokenImpersonation, &token); + ok(ret, "got error %d\n", GetLastError()); + + /* groups */ + ret = GetTokenInformation(token, TokenGroups, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "got %d with error %d\n", ret, GetLastError()); + token_groups = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetTokenInformation(token, TokenGroups, token_groups, size, &size); + ok(ret, "got error %d\n", GetLastError()); + + for (i = 0; i < token_groups->GroupCount; i++) + { + if (token_groups->Groups[i].Attributes & SE_GROUP_ENABLED) + break; + } + + if (i == token_groups->GroupCount) + { + HeapFree(GetProcessHeap(), 0, token_groups); + CloseHandle(token); + skip("User not a member of any group\n"); + return; + } + + is_member = FALSE; + ret = pCheckTokenMembership(token, token_groups->Groups[i].Sid, &is_member); + ok(ret, "got error %d\n", GetLastError()); + ok(is_member, "not a member\n"); + + /* disable a SID in new token */ + sattr.Sid = token_groups->Groups[i].Sid; + sattr.Attributes = 0; + ret = pCreateRestrictedToken(token, 0, 1, &sattr, 0, NULL, 0, NULL, &r_token); + todo_wine ok(ret, "got error %d\n", GetLastError()); + + if (ret) + { + /* check if a SID is enabled */ + is_member = TRUE; + ret = pCheckTokenMembership(r_token, token_groups->Groups[i].Sid, &is_member); + ok(ret, "got error %d\n", GetLastError()); + ok(!is_member, "not a member\n"); + + ret = GetTokenInformation(r_token, TokenGroups, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d with error %d\n", + ret, GetLastError()); + groups2 = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetTokenInformation(r_token, TokenGroups, groups2, size, &size); + ok(ret, "got error %d\n", GetLastError()); + + for (j = 0; j < groups2->GroupCount; j++) + { + if (EqualSid(groups2->Groups[j].Sid, token_groups->Groups[i].Sid)) + break; + } + + ok(groups2->Groups[j].Attributes & SE_GROUP_USE_FOR_DENY_ONLY, + "got wrong attributes\n"); + ok((groups2->Groups[j].Attributes & SE_GROUP_ENABLED) == 0, + "got wrong attributes\n"); + + HeapFree(GetProcessHeap(), 0, groups2); + } + + HeapFree(GetProcessHeap(), 0, token_groups); + CloseHandle(r_token); + CloseHandle(token); + CloseHandle(process_token); +} + START_TEST(security) { init(); @@ -3903,4 +3997,5 @@ START_TEST(security) test_EqualSid(); test_GetUserNameA(); test_GetUserNameW(); + test_CreateRestrictedToken(); }

1 0

Nikolay Sivov : advapi32: Fix CheckTokenMemberShip for primary tokens.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 5290766ae0826e506b944b42944a5468bb79fa5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5290766ae0826e506b944b429… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 2 02:12:51 2011 +0400 advapi32: Fix CheckTokenMemberShip for primary tokens. --- dlls/advapi32/security.c | 13 +++++++++++++ dlls/advapi32/tests/security.c | 6 ++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index c3454a8..e4953d0 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -607,6 +607,19 @@ CheckTokenMembership( HANDLE token, PSID sid_to_check, } token = thread_token; } + else + { + TOKEN_TYPE type; + + ret = GetTokenInformation(token, TokenType, &type, sizeof(TOKEN_TYPE), &size); + if (!ret) goto exit; + + if (type == TokenPrimary) + { + SetLastError(ERROR_NO_IMPERSONATION_TOKEN); + return FALSE; + } + } ret = GetTokenInformation(token, TokenGroups, NULL, 0, &size); if (!ret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 6a9a1d2..931f912 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3637,21 +3637,23 @@ static void test_CheckTokenMembership(void) return; } + is_member = FALSE; 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\n"); + is_member = FALSE; 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"); + is_member = TRUE; + SetLastError(0xdeadbeef); 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);

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 01fb0fdfe0c08fb3a709b71cff60b854b27b4d90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01fb0fdfe0c08fb3a709b71cf… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Aug 2 11:36:50 2011 +0900 po: Updated Korean translation. --- po/ko.po | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/po/ko.po b/po/ko.po index 276ab96..d00d929 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8622,32 +8622,27 @@ msgstr "%s %S %S 열린 리소스: %lu\n" #: net.rc:45 msgid "OK" -msgstr "" +msgstr "확인" #: net.rc:46 -#, fuzzy msgid "Paused" -msgstr "정지(&P)" +msgstr "정지됨" #: net.rc:47 -#, fuzzy msgid "Disconnected" -msgstr "파이프 연결됨\n" +msgstr "연결이 끊어짐" #: net.rc:48 -#, fuzzy msgid "A network error occurred" -msgstr "프린터 오류 발생." +msgstr "네트워크 오류가 발생함" #: net.rc:49 -#, fuzzy msgid "Connection is being made" -msgstr "연결이 활성화됨\n" +msgstr "연결이 활성화됨" #: net.rc:50 -#, fuzzy msgid "Reconnecting" -msgstr " %s 연결중" +msgstr "다시 연결중" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
77
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 August 2011