June 2011 - Wine-Commits - list.winehq.org

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

June 10, 2011

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

Alexandre Julliard : rpcrt4: Add support for the argument size of varying arrays.
by Alexandre Julliard June 10, 2011

June 10, 2011

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

Louis Lenders : netapi32: Improve stubbed NetGetJoinInformation function.
by Alexandre Julliard June 10, 2011

June 10, 2011

Module: wine Branch: master Commit: ed28cab62488d58a8e2d6d4c675b548512f1f230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed28cab62488d58a8e2d6d4c6… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Jun 10 11:06:53 2011 +0200 netapi32: Improve stubbed NetGetJoinInformation function. --- dlls/netapi32/wksta.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c index ad8d87e..ba2f628 100644 --- a/dlls/netapi32/wksta.c +++ b/dlls/netapi32/wksta.c @@ -584,10 +584,16 @@ NET_API_STATUS NET_API_FUNCTION NetGetJoinInformation( LPWSTR *Name, PNETSETUP_JOIN_STATUS type) { - FIXME("Stub %s %p %p\n", wine_dbgstr_w(Server), Name, type); + static const WCHAR workgroupW[] = {'W','o','r','k','g','r','o','u','p',0}; - *Name = NULL; - *type = NetSetupUnknownStatus; + FIXME("Semi-stub %s %p %p\n", wine_dbgstr_w(Server), Name, type); + + if (!Name || !type) + return ERROR_INVALID_PARAMETER; + + NetApiBufferAllocate(sizeof(workgroupW), (LPVOID *)Name); + lstrcpyW(*Name, workgroupW); + *type = NetSetupWorkgroupName; return NERR_Success; }

1 0

Louis Lenders : netapi32/tests: Add small conformance test for NetGetJoinInformation.
by Alexandre Julliard June 10, 2011

June 10, 2011

Module: wine Branch: master Commit: 6f08c7e97916684450e642a6c5e2207f296e7a4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f08c7e97916684450e642a6c… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Jun 10 10:41:50 2011 +0200 netapi32/tests: Add small conformance test for NetGetJoinInformation. --- dlls/netapi32/tests/wksta.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index fff5b48..54c25e5 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -31,6 +31,7 @@ #include "lmerr.h" #include "lmwksta.h" #include "lmapibuf.h" +#include "lmjoin.h" static NET_API_STATUS (WINAPI *pNetApiBufferFree)(LPVOID)=NULL; static NET_API_STATUS (WINAPI *pNetApiBufferSize)(LPVOID,LPDWORD)=NULL; @@ -38,6 +39,7 @@ static NET_API_STATUS (WINAPI *pNetpGetComputerName)(LPWSTR*)=NULL; static NET_API_STATUS (WINAPI *pNetWkstaUserGetInfo)(LPWSTR,DWORD,PBYTE*)=NULL; static NET_API_STATUS (WINAPI *pNetWkstaTransportEnum)(LPWSTR,DWORD,LPBYTE*, DWORD,LPDWORD,LPDWORD,LPDWORD)=NULL; +static NET_API_STATUS (WINAPI *pNetGetJoinInformation)(LPCWSTR,LPWSTR*,PNETSETUP_JOIN_STATUS); static WCHAR user_name[UNLEN + 1]; static WCHAR computer_name[MAX_COMPUTERNAME_LENGTH + 1]; @@ -179,6 +181,28 @@ static void run_wkstatransportenum_tests(void) } } +static void run_wkstajoininfo_tests(void) +{ + NET_API_STATUS ret; + LPWSTR buffer = NULL; + NETSETUP_JOIN_STATUS buffertype = 0xdada; + /* NT4 doesn't have this function */ + if (!pNetGetJoinInformation) { + win_skip("NetGetJoinInformation not available\n"); + return; + } + + ret = pNetGetJoinInformation(NULL, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "NetJoinGetInformation returned unexpected 0x%08x\n", ret); + ok(buffertype == 0xdada, "buffertype set to unexpected value %d\n", buffertype); + + ret = pNetGetJoinInformation(NULL, &buffer, &buffertype); + ok(ret == NERR_Success, "NetJoinGetInformation returned unexpected 0x%08x\n", ret); + ok(buffertype != 0xdada && buffertype != NetSetupUnknownStatus, "buffertype set to unexpected value %d\n", buffertype); + trace("workstation joined to %s with status %d\n", wine_dbgstr_w(buffer), buffertype); + pNetApiBufferFree(buffer); +} + START_TEST(wksta) { HMODULE hnetapi32=LoadLibraryA("netapi32.dll"); @@ -188,6 +212,7 @@ START_TEST(wksta) pNetpGetComputerName=(void*)GetProcAddress(hnetapi32,"NetpGetComputerName"); pNetWkstaUserGetInfo=(void*)GetProcAddress(hnetapi32,"NetWkstaUserGetInfo"); pNetWkstaTransportEnum=(void*)GetProcAddress(hnetapi32,"NetWkstaTransportEnum"); + pNetGetJoinInformation=(void*)GetProcAddress(hnetapi32,"NetGetJoinInformation"); /* These functions were introduced with NT. It's safe to assume that * if one is not available, none are. @@ -205,6 +230,7 @@ START_TEST(wksta) win_skip("Function NetpGetComputerName not available\n"); run_wkstausergetinfo_tests(); run_wkstatransportenum_tests(); + run_wkstajoininfo_tests(); } FreeLibrary(hnetapi32);

1 0

Ričardas Barkauskas : ddraw: Separate IDirectDrawSurface2 vtable.
by Alexandre Julliard June 10, 2011

June 10, 2011

Module: wine Branch: master Commit: a8ee7c5e00d7de1060857ff8d779ee8480b30b16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8ee7c5e00d7de1060857ff8d… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Thu Jun 9 17:35:15 2011 +0300 ddraw: Separate IDirectDrawSurface2 vtable. --- dlls/ddraw/ddraw_private.h | 7 + dlls/ddraw/surface.c | 446 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 452 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8ee7c5e00d7de1060857…

1 0

Stefan Dösinger : wined3d: Don' t check the FBO status if FIXMEs are off.
by Alexandre Julliard June 10, 2011

June 10, 2011

Module: wine Branch: master Commit: 7b39005256d2179b74e1962b1ba6d6555112d206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b39005256d2179b74e1962b1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 27 16:17:25 2011 +0200 wined3d: Don't check the FBO status if FIXMEs are off. --- dlls/wined3d/context.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b077c5f..3eb6c7d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -304,6 +304,8 @@ void context_check_fbo_status(struct wined3d_context *context, GLenum target) const struct wined3d_gl_info *gl_info = context->gl_info; GLenum status; + if (!FIXME_ON(d3d)) return; + status = gl_info->fbo_ops.glCheckFramebufferStatus(target); if (status == GL_FRAMEBUFFER_COMPLETE) {

1 0

Hans Leidekker : msi: Add a stub implementation of MsiCreateTransformSummaryInfo.
by Alexandre Julliard June 10, 2011

June 10, 2011

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

Hans Leidekker : advapi32: Make sure lpDisplayName is initialized in EnumServicesStatusA.
by Alexandre Julliard June 10, 2011

June 10, 2011

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 June 10, 2011

June 10, 2011

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 June 10, 2011

June 10, 2011

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