May 2018 - Wine-Commits - list.winehq.org

Julian Rüger : German translation for release 3.5
by Jeremy Newman May 18, 2018

May 18, 2018

Module: website Branch: master Commit: 102681d71aacf569ab6d887a500e569a77704d64 URL: https://source.winehq.org/git/website.git/?a=commit;h=102681d71aacf569ab6d8… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri May 18 14:45:02 2018 +0200 German translation for release 3.5 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018033001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2018033001.xml b/news/de/2018033001.xml new file mode 100644 index 0000000..6422e46 --- /dev/null +++ b/news/de/2018033001.xml @@ -0,0 +1,16 @@ +<news> +<date>30. März 2018</date> +<title>Wine 3.5 freigegeben</title> +<body> + Die Entwicklungsversion 3.5 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.5">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Weitere Vulkan-Unterstützung, inklusive des vulkan-1 Laders.</li> + <li>Unterstützung von kryptografischen Schlüsseln RSA und ECDSA.</li> + <li>Verbesserter Parser für Manifest-Dateien.</li> + <li>Unterstützung der Orte-Werkzeugleiste in Dateidialogen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.x/wine-3.5.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 3.0.1
by Jeremy Newman May 18, 2018

May 18, 2018

Module: website Branch: master Commit: d2bc13786c26588fa05e6b78f01ea399deb4e35d URL: https://source.winehq.org/git/website.git/?a=commit;h=d2bc13786c26588fa05e6… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri May 18 14:55:44 2018 +0200 German translation for release 3.0.1 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018051401.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/de/2018051401.xml b/news/de/2018051401.xml new file mode 100644 index 0000000..5996a0f --- /dev/null +++ b/news/de/2018051401.xml @@ -0,0 +1,13 @@ +<news> +<date>14. Mai 2018</date> +<title>Wine 3.0.1 freigegeben</title> +<body> + Die Wartungsversion 3.0.1 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.0.1">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Diverse Fehlerkorrekturen</li> + <li>Übersetzungs-Updates</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.0/wine-3.0.1.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 3.7
by Jeremy Newman May 18, 2018

May 18, 2018

Module: website Branch: master Commit: 9b7be496f529a468b089af4bcdc3d007c53a2818 URL: https://source.winehq.org/git/website.git/?a=commit;h=9b7be496f529a468b089a… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri May 18 14:50:54 2018 +0200 German translation for release 3.7 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018042701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2018042701.xml b/news/de/2018042701.xml new file mode 100644 index 0000000..2ab74d5 --- /dev/null +++ b/news/de/2018042701.xml @@ -0,0 +1,16 @@ +<news> +<date>27. April 2018</date> +<title>Wine 3.7 freigegeben</title> +<body> + Die Entwicklungsversion 3.7 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.7">Neuerungen (en)</a> in dieser Version: +<ul> + <li>MSI-custom-actions werden nun in separatem Prozess ausgeführt.</li> + <li>Unterstützung von Job-Dateien im Taskplaner.</li> + <li>Verbesserte Viewport-Unterstützung in Direct 3D.</li> + <li>Höhere Auflösungen der Standard-Icons.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.x/wine-3.7.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 3.6
by Jeremy Newman May 18, 2018

May 18, 2018

Module: website Branch: master Commit: 3dd17db7e07ded17781f1c8d097243777e2bc331 URL: https://source.winehq.org/git/website.git/?a=commit;h=3dd17db7e07ded17781f1… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri May 18 14:47:13 2018 +0200 German translation for release 3.6 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018041301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2018041301.xml b/news/de/2018041301.xml new file mode 100644 index 0000000..9d99961 --- /dev/null +++ b/news/de/2018041301.xml @@ -0,0 +1,16 @@ +<news> +<date>13. April 2018</date> +<title>Wine 3.6 freigegeben</title> +<body> + Die Entwicklungsversion 3.6 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.6">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von Icons im PNG-Format.</li> + <li>Unterstützung von 1D-Texturen.</li> + <li>Weitere Infrastruktur für High-DPI-Unterstützung.</li> + <li>Verbesserungen am OLE-Datencache.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.x/wine-3.6.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 3.4
by Jeremy Newman May 18, 2018

May 18, 2018

Module: website Branch: master Commit: dc8f0866627bc3dac8f2d312e3eb59c0d77de0f1 URL: https://source.winehq.org/git/website.git/?a=commit;h=dc8f0866627bc3dac8f2d… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri May 18 14:39:07 2018 +0200 German translation for release 3.4 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018031601.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2018031601.xml b/news/de/2018031601.xml new file mode 100644 index 0000000..e880dd4 --- /dev/null +++ b/news/de/2018031601.xml @@ -0,0 +1,16 @@ +<news> +<date>16. März 2018</date> +<title>Wine 3.4 freigegeben</title> +<body> + Die Entwicklungsversion 3.4 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.4">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Weitere Vulkan-Unterstützung, inklusive Integration mit dem X11-Treiber.</li> + <li>Bessere Abhandlung privilegierter Befehle unter x86-64.</li> + <li>Verbesserungen am Hexedit-Dialog von RegEdit.</li> + <li>Übernahme einer größeren Auswahl von Änderungen aus Wine-staging.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.x/wine-3.4.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 2.0.5
by Jeremy Newman May 18, 2018

May 18, 2018

Module: website Branch: master Commit: 2f4641e0ccd8143a526955708979c37c7841c509 URL: https://source.winehq.org/git/website.git/?a=commit;h=2f4641e0ccd8143a52695… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri May 18 14:40:12 2018 +0200 German translation for release 2.0.5 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018031801.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2018031801.xml b/news/de/2018031801.xml new file mode 100644 index 0000000..f3ba883 --- /dev/null +++ b/news/de/2018031801.xml @@ -0,0 +1,12 @@ +<news> +<date>18. März 2018</date> +<title>Wine 2.0.5 freigegeben</title> +<body> + Die Wartungsversion 2.0.5 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.0.5">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Diverse Fehlerkorrekturen</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.0/wine-2.0.5.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation of the WineConf announcement
by Jeremy Newman May 18, 2018

May 18, 2018

Module: website Branch: master Commit: a0bb8454e153eacf9d8a2d955be2ab49530aeacb URL: https://source.winehq.org/git/website.git/?a=commit;h=a0bb8454e153eacf9d8a2… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri May 18 14:33:49 2018 +0200 German translation of the WineConf announcement Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018030801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2018030801.xml b/news/de/2018030801.xml new file mode 100644 index 0000000..0c36048 --- /dev/null +++ b/news/de/2018030801.xml @@ -0,0 +1,15 @@ +<news> +<date>8. März 2018</date> +<title>WineConf 2018 - 25-jähriges Jubiläum</title> +<body> +Das Wine-Projekt ist erfreut verkünden zu können, dass die diesjährige WineConf 2018 +vom 29. Juni - 1. Juli in Den Haag stattfinden wird, passend zum +25-jährigen Jubiläum von Wine. +WineConf ist die jährliche Konferenz des Wine-Projekts, bei der sich +Mitgleider der Wine-Community, der breiteren Freie-Software-Bewegung +und interessierte Anwender treffen, um sich bei Essen und Getränken auszutauschen. +Traditionell finden dabei auch Vorträge einiger Teilnehmer statt, sowie formelle und +informelle Diskussionen zu allen Themen, die mit Wine zu tun haben. +Weitere Details dazu auf der <a href="https://wiki.winehq.org/WineConf2018">WineConf2018-Seite</a> +im Wine-Wiki. +</body></news>

1 0

Zebediah Figura : msi: Avoid using awstring in MsiGetSourcePathW().
by Alexandre Julliard May 18, 2018

May 18, 2018

Module: wine Branch: master Commit: 48aeef69fc99ff1460da934f4933f0499ff33b13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48aeef69fc99ff1460da934f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 17 10:48:19 2018 -0500 msi: Avoid using awstring in MsiGetSourcePathW(). 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> --- dlls/msi/install.c | 91 +++++++++++++++++++----------------------------------- 1 file changed, 32 insertions(+), 59 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index d62fe26..e043c04 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -367,58 +367,6 @@ WCHAR *msi_resolve_source_folder( MSIPACKAGE *package, const WCHAR *name, MSIFOL } /*********************************************************************** - * MSI_GetSourcePath (internal) - */ -static UINT MSI_GetSourcePath( MSIHANDLE hInstall, LPCWSTR szFolder, - awstring *szPathBuf, LPDWORD pcchPathBuf ) -{ - MSIPACKAGE *package; - LPWSTR path; - UINT r = ERROR_FUNCTION_FAILED; - - TRACE("%s %p %p\n", debugstr_w(szFolder), szPathBuf, pcchPathBuf ); - - if (!szFolder) - return ERROR_INVALID_PARAMETER; - - package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE ); - if (!package) - { - LPWSTR value = NULL; - MSIHANDLE remote; - - if (!(remote = msi_get_remote(hInstall))) - return ERROR_INVALID_HANDLE; - - r = remote_GetSourcePath(remote, szFolder, &value); - if (r != ERROR_SUCCESS) - return r; - - r = msi_strcpy_to_awstring(value, -1, szPathBuf, pcchPathBuf); - - midl_user_free(value); - return r; - } - - if (szPathBuf->str.w && !pcchPathBuf ) - { - msiobj_release( &package->hdr ); - return ERROR_INVALID_PARAMETER; - } - - path = msi_resolve_source_folder( package, szFolder, NULL ); - msiobj_release( &package->hdr ); - - TRACE("path = %s\n", debugstr_w(path)); - if (!path) - return ERROR_DIRECTORY; - - r = msi_strcpy_to_awstring( path, -1, szPathBuf, pcchPathBuf ); - msi_free( path ); - return r; -} - -/*********************************************************************** * MsiGetSourcePathA (MSI.@) */ UINT WINAPI MsiGetSourcePathA(MSIHANDLE hinst, const char *folder, char *buf, DWORD *sz) @@ -471,17 +419,42 @@ UINT WINAPI MsiGetSourcePathA(MSIHANDLE hinst, const char *folder, char *buf, DW /*********************************************************************** * MsiGetSourcePathW (MSI.@) */ -UINT WINAPI MsiGetSourcePathW( MSIHANDLE hInstall, LPCWSTR szFolder, - LPWSTR szPathBuf, LPDWORD pcchPathBuf ) +UINT WINAPI MsiGetSourcePathW(MSIHANDLE hinst, const WCHAR *folder, WCHAR *buf, DWORD *sz) { - awstring str; + MSIPACKAGE *package; + const WCHAR *path; + UINT r; + + TRACE("%s %p %p\n", debugstr_w(folder), buf, sz); + + if (!folder) + return ERROR_INVALID_PARAMETER; + + package = msihandle2msiinfo(hinst, MSIHANDLETYPE_PACKAGE); + if (!package) + { + WCHAR *path = NULL; + MSIHANDLE remote; - TRACE("%s %p %p\n", debugstr_w(szFolder), szPathBuf, pcchPathBuf ); + if (!(remote = msi_get_remote(hinst))) + return ERROR_INVALID_HANDLE; + + r = remote_GetSourcePath(remote, folder, &path); + if (!r) + r = msi_strncpyW(path, -1, buf, sz); - str.unicode = TRUE; - str.str.w = szPathBuf; + midl_user_free(path); + return r; + } - return MSI_GetSourcePath( hInstall, szFolder, &str, pcchPathBuf ); + path = msi_resolve_source_folder(package, folder, NULL); + if (path) + r = msi_strncpyW(path, -1, buf, sz); + else + r = ERROR_DIRECTORY; + + msiobj_release(&package->hdr); + return r; } /***********************************************************************

1 0

Zebediah Figura : msi: Handle the remote case directly in MsiGetSourcePathA().
by Alexandre Julliard May 18, 2018

May 18, 2018

Module: wine Branch: master Commit: 43ce218a48f5b3420f48379e911e974b8bb9ef88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43ce218a48f5b3420f48379e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 17 10:48:18 2018 -0500 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> --- dlls/msi/install.c | 48 ++++++++++++++++++++++++++++++++++++++---------- dlls/msi/tests/custom.c | 8 ++++---- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 31352c6..d62fe26 100644 --- a/dlls/msi/install.c +++ b/dlls/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/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 4e42eed..ff1be9b 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/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");

1 0

Zebediah Figura : msi: Avoid using awstring in MsiGetTargetPathW().
by Alexandre Julliard May 18, 2018

May 18, 2018

Module: wine Branch: master Commit: ce3fc1af555106bcc614a1b9259172357035517f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce3fc1af555106bcc614a1b9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 17 10:48:17 2018 -0500 msi: Avoid using awstring in MsiGetTargetPathW(). 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> --- dlls/msi/install.c | 80 ++++++++++++++++++++++-------------------------------- 1 file changed, 32 insertions(+), 48 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 93f9cce..31352c6 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -228,47 +228,6 @@ const WCHAR *msi_get_target_folder( MSIPACKAGE *package, const WCHAR *name ) } /*********************************************************************** - * MsiGetTargetPath (internal) - */ -static UINT MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder, - awstring *szPathBuf, LPDWORD pcchPathBuf ) -{ - MSIPACKAGE *package; - const WCHAR *path; - UINT r = ERROR_FUNCTION_FAILED; - - if (!szFolder) - return ERROR_INVALID_PARAMETER; - - package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE ); - if (!package) - { - LPWSTR value = NULL; - MSIHANDLE remote; - - if (!(remote = msi_get_remote(hInstall))) - return ERROR_INVALID_HANDLE; - - r = remote_GetTargetPath(remote, szFolder, &value); - if (r != ERROR_SUCCESS) - return r; - - r = msi_strcpy_to_awstring(value, -1, szPathBuf, pcchPathBuf); - - midl_user_free(value); - return r; - } - - path = msi_get_target_folder( package, szFolder ); - msiobj_release( &package->hdr ); - - if (!path) - return ERROR_DIRECTORY; - - return msi_strcpy_to_awstring( path, -1, szPathBuf, pcchPathBuf ); -} - -/*********************************************************************** * MsiGetTargetPathA (MSI.@) */ UINT WINAPI MsiGetTargetPathA(MSIHANDLE hinst, const char *folder, char *buf, DWORD *sz) @@ -321,17 +280,42 @@ UINT WINAPI MsiGetTargetPathA(MSIHANDLE hinst, const char *folder, char *buf, DW /*********************************************************************** * MsiGetTargetPathW (MSI.@) */ -UINT WINAPI MsiGetTargetPathW( MSIHANDLE hInstall, LPCWSTR szFolder, - LPWSTR szPathBuf, LPDWORD pcchPathBuf ) +UINT WINAPI MsiGetTargetPathW(MSIHANDLE hinst, const WCHAR *folder, WCHAR *buf, DWORD *sz) { - awstring path; + MSIPACKAGE *package; + const WCHAR *path; + UINT r; - TRACE("%s %p %p\n", debugstr_w(szFolder), szPathBuf, pcchPathBuf); + TRACE("%s %p %p\n", debugstr_w(folder), buf, sz); - path.unicode = TRUE; - path.str.w = szPathBuf; + if (!folder) + return ERROR_INVALID_PARAMETER; + + package = msihandle2msiinfo(hinst, MSIHANDLETYPE_PACKAGE); + if (!package) + { + WCHAR *path = NULL; + MSIHANDLE remote; - return MSI_GetTargetPath( hInstall, szFolder, &path, pcchPathBuf ); + if (!(remote = msi_get_remote(hinst))) + return ERROR_INVALID_HANDLE; + + r = remote_GetTargetPath(remote, folder, &path); + if (!r) + r = msi_strncpyW(path, -1, buf, sz); + + midl_user_free(path); + return r; + } + + path = msi_get_target_folder(package, folder); + if (path) + r = msi_strncpyW(path, -1, buf, sz); + else + r = ERROR_DIRECTORY; + + msiobj_release(&package->hdr); + return r; } static WCHAR *get_source_root( MSIPACKAGE *package )

1 0