wine-commits March 2009

wine-commits@winehq.org

2 participants
834 discussions

Detlef Riekenberg : dsound/tests: Remove duplicate version dump.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 8819156b493408c97c53fc62f7634e6abffab9ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=8819156b493408c97c53fc62f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 27 22:37:27 2009 +0100 dsound/tests: Remove duplicate version dump. We have the version already in the header of the winetest results. --- dlls/dsound/tests/capture.c | 1 - dlls/dsound/tests/ds3d.c | 1 - dlls/dsound/tests/ds3d8.c | 1 - dlls/dsound/tests/dsound.c | 1 - dlls/dsound/tests/dsound8.c | 34 ---------------------------------- dlls/dsound/tests/dsound_test.h | 1 - dlls/dsound/tests/duplex.c | 1 - dlls/dsound/tests/propset.c | 1 - 8 files changed, 0 insertions(+), 41 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index b2a377a..87a5a59 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -687,7 +687,6 @@ START_TEST(capture) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundCaptureCreate=(void*)GetProcAddress(hDsound, "DirectSoundCaptureCreate"); diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index db662c0..8f5b88a 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1280,7 +1280,6 @@ START_TEST(ds3d) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, "DirectSoundEnumerateA"); diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index ba9f2d2..1f5f28a 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -1133,7 +1133,6 @@ START_TEST(ds3d8) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, "DirectSoundEnumerateA"); diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 10a3fa8..114dbb6 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1083,7 +1083,6 @@ START_TEST(dsound) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, "DirectSoundEnumerateA"); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 2e02a92..c79a7ac 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -874,39 +874,6 @@ static void dsound8_tests(void) ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); } -const char * get_file_version(const char * file_name) -{ - static char version[32]; - static char backslash[] = "\\"; - DWORD size; - DWORD handle; - - size = GetFileVersionInfoSizeA("dsound.dll", &handle); - if (size) { - char * data = HeapAlloc(GetProcessHeap(), 0, size); - if (data) { - if (GetFileVersionInfoA("dsound.dll", handle, size, data)) { - VS_FIXEDFILEINFO *pFixedVersionInfo; - UINT len; - if (VerQueryValueA(data, backslash, (LPVOID *)&pFixedVersionInfo, &len)) { - sprintf(version, "%d.%d.%d.%d", - pFixedVersionInfo->dwFileVersionMS >> 16, - pFixedVersionInfo->dwFileVersionMS & 0xffff, - pFixedVersionInfo->dwFileVersionLS >> 16, - pFixedVersionInfo->dwFileVersionLS & 0xffff); - } else - sprintf(version, "not available"); - } else - sprintf(version, "failed"); - - HeapFree(GetProcessHeap(), 0, data); - } else - sprintf(version, "failed"); - } else - sprintf(version, "not available"); - - return version; -} START_TEST(dsound8) { @@ -917,7 +884,6 @@ START_TEST(dsound8) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, "DirectSoundEnumerateA"); diff --git a/dlls/dsound/tests/dsound_test.h b/dlls/dsound/tests/dsound_test.h index 23ca169..b09c98b 100644 --- a/dlls/dsound/tests/dsound_test.h +++ b/dlls/dsound/tests/dsound_test.h @@ -85,5 +85,4 @@ extern void test_buffer8(LPDIRECTSOUND8,LPDIRECTSOUNDBUFFER*, LPDIRECTSOUND3DLISTENER,BOOL,BOOL); extern const char * getDSBCAPS(DWORD xmask); extern int align(int length, int align); -extern const char * get_file_version(const char * file_name); extern const char * format_string(const WAVEFORMATEX* wfx); diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index ae816a4..11fb2a7 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -231,7 +231,6 @@ START_TEST(duplex) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundFullDuplexCreate=(void*)GetProcAddress(hDsound, "DirectSoundFullDuplexCreate"); diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index fba6e06..70a8e0d 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -720,7 +720,6 @@ START_TEST(propset) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { - trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, "DirectSoundEnumerateA");

1 0

Aric Stewart : msctf: Add a file version.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: f02e4dcf272e8602979d9301f293b905e4bc0fec URL: http://source.winehq.org/git/wine.git/?a=commit;h=f02e4dcf272e8602979d9301f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 27 12:22:03 2009 -0500 msctf: Add a file version. Checked by the IE8 install. --- dlls/msctf/Makefile.in | 3 +++ dlls/msctf/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/Makefile.in b/dlls/msctf/Makefile.in index 5502bd6..4387913 100644 --- a/dlls/msctf/Makefile.in +++ b/dlls/msctf/Makefile.in @@ -14,6 +14,9 @@ C_SRCS = \ regsvr.c \ threadmgr.c +RC_SRCS = \ + version.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/msctf/version.rc b/dlls/msctf/version.rc new file mode 100644 index 0000000..8bd8ff3 --- /dev/null +++ b/dlls/msctf/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2009 CodeWeavers, Aric Stewart + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Msctf" +#define WINE_FILENAME_STR "msctf.dll" +#define WINE_FILEVERSION 5,1,2600,3319 +#define WINE_FILEVERSION_STR " 5.1.2600.3319" +#define WINE_PRODUCTVERSION 5,1,2600,3319 +#define WINE_PRODUCTVERSION_STR "5.1.2600.3319" + +#include "wine/wine_common_ver.rc"

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@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

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

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

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

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

Hans Leidekker : msi: Allocate token information buffer dynamically.
by Alexandre Julliard 27 Mar '09

27 Mar '09

Module: wine Branch: master Commit: 4365b34838f14c0a6908ea794429ba6e493a59d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4365b34838f14c0a6908ea794… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 27 13:41:35 2009 +0100 msi: Allocate token information buffer dynamically. --- dlls/msi/tests/msi.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 13afd92..c3ef72b 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -516,15 +516,19 @@ static void create_test_guid(LPSTR prodcode, LPSTR squashed) static void get_user_sid(LPSTR *usersid) { HANDLE token; - BYTE buf[1024]; DWORD size; PTOKEN_USER user; OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); - size = sizeof(buf); - GetTokenInformation(token, TokenUser, buf, size, &size); - user = (PTOKEN_USER)buf; + + size = 0; + GetTokenInformation(token, TokenUser, NULL, size, &size); + user = HeapAlloc(GetProcessHeap(), 0, size); + + GetTokenInformation(token, TokenUser, user, size, &size); pConvertSidToStringSidA(user->User.Sid, usersid); + + HeapFree(GetProcessHeap(), 0, user); CloseHandle(token); }

1 0

Hans Leidekker : msi: Add tests for MsiEnumProducts.
by Alexandre Julliard 27 Mar '09

27 Mar '09

Module: wine Branch: master Commit: f0d1d61d3b8f613dfa82b7169484c32a70ed16b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0d1d61d3b8f613dfa82b7169… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 27 13:40:59 2009 +0100 msi: Add tests for MsiEnumProducts. --- dlls/msi/tests/msi.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 928e48a..13afd92 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -10874,6 +10874,76 @@ static void test_MsiGetPatchInfoEx(void) RegCloseKey(udprod); } +static void test_MsiEnumProducts(void) +{ + UINT r; + int found1, found2, found3; + DWORD index; + char product1[39], product2[39], product3[39], guid[39]; + char product_squashed1[33], product_squashed2[33], product_squashed3[33]; + char keypath1[MAX_PATH], keypath2[MAX_PATH], keypath3[MAX_PATH]; + char *usersid; + HKEY key1, key2, key3; + + create_test_guid(product1, product_squashed1); + create_test_guid(product2, product_squashed2); + create_test_guid(product3, product_squashed3); + get_user_sid(&usersid); + + strcpy(keypath1, "Software\\Classes\\Installer\\Products\\"); + strcat(keypath1, product_squashed1); + + r = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath1, &key1); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + strcpy(keypath2, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Managed\\"); + strcat(keypath2, usersid); + strcat(keypath2, "\\Installer\\Products\\"); + strcat(keypath2, product_squashed2); + + r = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath2, &key2); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + strcpy(keypath3, "Software\\Microsoft\\Installer\\Products\\"); + strcat(keypath3, product_squashed3); + + r = RegCreateKeyA(HKEY_CURRENT_USER, keypath3, &key3); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + index = 0; + r = MsiEnumProductsA(index, NULL); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); + + index = 2; + r = MsiEnumProductsA(index, guid); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); + + index = 0; + r = MsiEnumProductsA(index, guid); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + found1 = found2 = found3 = 0; + while ((r = MsiEnumProductsA(index, guid)) == ERROR_SUCCESS) + { + if (!strcmp(product1, guid)) found1 = 1; + if (!strcmp(product2, guid)) found2 = 1; + if (!strcmp(product3, guid)) found3 = 1; + index++; + } + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %u\n", r); + ok(found1, "product1 not found\n"); + ok(found2, "product2 not found\n"); + ok(found3, "product3 not found\n"); + + RegDeleteKeyA(key1, ""); + RegDeleteKeyA(key2, ""); + RegDeleteKeyA(key3, ""); + RegCloseKey(key1); + RegCloseKey(key2); + RegCloseKey(key3); + LocalFree(usersid); +} + START_TEST(msi) { init_functionpointers(); @@ -10901,6 +10971,7 @@ START_TEST(msi) test_MsiEnumPatchesEx(); test_MsiEnumPatches(); test_MsiGetPatchInfoEx(); + test_MsiEnumProducts(); } test_MsiGetFileVersion();

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

← Newer
1
...
8
9
10
11
12
13
14
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2009