ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Make MsiGetComponentState() RPC-compatible. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2018-04-23 23:18:17 -05:00 committed by Alexandre Julliard
parent 863680d5ed
commit 35b1b87dc9
4 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/msi/install.c
View File

@ -1359,33 +1359,22 @@ UINT WINAPI MsiGetComponentStateW(MSIHANDLE hInstall, LPCWSTR szComponent,
TRACE("%d %s %p %p\n", hInstall, debugstr_w(szComponent),
piInstalled, piAction);
if (!szComponent)
return ERROR_UNKNOWN_COMPONENT;
package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE);
if (!package)
{
MSIHANDLE remote;
HRESULT hr;
BSTR component;
if (!(remote = msi_get_remote(hInstall)))
return ERROR_INVALID_HANDLE;
component = SysAllocString(szComponent);
if (!component)
return ERROR_OUTOFMEMORY;
/* FIXME: should use SEH */
if (!piInstalled || !piAction)
return RPC_X_NULL_REF_POINTER;
hr = remote_GetComponentState(remote, component, piInstalled, piAction);
SysFreeString(component);
if (FAILED(hr))
{
if (HRESULT_FACILITY(hr) == FACILITY_WIN32)
return HRESULT_CODE(hr);
return ERROR_FUNCTION_FAILED;
}
return ERROR_SUCCESS;
return remote_GetComponentState(remote, szComponent, piInstalled, piAction);
}
ret = MSI_GetComponentStateW( package, szComponent, piInstalled, piAction);

5
dlls/msi/package.c
View File

@ -2534,11 +2534,10 @@ UINT __cdecl remote_SetFeatureState(MSIHANDLE hinst, LPCWSTR feature, INSTALLSTA
return MsiSetFeatureStateW(hinst, feature, state);
}
HRESULT __cdecl remote_GetComponentState(MSIHANDLE hinst, BSTR component,
UINT __cdecl remote_GetComponentState(MSIHANDLE hinst, LPCWSTR component,
INSTALLSTATE *installed, INSTALLSTATE *action)
{
UINT r = MsiGetComponentStateW(hinst, component, installed, action);
return HRESULT_FROM_WIN32(r);
return MsiGetComponentStateW(hinst, component, installed, action);
}
HRESULT __cdecl remote_SetComponentState(MSIHANDLE hinst, BSTR component, INSTALLSTATE state)

31
dlls/msi/tests/custom.c
View File

@ -655,6 +655,8 @@ static void test_feature_states(MSIHANDLE hinst)
INSTALLSTATE state, action;
UINT r;
/* test feature states */
r = MsiGetFeatureStateA(hinst, NULL, &state, &action);
ok(hinst, r == ERROR_UNKNOWN_FEATURE, "got %u\n", r);
@ -688,6 +690,35 @@ static void test_feature_states(MSIHANDLE hinst)
r = MsiGetFeatureStateA(hinst, "One", &state, &action);
ok(hinst, !r, "got %u\n", r);
ok(hinst, action == INSTALLSTATE_LOCAL, "got action %d\n", action);
/* test component states */
r = MsiGetComponentStateA(hinst, NULL, &state, &action);
ok(hinst, r == ERROR_UNKNOWN_COMPONENT, "got %u\n", r);
r = MsiGetComponentStateA(hinst, "fake", &state, &action);
ok(hinst, r == ERROR_UNKNOWN_COMPONENT, "got %u\n", r);
r = MsiGetComponentStateA(hinst, "One", NULL, &action);
ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r);
r = MsiGetComponentStateA(hinst, "One", &state, NULL);
ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r);
r = MsiGetComponentStateA(hinst, "One", &state, &action);
ok(hinst, !r, "got %u\n", r);
ok(hinst, state == INSTALLSTATE_ABSENT, "got state %d\n", state);
ok(hinst, action == INSTALLSTATE_LOCAL, "got action %d\n", action);
r = MsiGetComponentStateA(hinst, "dangler", &state, &action);
ok(hinst, !r, "got %u\n", r);
ok(hinst, state == INSTALLSTATE_ABSENT, "got state %d\n", state);
ok(hinst, action == INSTALLSTATE_UNKNOWN, "got action %d\n", action);
r = MsiGetComponentStateA(hinst, "component", &state, &action);
ok(hinst, !r, "got %u\n", r);
ok(hinst, state == INSTALLSTATE_UNKNOWN, "got state %d\n", state);
ok(hinst, action == INSTALLSTATE_LOCAL, "got action %d\n", action);
}
/* Main test. Anything that doesn't depend on a specific install configuration

2
dlls/msi/winemsi.idl
View File

@ -83,7 +83,7 @@ interface IWineMsiRemote
UINT remote_SetMode( [in] MSIHANDLE hinst, [in] MSIRUNMODE mode, [in] BOOL state );
UINT remote_GetFeatureState( [in] MSIHANDLE hinst, [in, string] LPCWSTR feature, [out] INSTALLSTATE *installed, [out] INSTALLSTATE *action );
UINT remote_SetFeatureState( [in] MSIHANDLE hinst, [in, string] LPCWSTR feature, [in] INSTALLSTATE state );
HRESULT remote_GetComponentState( [in] MSIHANDLE hinst, [in] BSTR component, [out] INSTALLSTATE *installed, [out] INSTALLSTATE *action );
UINT remote_GetComponentState( [in] MSIHANDLE hinst, [in, string] LPCWSTR component, [out] INSTALLSTATE *installed, [out] INSTALLSTATE *action );
HRESULT remote_SetComponentState( [in] MSIHANDLE hinst, [in] BSTR component, [in] INSTALLSTATE state );
HRESULT remote_GetLanguage( [in] MSIHANDLE hinst, [out] LANGID *language );
HRESULT remote_SetInstallLevel( [in] MSIHANDLE hinst, [in] int level );