Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-23 19:14:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] msi: Make MsiSetTargetPath() RPC-compatible.

Browse source 
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>

wine commit id e5fba6d23ee82229582a0cf19a455b3c5ca43776 by Zebediah Figura <z.figura12@gmail.com>
This commit is contained in:
winesync 2022-03-12 15:11:59 +01:00 committed by Mark Jansen
parent a529a627a9
commit a5e210012b
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
4 changed files with 20 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
dll/win32/msi/install.c
View file

@ -535,36 +535,12 @@ UINT WINAPI MsiSetTargetPathW(MSIHANDLE hInstall, LPCWSTR szFolder,
package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE); package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE);
if (!package) if (!package)
{ {
HRESULT hr;
BSTR folder, path;
MSIHANDLE remote; MSIHANDLE remote;
if (!(remote = msi_get_remote(hInstall))) if (!(remote = msi_get_remote(hInstall)))
return ERROR_INVALID_HANDLE; return ERROR_INVALID_HANDLE;
folder = SysAllocString( szFolder ); return remote_SetTargetPath(remote, szFolder, szFolderPath);
path = SysAllocString( szFolderPath );
if (!folder || !path)
{
SysFreeString(folder);
SysFreeString(path);
return ERROR_OUTOFMEMORY;
}
hr = remote_SetTargetPath(remote, folder, path);
SysFreeString(folder);
SysFreeString(path);
if (FAILED(hr))
{
if (HRESULT_FACILITY(hr) == FACILITY_WIN32)
return HRESULT_CODE(hr);
return ERROR_FUNCTION_FAILED;
}
return ERROR_SUCCESS;
} }
ret = MSI_SetTargetPathW( package, szFolder, szFolderPath ); ret = MSI_SetTargetPathW( package, szFolder, szFolderPath );

5
dll/win32/msi/package.c
View file

@ -2498,10 +2498,9 @@ UINT __cdecl remote_GetTargetPath(MSIHANDLE hinst, LPCWSTR folder, LPWSTR *value
return r; return r;
} }
HRESULT __cdecl remote_SetTargetPath(MSIHANDLE hinst, BSTR folder, BSTR value) UINT __cdecl remote_SetTargetPath(MSIHANDLE hinst, LPCWSTR folder, LPCWSTR value)
{ {
UINT r = MsiSetTargetPathW(hinst, folder, value); return MsiSetTargetPathW(hinst, folder, value);
return HRESULT_FROM_WIN32(r);
} }
HRESULT __cdecl remote_GetSourcePath(MSIHANDLE hinst, BSTR folder, BSTR value, DWORD *size) HRESULT __cdecl remote_GetSourcePath(MSIHANDLE hinst, BSTR folder, BSTR value, DWORD *size)

2
dll/win32/msi/winemsi.idl
View file

@ -77,7 +77,7 @@ interface IWineMsiRemote
UINT remote_DoAction( [in] MSIHANDLE hinst, [in, string] LPCWSTR action ); UINT remote_DoAction( [in] MSIHANDLE hinst, [in, string] LPCWSTR action );
UINT remote_Sequence( [in] MSIHANDLE hinst, [in, string] LPCWSTR table, [in] int sequence ); UINT remote_Sequence( [in] MSIHANDLE hinst, [in, string] LPCWSTR table, [in] int sequence );
UINT remote_GetTargetPath( [in] MSIHANDLE hinst, [in, string] LPCWSTR folder, [out, string] LPWSTR *value ); UINT remote_GetTargetPath( [in] MSIHANDLE hinst, [in, string] LPCWSTR folder, [out, string] LPWSTR *value );
HRESULT remote_SetTargetPath( [in] MSIHANDLE hinst, [in] BSTR folder, [in] BSTR value ); UINT remote_SetTargetPath( [in] MSIHANDLE hinst, [in, string] LPCWSTR folder, [in, string] LPCWSTR value );
HRESULT remote_GetSourcePath( [in] MSIHANDLE hinst, [in] BSTR folder, [out, size_is(*size)] BSTR value, [in, out] DWORD *size ); HRESULT remote_GetSourcePath( [in] MSIHANDLE hinst, [in] BSTR folder, [out, size_is(*size)] BSTR value, [in, out] DWORD *size );
HRESULT remote_GetMode( [in] MSIHANDLE hinst, [in] MSIRUNMODE mode, [out] BOOL *ret ); HRESULT remote_GetMode( [in] MSIHANDLE hinst, [in] MSIRUNMODE mode, [out] BOOL *ret );
HRESULT remote_SetMode( [in] MSIHANDLE hinst, [in] MSIRUNMODE mode, [in] BOOL state ); HRESULT remote_SetMode( [in] MSIHANDLE hinst, [in] MSIRUNMODE mode, [in] BOOL state );

16
modules/rostests/winetests/msi/custom.c
View file

@ -541,6 +541,22 @@ static void test_targetpath(MSIHANDLE hinst)
ok(hinst, !r, "got %u\n", r); ok(hinst, !r, "got %u\n", r);
ok(hinst, !lstrcmpW(bufferW, xyzW), "got %s\n", dbgstr_w(bufferW)); ok(hinst, !lstrcmpW(bufferW, xyzW), "got %s\n", dbgstr_w(bufferW));
ok(hinst, sz == 3, "got size %u\n", sz); ok(hinst, sz == 3, "got size %u\n", sz);
r = MsiSetTargetPathA(hinst, NULL, "C:\\subdir");
ok(hinst, r == ERROR_INVALID_PARAMETER, "got %u\n", r);
r = MsiSetTargetPathA(hinst, "TARGETDIR", NULL);
ok(hinst, r == ERROR_INVALID_PARAMETER, "got %u\n", r);
r = MsiSetTargetPathA(hinst, "TARGETDIR", "C:\\subdir");
ok(hinst, !r, "got %u\n", r);
sz = sizeof(buffer);
r = MsiGetTargetPathA(hinst, "TARGETDIR", buffer, &sz);
ok(hinst, !r, "got %u\n", r);
ok(hinst, !strcmp(buffer, "C:\\subdir\\"), "got \"%s\"\n", buffer);
r = MsiSetTargetPathA(hinst, "TARGETDIR", "C:\\");
} }
/* Main test. Anything that doesn't depend on a specific install configuration /* Main test. Anything that doesn't depend on a specific install configuration