July 2006 - Wine-commits - list.winehq.org

appdb/include filter.php
by WineHQ 15 Jul '06

15 Jul '06

ChangeSet ID: 26550 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/15 00:16:37 Modified files: include : filter.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Exclude GPC values that start with 'Dialog', these are used by Xinha and we don't want to modify that code. Also exclude PHPSESSID, this is a convenience for developers as php uses this key for its default session management and we really don't mind if it is defined or not as we use our own session handlers Patch: http://cvs.winehq.org/patch.py?id=26550 Old revision New revision Changes Path 1.6 1.7 +5 -3 appdb/include/filter.php Index: appdb/include/filter.php diff -u -p appdb/include/filter.php:1.6 appdb/include/filter.php:1.7 --- appdb/include/filter.php:1.6 15 Jul 2006 5:16:37 -0000 +++ appdb/include/filter.php 15 Jul 2006 5:16:37 -0000 @@ -45,11 +45,13 @@ function filter_gpc() break; default: // don't filter the AppDB session cookie and MAX_FILE_SIZE - if($aKeys[$i]!="whq_appdb" && $aKeys[$i]!="MAX_FILE_SIZE") - { + // and the DialogX values that xinha uses + if($aKeys[$i]!="whq_appdb" && $aKeys[$i]!="MAX_FILE_SIZE" && $aKeys[$i]!="PHPSESSID" + && strpos($aKeys[$i], "Dialog") == 0) + { util_show_error_page_and_exit("Fatal error: type of variable ".$aKeys[$i]." is not recognized."); } - break; + break; } }

1 0

lostwages/templates/en download.template
by Jeremy Newman 14 Jul '06

14 Jul '06

ChangeSet ID: 26549 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/07/14 14:59:23 Modified files: templates/en : download.template Log message: Scott Ritchie <scott(a)open-vote.org> * Update download page to include Ubuntu Dapper Patch: http://cvs.winehq.org/patch.py?id=26549 Old revision New revision Changes Path 1.84 1.85 +1 -1 lostwages/templates/en/download.template Index: lostwages/templates/en/download.template diff -u -p lostwages/templates/en/download.template:1.84 lostwages/templates/en/download.template:1.85 --- lostwages/templates/en/download.template:1.84 14 Jul 2006 19:59:23 -0000 +++ lostwages/templates/en/download.template 14 Jul 2006 19:59:23 -0000 @@ -66,7 +66,7 @@ for post-installation instructions.< <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/site/download-deb">Ubuntu</a> - binary and source .debs for Ubuntu Breezy Badger</td> + binary and source .debs for Ubuntu Breezy Badger and Dapper Drake</td> <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr>

1 0

lostwages/templates/en download.template
by Jeremy Newman 14 Jul '06

14 Jul '06

ChangeSet ID: 26548 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/07/14 14:58:37 Modified files: templates/en : download.template Log message: Brian Vincent <vinn(a)theshell.com> - change RH maintainer Patch: http://cvs.winehq.org/patch.py?id=26548 Old revision New revision Changes Path 1.83 1.84 +3 -3 lostwages/templates/en/download.template Index: lostwages/templates/en/download.template diff -u -p lostwages/templates/en/download.template:1.83 lostwages/templates/en/download.template:1.84 --- lostwages/templates/en/download.template:1.83 14 Jul 2006 19:58:37 -0000 +++ lostwages/templates/en/download.template 14 Jul 2006 19:58:37 -0000 @@ -25,9 +25,9 @@ for post-installation instructions.< <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="RedHat Linux" border="0"></a> </td> <td> <a href="http://download.fedora.redhat.com/pub/fedora/linux/extras/5/i386/repodata/r…">Red Hat / Fedora</a> - binary and source .rpms for RedHat 8, 9, Fedora Core 3, 4, 5, White - Box Enterprise Linux 3.0 (RHEL 3.0 compatible), CentOS 4 (RHEL 4.0 - compatible). The wine meta package is available via <tt>yum</tt> + binary and source .rpms for RedHat 8, 9; Fedora Core 3, 4, 5; and + compatible distributions. + The wine meta package is available via <tt>yum</tt> through the Fedora Extras repository by running <tt>$ yum install wine </tt>" </td>

1 0

Stefan Siebert : msi: cabinet_notify - don' t fail on files with the same filepath.
by Alexandre Julliard 14 Jul '06

14 Jul '06

Module: wine Branch: refs/heads/master Commit: ded4fbcc3c0d1e5f65cfb4e0e575f111c1e8974a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ded4fbcc3c0d1e5f65cfb4e… Author: Stefan Siebert <stefan.siebert(a)ssiebert.de> Date: Wed Jul 12 21:02:54 2006 +0200 msi: cabinet_notify - don't fail on files with the same filepath. --- dlls/msi/files.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 22cec6d..534199f 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -232,7 +232,7 @@ static INT_PTR cabinet_notify(FDINOTIFIC TRACE("extracting %s\n", debugstr_w(f->TargetPath) ); handle = CreateFileW( f->TargetPath, GENERIC_READ | GENERIC_WRITE, 0, - NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL ); + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); if ( handle == INVALID_HANDLE_VALUE ) { ERR("failed to create %s (error %ld)\n",

1 0

Christian Costa : wined3d: Only copy memory corresponding to the dib section instead of the power of 2 surface .
by Alexandre Julliard 14 Jul '06

14 Jul '06

Module: wine Branch: refs/heads/master Commit: 494841d3e589041809adb5da54ac110dc7a4eaef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=494841d3e589041809adb5d… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Jul 13 18:35:45 2006 +0200 wined3d: Only copy memory corresponding to the dib section instead of the power of 2 surface. --- dlls/wined3d/surface.c | 5 +++-- dlls/wined3d/wined3d_main.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b86dd7b..b827fa8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1021,17 +1021,18 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC if( (NP2_REPACK == wined3d_settings.nonpower2_mode || This->resource.usage & WINED3DUSAGE_RENDERTARGET)) { b_info->bmiHeader.biWidth = This->currentDesc.Width; b_info->bmiHeader.biHeight = -This->currentDesc.Height; + b_info->bmiHeader.biSizeImage = This->currentDesc.Width * This->currentDesc.Height * This->bytesPerPixel; /* Use the full pow2 image size(assigned below) because LockRect * will need it for a full glGetTexImage call */ } else { b_info->bmiHeader.biWidth = This->pow2Width; b_info->bmiHeader.biHeight = -This->pow2Height; + b_info->bmiHeader.biSizeImage = This->resource.size; } b_info->bmiHeader.biPlanes = 1; b_info->bmiHeader.biBitCount = This->bytesPerPixel * 8; - b_info->bmiHeader.biSizeImage = This->resource.size; b_info->bmiHeader.biXPelsPerMeter = 0; b_info->bmiHeader.biYPelsPerMeter = 0; @@ -1092,7 +1093,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC /* copy the existing surface to the dib section */ if(This->resource.allocatedMemory) { - memcpy(This->dib.bitmap_data, This->resource.allocatedMemory, This->resource.size); + memcpy(This->dib.bitmap_data, This->resource.allocatedMemory, b_info->bmiHeader.biSizeImage); /* We won't need that any more */ HeapFree(GetProcessHeap(), 0, This->resource.allocatedMemory); } else { diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 47733c8..9f984b0 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -191,7 +191,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, } else if (!strcmp(buffer,"repack")) { - TRACE("Repacking non-power2 textre\n"); + TRACE("Repacking non-power2 textures\n"); wined3d_settings.nonpower2_mode = NP2_REPACK; } /* There will be a couple of other choices for nonpow2, they are: TextureRecrangle and OpenGL 2 */

1 0

András Kovács : shell32: Stub for SHSetLocalizedName.
by Alexandre Julliard 14 Jul '06

14 Jul '06

Module: wine Branch: refs/heads/master Commit: 38c8950e17bb7d18cfba20386a660ef668f6b22e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=38c8950e17bb7d18cfba203… Author: András Kovács <andras(a)csevego.net> Date: Fri Jul 14 06:33:25 2006 +0200 shell32: Stub for SHSetLocalizedName. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellord.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 4d02d7a..debb9a4 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -366,6 +366,7 @@ #300 stub Shl3216_ThunkData32 @ stub SHPathPrepareForWriteW @ stdcall SHQueryRecycleBinA(str ptr) @ stdcall SHQueryRecycleBinW(wstr ptr) +@ stdcall SHSetLocalizedName(wstr wstr long) @ stub SHUpdateRecycleBinIcon @ stdcall SheChangeDirA(str) @ stub SheChangeDirExA diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 38ebcbb..a6216d3 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1703,3 +1703,13 @@ HRESULT WINAPI SHQueryRecycleBinW(LPCWST return S_OK; } + +/************************************************************************* + * SHSetLocalizedName (SHELL32.@) + */ +HRESULT WINAPI SHSetLocalizedName(LPWSTR pszPath, LPCWSTR pszResModule, int idsRes) +{ + FIXME("%p, %s, %d - stub\n", pszPath, debugstr_w(pszResModule), idsRes); + + return S_OK; +}

1 0

Juan Lang : msi: Let caller set property in AppSearch.
by Alexandre Julliard 14 Jul '06

14 Jul '06

Module: wine Branch: refs/heads/master Commit: 5cf870dae5d92fda07128b5768e6bfd056dfa1eb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5cf870dae5d92fda07128b5… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Jul 13 16:04:38 2006 -0700 msi: Let caller set property in AppSearch. --- dlls/msi/appsearch.c | 120 +++++++++++++++++++++++++------------------------- 1 files changed, 60 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5cf870dae5d92fda071…

1 0

Mike McCormack : msi: Use awstring to return strings from MsiGetProductInfo .
by Alexandre Julliard 14 Jul '06

14 Jul '06

Module: wine Branch: refs/heads/master Commit: c19f9e9c314c02abd9da4c40fd8a65a3a996b525 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c19f9e9c314c02abd9da4c4… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jul 14 15:21:10 2006 +0900 msi: Use awstring to return strings from MsiGetProductInfo. --- dlls/msi/msi.c | 148 ++++++++++++++++++++++++++------------------------------ 1 files changed, 68 insertions(+), 80 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index bb30415..5d29a11 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -457,81 +457,23 @@ UINT WINAPI MsiGetProductCodeW(LPCWSTR s return ERROR_SUCCESS; } -UINT WINAPI MsiGetProductInfoA(LPCSTR szProduct, LPCSTR szAttribute, - LPSTR szBuffer, DWORD *pcchValueBuf) -{ - LPWSTR szwProduct = NULL, szwAttribute = NULL, szwBuffer = NULL; - UINT r = ERROR_OUTOFMEMORY; - DWORD pcchwValueBuf = 0; - - TRACE("%s %s %p %p\n", debugstr_a(szProduct), debugstr_a(szAttribute), - szBuffer, pcchValueBuf); - - if( szProduct ) - { - szwProduct = strdupAtoW( szProduct ); - if( !szwProduct ) - goto end; - } - - if( szAttribute ) - { - szwAttribute = strdupAtoW( szAttribute ); - if( !szwAttribute ) - goto end; - } - - if( szBuffer ) - { - szwBuffer = msi_alloc( (*pcchValueBuf) * sizeof(WCHAR) ); - pcchwValueBuf = *pcchValueBuf; - if( !szwBuffer ) - goto end; - } - - r = MsiGetProductInfoW( szwProduct, szwAttribute, szwBuffer, - &pcchwValueBuf ); - - if( ERROR_SUCCESS == r ) - { - INT old_len = *pcchValueBuf; - *pcchValueBuf = WideCharToMultiByte(CP_ACP, 0, szwBuffer, pcchwValueBuf, - szBuffer, *pcchValueBuf, NULL, NULL); - if (old_len > *pcchValueBuf) - szBuffer[*pcchValueBuf]=0; - } - -end: - msi_free( szwProduct ); - msi_free( szwAttribute ); - msi_free( szwBuffer ); - - return r; -} - -UINT WINAPI MsiGetProductInfoW(LPCWSTR szProduct, LPCWSTR szAttribute, - LPWSTR szBuffer, DWORD *pcchValueBuf) +UINT WINAPI MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, + awstring *szValue, DWORD *pcchValueBuf) { UINT r; HKEY hkey; LPWSTR val = NULL; - FIXME("%s %s %p %p\n",debugstr_w(szProduct), debugstr_w(szAttribute), - szBuffer, pcchValueBuf); + TRACE("%s %s %p %p\n", debugstr_w(szProduct), + debugstr_w(szAttribute), szValue, pcchValueBuf); - /* - * FIXME: - * - * We should use msi_strcpy_to_awstring to return strings. - * - * The values seem scattered/dupicated in the registry. Is there a system? + /* + * FIXME: Values seem scattered/duplicated in the registry. Is there a system? */ - if (NULL != szBuffer && NULL == pcchValueBuf) + if ((szValue && !pcchValueBuf) || !szProduct || !szAttribute) return ERROR_INVALID_PARAMETER; - if (NULL == szProduct || NULL == szAttribute) - return ERROR_INVALID_PARAMETER; - + /* check for special properties */ if (!lstrcmpW(szAttribute, INSTALLPROPERTY_PACKAGECODEW)) { @@ -595,10 +537,13 @@ UINT WINAPI MsiGetProductInfoW(LPCWSTR s static const WCHAR szDisplayVersion[] = { 'D','i','s','p','l','a','y','V','e','r','s','i','o','n',0 }; - if (!lstrcmpW(szAttribute, INSTALLPROPERTY_VERSIONSTRINGW)) + FIXME("%s\n", debugstr_w(szAttribute)); + /* FIXME: some attribute values not tested... */ + + if (!lstrcmpW( szAttribute, INSTALLPROPERTY_VERSIONSTRINGW )) szAttribute = szDisplayVersion; - r = MSIREG_OpenUninstallKey(szProduct, &hkey, FALSE); + r = MSIREG_OpenUninstallKey( szProduct, &hkey, FALSE ); if (r != ERROR_SUCCESS) return ERROR_UNKNOWN_PRODUCT; @@ -612,14 +557,57 @@ UINT WINAPI MsiGetProductInfoW(LPCWSTR s if (!val) return ERROR_UNKNOWN_PROPERTY; - if (lstrlenW(val) > *pcchValueBuf) - return ERROR_MORE_DATA; - - lstrcpyW(szBuffer, val); + r = msi_strcpy_to_awstring( val, szValue, pcchValueBuf ); HeapFree(GetProcessHeap(), 0, val); - return ERROR_SUCCESS; + return r; +} + +UINT WINAPI MsiGetProductInfoA(LPCSTR szProduct, LPCSTR szAttribute, + LPSTR szBuffer, DWORD *pcchValueBuf) +{ + LPWSTR szwProduct, szwAttribute = NULL; + UINT r = ERROR_OUTOFMEMORY; + awstring buffer; + + TRACE("%s %s %p %p\n", debugstr_a(szProduct), debugstr_a(szAttribute), + szBuffer, pcchValueBuf); + + szwProduct = strdupAtoW( szProduct ); + if( szProduct && !szwProduct ) + goto end; + + szwAttribute = strdupAtoW( szAttribute ); + if( szAttribute && !szwAttribute ) + goto end; + + buffer.unicode = FALSE; + buffer.str.a = szBuffer; + + r = MSI_GetProductInfo( szwProduct, szwAttribute, + &buffer, pcchValueBuf ); + +end: + msi_free( szwProduct ); + msi_free( szwAttribute ); + + return r; +} + +UINT WINAPI MsiGetProductInfoW(LPCWSTR szProduct, LPCWSTR szAttribute, + LPWSTR szBuffer, DWORD *pcchValueBuf) +{ + awstring buffer; + + TRACE("%s %s %p %p\n", debugstr_w(szProduct), debugstr_w(szAttribute), + szBuffer, pcchValueBuf); + + buffer.unicode = TRUE; + buffer.str.w = szBuffer; + + return MSI_GetProductInfo( szProduct, szAttribute, + &buffer, pcchValueBuf ); } UINT WINAPI MsiEnableLogA(DWORD dwLogMode, LPCSTR szLogFile, DWORD attributes) @@ -1567,7 +1555,7 @@ UINT WINAPI MsiProvideQualifiedComponent TRACE("%s %s %li %s %li %li %p %p\n", debugstr_w(szComponent), debugstr_w(szQualifier), dwInstallMode, debugstr_w(szProduct), Unused1, Unused2, lpPathBuf, pcchPathBuf); - + rc = MSIREG_OpenUserComponentsKey(szComponent, &hkey, FALSE); if (rc != ERROR_SUCCESS) return ERROR_INDEX_ABSENT; @@ -1590,18 +1578,18 @@ UINT WINAPI MsiProvideQualifiedComponent } MsiDecomposeDescriptorW(info, product, feature, component, &sz); - + if (!szProduct) rc = MsiGetComponentPathW(product, component, lpPathBuf, pcchPathBuf); else rc = MsiGetComponentPathW(szProduct, component, lpPathBuf, pcchPathBuf); - + RegCloseKey(hkey); msi_free(info); if (rc == INSTALLSTATE_LOCAL) return ERROR_SUCCESS; - else + else return ERROR_FILE_NOT_FOUND; } @@ -1721,7 +1709,7 @@ USERINFOSTATE WINAPI MsiGetUserInfoW(LPC } if (pcchSerialBuf) *pcchSerialBuf = sz / sizeof(WCHAR); - + RegCloseKey(hkey); return USERINFOSTATE_PRESENT; } @@ -1969,7 +1957,7 @@ UINT WINAPI MsiReinstallFeatureW( LPCWST return r; MSI_SetPropertyW(package,REINSTALLMODE,reinstallmode); - + sz = lstrlenW(szInstalled); sz += lstrlenW(fmt); sz += lstrlenW(szFeature); @@ -2002,7 +1990,7 @@ UINT WINAPI MsiReinstallFeatureA( LPCSTR wszFeature = strdupAtoW(szFeature); rc = MsiReinstallFeatureW(wszProduct, wszFeature, dwReinstallMode); - + msi_free(wszProduct); msi_free(wszFeature); return rc;

1 0

Mike McCormack : msi: Read from the registry, not the database in MsiGetProductInfo.
by Alexandre Julliard 14 Jul '06

14 Jul '06

Module: wine Branch: refs/heads/master Commit: cd5bac0b3df39da5068adfd2daae554d7483d40e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cd5bac0b3df39da5068adfd… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jul 14 15:20:44 2006 +0900 msi: Read from the registry, not the database in MsiGetProductInfo. --- dlls/msi/msi.c | 125 ++++++++++++++++++++++++++++++++------------------------ 1 files changed, 72 insertions(+), 53 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 81c531b..bb30415 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -512,95 +512,114 @@ end: UINT WINAPI MsiGetProductInfoW(LPCWSTR szProduct, LPCWSTR szAttribute, LPWSTR szBuffer, DWORD *pcchValueBuf) { - MSIHANDLE hProduct; UINT r; - static const WCHAR szProductVersion[] = - {'P','r','o','d','u','c','t','V','e','r','s','i','o','n',0}; - static const WCHAR szProductLanguage[] = - {'P','r','o','d','u','c','t','L','a','n','g','u','a','g','e',0}; + HKEY hkey; + LPWSTR val = NULL; FIXME("%s %s %p %p\n",debugstr_w(szProduct), debugstr_w(szAttribute), szBuffer, pcchValueBuf); + /* + * FIXME: + * + * We should use msi_strcpy_to_awstring to return strings. + * + * The values seem scattered/dupicated in the registry. Is there a system? + */ + if (NULL != szBuffer && NULL == pcchValueBuf) return ERROR_INVALID_PARAMETER; if (NULL == szProduct || NULL == szAttribute) return ERROR_INVALID_PARAMETER; /* check for special properties */ - if (strcmpW(szAttribute, INSTALLPROPERTY_PACKAGECODEW)==0) + if (!lstrcmpW(szAttribute, INSTALLPROPERTY_PACKAGECODEW)) { - HKEY hkey; - WCHAR squished[GUID_SIZE]; - WCHAR package[200]; - DWORD sz = sizeof(squished); + LPWSTR regval; + WCHAR packagecode[35]; r = MSIREG_OpenUserProductsKey(szProduct, &hkey, FALSE); if (r != ERROR_SUCCESS) return ERROR_UNKNOWN_PRODUCT; - r = RegQueryValueExW(hkey, INSTALLPROPERTY_PACKAGECODEW, NULL, NULL, - (LPBYTE)squished, &sz); - if (r != ERROR_SUCCESS) + regval = msi_reg_get_val_str( hkey, szAttribute ); + if (regval) { - RegCloseKey(hkey); - return ERROR_UNKNOWN_PRODUCT; + if (unsquash_guid(regval, packagecode)) + val = strdupW(packagecode); + msi_free(regval); } - unsquash_guid(squished, package); - *pcchValueBuf = strlenW(package); - if (strlenW(package) > *pcchValueBuf) - { - RegCloseKey(hkey); - return ERROR_MORE_DATA; - } - else - strcpyW(szBuffer, package); - RegCloseKey(hkey); - r = ERROR_SUCCESS; } - else if (strcmpW(szAttribute, INSTALLPROPERTY_VERSIONSTRINGW)==0) + else if (!lstrcmpW(szAttribute, INSTALLPROPERTY_ASSIGNMENTTYPEW)) { - r = MsiOpenProductW(szProduct, &hProduct); - if (ERROR_SUCCESS != r) - return r; - - r = MsiGetPropertyW(hProduct, szProductVersion, szBuffer, pcchValueBuf); - MsiCloseHandle(hProduct); + static const WCHAR one[] = { '1',0 }; + /* + * FIXME: should be in the Product key (user or system?) + * but isn't written yet... + */ + val = strdupW( one ); } - else if (strcmpW(szAttribute, INSTALLPROPERTY_ASSIGNMENTTYPEW)==0) + else if (!lstrcmpW(szAttribute, INSTALLPROPERTY_LANGUAGEW) || + !lstrcmpW(szAttribute, INSTALLPROPERTY_VERSIONW)) { - FIXME("0 (zero) if advertised or per user , 1(one) if per machine.\n"); - if (szBuffer) + static const WCHAR fmt[] = { '%','u',0 }; + WCHAR szVal[16]; + DWORD regval; + + r = MSIREG_OpenUninstallKey(szProduct, &hkey, FALSE); + if (r != ERROR_SUCCESS) + return ERROR_UNKNOWN_PRODUCT; + + if (msi_reg_get_val_dword( hkey, szAttribute, &regval)) { - szBuffer[0] = '1'; - szBuffer[1] = 0; + sprintfW(szVal, fmt, regval); + val = strdupW( szVal ); } - if (pcchValueBuf) - *pcchValueBuf = 1; - r = ERROR_SUCCESS; + + RegCloseKey(hkey); } - else if (strcmpW(szAttribute, INSTALLPROPERTY_LANGUAGEW)==0) + else if (!lstrcmpW(szAttribute, INSTALLPROPERTY_PRODUCTNAMEW)) { - r = MsiOpenProductW(szProduct, &hProduct); - if (ERROR_SUCCESS != r) - return r; + r = MSIREG_OpenUserProductsKey(szProduct, &hkey, FALSE); + if (r != ERROR_SUCCESS) + return ERROR_UNKNOWN_PRODUCT; + + val = msi_reg_get_val_str( hkey, szAttribute ); - r = MsiGetPropertyW(hProduct, szProductLanguage, szBuffer, pcchValueBuf); - MsiCloseHandle(hProduct); + RegCloseKey(hkey); } else { - r = MsiOpenProductW(szProduct, &hProduct); - if (ERROR_SUCCESS != r) - return r; + static const WCHAR szDisplayVersion[] = { + 'D','i','s','p','l','a','y','V','e','r','s','i','o','n',0 }; + + if (!lstrcmpW(szAttribute, INSTALLPROPERTY_VERSIONSTRINGW)) + szAttribute = szDisplayVersion; + + r = MSIREG_OpenUninstallKey(szProduct, &hkey, FALSE); + if (r != ERROR_SUCCESS) + return ERROR_UNKNOWN_PRODUCT; + + val = msi_reg_get_val_str( hkey, szAttribute ); - r = MsiGetPropertyW(hProduct, szAttribute, szBuffer, pcchValueBuf); - MsiCloseHandle(hProduct); + RegCloseKey(hkey); } - return r; + TRACE("returning %s\n", debugstr_w(val)); + + if (!val) + return ERROR_UNKNOWN_PROPERTY; + + if (lstrlenW(val) > *pcchValueBuf) + return ERROR_MORE_DATA; + + lstrcpyW(szBuffer, val); + + HeapFree(GetProcessHeap(), 0, val); + + return ERROR_SUCCESS; } UINT WINAPI MsiEnableLogA(DWORD dwLogMode, LPCSTR szLogFile, DWORD attributes)

1 0

Mike McCormack : msi: Add some registry reading macro functions.
by Alexandre Julliard 14 Jul '06

14 Jul '06

Module: wine Branch: refs/heads/master Commit: a3c03fea58c6e56707d947fdc575cd2b20acd847 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a3c03fea58c6e56707d947f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jul 14 15:19:32 2006 +0900 msi: Add some registry reading macro functions. --- dlls/msi/msipriv.h | 3 +++ dlls/msi/registry.c | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 3f69910..999b4ca 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -415,6 +415,9 @@ extern UINT MSIREG_OpenUserComponentsKey extern UINT MSIREG_OpenUpgradeCodesKey(LPCWSTR szProduct, HKEY* key, BOOL create); extern UINT MSIREG_OpenUserUpgradeCodesKey(LPCWSTR szProduct, HKEY* key, BOOL create); +extern LPWSTR msi_reg_get_val_str( HKEY hkey, LPCWSTR name ); +extern BOOL msi_reg_get_val_dword( HKEY hkey, LPCWSTR name, DWORD *val); + extern DWORD msi_version_str_to_dword(LPCWSTR p); extern LPWSTR msi_version_dword_to_str(DWORD version); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index c7a7e8a..7c6eca1 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -369,6 +369,32 @@ LONG msi_reg_set_subkey_val( HKEY hkey, return r; } +LPWSTR msi_reg_get_val_str( HKEY hkey, LPCWSTR name ) +{ + DWORD len = 0; + LPWSTR val; + LONG r; + + r = RegQueryValueExW(hkey, name, NULL, NULL, NULL, &len); + if (r != ERROR_SUCCESS) + return NULL; + + len += sizeof (WCHAR); + val = msi_alloc( len ); + if (!val) + return NULL; + val[0] = 0; + RegQueryValueExW(hkey, name, NULL, NULL, (LPBYTE) val, &len); + return val; +} + +BOOL msi_reg_get_val_dword( HKEY hkey, LPCWSTR name, DWORD *val) +{ + DWORD type, len = sizeof (DWORD); + LONG r = RegQueryValueExW(hkey, name, NULL, &type, (LPBYTE) val, &len); + return r == ERROR_SUCCESS && type == REG_DWORD; +} + UINT MSIREG_OpenUninstallKey(LPCWSTR szProduct, HKEY* key, BOOL create) { UINT rc;

1 0