wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Alexandre Julliard : rpcrt4: Don't try to bind to a null handle.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: cdf457774d4310c6af65af69472a5090fbcd93d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf457774d4310c6af65af694… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 17:45:14 2011 +0200 rpcrt4: Don't try to bind to a null handle. --- dlls/rpcrt4/ndr_stubless.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index f7bd670..0f54211 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -191,14 +191,14 @@ static PFORMAT_STRING client_get_handle( } else context_handle = *(NDR_CCONTEXT *)ARG_FROM_OFFSET(pStubMsg->StackTop, pDesc->offset); - if ((pDesc->flags & NDR_CONTEXT_HANDLE_CANNOT_BE_NULL) && - !context_handle) + + if (context_handle) *phBinding = NDRCContextBinding(context_handle); + else if (pDesc->flags & NDR_CONTEXT_HANDLE_CANNOT_BE_NULL) { ERR("null context handle isn't allowed\n"); RpcRaiseException(RPC_X_SS_IN_NULL_CONTEXT); return NULL; } - *phBinding = NDRCContextBinding(context_handle); /* FIXME: should we store this structure in stubMsg.pContext? */ return pFormat + sizeof(NDR_EHD_CONTEXT); }

1 0

Alexandre Julliard : rpcrt4: Add support for the argument size of varying arrays.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: c8d787dba864f4311f385a6121a072cbb4e2d471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d787dba864f4311f385a612… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 7 20:45:33 2011 +0200 rpcrt4: Add support for the argument size of varying arrays. --- dlls/rpcrt4/ndr_stubless.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 173ff61..f7bd670 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1001,14 +1001,17 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) FIXME("Unhandled conformant description\n"); break; case RPC_FC_CARRAY: + case RPC_FC_CVARRAY: size = *(const WORD*)(pFormat + 2); ComputeConformance(pStubMsg, NULL, pFormat + 4, 0); size *= pStubMsg->MaxCount; break; case RPC_FC_SMFARRAY: + case RPC_FC_SMVARRAY: size = *(const WORD*)(pFormat + 2); break; case RPC_FC_LGFARRAY: + case RPC_FC_LGVARRAY: size = *(const DWORD*)(pFormat + 2); break; case RPC_FC_BOGUS_ARRAY:

1 0

Alexandre Julliard : rpcrt4: Fix parameter stack size computation in the old-style stubless marshaller.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 87cf6ec75d5a2822d1f0af7fd7f3037262a3406b URL: http://source.winehq.org/git/wine.git/?a=commit;h=87cf6ec75d5a2822d1f0af7fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 7 20:44:16 2011 +0200 rpcrt4: Fix parameter stack size computation in the old-style stubless marshaller. --- dlls/rpcrt4/ndr_stubless.c | 42 +++++++++++++++--------------------------- 1 files changed, 15 insertions(+), 27 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 64b5f12..173ff61 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -412,26 +412,23 @@ static unsigned int type_stack_size(unsigned char fc) case RPC_FC_CHAR: case RPC_FC_SMALL: case RPC_FC_USMALL: - return sizeof(char); case RPC_FC_WCHAR: case RPC_FC_SHORT: case RPC_FC_USHORT: - return sizeof(short); case RPC_FC_LONG: case RPC_FC_ULONG: + case RPC_FC_INT3264: + case RPC_FC_UINT3264: case RPC_FC_ENUM16: case RPC_FC_ENUM32: - return sizeof(int); case RPC_FC_FLOAT: - return sizeof(float); + case RPC_FC_ERROR_STATUS_T: + case RPC_FC_IGNORE: + return sizeof(void *); case RPC_FC_DOUBLE: return sizeof(double); case RPC_FC_HYPER: return sizeof(ULONGLONG); - case RPC_FC_ERROR_STATUS_T: - return sizeof(error_status_t); - case RPC_FC_IGNORE: - return sizeof(void *); default: ERR("invalid base type 0x%x\n", fc); RpcRaiseException(RPC_S_INTERNAL_ERROR); @@ -463,7 +460,7 @@ void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, /* current format string offset */ int current_offset = 0; /* current stack offset */ - unsigned short current_stack_offset = 0; + unsigned short current_stack_offset = object_proc ? sizeof(void *) : 0; /* counter */ unsigned short i; @@ -475,19 +472,15 @@ void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, { const NDR_PARAM_OI_BASETYPE *pParam = (const NDR_PARAM_OI_BASETYPE *)&pFormat[current_offset]; - /* note: current_stack_offset starts after the This pointer - * if present, so adjust this */ - unsigned short current_stack_offset_adjusted = current_stack_offset + - (object_proc ? sizeof(void *) : 0); - unsigned char * pArg = ARG_FROM_OFFSET(args, current_stack_offset_adjusted); + unsigned char * pArg = ARG_FROM_OFFSET(args, current_stack_offset); /* no more parameters; exit loop */ - if (current_stack_offset_adjusted >= stack_size) + if (current_stack_offset >= stack_size) break; TRACE("param[%d]: old format\n", i); TRACE("\tparam_direction: 0x%x\n", pParam->param_direction); - TRACE("\tstack_offset: 0x%x\n", current_stack_offset_adjusted); + TRACE("\tstack_offset: 0x%x\n", current_stack_offset); TRACE("\tmemory addr (before): %p\n", pArg); if (pParam->param_direction == RPC_FC_IN_PARAM_BASETYPE || @@ -567,10 +560,9 @@ void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, RpcRaiseException(RPC_S_INTERNAL_ERROR); } - current_stack_offset += pParamOther->stack_size * sizeof(INT); + current_stack_offset += pParamOther->stack_size * sizeof(void *); current_offset += sizeof(NDR_PARAM_OI_OTHER); } - TRACE("\tmemory addr (after): %p\n", pArg); } } @@ -1242,7 +1234,7 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, /* current format string offset */ int current_offset = 0; /* current stack offset */ - unsigned short current_stack_offset = 0; + unsigned short current_stack_offset = object ? sizeof(void *) : 0; /* location to put retval into */ LONG_PTR *retval_ptr = NULL; @@ -1250,19 +1242,15 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, { const NDR_PARAM_OI_BASETYPE *pParam = (const NDR_PARAM_OI_BASETYPE *)&pFormat[current_offset]; - /* note: current_stack_offset starts after the This pointer - * if present, so adjust this */ - unsigned short current_stack_offset_adjusted = current_stack_offset + - (object ? sizeof(void *) : 0); - unsigned char *pArg = args + current_stack_offset_adjusted; + unsigned char *pArg = args + current_stack_offset; /* no more parameters; exit loop */ - if (current_stack_offset_adjusted >= stack_size) + if (current_stack_offset >= stack_size) break; TRACE("param[%d]: old format\n", i); TRACE("\tparam_direction: 0x%x\n", pParam->param_direction); - TRACE("\tstack_offset: 0x%x\n", current_stack_offset_adjusted); + TRACE("\tstack_offset: 0x%x\n", current_stack_offset); if (pParam->param_direction == RPC_FC_IN_PARAM_BASETYPE || pParam->param_direction == RPC_FC_RETURN_PARAM_BASETYPE) @@ -1372,7 +1360,7 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, RpcRaiseException(RPC_S_INTERNAL_ERROR); } - current_stack_offset += pParamOther->stack_size * sizeof(INT); + current_stack_offset += pParamOther->stack_size * sizeof(void *); current_offset += sizeof(NDR_PARAM_OI_OTHER); } }

1 0

Alexandre Julliard : rpcrt4: Fix handling of arguments passed by value in the old-style stubless marshaller .
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 5d7e4da81ab403b034e97b6c5fc4307fcef9217c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d7e4da81ab403b034e97b6c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 7 20:41:17 2011 +0200 rpcrt4: Fix handling of arguments passed by value in the old-style stubless marshaller. --- dlls/rpcrt4/ndr_stubless.c | 69 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 55 insertions(+), 14 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 45cfc94..64b5f12 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -438,6 +438,23 @@ static unsigned int type_stack_size(unsigned char fc) } } +static BOOL is_by_value( PFORMAT_STRING format ) +{ + switch (*format) + { + case RPC_FC_USER_MARSHAL: + case RPC_FC_STRUCT: + case RPC_FC_PSTRUCT: + case RPC_FC_CSTRUCT: + case RPC_FC_CPSTRUCT: + case RPC_FC_CVSTRUCT: + case RPC_FC_BOGUS_STRUCT: + return TRUE; + default: + return FALSE; + } +} + void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, int phase, unsigned char *args, unsigned short stack_size, @@ -510,11 +527,9 @@ void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, } else { - const NDR_PARAM_OI_OTHER *pParamOther = - (const NDR_PARAM_OI_OTHER *)&pFormat[current_offset]; - - const unsigned char *pTypeFormat = - &pStubMsg->StubDesc->pFormatTypes[pParamOther->type_offset]; + const NDR_PARAM_OI_OTHER *pParamOther = (const NDR_PARAM_OI_OTHER *)&pFormat[current_offset]; + const unsigned char *pTypeFormat = &pStubMsg->StubDesc->pFormatTypes[pParamOther->type_offset]; + const BOOL by_value = is_by_value( pTypeFormat ); TRACE("\tcomplex type 0x%02x\n", *pTypeFormat); @@ -523,17 +538,28 @@ void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, case PROXY_CALCSIZE: if (pParam->param_direction == RPC_FC_IN_PARAM || pParam->param_direction == RPC_FC_IN_OUT_PARAM) - call_buffer_sizer(pStubMsg, *(unsigned char **)pArg, pTypeFormat); + { + if (!by_value) pArg = *(unsigned char **)pArg; + call_buffer_sizer(pStubMsg, pArg, pTypeFormat); + } break; case PROXY_MARSHAL: if (pParam->param_direction == RPC_FC_IN_PARAM || pParam->param_direction == RPC_FC_IN_OUT_PARAM) - call_marshaller(pStubMsg, *(unsigned char **)pArg, pTypeFormat); + { + if (!by_value) pArg = *(unsigned char **)pArg; + call_marshaller(pStubMsg, pArg, pTypeFormat); + } break; case PROXY_UNMARSHAL: if (pParam->param_direction == RPC_FC_IN_OUT_PARAM || pParam->param_direction == RPC_FC_OUT_PARAM) - call_unmarshaller(pStubMsg, (unsigned char **)pArg, pTypeFormat, 0); + { + if (by_value) + call_unmarshaller(pStubMsg, &pArg, pTypeFormat, 0); + else + call_unmarshaller(pStubMsg, (unsigned char **)pArg, pTypeFormat, 0); + } else if (pParam->param_direction == RPC_FC_RETURN_PARAM) call_unmarshaller(pStubMsg, (unsigned char **)pRetVal, pTypeFormat, 0); break; @@ -1283,6 +1309,7 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, const unsigned char * pTypeFormat = &pStubMsg->StubDesc->pFormatTypes[pParamOther->type_offset]; + const BOOL by_value = is_by_value( pTypeFormat ); TRACE("\tcomplex type 0x%02x\n", *pTypeFormat); @@ -1295,17 +1322,23 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, if (pParam->param_direction == RPC_FC_OUT_PARAM || pParam->param_direction == RPC_FC_IN_OUT_PARAM || pParam->param_direction == RPC_FC_RETURN_PARAM) - call_marshaller(pStubMsg, *(unsigned char **)pArg, pTypeFormat); + { + if (!by_value) pArg = *(unsigned char **)pArg; + call_marshaller(pStubMsg, pArg, pTypeFormat); + } break; case STUBLESS_FREE: if (pParam->param_direction == RPC_FC_IN_OUT_PARAM || pParam->param_direction == RPC_FC_IN_PARAM) - call_freer(pStubMsg, *(unsigned char **)pArg, pTypeFormat); - else if (pParam->param_direction == RPC_FC_OUT_PARAM) + { + if (!by_value) pArg = *(unsigned char **)pArg; + call_freer(pStubMsg, pArg, pTypeFormat); + } + else if (pParam->param_direction == RPC_FC_OUT_PARAM && !by_value) pStubMsg->pfnFree(*(void **)pArg); break; case STUBLESS_INITOUT: - if (pParam->param_direction == RPC_FC_OUT_PARAM) + if (pParam->param_direction == RPC_FC_OUT_PARAM && !by_value) { DWORD size = calc_arg_size(pStubMsg, pTypeFormat); @@ -1319,13 +1352,21 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, case STUBLESS_UNMARSHAL: if (pParam->param_direction == RPC_FC_IN_OUT_PARAM || pParam->param_direction == RPC_FC_IN_PARAM) - call_unmarshaller(pStubMsg, (unsigned char **)pArg, pTypeFormat, 0); + { + if (by_value) + call_unmarshaller(pStubMsg, &pArg, pTypeFormat, 0); + else + call_unmarshaller(pStubMsg, (unsigned char **)pArg, pTypeFormat, 0); + } break; case STUBLESS_CALCSIZE: if (pParam->param_direction == RPC_FC_OUT_PARAM || pParam->param_direction == RPC_FC_IN_OUT_PARAM || pParam->param_direction == RPC_FC_RETURN_PARAM) - call_buffer_sizer(pStubMsg, *(unsigned char **)pArg, pTypeFormat); + { + if (!by_value) pArg = *(unsigned char **)pArg; + call_buffer_sizer(pStubMsg, pArg, pTypeFormat); + } break; default: RpcRaiseException(RPC_S_INTERNAL_ERROR);

1 0

Alexandre Julliard : rpcrt4: Don' t marshall out-only parameters in the old-style stubless marshaller.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 0941644db7ef0f8340ad8204c10d45d4e7335a79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0941644db7ef0f8340ad8204c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 7 20:38:50 2011 +0200 rpcrt4: Don't marshall out-only parameters in the old-style stubless marshaller. --- dlls/rpcrt4/ndr_stubless.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 171d74d..45cfc94 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -522,12 +522,12 @@ void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, { case PROXY_CALCSIZE: if (pParam->param_direction == RPC_FC_IN_PARAM || - pParam->param_direction & RPC_FC_IN_OUT_PARAM) + pParam->param_direction == RPC_FC_IN_OUT_PARAM) call_buffer_sizer(pStubMsg, *(unsigned char **)pArg, pTypeFormat); break; case PROXY_MARSHAL: if (pParam->param_direction == RPC_FC_IN_PARAM || - pParam->param_direction & RPC_FC_IN_OUT_PARAM) + pParam->param_direction == RPC_FC_IN_OUT_PARAM) call_marshaller(pStubMsg, *(unsigned char **)pArg, pTypeFormat); break; case PROXY_UNMARSHAL:

1 0

Hans Leidekker : advapi32: Make sure lpDisplayName is initialized in EnumServicesStatusA.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: dc46df47a41c34cdc94e7ac1f5da84e0d898877a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc46df47a41c34cdc94e7ac1f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 10 10:14:07 2011 +0200 advapi32: Make sure lpDisplayName is initialized in EnumServicesStatusA. --- dlls/advapi32/service.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 88a15b9..2fc3d71 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1514,6 +1514,7 @@ EnumServicesStatusA( SC_HANDLE hmngr, DWORD type, DWORD state, LPENUM_SERVICE_ST p += sz; n -= sz; } + else services[i].lpDisplayName = NULL; services[i].ServiceStatus = servicesW[i].ServiceStatus; } @@ -1640,6 +1641,7 @@ EnumServicesStatusExA( SC_HANDLE hmngr, SC_ENUM_TYPE level, DWORD type, DWORD st p += sz; n -= sz; } + else services[i].lpDisplayName = NULL; services[i].ServiceStatusProcess = servicesW[i].ServiceStatusProcess; }

1 0

Hans Leidekker : msi: Implement and test MsiSetFeatureAttributes.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 667ba16dbcfe7af610df0fddcc581522788b39dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=667ba16dbcfe7af610df0fddc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 10 10:13:47 2011 +0200 msi: Implement and test MsiSetFeatureAttributes. --- dlls/msi/install.c | 70 ++++++++++++++++++++++++++++++++++++-- dlls/msi/msi.spec | 4 +- dlls/msi/tests/install.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++ include/msiquery.h | 4 ++ 4 files changed, 155 insertions(+), 6 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 6225281..2be4c6c 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -1028,6 +1028,70 @@ UINT WINAPI MsiSetFeatureStateW(MSIHANDLE hInstall, LPCWSTR szFeature, } /*********************************************************************** +* MsiSetFeatureAttributesA (MSI.@) +*/ +UINT WINAPI MsiSetFeatureAttributesA( MSIHANDLE handle, LPCSTR feature, DWORD attrs ) +{ + UINT r; + WCHAR *featureW = NULL; + + TRACE("%u, %s, 0x%08x\n", handle, debugstr_a(feature), attrs); + + if (feature && !(featureW = strdupAtoW( feature ))) return ERROR_OUTOFMEMORY; + + r = MsiSetFeatureAttributesW( handle, featureW, attrs ); + msi_free( featureW ); + return r; +} + +static DWORD unmap_feature_attributes( DWORD attrs ) +{ + DWORD ret = 0; + + if (attrs & INSTALLFEATUREATTRIBUTE_FAVORLOCAL) ret = msidbFeatureAttributesFavorLocal; + if (attrs & INSTALLFEATUREATTRIBUTE_FAVORSOURCE) ret |= msidbFeatureAttributesFavorSource; + if (attrs & INSTALLFEATUREATTRIBUTE_FOLLOWPARENT) ret |= msidbFeatureAttributesFollowParent; + if (attrs & INSTALLFEATUREATTRIBUTE_FAVORADVERTISE) ret |= msidbFeatureAttributesFavorAdvertise; + if (attrs & INSTALLFEATUREATTRIBUTE_DISALLOWADVERTISE) ret |= msidbFeatureAttributesDisallowAdvertise; + if (attrs & INSTALLFEATUREATTRIBUTE_NOUNSUPPORTEDADVERTISE) ret |= msidbFeatureAttributesNoUnsupportedAdvertise; + return ret; +} + +/*********************************************************************** +* MsiSetFeatureAttributesW (MSI.@) +*/ +UINT WINAPI MsiSetFeatureAttributesW( MSIHANDLE handle, LPCWSTR name, DWORD attrs ) +{ + MSIPACKAGE *package; + MSIFEATURE *feature; + WCHAR *costing; + + TRACE("%u, %s, 0x%08x\n", handle, debugstr_w(name), attrs); + + if (!name || !name[0]) return ERROR_UNKNOWN_FEATURE; + + if (!(package = msihandle2msiinfo( handle, MSIHANDLETYPE_PACKAGE ))) + return ERROR_INVALID_HANDLE; + + costing = msi_dup_property( package->db, szCostingComplete ); + if (!costing || !strcmpW( costing, szOne )) + { + msi_free( costing ); + msiobj_release( &package->hdr ); + return ERROR_FUNCTION_FAILED; + } + msi_free( costing ); + if (!(feature = msi_get_loaded_feature( package, name ))) + { + msiobj_release( &package->hdr ); + return ERROR_UNKNOWN_FEATURE; + } + feature->Attributes = unmap_feature_attributes( attrs ); + msiobj_release( &package->hdr ); + return ERROR_SUCCESS; +} + +/*********************************************************************** * MsiGetFeatureStateA (MSI.@) */ UINT WINAPI MsiGetFeatureStateA(MSIHANDLE hInstall, LPCSTR szFeature, @@ -1036,12 +1100,10 @@ UINT WINAPI MsiGetFeatureStateA(MSIHANDLE hInstall, LPCSTR szFeature, LPWSTR szwFeature = NULL; UINT rc; - szwFeature = strdupAtoW(szFeature); - - rc = MsiGetFeatureStateW(hInstall,szwFeature,piInstalled, piAction); + if (szFeature && !(szwFeature = strdupAtoW(szFeature))) return ERROR_OUTOFMEMORY; + rc = MsiGetFeatureStateW(hInstall, szwFeature, piInstalled, piAction); msi_free( szwFeature); - return rc; } diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 1008813..5f4a51f 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -199,8 +199,8 @@ 203 stdcall MsiProvideQualifiedComponentExW(wstr wstr long wstr long long ptr ptr) 204 stdcall MsiEnumRelatedProductsA(str long long ptr) 205 stdcall MsiEnumRelatedProductsW(wstr long long ptr) -206 stub MsiSetFeatureAttributesA -207 stub MsiSetFeatureAttributesW +206 stdcall MsiSetFeatureAttributesA(long str long) +207 stdcall MsiSetFeatureAttributesW(long wstr long) 208 stdcall MsiSourceListClearAllA(str str long) 209 stdcall MsiSourceListClearAllW(wstr wstr long) 210 stdcall MsiSourceListAddSourceA(str str long str) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 267b2bd..f93cc48 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6469,6 +6469,88 @@ static void test_MsiGetFeatureInfo(void) DeleteFileA( msifile ); } +static void test_MsiSetFeatureAttributes(void) +{ + UINT r; + DWORD attrs; + char path[MAX_PATH]; + MSIHANDLE package; + + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + create_database( msifile, tables, sizeof(tables) / sizeof(tables[0]) ); + + strcpy( path, CURR_DIR ); + strcat( path, "\\" ); + strcat( path, msifile ); + + r = MsiOpenPackage( path, &package ); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + DeleteFileA( msifile ); + return; + } + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + + r = MsiSetFeatureAttributesA( package, "One", INSTALLFEATUREATTRIBUTE_FAVORLOCAL ); + ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_FUNCTION_FAILED, got %u\n", r); + + r = MsiDoAction( package, "CostInitialize" ); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + + r = MsiSetFeatureAttributesA( 0, "One", INSTALLFEATUREATTRIBUTE_FAVORLOCAL ); + ok(r == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %u\n", r); + + r = MsiSetFeatureAttributesA( package, "", INSTALLFEATUREATTRIBUTE_FAVORLOCAL ); + ok(r == ERROR_UNKNOWN_FEATURE, "expected ERROR_UNKNOWN_FEATURE, got %u\n", r); + + r = MsiSetFeatureAttributesA( package, NULL, INSTALLFEATUREATTRIBUTE_FAVORLOCAL ); + ok(r == ERROR_UNKNOWN_FEATURE, "expected ERROR_UNKNOWN_FEATURE, got %u\n", r); + + r = MsiSetFeatureAttributesA( package, "One", 0 ); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + + attrs = 0xdeadbeef; + r = MsiGetFeatureInfoA( package, "One", &attrs, NULL, NULL, NULL, NULL ); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + ok(attrs == INSTALLFEATUREATTRIBUTE_FAVORLOCAL, + "expected INSTALLFEATUREATTRIBUTE_FAVORLOCAL, got 0x%08x\n", attrs); + + r = MsiSetFeatureAttributesA( package, "One", INSTALLFEATUREATTRIBUTE_FAVORLOCAL ); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + + attrs = 0; + r = MsiGetFeatureInfoA( package, "One", &attrs, NULL, NULL, NULL, NULL ); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + ok(attrs == INSTALLFEATUREATTRIBUTE_FAVORLOCAL, + "expected INSTALLFEATUREATTRIBUTE_FAVORLOCAL, got 0x%08x\n", attrs); + + r = MsiDoAction( package, "FileCost" ); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + + r = MsiSetFeatureAttributesA( package, "One", INSTALLFEATUREATTRIBUTE_FAVORSOURCE ); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + + attrs = 0; + r = MsiGetFeatureInfoA( package, "One", &attrs, NULL, NULL, NULL, NULL ); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + ok(attrs == INSTALLFEATUREATTRIBUTE_FAVORSOURCE, + "expected INSTALLFEATUREATTRIBUTE_FAVORSOURCE, got 0x%08x\n", attrs); + + r = MsiDoAction( package, "CostFinalize" ); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + + r = MsiSetFeatureAttributesA( package, "One", INSTALLFEATUREATTRIBUTE_FAVORLOCAL ); + ok(r == ERROR_FUNCTION_FAILED, "expected ERROR_FUNCTION_FAILED, got %u\n", r); + + MsiCloseHandle( package ); + DeleteFileA( msifile ); +} + START_TEST(install) { DWORD len; @@ -6559,6 +6641,7 @@ START_TEST(install) test_command_line_parsing(); test_upgrade_code(); test_MsiGetFeatureInfo(); + test_MsiSetFeatureAttributes(); DeleteFileA(log_file); diff --git a/include/msiquery.h b/include/msiquery.h index 2ea8320..fbd4651 100644 --- a/include/msiquery.h +++ b/include/msiquery.h @@ -248,6 +248,10 @@ MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE); UINT WINAPI MsiViewGetColumnInfo(MSIHANDLE, MSICOLINFO, MSIHANDLE*); INT WINAPI MsiProcessMessage(MSIHANDLE, INSTALLMESSAGE, MSIHANDLE); +UINT WINAPI MsiSetFeatureAttributesA(MSIHANDLE, LPCSTR, DWORD); +UINT WINAPI MsiSetFeatureAttributesW(MSIHANDLE, LPCWSTR, DWORD); +#define MsiSetFeatureAttributes WINELIB_NAME_AW(MsiSetFeatureAttributes) + UINT WINAPI MsiSetFeatureStateA(MSIHANDLE, LPCSTR, INSTALLSTATE); UINT WINAPI MsiSetFeatureStateW(MSIHANDLE, LPCWSTR, INSTALLSTATE); #define MsiSetFeatureState WINELIB_NAME_AW(MsiSetFeatureState)

1 0

Hans Leidekker : msi: Implement and test MsiGetFeatureInfo.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 4c9c50d86b475f2531f841c0ad1176470e89cc0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c9c50d86b475f2531f841c0a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 10 10:13:34 2011 +0200 msi: Implement and test MsiGetFeatureInfo. --- dlls/msi/action.c | 8 ++-- dlls/msi/install.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/msi.spec | 4 +- dlls/msi/msipriv.h | 2 + dlls/msi/tests/install.c | 84 ++++++++++++++++++++++++++++++++ include/msi.h | 14 +++++ 6 files changed, 226 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c9c50d86b475f2531f84…

1 0

Hans Leidekker : msi: Remove redundant function find_feature_by_name.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: aec97287bcc100f56a54587da6286f348ca3fe56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec97287bcc100f56a54587da… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 10 10:13:20 2011 +0200 msi: Remove redundant function find_feature_by_name. --- dlls/msi/action.c | 22 +++------------------- 1 files changed, 3 insertions(+), 19 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e460465..3f6eae7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1081,22 +1081,6 @@ static UINT iterate_load_featurecomponents(MSIRECORD *row, LPVOID param) return ERROR_SUCCESS; } -static MSIFEATURE *find_feature_by_name( MSIPACKAGE *package, LPCWSTR name ) -{ - MSIFEATURE *feature; - - if ( !name ) - return NULL; - - LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - { - if ( !strcmpW( feature->Feature, name ) ) - return feature; - } - - return NULL; -} - static UINT load_feature(MSIRECORD * row, LPVOID param) { MSIPACKAGE* package = param; @@ -1159,17 +1143,17 @@ static UINT load_feature(MSIRECORD * row, LPVOID param) static UINT find_feature_children(MSIRECORD * row, LPVOID param) { - MSIPACKAGE* package = param; + MSIPACKAGE *package = param; MSIFEATURE *parent, *child; - child = find_feature_by_name( package, MSI_RecordGetString( row, 1 ) ); + child = msi_get_loaded_feature( package, MSI_RecordGetString( row, 1 ) ); if (!child) return ERROR_FUNCTION_FAILED; if (!child->Feature_Parent) return ERROR_SUCCESS; - parent = find_feature_by_name( package, child->Feature_Parent ); + parent = msi_get_loaded_feature( package, child->Feature_Parent ); if (!parent) return ERROR_FUNCTION_FAILED;

1 0

Hans Leidekker : msi: Add a stub implementation of MsiCreateTransformSummaryInfo.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 6efc9f9281f89bdff2623b1102d515112a918be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6efc9f9281f89bdff2623b110… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 10 10:12:50 2011 +0200 msi: Add a stub implementation of MsiCreateTransformSummaryInfo. --- dlls/msi/msi.spec | 4 ++-- dlls/msi/suminfo.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 273e5dc..0fe2177 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -178,8 +178,8 @@ 182 stdcall -private DllGetVersion(ptr) 183 stub MsiGetProductCodeFromPackageCodeA 184 stub MsiGetProductCodeFromPackageCodeW -185 stub MsiCreateTransformSummaryInfoA -186 stub MsiCreateTransformSummaryInfoW +185 stdcall MsiCreateTransformSummaryInfoA(long long str long long) +186 stdcall MsiCreateTransformSummaryInfoW(long long wstr long long) 187 stub MsiQueryFeatureStateFromDescriptorA 188 stub MsiQueryFeatureStateFromDescriptorW 189 stdcall MsiConfigureProductExA(str long long str) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 2a9cd71..ccde725 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -977,3 +977,24 @@ UINT WINAPI MsiSummaryInfoPersist( MSIHANDLE handle ) msiobj_release( &si->hdr ); return ret; } + +UINT WINAPI MsiCreateTransformSummaryInfoA( MSIHANDLE db, MSIHANDLE db_ref, LPCSTR transform, int error, int validation ) +{ + UINT r; + WCHAR *transformW = NULL; + + TRACE("%u, %u, %s, %d, %d\n", db, db_ref, debugstr_a(transform), error, validation); + + if (transform && !(transformW = strdupAtoW( transform ))) + return ERROR_OUTOFMEMORY; + + r = MsiCreateTransformSummaryInfoW( db, db_ref, transformW, error, validation ); + msi_free( transformW ); + return r; +} + +UINT WINAPI MsiCreateTransformSummaryInfoW( MSIHANDLE db, MSIHANDLE db_ref, LPCWSTR transform, int error, int validation ) +{ + FIXME("%u, %u, %s, %d, %d\n", db, db_ref, debugstr_w(transform), error, validation); + return ERROR_FUNCTION_FAILED; +}

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
81
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 June 2011