January 2007 - Wine-Commits

Vitaliy Margolen : advapi32: Add more tests for granted access mask. Fix test on Wine.
by Alexandre Julliard Jan. 25, 2007

Jan. 25, 2007

Module: wine Branch: master Commit: c04e7e7878fae6591f7fe0df0a6adf2336dc5716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c04e7e7878fae6591f7fe0df0… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Jan 24 23:43:18 2007 -0700 advapi32: Add more tests for granted access mask. Fix test on Wine. --- dlls/advapi32/tests/security.c | 138 +++++++++++++++++++++++++++++++++++++++- server/handle.c | 2 +- 2 files changed, 138 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4fc9fad..bb5954c 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -31,6 +31,7 @@ #include "sddl.h" #include "ntsecapi.h" #include "lmcons.h" +#include "winternl.h" #include "wine/test.h" @@ -59,8 +60,11 @@ typedef NTSTATUS (WINAPI *fnLsaQueryInfo typedef NTSTATUS (WINAPI *fnLsaClose)(LSA_HANDLE); typedef NTSTATUS (WINAPI *fnLsaFreeMemory)(PVOID); typedef NTSTATUS (WINAPI *fnLsaOpenPolicy)(PLSA_UNICODE_STRING,PLSA_OBJECT_ATTRIBUTES,ACCESS_MASK,PLSA_HANDLE); +static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE,OBJECT_INFORMATION_CLASS,PVOID,ULONG,PULONG); static HMODULE hmod; +static int myARGC; +static char** myARGV; fnBuildTrusteeWithSidA pBuildTrusteeWithSidA; fnBuildTrusteeWithNameA pBuildTrusteeWithNameA; @@ -85,7 +89,12 @@ struct sidRef static void init(void) { + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + hmod = GetModuleHandle("advapi32.dll"); + myARGC = winetest_get_mainargs( &myARGV ); + + pNtQueryObject = (void *)GetProcAddress( hntdll, "NtQueryObject" ); } static void test_str_sid(const char *str_sid) @@ -673,7 +682,7 @@ static void test_AccessCheck(void) res = InitializeAcl(Acl, 256, ACL_REVISION); if(!res && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - trace("ACLs not implemented - skipping tests\n"); + skip("ACLs not implemented - skipping tests\n"); return; } ok(res, "InitializeAcl failed with error %d\n", GetLastError()); @@ -1347,10 +1356,136 @@ static void test_LookupAccountName(void) HeapFree(GetProcessHeap(), 0, domain); } +#define TEST_GRANTED_ACCESS(a,b) test_granted_access(a,b,__LINE__) +static void test_granted_access(HANDLE handle, ACCESS_MASK access, int line) +{ + OBJECT_BASIC_INFORMATION obj_info; + NTSTATUS status; + + if (!pNtQueryObject) + { + skip_(__FILE__, line)("Not NT platform - skipping tests\n"); + return; + } + + status = pNtQueryObject( handle, ObjectBasicInformation, &obj_info, + sizeof(obj_info), NULL ); + ok_(__FILE__, line)(!status, "NtQueryObject with err: %08x\n", status); + ok_(__FILE__, line)(obj_info.GrantedAccess == access, "Gratned access should " + "be 0x%08x, instead of 0x%08x\n", access, obj_info.GrantedAccess); +} + +static void test_process_security(void) +{ + BOOL res; + PSID AdminSid = NULL, UsersSid = NULL; + PACL Acl = NULL; + SECURITY_DESCRIPTOR *SecurityDescriptor = NULL; + SID_IDENTIFIER_AUTHORITY SIDAuthNT = { SECURITY_NT_AUTHORITY }; + char buffer[MAX_PATH]; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + SECURITY_ATTRIBUTES psa; + + Acl = HeapAlloc(GetProcessHeap(), 0, 256); + res = InitializeAcl(Acl, 256, ACL_REVISION); + if (!res && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("ACLs not implemented - skipping tests\n"); + return; + } + ok(res, "InitializeAcl failed with error %d\n", GetLastError()); + + res = AllocateAndInitializeSid( &SIDAuthNT, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &AdminSid); + ok(res, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); + res = AllocateAndInitializeSid( &SIDAuthNT, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_USERS, 0, 0, 0, 0, 0, 0, &UsersSid); + ok(res, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); + + res = AddAccessDeniedAce(Acl, ACL_REVISION, PROCESS_VM_READ, AdminSid); + ok(res, "AddAccessDeniedAce failed with error %d\n", GetLastError()); + res = AddAccessAllowedAce(Acl, ACL_REVISION, PROCESS_ALL_ACCESS, AdminSid); + ok(res, "AddAccessAllowedAceEx failed with error %d\n", GetLastError()); + + SecurityDescriptor = HeapAlloc(GetProcessHeap(), 0, SECURITY_DESCRIPTOR_MIN_LENGTH); + res = InitializeSecurityDescriptor(SecurityDescriptor, SECURITY_DESCRIPTOR_REVISION); + ok(res, "InitializeSecurityDescriptor failed with error %d\n", GetLastError()); + + /* Set owner and group and dacl */ + res = SetSecurityDescriptorOwner(SecurityDescriptor, AdminSid, FALSE); + ok(res, "SetSecurityDescriptorOwner failed with error %d\n", GetLastError()); + res = SetSecurityDescriptorGroup(SecurityDescriptor, UsersSid, TRUE); + ok(res, "SetSecurityDescriptorGroup failed with error %d\n", GetLastError()); + res = SetSecurityDescriptorDacl(SecurityDescriptor, TRUE, Acl, FALSE); + ok(res, "SetSecurityDescriptorDacl failed with error %d\n", GetLastError()); + + + sprintf(buffer, "%s tests/security.c test", myARGV[0]); + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + + psa.nLength = sizeof(psa); + psa.lpSecurityDescriptor = SecurityDescriptor; + psa.bInheritHandle = TRUE; + + /* Doesn't matter what ACL say we should get full access for ourselves */ + ok(CreateProcessA( NULL, buffer, &psa, NULL, FALSE, 0, NULL, NULL, &startup, &info ), + "CreateProcess with err:%d\n", GetLastError()); + TEST_GRANTED_ACCESS( info.hProcess, PROCESS_ALL_ACCESS ); + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); + + if (AdminSid) FreeSid(AdminSid); + if (UsersSid) FreeSid(UsersSid); + HeapFree(GetProcessHeap(), 0, Acl); + HeapFree(GetProcessHeap(), 0, SecurityDescriptor); +} + +static void test_process_security_child(void) +{ + HANDLE handle, handle1; + + handle = OpenProcess( PROCESS_TERMINATE, FALSE, GetCurrentProcessId() ); + ok(handle != NULL, "OpenProcess(PROCESS_TERMINATE) with err:%d\n", GetLastError()); + TEST_GRANTED_ACCESS( handle, PROCESS_TERMINATE ); + + ok(DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), + &handle1, PROCESS_ALL_ACCESS, TRUE, DUPLICATE_SAME_ACCESS), + "duplicating handle err:%d\n", GetLastError()); + TEST_GRANTED_ACCESS( handle, PROCESS_TERMINATE ); + + CloseHandle( handle1 ); + CloseHandle( handle ); + + /* These two should fail - they are denied by ACL */ + handle = OpenProcess( PROCESS_VM_READ, FALSE, GetCurrentProcessId() ); + todo_wine + ok(handle == NULL, "OpenProcess(PROCESS_VM_READ) should have failed\n"); + handle = OpenProcess( PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId() ); + todo_wine + ok(handle == NULL, "OpenProcess(PROCESS_ALL_ACCESS) should have failed\n"); + + /* Documented privilege elevation */ + ok(DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), + &handle, PROCESS_ALL_ACCESS, TRUE, DUPLICATE_SAME_ACCESS), + "duplicating handle err:%d\n", GetLastError()); + TEST_GRANTED_ACCESS( handle, PROCESS_ALL_ACCESS ); + + CloseHandle( handle ); +} + START_TEST(security) { init(); if (!hmod) return; + + if (myARGC >= 3) + { + test_process_security_child(); + return; + } test_sid(); test_trustee(); test_luid(); @@ -1359,4 +1494,5 @@ START_TEST(security) test_token_attr(); test_LookupAccountSid(); test_LookupAccountName(); + test_process_security(); } diff --git a/server/handle.c b/server/handle.c index f0c58a8..4b52280 100644 --- a/server/handle.c +++ b/server/handle.c @@ -459,7 +459,7 @@ obj_handle_t duplicate_handle( struct pr access = entry->access; else /* pseudo-handle, give it full access */ { - access = STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL; + access = obj->ops->map_access( obj, GENERIC_ALL ); clear_error(); } }

1 0

Vitaliy Margolen : advapi32: Add few more tests for token access check and fix it on Wine.
by Alexandre Julliard Jan. 25, 2007

Jan. 25, 2007

Module: wine Branch: master Commit: 2cf11ef771955bf858d062a2de218e619cd0f4d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cf11ef771955bf858d062a2d… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Jan 24 23:41:39 2007 -0700 advapi32: Add few more tests for token access check and fix it on Wine. --- dlls/advapi32/tests/security.c | 48 +++++++++++++++++++++++++++++++++------ server/token.c | 2 +- 2 files changed, 41 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 6ff3a0f..4fc9fad 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -656,6 +656,7 @@ static void test_AccessCheck(void) BOOL res; HMODULE NtDllModule; BOOLEAN Enabled; + DWORD err; NtDllModule = GetModuleHandle("ntdll.dll"); @@ -691,8 +692,8 @@ static void test_AccessCheck(void) res = AddAccessAllowedAce(Acl, ACL_REVISION, KEY_READ, EveryoneSid); ok(res, "AddAccessAllowedAceEx failed with error %d\n", GetLastError()); - res = AddAccessAllowedAce(Acl, ACL_REVISION, KEY_ALL_ACCESS, AdminSid); - ok(res, "AddAccessAllowedAceEx failed with error %d\n", GetLastError()); + res = AddAccessDeniedAce(Acl, ACL_REVISION, KEY_SET_VALUE, AdminSid); + ok(res, "AddAccessDeniedAce failed with error %d\n", GetLastError()); SecurityDescriptor = HeapAlloc(GetProcessHeap(), 0, SECURITY_DESCRIPTOR_MIN_LENGTH); @@ -702,12 +703,6 @@ static void test_AccessCheck(void) res = SetSecurityDescriptorDacl(SecurityDescriptor, TRUE, Acl, FALSE); ok(res, "SetSecurityDescriptorDacl failed with error %d\n", GetLastError()); - res = SetSecurityDescriptorOwner(SecurityDescriptor, AdminSid, FALSE); - ok(res, "SetSecurityDescriptorOwner failed with error %d\n", GetLastError()); - - res = SetSecurityDescriptorGroup(SecurityDescriptor, UsersSid, TRUE); - ok(res, "SetSecurityDescriptorGroup failed with error %d\n", GetLastError()); - PrivSetLen = FIELD_OFFSET(PRIVILEGE_SET, Privilege[16]); PrivSet = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, PrivSetLen); PrivSet->PrivilegeCount = 16; @@ -720,6 +715,33 @@ static void test_AccessCheck(void) TOKEN_QUERY, TRUE, &Token); ok(ret, "OpenThreadToken failed with error %d\n", GetLastError()); + /* SD without owner/group */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0xdeadbeef; + ret = AccessCheck(SecurityDescriptor, Token, KEY_QUERY_VALUE, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_SECURITY_DESCR, "AccessCheck should have " + "failed with ERROR_INVALID_SECURITY_DESCR, instead of %d\n", err); + ok(Access == 0xdeadbeef && AccessStatus == 0xdeadbeef, + "Access and/or AccessStatus were changed!\n"); + + /* Set owner and group */ + res = SetSecurityDescriptorOwner(SecurityDescriptor, AdminSid, FALSE); + ok(res, "SetSecurityDescriptorOwner failed with error %d\n", GetLastError()); + res = SetSecurityDescriptorGroup(SecurityDescriptor, UsersSid, TRUE); + ok(res, "SetSecurityDescriptorGroup failed with error %d\n", GetLastError()); + + /* Generic access mask */ + SetLastError(0xdeadbeef); + ret = AccessCheck(SecurityDescriptor, Token, GENERIC_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + ok(!ret && err == ERROR_GENERIC_NOT_MAPPED, "AccessCheck should have failed " + "with ERROR_GENERIC_NOT_MAPPED, instead of %d\n", err); + ok(Access == 0xdeadbeef && AccessStatus == 0xdeadbeef, + "Access and/or AccessStatus were changed!\n"); + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); ok(ret, "AccessCheck failed with error %d\n", GetLastError()); @@ -735,6 +757,16 @@ static void test_AccessCheck(void) GetLastError()); trace("AccessCheck with MAXIMUM_ALLOWED got Access 0x%08x\n", Access); + /* Access denied by SD */ + SetLastError(0xdeadbeef); + ret = AccessCheck(SecurityDescriptor, Token, KEY_WRITE, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + ok(ret, "AccessCheck failed with error %d\n", GetLastError()); + err = GetLastError(); + ok(!AccessStatus && err == ERROR_ACCESS_DENIED, "AccessCheck should have failed " + "with ERROR_ACCESS_DENIED, instead of %d\n", err); + ok(!Access, "Should have failed to grant any access, got 0x%08x\n", Access); + SetLastError(0); PrivSet->PrivilegeCount = 16; ret = AccessCheck(SecurityDescriptor, Token, ACCESS_SYSTEM_SECURITY, &Mapping, diff --git a/server/token.c b/server/token.c index c27e73b..e3e0490 100644 --- a/server/token.c +++ b/server/token.c @@ -838,7 +838,7 @@ static unsigned int token_access_check( if (desired_access & access) { *granted_access = 0; - return STATUS_SUCCESS; + return STATUS_ACCESS_DENIED; } } }

1 0

Vitaliy Margolen : server: Reverse return value and status in token_access_check to be consistent.
by Alexandre Julliard Jan. 25, 2007

Jan. 25, 2007

Module: wine Branch: master Commit: fad936c7c5192114ef34db3dcab5437208f085bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad936c7c5192114ef34db3dc… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Jan 24 23:42:15 2007 -0700 server: Reverse return value and status in token_access_check to be consistent. --- server/token.c | 63 ++++++++++++++++++++++--------------------------------- 1 files changed, 25 insertions(+), 38 deletions(-) diff --git a/server/token.c b/server/token.c index e3e0490..28455a5 100644 --- a/server/token.c +++ b/server/token.c @@ -707,11 +707,12 @@ static int token_sid_present( struct tok return FALSE; } -/* checks access to a security descriptor. sd must have been validated by caller. - * it returns STATUS_SUCCESS if access was granted to the object, or an error - * status code if not, giving the reason. errors not relating to giving access - * to the object are returned in the status parameter. granted_access and - * status always have a valid value stored in them on return. */ +/* Checks access to a security descriptor. 'sd' must have been validated by + * caller. It returns STATUS_SUCCESS if call succeeded or an error indicating + * the reason. 'status' parameter will indicate if access is granted or denied. + * + * If both returned value and 'status' are STATUS_SUCCESS then access is granted. + */ static unsigned int token_access_check( struct token *token, const struct security_descriptor *sd, unsigned int desired_access, @@ -729,16 +730,14 @@ static unsigned int token_access_check( const ACE_HEADER *ace; const SID *owner; - /* assume success, but no access rights */ - *status = STATUS_SUCCESS; + /* assume no access rights */ *granted_access = 0; /* fail if desired_access contains generic rights */ if (desired_access & (GENERIC_READ|GENERIC_WRITE|GENERIC_EXECUTE|GENERIC_ALL)) { *priv_count = 0; - *status = STATUS_GENERIC_NOT_MAPPED; - return STATUS_ACCESS_DENIED; + return STATUS_GENERIC_NOT_MAPPED; } dacl = sd_get_dacl( sd, &dacl_present ); @@ -746,8 +745,7 @@ static unsigned int token_access_check( if (!owner || !sd_get_group( sd )) { *priv_count = 0; - *status = STATUS_INVALID_SECURITY_DESCR; - return STATUS_ACCESS_DENIED; + return STATUS_INVALID_SECURITY_DESCR; } /* 1: Grant desired access if the object is unprotected */ @@ -755,12 +753,13 @@ static unsigned int token_access_check( { *priv_count = 0; *granted_access = desired_access; - return STATUS_SUCCESS; + return *status = STATUS_SUCCESS; } if (!dacl) { *priv_count = 0; - return STATUS_ACCESS_DENIED; + *status = STATUS_ACCESS_DENIED; + return STATUS_SUCCESS; } /* 2: Check if caller wants access to system security part. Note: access @@ -789,13 +788,14 @@ static unsigned int token_access_check( if (desired_access == current_access) { *granted_access = current_access; - return STATUS_SUCCESS; + return *status = STATUS_SUCCESS; } } else { *priv_count = 0; - return STATUS_PRIVILEGE_NOT_HELD; + *status = STATUS_PRIVILEGE_NOT_HELD; + return STATUS_SUCCESS; } } else if (priv_count) *priv_count = 0; @@ -810,7 +810,7 @@ static unsigned int token_access_check( if (desired_access == current_access) { *granted_access = current_access; - return STATUS_SUCCESS; + return *status = STATUS_SUCCESS; } } @@ -835,11 +835,7 @@ static unsigned int token_access_check( else { denied_access |= (access & ~current_access); - if (desired_access & access) - { - *granted_access = 0; - return STATUS_ACCESS_DENIED; - } + if (desired_access & access) goto done; } } break; @@ -866,24 +862,17 @@ static unsigned int token_access_check( ace = ace_next( ace ); } +done: if (desired_access & MAXIMUM_ALLOWED) - { *granted_access = current_access & ~denied_access; - if (*granted_access) - return STATUS_SUCCESS; - else - return STATUS_ACCESS_DENIED; - } else - { if ((current_access & desired_access) == desired_access) - { *granted_access = current_access & desired_access; - return STATUS_SUCCESS; - } else - return STATUS_ACCESS_DENIED; - } + *granted_access = 0; + + *status = *granted_access ? STATUS_SUCCESS : STATUS_ACCESS_DENIED; + return STATUS_SUCCESS; } const ACL *token_get_default_dacl( struct token *token ) @@ -1109,9 +1098,9 @@ DECL_HANDLER(access_check) mapping.GenericExecute = req->mapping_execute; mapping.GenericAll = req->mapping_all; - reply->access_status = token_access_check( + status = token_access_check( token, sd, req->desired_access, &priv, &priv_count, &mapping, - &reply->access_granted, &status ); + &reply->access_granted, &reply->access_status ); reply->privileges_len = priv_count*sizeof(LUID_AND_ATTRIBUTES); @@ -1121,9 +1110,7 @@ DECL_HANDLER(access_check) memcpy( privs, &priv, sizeof(priv) ); } - if (status != STATUS_SUCCESS) - set_error( status ); - + set_error( status ); release_object( token ); } }

1 0

Paul Vriens : qcap: Initialize a variable (Coverity).
by Alexandre Julliard Jan. 25, 2007

Jan. 25, 2007

Module: wine Branch: master Commit: 3c3e3e8d1d02b2c8995b90227a7355d77fe47af6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c3e3e8d1d02b2c8995b90227… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jan 25 09:46:40 2007 +0100 qcap: Initialize a variable (Coverity). --- dlls/qcap/dllsetup.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qcap/dllsetup.c b/dlls/qcap/dllsetup.c index 036228a..8de99ec 100644 --- a/dlls/qcap/dllsetup.c +++ b/dlls/qcap/dllsetup.c @@ -94,7 +94,7 @@ static HRESULT SetupRegisterClass(HKEY c LPCWSTR szServerType, LPCWSTR szThreadingModel) { - HKEY hkey, hsubkey; + HKEY hkey, hsubkey = NULL; LONG ret = RegCreateKeyW(clsid, szCLSID, &hkey); if (ERROR_SUCCESS != ret) return HRESULT_FROM_WIN32(ret);

1 0

Andrew Talbot : rpcrt4: Declare some functions static.
by Alexandre Julliard Jan. 25, 2007

Jan. 25, 2007

Module: wine Branch: master Commit: 3bc14d91101f71545ddf61bf0602e45136b75807 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bc14d91101f71545ddf61bf0… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Jan 24 21:18:25 2007 +0000 rpcrt4: Declare some functions static. --- dlls/rpcrt4/rpc_binding.c | 10 ++++++---- dlls/rpcrt4/rpc_binding.h | 4 ---- dlls/rpcrt4/rpc_message.c | 2 +- dlls/rpcrt4/rpcrt4_main.c | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 1d10f3d..9203869 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -110,7 +110,7 @@ static RPC_STATUS RPCRT4_AllocBinding(Rp return RPC_S_OK; } -RPC_STATUS RPCRT4_CreateBindingA(RpcBinding** Binding, BOOL server, LPSTR Protseq) +static RPC_STATUS RPCRT4_CreateBindingA(RpcBinding** Binding, BOOL server, LPSTR Protseq) { RpcBinding* NewBinding; @@ -123,7 +123,7 @@ RPC_STATUS RPCRT4_CreateBindingA(RpcBind return RPC_S_OK; } -RPC_STATUS RPCRT4_CreateBindingW(RpcBinding** Binding, BOOL server, LPWSTR Protseq) +static RPC_STATUS RPCRT4_CreateBindingW(RpcBinding** Binding, BOOL server, LPWSTR Protseq) { RpcBinding* NewBinding; @@ -136,7 +136,8 @@ RPC_STATUS RPCRT4_CreateBindingW(RpcBind return RPC_S_OK; } -RPC_STATUS RPCRT4_CompleteBindingA(RpcBinding* Binding, LPSTR NetworkAddr, LPSTR Endpoint, LPSTR NetworkOptions) +static RPC_STATUS RPCRT4_CompleteBindingA(RpcBinding* Binding, LPSTR NetworkAddr, + LPSTR Endpoint, LPSTR NetworkOptions) { TRACE("(RpcBinding == ^%p, NetworkAddr == %s, EndPoint == %s, NetworkOptions == %s)\n", Binding, debugstr_a(NetworkAddr), debugstr_a(Endpoint), debugstr_a(NetworkOptions)); @@ -156,7 +157,8 @@ RPC_STATUS RPCRT4_CompleteBindingA(RpcBi return RPC_S_OK; } -RPC_STATUS RPCRT4_CompleteBindingW(RpcBinding* Binding, LPWSTR NetworkAddr, LPWSTR Endpoint, LPWSTR NetworkOptions) +static RPC_STATUS RPCRT4_CompleteBindingW(RpcBinding* Binding, LPWSTR NetworkAddr, + LPWSTR Endpoint, LPWSTR NetworkOptions) { TRACE("(RpcBinding == ^%p, NetworkAddr == %s, EndPoint == %s, NetworkOptions == %s)\n", Binding, debugstr_w(NetworkAddr), debugstr_w(Endpoint), debugstr_w(NetworkOptions)); diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index f1ebdbd..651d79e 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -125,10 +125,6 @@ RPC_STATUS RPCRT4_OpenClientConnection(R RPC_STATUS RPCRT4_CloseConnection(RpcConnection* Connection); RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnection* OldConnection); -RPC_STATUS RPCRT4_CreateBindingA(RpcBinding** Binding, BOOL server, LPSTR Protseq); -RPC_STATUS RPCRT4_CreateBindingW(RpcBinding** Binding, BOOL server, LPWSTR Protseq); -RPC_STATUS RPCRT4_CompleteBindingA(RpcBinding* Binding, LPSTR NetworkAddr, LPSTR Endpoint, LPSTR NetworkOptions); -RPC_STATUS RPCRT4_CompleteBindingW(RpcBinding* Binding, LPWSTR NetworkAddr, LPWSTR Endpoint, LPWSTR NetworkOptions); RPC_STATUS RPCRT4_ResolveBinding(RpcBinding* Binding, LPSTR Endpoint); RPC_STATUS RPCRT4_SetBindingObject(RpcBinding* Binding, UUID* ObjectUuid); RPC_STATUS RPCRT4_MakeBinding(RpcBinding** Binding, RpcConnection* Connection); diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 4f38069..829b6ca 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -200,7 +200,7 @@ RpcPktHdr *RPCRT4_BuildBindHeader(unsign return header; } -RpcPktHdr *RPCRT4_BuildAuthHeader(unsigned long DataRepresentation) +static RpcPktHdr *RPCRT4_BuildAuthHeader(unsigned long DataRepresentation) { RpcPktHdr *header; diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index 7fa3558..e4191d8 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -655,8 +655,8 @@ HRESULT WINAPI DllRegisterServer( void ) return S_OK; } -BOOL RPCRT4_StartRPCSS(void) -{ +static BOOL RPCRT4_StartRPCSS(void) +{ PROCESS_INFORMATION pi; STARTUPINFOA si; static char cmd[6];

1 0

Andrew Talbot : rsaenh: Declare some functions static.
by Alexandre Julliard Jan. 25, 2007

Jan. 25, 2007

Module: wine Branch: master Commit: a228eefe6da4ab497c3909faa81b74c146dca420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a228eefe6da4ab497c3909faa… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Jan 24 22:37:52 2007 +0000 rsaenh: Declare some functions static. --- dlls/rsaenh/des.c | 2 +- dlls/rsaenh/handle.c | 48 ++++++++++++++++++++++++------------------------ dlls/rsaenh/handle.h | 2 -- dlls/rsaenh/rsa.c | 4 ++-- 4 files changed, 27 insertions(+), 29 deletions(-) diff --git a/dlls/rsaenh/des.c b/dlls/rsaenh/des.c index 67b6871..67931de 100644 --- a/dlls/rsaenh/des.c +++ b/dlls/rsaenh/des.c @@ -1282,7 +1282,7 @@ static const ulong64 des_fp[8][256] = { static void cookey(const ulong32 *raw1, ulong32 *keyout); -void deskey(const unsigned char *key, short edf, ulong32 *keyout) +static void deskey(const unsigned char *key, short edf, ulong32 *keyout) { ulong32 i, j, l, m, n, kn[32]; unsigned char pc1m[56], pcr[56]; diff --git a/dlls/rsaenh/handle.c b/dlls/rsaenh/handle.c index d924c2d..1238651 100644 --- a/dlls/rsaenh/handle.c +++ b/dlls/rsaenh/handle.c @@ -122,6 +122,28 @@ exit: } /****************************************************************************** + * release_all_handles + * + * Releases all valid handles in the given handle table and shrinks the table + * to zero size. + * + * PARAMS + * lpTable [I] The table of which all valid handles shall be released. + */ +static void release_all_handles(HANDLETABLE *lpTable) +{ + unsigned int i; + + TRACE("(lpTable=%p)\n", lpTable); + + EnterCriticalSection(&lpTable->mutex); + for (i=0; i<lpTable->iEntries; i++) + if (lpTable->paEntries[i].pObject) + release_handle(lpTable, lpTable->paEntries[i].pObject->dwType, INDEX2HANDLE(i)); + LeaveCriticalSection(&lpTable->mutex); +} + +/****************************************************************************** * alloc_handle_table * * Allocates a new handle table @@ -235,10 +257,10 @@ static int grow_handle_table(HANDLETABLE * non zero, if successful * zero, if not successful (no free handle) */ -int alloc_handle(HANDLETABLE *lpTable, OBJECTHDR *lpObject, unsigned int *lpHandle) +static int alloc_handle(HANDLETABLE *lpTable, OBJECTHDR *lpObject, unsigned int *lpHandle) { int ret = 0; - + TRACE("(lpTable=%p, lpObject=%p, lpHandle=%p)\n", lpTable, lpObject, lpHandle); EnterCriticalSection(&lpTable->mutex); @@ -314,28 +336,6 @@ exit: } /****************************************************************************** - * release_all_handles - * - * Releases all valid handles in the given handle table and shrinks the table - * to zero size. - * - * PARAMS - * lpTable [I] The table of which all valid handles shall be released. - */ -void release_all_handles(HANDLETABLE *lpTable) -{ - unsigned int i; - - TRACE("(lpTable=%p)\n", lpTable); - - EnterCriticalSection(&lpTable->mutex); - for (i=0; i<lpTable->iEntries; i++) - if (lpTable->paEntries[i].pObject) - release_handle(lpTable, lpTable->paEntries[i].pObject->dwType, INDEX2HANDLE(i)); - LeaveCriticalSection(&lpTable->mutex); -} - -/****************************************************************************** * lookup_handle * * Returns the object identified by the handle in the given handle table diff --git a/dlls/rsaenh/handle.h b/dlls/rsaenh/handle.h index 6fa9639..b9ca6a8 100644 --- a/dlls/rsaenh/handle.h +++ b/dlls/rsaenh/handle.h @@ -56,10 +56,8 @@ typedef struct tagHANDLETABLE int alloc_handle_table (HANDLETABLE **lplpTable); void init_handle_table (HANDLETABLE *lpTable); -void release_all_handles (HANDLETABLE *lpTable); int release_handle_table(HANDLETABLE *lpTable); void destroy_handle_table(HANDLETABLE *lpTable); -int alloc_handle (HANDLETABLE *lpTable, OBJECTHDR *lpObject, unsigned int *lpHandle); int release_handle (HANDLETABLE *lpTable, unsigned int handle, DWORD dwType); int copy_handle (HANDLETABLE *lpTable, unsigned int handle, DWORD dwType, unsigned int *copy); int lookup_handle (HANDLETABLE *lpTable, unsigned int handle, DWORD dwType, OBJECTHDR **lplpObject); diff --git a/dlls/rsaenh/rsa.c b/dlls/rsaenh/rsa.c index 00a65e5..e6ccddf 100644 --- a/dlls/rsaenh/rsa.c +++ b/dlls/rsaenh/rsa.c @@ -39,7 +39,7 @@ static const struct { }; /* convert a MPI error to a LTC error (Possibly the most powerful function ever! Oh wait... no) */ -int mpi_to_ltc_error(int err) +static int mpi_to_ltc_error(int err) { int x; @@ -58,7 +58,7 @@ static int rand_prime_helper(unsigned ch return gen_rand_impl(dst, len) ? len : 0; } -int rand_prime(mp_int *N, long len) +static int rand_prime(mp_int *N, long len) { int type;

1 0

Rob Shearman : rpcrt4: RPCRT4_strdupWtoA and RPCRT4_strdupAtoW don' t change the input string, so make the input const.
by Alexandre Julliard Jan. 25, 2007

Jan. 25, 2007

Module: wine Branch: master Commit: 399844e9f651756735efafea5e381e65023dca4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=399844e9f651756735efafea5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 25 10:24:00 2007 +0000 rpcrt4: RPCRT4_strdupWtoA and RPCRT4_strdupAtoW don't change the input string, so make the input const. --- dlls/rpcrt4/rpc_binding.c | 4 ++-- dlls/rpcrt4/rpc_binding.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index ffa9659..1d10f3d 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -57,7 +57,7 @@ LPSTR RPCRT4_strndupA(LPCSTR src, INT sl return s; } -LPSTR RPCRT4_strdupWtoA(LPWSTR src) +LPSTR RPCRT4_strdupWtoA(LPCWSTR src) { DWORD len; LPSTR s; @@ -68,7 +68,7 @@ LPSTR RPCRT4_strdupWtoA(LPWSTR src) return s; } -LPWSTR RPCRT4_strdupAtoW(LPSTR src) +LPWSTR RPCRT4_strdupAtoW(LPCSTR src) { DWORD len; LPWSTR s; diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 76100d6..f1ebdbd 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -105,8 +105,8 @@ typedef struct _RpcBinding LPSTR RPCRT4_strndupA(LPCSTR src, INT len); LPWSTR RPCRT4_strndupW(LPCWSTR src, INT len); -LPSTR RPCRT4_strdupWtoA(LPWSTR src); -LPWSTR RPCRT4_strdupAtoW(LPSTR src); +LPSTR RPCRT4_strdupWtoA(LPCWSTR src); +LPWSTR RPCRT4_strdupAtoW(LPCSTR src); void RPCRT4_strfree(LPSTR src); #define RPCRT4_strdupA(x) RPCRT4_strndupA((x),-1)

1 0

Rob Shearman : rpcrt4: Stash away NetworkOptions passed in from the binding string so that transports can look at the string if needed .
by Alexandre Julliard Jan. 25, 2007

Jan. 25, 2007

Module: wine Branch: master Commit: 961455c7f033110dad03dab7f0f688e9c89763fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=961455c7f033110dad03dab7f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 25 10:23:11 2007 +0000 rpcrt4: Stash away NetworkOptions passed in from the binding string so that transports can look at the string if needed. --- dlls/rpcrt4/rpc_binding.c | 12 +++++++++--- dlls/rpcrt4/rpc_binding.h | 6 ++++-- dlls/rpcrt4/rpc_transport.c | 4 +++- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 0034907..ffa9659 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -79,7 +79,7 @@ LPWSTR RPCRT4_strdupAtoW(LPSTR src) return s; } -LPWSTR RPCRT4_strndupW(LPWSTR src, INT slen) +LPWSTR RPCRT4_strndupW(LPCWSTR src, INT slen) { DWORD len; LPWSTR s; @@ -149,6 +149,8 @@ RPC_STATUS RPCRT4_CompleteBindingA(RpcBi } else { Binding->Endpoint = RPCRT4_strdupA(""); } + HeapFree(GetProcessHeap(), 0, Binding->NetworkOptions); + Binding->NetworkOptions = RPCRT4_strdupAtoW(NetworkOptions); if (!Binding->Endpoint) ERR("out of memory?\n"); return RPC_S_OK; @@ -168,6 +170,8 @@ RPC_STATUS RPCRT4_CompleteBindingW(RpcBi Binding->Endpoint = RPCRT4_strdupA(""); } if (!Binding->Endpoint) ERR("out of memory?\n"); + HeapFree(GetProcessHeap(), 0, Binding->NetworkOptions); + Binding->NetworkOptions = RPCRT4_strdupW(NetworkOptions); return RPC_S_OK; } @@ -224,6 +228,7 @@ RPC_STATUS RPCRT4_DestroyBinding(RpcBind RPCRT4_strfree(Binding->Endpoint); RPCRT4_strfree(Binding->NetworkAddr); RPCRT4_strfree(Binding->Protseq); + HeapFree(GetProcessHeap(), 0, Binding->NetworkOptions); if (Binding->AuthInfo) RpcAuthInfo_Release(Binding->AuthInfo); if (Binding->QOS) RpcQualityOfService_Release(Binding->QOS); HeapFree(GetProcessHeap(), 0, Binding); @@ -259,8 +264,8 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding /* create a new connection */ status = RPCRT4_CreateConnection(&NewConnection, Binding->server, Binding->Protseq, Binding->NetworkAddr, - Binding->Endpoint, NULL, Binding->AuthInfo, - Binding->QOS, Binding); + Binding->Endpoint, Binding->NetworkOptions, + Binding->AuthInfo, Binding->QOS, Binding); if (status != RPC_S_OK) return status; @@ -873,6 +878,7 @@ RPC_STATUS RPC_ENTRY RpcBindingCopy( DestBinding->Protseq = RPCRT4_strndupA(SrcBinding->Protseq, -1); DestBinding->NetworkAddr = RPCRT4_strndupA(SrcBinding->NetworkAddr, -1); DestBinding->Endpoint = RPCRT4_strndupA(SrcBinding->Endpoint, -1); + DestBinding->NetworkOptions = RPCRT4_strdupW(SrcBinding->NetworkOptions); if (SrcBinding->AuthInfo) RpcAuthInfo_AddRef(SrcBinding->AuthInfo); DestBinding->AuthInfo = SrcBinding->AuthInfo; diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 6b5ca21..76100d6 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -52,6 +52,7 @@ typedef struct _RpcConnection BOOL server; LPSTR NetworkAddr; LPSTR Endpoint; + LPWSTR NetworkOptions; const struct connection_ops *ops; USHORT MaxTransmissionSize; /* The active interface bound to server. */ @@ -92,6 +93,7 @@ typedef struct _RpcBinding LPSTR Protseq; LPSTR NetworkAddr; LPSTR Endpoint; + LPWSTR NetworkOptions; RPC_BLOCKING_FN BlockingFn; ULONG ServerTid; RpcConnection* FromConn; @@ -102,7 +104,7 @@ typedef struct _RpcBinding } RpcBinding; LPSTR RPCRT4_strndupA(LPCSTR src, INT len); -LPWSTR RPCRT4_strndupW(LPWSTR src, INT len); +LPWSTR RPCRT4_strndupW(LPCWSTR src, INT len); LPSTR RPCRT4_strdupWtoA(LPWSTR src); LPWSTR RPCRT4_strdupAtoW(LPSTR src); void RPCRT4_strfree(LPSTR src); @@ -117,7 +119,7 @@ ULONG RpcQualityOfService_Release(RpcQua RpcConnection *RPCRT4_GetIdleConnection(const RPC_SYNTAX_IDENTIFIER *InterfaceId, const RPC_SYNTAX_IDENTIFIER *TransferSyntax, LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, const RpcAuthInfo* AuthInfo, const RpcQualityOfService *QOS); void RPCRT4_ReleaseIdleConnection(RpcConnection *Connection); -RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS, RpcBinding* Binding); +RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS, RpcBinding* Binding); RPC_STATUS RPCRT4_DestroyConnection(RpcConnection* Connection); RPC_STATUS RPCRT4_OpenClientConnection(RpcConnection* Connection); RPC_STATUS RPCRT4_CloseConnection(RpcConnection* Connection); diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index c92d79d..bf998bb 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1336,7 +1336,7 @@ RPC_STATUS RPCRT4_CloseConnection(RpcCon RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, - LPCSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS, + LPCWSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS, RpcBinding* Binding) { const struct connection_ops *ops; @@ -1355,6 +1355,7 @@ RPC_STATUS RPCRT4_CreateConnection(RpcCo NewConnection->ops = ops; NewConnection->NetworkAddr = RPCRT4_strdupA(NetworkAddr); NewConnection->Endpoint = RPCRT4_strdupA(Endpoint); + NewConnection->NetworkOptions = RPCRT4_strdupW(NetworkOptions); NewConnection->Used = Binding; NewConnection->MaxTransmissionSize = RPC_MAX_PACKET_SIZE; memset(&NewConnection->ActiveInterface, 0, sizeof(NewConnection->ActiveInterface)); @@ -1430,6 +1431,7 @@ RPC_STATUS RPCRT4_DestroyConnection(RpcC RPCRT4_CloseConnection(Connection); RPCRT4_strfree(Connection->Endpoint); RPCRT4_strfree(Connection->NetworkAddr); + HeapFree(GetProcessHeap(), 0, Connection->NetworkOptions); if (Connection->AuthInfo) RpcAuthInfo_Release(Connection->AuthInfo); if (Connection->QOS) RpcQualityOfService_Release(Connection->QOS); HeapFree(GetProcessHeap(), 0, Connection);

1 0

Mike McCormack : msi: Implement IClassFactory->QueryInterface() for the msi server dll.
by Alexandre Julliard Jan. 25, 2007

Jan. 25, 2007

Module: wine Branch: master Commit: c63d21bf8c0f4f4fab67438715556709eaff34fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c63d21bf8c0f4f4fab6743871… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jan 25 19:17:42 2007 +0900 msi: Implement IClassFactory->QueryInterface() for the msi server dll. --- dlls/msi/msi_main.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c index 294de71..48cfd15 100644 --- a/dlls/msi/msi_main.c +++ b/dlls/msi/msi_main.c @@ -59,7 +59,7 @@ static void UnlockModule(void) } /****************************************************************** - * DllMain + * DllMain */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -78,8 +78,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, return TRUE; } -typedef struct tagIClassFactoryImpl -{ +typedef struct tagIClassFactoryImpl { const IClassFactoryVtbl *lpVtbl; } IClassFactoryImpl; @@ -87,7 +86,16 @@ static HRESULT WINAPI MsiCF_QueryInterfa REFIID riid,LPVOID *ppobj) { IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - FIXME("%p %s %p\n",This,debugstr_guid(riid),ppobj); + + TRACE("%p %s %p\n",This,debugstr_guid(riid),ppobj); + + if( IsEqualCLSID( riid, &IID_IUnknown ) || + IsEqualCLSID( riid, &IID_IClassFactory ) ) + { + IClassFactory_AddRef( iface ); + *ppobj = iface; + return S_OK; + } return E_NOINTERFACE; }

1 0

Mike McCormack : msi: Implement IDispatch->CreateInstance() for the msi server dll.
by Alexandre Julliard Jan. 25, 2007

Jan. 25, 2007

Module: wine Branch: master Commit: 9c76a0b37afd3650b01784dbba61fdf3fad90808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c76a0b37afd3650b01784dbb… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jan 25 19:18:18 2007 +0900 msi: Implement IDispatch->CreateInstance() for the msi server dll. --- dlls/msi/msi_main.c | 37 +++++++++++++++++++++++++++++-------- 1 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c index 48cfd15..dc9d7f4 100644 --- a/dlls/msi/msi_main.c +++ b/dlls/msi/msi_main.c @@ -80,8 +80,15 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, typedef struct tagIClassFactoryImpl { const IClassFactoryVtbl *lpVtbl; + HRESULT (*create_object)( IUnknown*, LPVOID* ); } IClassFactoryImpl; +static HRESULT create_msiserver( IUnknown *pOuter, LPVOID *ppObj ) +{ + FIXME("\n"); + return E_FAIL; +} + static HRESULT WINAPI MsiCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid,LPVOID *ppobj) { @@ -115,9 +122,18 @@ static HRESULT WINAPI MsiCF_CreateInstan LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IUnknown *unk = NULL; + HRESULT r; - FIXME("%p %p %s %p\n", This, pOuter, debugstr_guid(riid), ppobj); - return E_FAIL; + TRACE("%p %p %s %p\n", This, pOuter, debugstr_guid(riid), ppobj); + + r = This->create_object( pOuter, ppobj ); + if (SUCCEEDED(r)) + { + r = IUnknown_QueryInterface( unk, riid, ppobj ); + IUnknown_Release( unk ); + } + return r; } static HRESULT WINAPI MsiCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) @@ -141,7 +157,7 @@ static const IClassFactoryVtbl MsiCF_Vtb MsiCF_LockServer }; -static IClassFactoryImpl Msi_CF = { &MsiCF_Vtbl }; +static IClassFactoryImpl MsiServer_CF = { &MsiCF_Vtbl, create_msiserver }; /****************************************************************** * DllGetClassObject [MSI.@] @@ -150,15 +166,20 @@ HRESULT WINAPI DllGetClassObject(REFCLSI { TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - if( IsEqualCLSID (rclsid, &CLSID_IMsiServer) || - IsEqualCLSID (rclsid, &CLSID_IMsiServerMessage) || + if ( IsEqualCLSID (rclsid, &CLSID_IMsiServerX2) ) + { + *ppv = (LPVOID) &MsiServer_CF; + return S_OK; + } + + if( IsEqualCLSID (rclsid, &CLSID_IMsiServerMessage) || + IsEqualCLSID (rclsid, &CLSID_IMsiServer) || IsEqualCLSID (rclsid, &CLSID_IMsiServerX1) || - IsEqualCLSID (rclsid, &CLSID_IMsiServerX2) || IsEqualCLSID (rclsid, &CLSID_IMsiServerX3) ) { - *ppv = (LPVOID) &Msi_CF; - return S_OK; + FIXME("create %s object\n", debugstr_guid( rclsid )); } + return CLASS_E_CLASSNOTAVAILABLE; }

1 0