msi: use strings in upgrade.c
Aric Stewart
aric at codeweavers.com
Mon Jul 11 10:05:06 CDT 2005
use the strings defined in msi.h in upgrade.c
-------------- next part --------------
Index: dlls/msi/upgrade.c
===================================================================
RCS file: /home/wine/wine/dlls/msi/upgrade.c,v
retrieving revision 1.3
diff -u -r1.3 upgrade.c
--- dlls/msi/upgrade.c 30 Jun 2005 20:45:43 -0000 1.3
+++ dlls/msi/upgrade.c 11 Jul 2005 15:04:33 -0000
@@ -136,10 +136,6 @@
DWORD sz = 0x100;
HKEY hukey;
INT r;
- static const WCHAR szVersion[] =
- {'V','e','r','s','i','o','n',0};
- static const WCHAR szLanguage[] =
- {'L','a','n','g','u','a','g','e',0};
unsquash_guid(product,productid);
rc = MSIREG_OpenUserProductsKey(productid, &hukey, FALSE);
@@ -151,8 +147,8 @@
}
sz = sizeof(DWORD);
- RegQueryValueExW(hukey, szVersion, NULL, NULL, (LPBYTE)&check,
- &sz);
+ RegQueryValueExW(hukey, INSTALLPROPERTY_VERSIONstringW, NULL, NULL,
+ (LPBYTE)&check, &sz);
/* check min */
ver = MSI_RecordGetString(rec,2);
comp_ver = build_version_dword(ver);
@@ -179,8 +175,8 @@
/* check language*/
sz = sizeof(DWORD);
- RegQueryValueExW(hukey, szLanguage, NULL, NULL, (LPBYTE)&check,
- &sz);
+ RegQueryValueExW(hukey, INSTALLPROPERTY_LANGUAGEstringW, NULL, NULL,
+ (LPBYTE)&check, &sz);
RegCloseKey(hukey);
language = MSI_RecordGetString(rec,4);
TRACE("Checking languages 0x%lx and %s\n", check,
More information about the wine-patches
mailing list