https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2491afaa145a339b74c14…
commit 2491afaa145a339b74c147d36675f0e93a5d93e2
Author: winesync <ros-dev(a)reactos.org>
AuthorDate: Sat Mar 12 15:12:19 2022 +0100
Commit: Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Sun Mar 20 19:27:46 2022 +0100
[WINESYNC] msi: Handle the remote case directly in MsiGetSourcePathA().
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 43ce218a48f5b3420f48379e911e974b8bb9ef88 by Zebediah Figura
<z.figura12(a)gmail.com>
---
dll/win32/msi/install.c | 48 ++++++++++++++++++++++++++-------
modules/rostests/winetests/msi/custom.c | 8 +++---
2 files changed, 42 insertions(+), 14 deletions(-)
diff --git a/dll/win32/msi/install.c b/dll/win32/msi/install.c
index 4d8fecfe256..e0b61e04833 100644
--- a/dll/win32/msi/install.c
+++ b/dll/win32/msi/install.c
@@ -421,22 +421,50 @@ static UINT MSI_GetSourcePath( MSIHANDLE hInstall, LPCWSTR
szFolder,
/***********************************************************************
* MsiGetSourcePathA (MSI.@)
*/
-UINT WINAPI MsiGetSourcePathA( MSIHANDLE hInstall, LPCSTR szFolder,
- LPSTR szPathBuf, LPDWORD pcchPathBuf )
+UINT WINAPI MsiGetSourcePathA(MSIHANDLE hinst, const char *folder, char *buf, DWORD *sz)
{
- LPWSTR folder;
- awstring str;
+ MSIPACKAGE *package;
+ const WCHAR *path;
+ WCHAR *folderW;
UINT r;
- TRACE("%s %p %p\n", debugstr_a(szFolder), szPathBuf, pcchPathBuf);
+ TRACE("%s %p %p\n", debugstr_a(folder), buf, sz);
+
+ if (!folder)
+ return ERROR_INVALID_PARAMETER;
+
+ if (!(folderW = strdupAtoW(folder)))
+ return ERROR_OUTOFMEMORY;
+
+ package = msihandle2msiinfo(hinst, MSIHANDLETYPE_PACKAGE);
+ if (!package)
+ {
+ WCHAR *path = NULL;
+ MSIHANDLE remote;
+
+ if (!(remote = msi_get_remote(hinst)))
+ {
+ heap_free(folderW);
+ return ERROR_INVALID_HANDLE;
+ }
- str.unicode = FALSE;
- str.str.a = szPathBuf;
+ r = remote_GetSourcePath(remote, folderW, &path);
+ if (!r)
+ r = msi_strncpyWtoA(path, -1, buf, sz, TRUE);
+
+ midl_user_free(path);
+ heap_free(folderW);
+ return r;
+ }
- folder = strdupAtoW( szFolder );
- r = MSI_GetSourcePath( hInstall, folder, &str, pcchPathBuf );
- msi_free( folder );
+ path = msi_resolve_source_folder(package, folderW, NULL);
+ if (path)
+ r = msi_strncpyWtoA(path, -1, buf, sz, FALSE);
+ else
+ r = ERROR_DIRECTORY;
+ heap_free(folderW);
+ msiobj_release(&package->hdr);
return r;
}
diff --git a/modules/rostests/winetests/msi/custom.c
b/modules/rostests/winetests/msi/custom.c
index 4e42eed64b9..ff1be9b282a 100644
--- a/modules/rostests/winetests/msi/custom.c
+++ b/modules/rostests/winetests/msi/custom.c
@@ -584,28 +584,28 @@ static void test_targetpath(MSIHANDLE hinst)
sz = 0;
r = MsiGetSourcePathA(hinst, "TARGETDIR", NULL, &sz);
ok(hinst, !r, "got %u\n", r);
- todo_wine_ok(hinst, sz == srcsz * 2, "got size %u\n", sz);
+ ok(hinst, sz == srcsz * 2, "got size %u\n", sz);
sz = 0;
strcpy(buffer,"q");
r = MsiGetSourcePathA(hinst, "TARGETDIR", buffer, &sz);
ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r);
ok(hinst, !strcmp(buffer, "q"), "got \"%s\"\n",
buffer);
- todo_wine_ok(hinst, sz == srcsz * 2, "got size %u\n", sz);
+ ok(hinst, sz == srcsz * 2, "got size %u\n", sz);
sz = 1;
strcpy(buffer,"x");
r = MsiGetSourcePathA(hinst, "TARGETDIR", buffer, &sz);
ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r);
ok(hinst, !buffer[0], "got \"%s\"\n", buffer);
- todo_wine_ok(hinst, sz == srcsz * 2, "got size %u\n", sz);
+ ok(hinst, sz == srcsz * 2, "got size %u\n", sz);
sz = srcsz;
strcpy(buffer,"x");
r = MsiGetSourcePathA(hinst, "TARGETDIR", buffer, &sz);
ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r);
ok(hinst, strlen(buffer) == srcsz - 1, "wrong buffer length %d\n",
strlen(buffer));
- todo_wine_ok(hinst, sz == srcsz * 2, "got size %u\n", sz);
+ ok(hinst, sz == srcsz * 2, "got size %u\n", sz);
sz = srcsz + 1;
strcpy(buffer,"x");