March 2009 - Wine-commits - list.winehq.org

Austin English : configure: inet_ntop and inet_pton depend on -lsocket on Solaris.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 0656691706dc5d85ed643c949d87aa9b70867eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0656691706dc5d85ed643c949… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Mar 28 00:13:09 2009 -0500 configure: inet_ntop and inet_pton depend on -lsocket on Solaris. --- configure | 8 ++++---- configure.ac | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 668adbc..eb66b54 100755 --- a/configure +++ b/configure @@ -17950,8 +17950,6 @@ CFLAGS="$CFLAGS $BUILTINFLAG" - - for ac_func in \ _pclose \ _popen \ @@ -17983,8 +17981,6 @@ for ac_func in \ gettid \ gettimeofday \ getuid \ - inet_ntop \ - inet_pton \ kqueue \ lstat \ memmove \ @@ -18656,6 +18652,8 @@ fi + + for ac_func in \ getaddrinfo \ getnameinfo \ @@ -18664,6 +18662,8 @@ for ac_func in \ getprotobynumber \ getservbyport \ inet_network \ + inet_ntop \ + inet_pton \ sendmsg \ socketpair \ diff --git a/configure.ac b/configure.ac index c13abc4..9c90bff 100644 --- a/configure.ac +++ b/configure.ac @@ -1456,8 +1456,6 @@ AC_CHECK_FUNCS(\ gettid \ gettimeofday \ getuid \ - inet_ntop \ - inet_pton \ kqueue \ lstat \ memmove \ @@ -1530,6 +1528,8 @@ AC_CHECK_FUNCS(\ getprotobynumber \ getservbyport \ inet_network \ + inet_ntop \ + inet_pton \ sendmsg \ socketpair \ )

1 0

Aurimas Fischer : credui: Add Lithuanian translation.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 4e7b9b4f7bbe0f3003732228983ed48168546fd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e7b9b4f7bbe0f30037322289… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Sat Mar 28 14:02:36 2009 +0200 credui: Add Lithuanian translation. --- dlls/credui/credui.rc | 1 + dlls/credui/credui_Lt.rc | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/credui/credui.rc b/dlls/credui/credui.rc index 41f332c..d144fd2 100644 --- a/dlls/credui/credui.rc +++ b/dlls/credui/credui.rc @@ -33,6 +33,7 @@ IDB_BANNER BITMAP LOADONCALL DISCARDABLE banner.bmp #include "credui_Es.rc" #include "credui_Fr.rc" #include "credui_Ko.rc" +#include "credui_Lt.rc" #include "credui_Nl.rc" #include "credui_No.rc" #include "credui_Pl.rc" diff --git a/dlls/credui/credui_Lt.rc b/dlls/credui/credui_Lt.rc new file mode 100644 index 0000000..9ad3e4b --- /dev/null +++ b/dlls/credui/credui_Lt.rc @@ -0,0 +1,55 @@ +/* + * Lithuanian language resource file for Credentials UI + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "&Naudotojo vardas:",-1,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "&Slaptažodis:",-1,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "Į&siminti mano slaptažodį",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "Gerai",IDOK,97,128,50,14 + PUSHBUTTON "Atsisakyti",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "Užmegzti ryšį su %s" + IDS_MESSAGEFORMAT "Jungiamasi prie %s" + IDS_INCORRECTPASSWORDTITLE "Prisijungimas nesėkmingas" + IDS_INCORRECTPASSWORD "Įsitikinkite, kad naudotojo vardas\nir slaptažodis yra teisingi." + IDS_CAPSLOCKONTITLE "Didžiųjų raidžių būsena įjungta" + IDS_CAPSLOCKON "Kai įjungta didžiųjų raidžių būsena, savo slaptažodį galite įvesti neteisingai.\n\nPaspauskite didžiųjų raidžių klaviatūros klavišą didžiųjų raidžių būsenai išjungti\nprieš rinkdami savo slaptažodį." +} + +#pragma code_page(default)

1 0

Maik Schulz : german translation for release 1.1.18 news item
by Jeremy Newman 30 Mar '09

30 Mar '09

Module: website Branch: master Commit: 7256ae8d8b7b5f1deff4cbd4fbf64a954b10c53f URL: http://source.winehq.org/git/website.git/?a=commit;h=7256ae8d8b7b5f1deff4cb… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Sat Mar 28 09:36:01 2009 +0100 german translation for release 1.1.18 news item Hi, please find the patch for the translation for the 1.1.18 release news item attached. Cheers, -Maik >From 1584248d3698fe1eed779635bb0cb648f2dd360a Mon Sep 17 00:00:00 2001 From: Maik Schulz <maik.schulz(a)gmail.com> Date: Sat, 28 Mar 2009 09:32:16 +0100 Subject: german translation for release 1.1.18 news item --- news/de/2009032701.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/de/2009032701.xml b/news/de/2009032701.xml new file mode 100644 index 0000000..ec1e6dd --- /dev/null +++ b/news/de/2009032701.xml @@ -0,0 +1,16 @@ +<news> +<date>March 27, 2009</date> +<title>Wine 1.1.18 Released</title> +<body> + Die Entwicklungsversion 1.1.18 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.1.18">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für RPC über HTTP.</li> + <li>Verbesserte Unterstützung von Aktualisierungen in MSI.</li> + <li>Debug Symbole in WineDbg unter Mac OS X.</li> + <li>Viele Aufräumarbeiten im Direct3D Quellcode.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.18.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Scott Ritchie : Update-download-and-download-deb-page-for-Ubuntu-9.04
by Jeremy Newman 30 Mar '09

30 Mar '09

Module: website Branch: master Commit: 7ed6536bc070fa779ec67e82669184872ea13d9a URL: http://source.winehq.org/git/website.git/?a=commit;h=7ed6536bc070fa779ec67e… Author: Scott Ritchie <scott(a)open-vote.org> Date: Sat Mar 28 18:43:12 2009 -0700 Update-download-and-download-deb-page-for-Ubuntu-9.04 Update-download-and-download-deb-page-for-Ubuntu-9.04 >From 68aae6bbfe0f45c9c8bf8c8433d531354a87d4b1 Mon Sep 17 00:00:00 2001 From: Scott Ritchie <scott(a)open-vote.org> Date: Sat, 28 Mar 2009 11:52:47 -0700 Subject: Update download and download-deb page for Ubuntu 9.04 To: wine-patches <wine-patches(a)winehq.org> Reply-To: wine-devel <wine-devel(a)winehq.org> --- templates/en/download.template | 2 +- templates/en/download/deb.template | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index f1fefbb..12829b9 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -61,7 +61,7 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/deb">Ubuntu</a> - binary and source .debs for Ubuntu Hardy (8.04) and Intrepid (8.10) + binary and source .debs for Ubuntu Hardy (8.04), Intrepid (8.10), and Jaunty (9.04) <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr> diff --git a/templates/en/download/deb.template b/templates/en/download/deb.template index e7d8c8c..18972d9 100644 --- a/templates/en/download/deb.template +++ b/templates/en/download/deb.template @@ -32,6 +32,8 @@ Party Software tab and click Add. Then, copy and paste one of the lines below depending on which version you are running. +For Ubuntu Jaunty (9.04): +deb http://wine.budgetdedicated.com/apt jaunty main #WineHQ - Ubuntu 9.04 "Jaunty Jackalope" For Ubuntu Intrepid (8.10): deb http://wine.budgetdedicated.com/apt intrepid main #WineHQ - Ubuntu 8.10 "Intrepid Ibex" For Ubuntu Hardy (8.04): @@ -85,6 +87,8 @@ and pasting the following into your terminal: Next, add the repository to your system's list of APT sources: +For Ubuntu Jaunty (9.04): +sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/jaunty.list -O /etc/apt/sources.list.d/winehq.list For Ubuntu Intrepid (8.10): sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/intrepid.list -O /etc/apt/sources.list.d/winehq.list For Ubuntu Hardy (8.04):

1 0

Alexandre Julliard : Wine release 1.1.18
by Alexandre Julliard 27 Mar '09

27 Mar '09

Module: website Branch: master Commit: 9af3985067dd773d017971c0eb109ca3f26a81ca URL: http://source.winehq.org/git/website.git/?a=commit;h=9af3985067dd773d017971… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 27 19:37:55 2009 +0100 Wine release 1.1.18 --- news/en/2009032701.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2009032701.xml b/news/en/2009032701.xml new file mode 100644 index 0000000..8f108f1 --- /dev/null +++ b/news/en/2009032701.xml @@ -0,0 +1,16 @@ +<news> +<date>March 27, 2009</date> +<title>Wine 1.1.18 Released</title> +<body> + The Wine development release 1.1.18 is now available. + <a href="{$root}/announce/1.1.18">What's new</a> in this release: +<ul> + <li>RPC over HTTP support.</li> + <li>Improved support for upgrades in MSI.</li> + <li>Debug symbols in WineDbg on Mac OS X.</li> + <li>Many Direct3D code cleanups.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.18.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.1.18.
by Alexandre Julliard 27 Mar '09

27 Mar '09

Module: wine Branch: master Commit: 3949bb691839c5745c41e14ad1e88aee7d974e53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3949bb691839c5745c41e14ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 27 19:31:22 2009 +0100 Release 1.1.18. --- ANNOUNCE | 936 +++++++++++++++++++++++-------------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 368 insertions(+), 588 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3949bb691839c5745c41e…

1 0

Tag wine-1.1.18 : Alexandre Julliard : Release 1.1.18
by Alexandre Julliard 27 Mar '09

27 Mar '09

Module: wine Branch: refs/tags/wine-1.1.18 Tag: b5ed058c46b885c503820d0b22b218af4e2e6ecb URL: http://source.winehq.org/git/wine.git/?a=tag;h=b5ed058c46b885c503820d0b22b2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 27 19:31:23 2009 +0100 Release 1.1.18

1 0

Stefano Guidoni : winemp3: Fixed mpeg3_streamsize.
by Alexandre Julliard 27 Mar '09

27 Mar '09

Module: wine Branch: master Commit: 21186d5a69a4d1f787edfe92ad26d4a7a964651a URL: http://source.winehq.org/git/wine.git/?a=commit;h=21186d5a69a4d1f787edfe92a… Author: Stefano Guidoni <s.guidoni(a)tin.it> Date: Tue Mar 24 20:52:54 2009 +0100 winemp3: Fixed mpeg3_streamsize. mpeg3_streamsize must estimate the number of samples of an mp3 chunk. The result must be block aligned (PCM) or frame aligned (MP3). --- dlls/winemp3.acm/mpegl3.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 6d476e4..e0f0ebd 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -471,6 +471,8 @@ static LRESULT MPEG3_StreamClose(PACMDRVSTREAMINSTANCE adsi) */ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE adss) { + DWORD nblocks; + switch (adss->fdwSize) { case ACM_STREAMSIZEF_DESTINATION: @@ -478,14 +480,19 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEGLAYER3) { - /* don't take block overhead into account, doesn't matter too much */ - adss->cbSrcLength = adss->cbDstLength * 12; + nblocks = (adsi->pwfxDst->nAvgBytesPerSec * 8 * 144 / adsi->pwfxDst->nSamplesPerSec); + nblocks = (adss->cbDstLength - 3002 - nblocks) / nblocks; + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; + adss->cbSrcLength = nblocks * 1152 * adsi->pwfxSrc->nBlockAlign; } else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { - FIXME("misses the block header overhead\n"); - adss->cbSrcLength = 256 + adss->cbDstLength / 12; + nblocks = adss->cbDstLength / (adsi->pwfxDst->nBlockAlign * 1152); + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; + adss->cbSrcLength = nblocks * (DWORD)(adsi->pwfxSrc->nAvgBytesPerSec * 8 * 144 / adsi->pwfxSrc->nSamplesPerSec); } else { @@ -497,14 +504,19 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEGLAYER3) { - FIXME("misses the block header overhead\n"); - adss->cbDstLength = 256 + adss->cbSrcLength / 12; + nblocks = adss->cbSrcLength / (adsi->pwfxSrc->nBlockAlign * 1152); + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; + adss->cbDstLength = nblocks * (DWORD)(adsi->pwfxDst->nAvgBytesPerSec * 8 * 144 / adsi->pwfxDst->nSamplesPerSec); } else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { - /* don't take block overhead into account, doesn't matter too much */ - adss->cbDstLength = adss->cbSrcLength * 12; + nblocks = (adsi->pwfxSrc->nAvgBytesPerSec * 8 * 144 / adsi->pwfxSrc->nSamplesPerSec); + nblocks = (adss->cbSrcLength - 3002 - nblocks) / nblocks; + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; + adss->cbDstLength = nblocks * 1152 * adsi->pwfxDst->nBlockAlign; } else {

1 0

Paul Vriens : kernel32/tests: Fix some test failures on NT4 and below.
by Alexandre Julliard 27 Mar '09

27 Mar '09

Module: wine Branch: master Commit: 7eca8022df557e06aabf32c7c1268753127c8e15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eca8022df557e06aabf32c7c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Mar 27 11:46:25 2009 +0100 kernel32/tests: Fix some test failures on NT4 and below. --- dlls/kernel32/tests/profile.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 5651deb..ab7c7fa 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -843,7 +843,9 @@ static void test_WritePrivateProfileString(void) SetLastError(0xdeadbeef); ret = WritePrivateProfileStringA(NULL, "key", "string", path); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - ok(GetLastError() == ERROR_FILE_NOT_FOUND, + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + broken(GetLastError() == ERROR_INVALID_PARAMETER) || /* NT4 */ + broken(GetLastError() == 0xdeadbeef), /* Win9x and WinME */ "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); ok(GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES, "Expected path to not exist\n"); @@ -855,7 +857,9 @@ static void test_WritePrivateProfileString(void) SetLastError(0xdeadbeef); ret = WritePrivateProfileStringA(NULL, "key", "string", path); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - ok(GetLastError() == ERROR_FILE_NOT_FOUND, + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + broken(GetLastError() == ERROR_INVALID_PARAMETER) || /* NT4 */ + broken(GetLastError() == 0xdeadbeef), /* Win9x and WinME */ "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); ok(check_file_data(path, data), "File doesn't match\n"); DeleteFileA(path);

1 0

Hans Leidekker : msi: Enumerate products from all contexts.
by Alexandre Julliard 27 Mar '09

27 Mar '09

Module: wine Branch: master Commit: 9163b0d0a388c2aa2b1e7cf835e01616ba66fb4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9163b0d0a388c2aa2b1e7cf83… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 27 13:40:16 2009 +0100 msi: Enumerate products from all contexts. Fix for office 2007 proofing tools installer. --- dlls/msi/registry.c | 121 ++++++++++++++++++++++++++++++++++++++++--- dlls/msi/tests/automation.c | 2 +- 2 files changed, 114 insertions(+), 9 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 3205079..3ba34d1 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -103,6 +103,12 @@ static const WCHAR szUninstall_fmt[] = { 'U','n','i','n','s','t','a','l','l','\\', '%','s',0 }; +static const WCHAR szUserProduct[] = { +'S','o','f','t','w','a','r','e','\\', +'M','i','c','r','o','s','o','f','t','\\', +'I','n','s','t','a','l','l','e','r','\\', +'P','r','o','d','u','c','t','s',0}; + static const WCHAR szUserProduct_fmt[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -187,6 +193,12 @@ static const WCHAR szInstallProperties_fmt[] = { '%','s','\\','P','r','o','d','u','c','t','s','\\','%','s','\\', 'I','n','s','t','a','l','l','P','r','o','p','e','r','t','i','e','s',0}; +static const WCHAR szInstaller_LocalClassesProd[] = { +'S','o','f','t','w','a','r','e','\\', +'C','l','a','s','s','e','s','\\', +'I','n','s','t','a','l','l','e','r','\\', +'P','r','o','d','u','c','t','s',0}; + static const WCHAR szInstaller_LocalClassesProd_fmt[] = { 'S','o','f','t','w','a','r','e','\\', 'C','l','a','s','s','e','s','\\', @@ -199,6 +211,16 @@ static const WCHAR szInstaller_LocalClassesFeat_fmt[] = { 'I','n','s','t','a','l','l','e','r','\\', 'F','e','a','t','u','r','e','s','\\','%','s',0}; +static const WCHAR szInstaller_LocalManaged_fmt[] = { +'S','o','f','t','w','a','r','e','\\', +'M','i','c','r','o','s','o','f','t','\\', +'W','i','n','d','o','w','s','\\', +'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', +'I','n','s','t','a','l','l','e','r','\\', +'M','a','n','a','g','e','d','\\','%','s','\\', +'I','n','s','t','a','l','l','e','r','\\', +'P','r','o','d','u','c','t','s',0}; + static const WCHAR szInstaller_LocalManagedProd_fmt[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -1198,25 +1220,108 @@ UINT WINAPI MsiEnumProductsA(DWORD index, LPSTR lpguid) UINT WINAPI MsiEnumProductsW(DWORD index, LPWSTR lpguid) { - HKEY hkeyProducts = 0; - DWORD r; + UINT r; WCHAR szKeyName[SQUISH_GUID_SIZE]; + HKEY key; + DWORD machine_count, managed_count, unmanaged_count; + WCHAR keypath[MAX_PATH]; + LPWSTR usersid = NULL; + + static DWORD last_index; TRACE("%d %p\n", index, lpguid); if (NULL == lpguid) return ERROR_INVALID_PARAMETER; - r = RegCreateKeyW(HKEY_LOCAL_MACHINE, szInstaller_Products, &hkeyProducts); + if (index && index - last_index != 1) + return ERROR_INVALID_PARAMETER; + + r = RegCreateKeyW(HKEY_LOCAL_MACHINE, szInstaller_LocalClassesProd, &key); if( r != ERROR_SUCCESS ) return ERROR_NO_MORE_ITEMS; - r = RegEnumKeyW(hkeyProducts, index, szKeyName, SQUISH_GUID_SIZE); - if( r == ERROR_SUCCESS ) - unsquash_guid(szKeyName, lpguid); - RegCloseKey(hkeyProducts); + r = RegQueryInfoKeyW(key, NULL, NULL, NULL, &machine_count, NULL, NULL, + NULL, NULL, NULL, NULL, NULL); + if( r != ERROR_SUCCESS ) + { + RegCloseKey(key); + return ERROR_NO_MORE_ITEMS; + } - return r; + if (machine_count && index <= machine_count) + { + r = RegEnumKeyW(key, index, szKeyName, SQUISH_GUID_SIZE); + if( r == ERROR_SUCCESS ) + { + unsquash_guid(szKeyName, lpguid); + last_index = index; + RegCloseKey(key); + return ERROR_SUCCESS; + } + } + RegCloseKey(key); + + r = get_user_sid(&usersid); + if (r != ERROR_SUCCESS || !usersid) + { + ERR("Failed to retrieve user SID: %d\n", r); + return r; + } + sprintfW(keypath, szInstaller_LocalManaged_fmt, usersid); + LocalFree(usersid); + + r = RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, &key); + if( r != ERROR_SUCCESS ) + return ERROR_NO_MORE_ITEMS; + + r = RegQueryInfoKeyW(key, NULL, NULL, NULL, &managed_count, NULL, NULL, + NULL, NULL, NULL, NULL, NULL); + if( r != ERROR_SUCCESS ) + { + RegCloseKey(key); + return ERROR_NO_MORE_ITEMS; + } + + if (managed_count && index <= machine_count + managed_count) + { + r = RegEnumKeyW(key, index - machine_count, szKeyName, SQUISH_GUID_SIZE); + if( r == ERROR_SUCCESS ) + { + unsquash_guid(szKeyName, lpguid); + last_index = index; + RegCloseKey(key); + return ERROR_SUCCESS; + } + } + RegCloseKey(key); + + r = RegCreateKeyW(HKEY_CURRENT_USER, szUserProduct, &key); + if( r != ERROR_SUCCESS ) + return ERROR_NO_MORE_ITEMS; + + r = RegQueryInfoKeyW(key, NULL, NULL, NULL, &unmanaged_count, NULL, NULL, + NULL, NULL, NULL, NULL, NULL); + if( r != ERROR_SUCCESS ) + { + RegCloseKey(key); + return ERROR_NO_MORE_ITEMS; + } + + if (unmanaged_count && index <= machine_count + managed_count + unmanaged_count) + { + r = RegEnumKeyW(key, index - machine_count - managed_count, szKeyName, SQUISH_GUID_SIZE); + if( r == ERROR_SUCCESS ) + { + unsquash_guid(szKeyName, lpguid); + last_index = index; + RegCloseKey(key); + return ERROR_SUCCESS; + } + } + RegCloseKey(key); + + return ERROR_NO_MORE_ITEMS; } UINT WINAPI MsiEnumFeaturesA(LPCSTR szProduct, DWORD index, diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index ca40f09..f9ab254 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -2022,7 +2022,7 @@ static void test_Installer_Products(BOOL bProductInstalled) } } - if (bProductInstalled) todo_wine + if (bProductInstalled) { ok(bProductInstalled == bProductFound, "Product expected to %s installed but product code was %s\n", bProductInstalled ? "be" : "not be",

1 0