February 2008 - Wine-Commits

James Hawkins : msi: Fix and simplify handling of REG_MULTI_SZ strings in the WriteRegistryValues action .
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 21b4af1b465f27262ad434d2f8af6f78fa5b25b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21b4af1b465f27262ad434d2f… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Feb 24 20:15:31 2008 -0600 msi: Fix and simplify handling of REG_MULTI_SZ strings in the WriteRegistryValues action. --- dlls/msi/action.c | 20 ++------------------ 1 files changed, 2 insertions(+), 18 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 432496b..7058aa8 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2322,7 +2322,6 @@ static LPSTR parse_value(MSIPACKAGE *package, LPCWSTR value, DWORD *type, { static const WCHAR szMulti[] = {'[','~',']',0}; LPCWSTR ptr; - LPWSTR newdata; *type=REG_SZ; if (value[0]=='#') @@ -2350,19 +2349,8 @@ static LPSTR parse_value(MSIPACKAGE *package, LPCWSTR value, DWORD *type, /* add double NULL terminator */ if (*type == REG_MULTI_SZ) { - *size += sizeof(WCHAR); - newdata = msi_alloc(*size); - if (!newdata) - { - msi_free(data); - return NULL; - } - - memcpy(newdata, data, *size - 1); - newdata[*size] = '\0'; - - msi_free(data); - data = (LPSTR)newdata; + *size += 2 * sizeof(WCHAR); /* two NULL terminators */ + data = msi_realloc_zero(data, *size); } } return data; @@ -2503,10 +2491,6 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) deformat_string(package, name, &deformated); - /* get the double nulls to terminate SZ_MULTI */ - if (type == REG_MULTI_SZ) - size +=sizeof(WCHAR); - if (!check_first) { TRACE("Setting value %s of %s\n",debugstr_w(deformated),

1 0

James Hawkins : msi: Simplify MsiSourceListAddMediaDisk.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: b532c0c3067b95b48f400feb755b4301cf825c7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b532c0c3067b95b48f400feb7… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Feb 24 20:09:35 2008 -0600 msi: Simplify MsiSourceListAddMediaDisk. --- dlls/msi/source.c | 38 ++++++++++++++------------------------ 1 files changed, 14 insertions(+), 24 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 85b3d81..716414f 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -979,13 +979,12 @@ UINT WINAPI MsiSourceListAddMediaDiskW(LPCWSTR szProduct, LPCWSTR szUserSid, UINT rc; WCHAR szIndex[10]; WCHAR squished_pc[GUID_SIZE]; - static const WCHAR fmt[] = {'%','i',0}; - static const WCHAR disk_fmt[] = {'%','s',';','%','s',0}; - static const WCHAR empty[1] = {0}; - LPCWSTR pt1,pt2; LPWSTR buffer; DWORD size; + static const WCHAR fmt[] = {'%','i',0}; + static const WCHAR semicolon[] = {';',0}; + TRACE("%s %s %x %x %i %s %s\n", debugstr_w(szProduct), debugstr_w(szUserSid), dwContext, dwOptions, dwDiskId, debugstr_w(szVolumeLabel), debugstr_w(szDiskPrompt)); @@ -1012,33 +1011,24 @@ UINT WINAPI MsiSourceListAddMediaDiskW(LPCWSTR szProduct, LPCWSTR szUserSid, if (rc != ERROR_SUCCESS) return rc; - OpenMediaSubkey(sourcekey,&mediakey,TRUE); + OpenMediaSubkey(sourcekey, &mediakey, TRUE); - sprintfW(szIndex,fmt,dwDiskId); + sprintfW(szIndex, fmt, dwDiskId); size = 2; - if (szVolumeLabel) - { - size +=lstrlenW(szVolumeLabel); - pt1 = szVolumeLabel; - } - else - pt1 = empty; - if (szDiskPrompt) - { - size +=lstrlenW(szDiskPrompt); - pt2 = szDiskPrompt; - } - else - pt2 = empty; - - size *=sizeof(WCHAR); + if (szVolumeLabel) size += lstrlenW(szVolumeLabel); + if (szDiskPrompt) size += lstrlenW(szDiskPrompt); + size *= sizeof(WCHAR); buffer = msi_alloc(size); - sprintfW(buffer,disk_fmt,pt1,pt2); + *buffer = '\0'; + + if (szVolumeLabel) lstrcpyW(buffer, szVolumeLabel); + lstrcatW(buffer, semicolon); + if (szDiskPrompt) lstrcatW(buffer, szDiskPrompt); RegSetValueExW(mediakey, szIndex, 0, REG_SZ, (LPBYTE)buffer, size); - msi_free( buffer ); + msi_free(buffer); RegCloseKey(sourcekey); RegCloseKey(mediakey);

1 0

James Hawkins : msi: Remove invalid fixmes.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: d3b37385675a2a5c43d00a08229f06e5465cddc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3b37385675a2a5c43d00a082… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Feb 24 20:08:54 2008 -0600 msi: Remove invalid fixmes. --- dlls/msi/source.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index ca4a8ea..85b3d81 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -1007,12 +1007,6 @@ UINT WINAPI MsiSourceListAddMediaDiskW(LPCWSTR szProduct, LPCWSTR szUserSid, FIXME("Unhandled options MSICODE_PATCH\n"); return ERROR_FUNCTION_FAILED; } - - if (szUserSid) - FIXME("Unhandled UserSid %s\n",debugstr_w(szUserSid)); - - if (dwContext == MSIINSTALLCONTEXT_USERUNMANAGED) - FIXME("Unknown context MSIINSTALLCONTEXT_USERUNMANAGED\n"); rc = OpenSourceKey(szProduct, &sourcekey, MSICODE_PRODUCT, dwContext, FALSE); if (rc != ERROR_SUCCESS)

1 0

James Hawkins : msi: Return the result of the call to OpenSourceKey.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 08172ad1c49b2bf4314cd2a00e19a39c913942fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=08172ad1c49b2bf4314cd2a00… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Feb 24 20:08:14 2008 -0600 msi: Return the result of the call to OpenSourceKey. --- dlls/msi/source.c | 2 +- dlls/msi/tests/source.c | 21 ++++++--------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 3ffa5d8..ca4a8ea 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -1016,7 +1016,7 @@ UINT WINAPI MsiSourceListAddMediaDiskW(LPCWSTR szProduct, LPCWSTR szUserSid, rc = OpenSourceKey(szProduct, &sourcekey, MSICODE_PRODUCT, dwContext, FALSE); if (rc != ERROR_SUCCESS) - return ERROR_UNKNOWN_PRODUCT; + return rc; OpenMediaSubkey(sourcekey,&mediakey,TRUE); diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index d2e3b02..d4a1e3b 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -2024,11 +2024,8 @@ static void test_MsiSourceListAddMediaDisk(void) r = MsiSourceListAddMediaDiskA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, 1, "label", "prompt"); - todo_wine - { - ok(r == ERROR_BAD_CONFIGURATION, - "Expected ERROR_BAD_CONFIGURATION, got %d\n", r); - } + ok(r == ERROR_BAD_CONFIGURATION, + "Expected ERROR_BAD_CONFIGURATION, got %d\n", r); res = RegCreateKeyA(userkey, "SourceList", &source); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -2158,11 +2155,8 @@ static void test_MsiSourceListAddMediaDisk(void) r = MsiSourceListAddMediaDiskA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, 1, "label", "prompt"); - todo_wine - { - ok(r == ERROR_BAD_CONFIGURATION, - "Expected ERROR_BAD_CONFIGURATION, got %d\n", r); - } + ok(r == ERROR_BAD_CONFIGURATION, + "Expected ERROR_BAD_CONFIGURATION, got %d\n", r); res = RegCreateKeyA(userkey, "SourceList", &source); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -2199,11 +2193,8 @@ static void test_MsiSourceListAddMediaDisk(void) r = MsiSourceListAddMediaDiskA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE, MSICODE_PRODUCT, 1, "label", "prompt"); - todo_wine - { - ok(r == ERROR_BAD_CONFIGURATION, - "Expected ERROR_BAD_CONFIGURATION, got %d\n", r); - } + ok(r == ERROR_BAD_CONFIGURATION, + "Expected ERROR_BAD_CONFIGURATION, got %d\n", r); res = RegCreateKeyA(prodkey, "SourceList", &source); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);

1 0

James Hawkins : msi: Validate the parameters of MsiSourceListAddMediaDisk.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 34d50c1e3e3721165dc8e96bbd889976ddaf9a40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34d50c1e3e3721165dc8e96bb… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Feb 24 20:07:21 2008 -0600 msi: Validate the parameters of MsiSourceListAddMediaDisk. --- dlls/msi/source.c | 12 ++++++++- dlls/msi/tests/source.c | 63 +++++++++++++--------------------------------- 2 files changed, 29 insertions(+), 46 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index b2a45b1..3ffa5d8 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -978,6 +978,7 @@ UINT WINAPI MsiSourceListAddMediaDiskW(LPCWSTR szProduct, LPCWSTR szUserSid, HKEY mediakey; UINT rc; WCHAR szIndex[10]; + WCHAR squished_pc[GUID_SIZE]; static const WCHAR fmt[] = {'%','i',0}; static const WCHAR disk_fmt[] = {'%','s',';','%','s',0}; static const WCHAR empty[1] = {0}; @@ -989,7 +990,16 @@ UINT WINAPI MsiSourceListAddMediaDiskW(LPCWSTR szProduct, LPCWSTR szUserSid, debugstr_w(szUserSid), dwContext, dwOptions, dwDiskId, debugstr_w(szVolumeLabel), debugstr_w(szDiskPrompt)); - if (!szProduct || lstrlenW(szProduct) > 39) + if (!szProduct || !squash_guid(szProduct, squished_pc)) + return ERROR_INVALID_PARAMETER; + + if (dwOptions != MSICODE_PRODUCT && dwOptions != MSICODE_PATCH) + return ERROR_INVALID_PARAMETER; + + if ((szVolumeLabel && !*szVolumeLabel) || (szDiskPrompt && !*szDiskPrompt)) + return ERROR_INVALID_PARAMETER; + + if ((dwContext & MSIINSTALLCONTEXT_MACHINE) && szUserSid) return ERROR_INVALID_PARAMETER; if (dwOptions & MSICODE_PATCH) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index c11b3f1..d2e3b02 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -1965,30 +1965,21 @@ static void test_MsiSourceListAddMediaDisk(void) /* empty szProductCodeOrPatchCode */ r = MsiSourceListAddMediaDiskA("", usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, 1, "label", "prompt"); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* garbage szProductCodeOrPatchCode */ r = MsiSourceListAddMediaDiskA("garbage", usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, 1, "label", "prompt"); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* guid without brackets */ r = MsiSourceListAddMediaDiskA("51CD2AD5-0482-4C46-8DDD-0ED1022AA1AA", usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, 1, "label", "prompt"); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* guid with brackets */ r = MsiSourceListAddMediaDiskA("{51CD2AD5-0482-4C46-8DDD-0ED1022AA1AA}", @@ -2002,33 +1993,24 @@ static void test_MsiSourceListAddMediaDisk(void) usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, 1, "label", "prompt"); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* dwOptions has MSISOURCETYPE_URL */ r = MsiSourceListAddMediaDiskA("{51CD2AD5-0482-4C46-8DDD-0ED1022AA1AA}", usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT | MSISOURCETYPE_URL, 1, "label", "prompt"); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* dwOptions has MSISOURCETYPE_MEDIA */ r = MsiSourceListAddMediaDiskA("{51CD2AD5-0482-4C46-8DDD-0ED1022AA1AA}", usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT | MSISOURCETYPE_MEDIA, 1, "label", "prompt"); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* MSIINSTALLCONTEXT_USERUNMANAGED */ @@ -2119,11 +2101,8 @@ static void test_MsiSourceListAddMediaDisk(void) r = MsiSourceListAddMediaDiskA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, 1, "etikett", ""); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* update dwDiskId 1, szVolumeLable is NULL */ r = MsiSourceListAddMediaDiskA(prodcode, usersid, @@ -2140,11 +2119,8 @@ static void test_MsiSourceListAddMediaDisk(void) r = MsiSourceListAddMediaDiskA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, 1, "", "provoquer"); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* szUserSid is NULL */ r = MsiSourceListAddMediaDiskA(prodcode, NULL, @@ -2248,11 +2224,8 @@ static void test_MsiSourceListAddMediaDisk(void) r = MsiSourceListAddMediaDiskA(prodcode, usersid, MSIINSTALLCONTEXT_MACHINE, MSICODE_PRODUCT, 1, "label", "prompt"); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); RegDeleteValueA(media, "1"); RegDeleteKeyA(media, "");

1 0

James Hawkins : msi: Add tests for MsiSourceListAddMediaDisk.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 1fced5cc1d244c5f954ad962d409c7e0177e97c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fced5cc1d244c5f954ad962d… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Feb 24 20:06:28 2008 -0600 msi: Add tests for MsiSourceListAddMediaDisk. --- dlls/msi/msi.spec | 2 +- dlls/msi/source.c | 33 ++++- dlls/msi/tests/automation.c | 7 +- dlls/msi/tests/source.c | 324 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 357 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1fced5cc1d244c5f954ad…

1 0

James Hawkins : msi: Fix the INSTALLPROPERTY_LASTUSEDSOURCE case.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 737dedfcbbb736549ba97d8487f7ef024f713240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=737dedfcbbb736549ba97d848… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Feb 24 20:05:04 2008 -0600 msi: Fix the INSTALLPROPERTY_LASTUSEDSOURCE case. --- dlls/msi/source.c | 60 +++++++++++++++++++++----------------- dlls/msi/tests/install.c | 9 ++---- dlls/msi/tests/source.c | 71 ++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 101 insertions(+), 39 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 9ae4a65..16e247c 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -353,6 +353,8 @@ UINT WINAPI MsiSourceListGetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, { WCHAR squished_pc[GUID_SIZE]; HKEY sourcekey, media; + LPWSTR source, ptr; + DWORD size; UINT rc; static const WCHAR mediapack[] = { @@ -400,39 +402,43 @@ UINT WINAPI MsiSourceListGetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, RegQueryValueExW(media, szProperty, 0, 0, (LPBYTE)szValue, pcchValue); RegCloseKey(media); } - else if (strcmpW(szProperty, INSTALLPROPERTY_LASTUSEDSOURCEW)==0) + else if (!lstrcmpW(szProperty, INSTALLPROPERTY_LASTUSEDSOURCEW)) { - LPWSTR buffer; - DWORD size = 0; + rc = RegQueryValueExW(sourcekey, INSTALLPROPERTY_LASTUSEDSOURCEW, + 0, 0, NULL, &size); + if (rc != ERROR_SUCCESS) + { + RegCloseKey(sourcekey); + return ERROR_SUCCESS; + } - RegQueryValueExW(sourcekey, INSTALLPROPERTY_LASTUSEDSOURCEW, 0, 0, - NULL, &size); - if (size == 0) - rc = ERROR_UNKNOWN_PROPERTY; + source = msi_alloc(size); + RegQueryValueExW(sourcekey, INSTALLPROPERTY_LASTUSEDSOURCEW, + 0, 0, (LPBYTE)source, &size); + + if (!*source) + { + msi_free(source); + RegCloseKey(sourcekey); + return ERROR_SUCCESS; + } + + ptr = strrchrW(source, ';'); + if (!ptr) + ptr = source; else + ptr++; + + if (szValue) { - LPWSTR ptr; - buffer = msi_alloc(size); - rc = RegQueryValueExW(sourcekey, INSTALLPROPERTY_LASTUSEDSOURCEW, - 0, 0, (LPBYTE)buffer,&size); - ptr = strchrW(buffer,';'); - if (ptr) ptr = strchrW(ptr+1,';'); - if (!ptr) - rc = ERROR_UNKNOWN_PROPERTY; + if (lstrlenW(ptr) < *pcchValue) + lstrcpyW(szValue, ptr); else - { - ptr ++; - lstrcpynW(szValue, ptr, *pcchValue); - if (lstrlenW(ptr) > *pcchValue) - { - *pcchValue = lstrlenW(ptr)+1; - rc = ERROR_MORE_DATA; - } - else - rc = ERROR_SUCCESS; - } - msi_free(buffer); + rc = ERROR_MORE_DATA; } + + *pcchValue = lstrlenW(ptr); + msi_free(source); } else if (strcmpW(INSTALLPROPERTY_LASTUSEDTYPEW, szProperty)==0) { diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 963d3d8..b62e625 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3017,12 +3017,9 @@ static void test_publishsourcelist(void) lstrcpyA(value, "aaa"); r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); - ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); + ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); size = MAX_PATH; lstrcpyA(value, "aaa"); diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 00a869a..76720da 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -373,6 +373,20 @@ static void test_MsiSourceListGetInfo(void) ok(!lstrcmpA(value, "prompt"), "Expected \"prompt\", got \"%s\"\n", value); ok(size == 6, "Expected 6, got %d\n", size); + data = ""; + res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ, + (const BYTE *)data, lstrlenA(data) + 1); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* INSTALLPROPERTY_LASTUSEDSOURCE, source is empty */ + size = MAX_PATH; + r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, + value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, ""), "Expected \"\", got \"%s\"\n", value); + ok(size == 0, "Expected 0, got %d\n", size); + data = "source"; res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ, (const BYTE *)data, lstrlenA(data) + 1); @@ -383,12 +397,57 @@ static void test_MsiSourceListGetInfo(void) r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(value, "source"), "Expected \"source\", got \"%s\"\n", value); - ok(size == 6, "Expected 6, got %d\n", size); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, "source"), "Expected \"source\", got \"%s\"\n", value); + ok(size == 6, "Expected 6, got %d\n", size); + + /* INSTALLPROPERTY_LASTUSEDSOURCE, size is too short */ + size = 4; + lstrcpyA(value, "aaa"); + r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, + value, &size); + ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); + ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got \"%s\"\n", value); + ok(size == 6, "Expected 6, got %d\n", size); + + /* INSTALLPROPERTY_LASTUSEDSOURCE, size is exactly 6 */ + size = 6; + lstrcpyA(value, "aaa"); + r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, + value, &size); + ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); + ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got \"%s\"\n", value); + ok(size == 6, "Expected 6, got %d\n", size); + + data = "a;source"; + res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ, + (const BYTE *)data, lstrlenA(data) + 1); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* INSTALLPROPERTY_LASTUSEDSOURCE, one semi-colon */ + size = MAX_PATH; + r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, + value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, "source"), "Expected \"source\", got \"%s\"\n", value); + ok(size == 6, "Expected 6, got %d\n", size); + + data = "a:source"; + res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ, + (const BYTE *)data, lstrlenA(data) + 1); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* INSTALLPROPERTY_LASTUSEDSOURCE, one colon */ + size = MAX_PATH; + r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, + value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, "a:source"), "Expected \"a:source\", got \"%s\"\n", value); + ok(size == 8, "Expected 8, got %d\n", size); /* INSTALLPROPERTY_LASTUSEDTYPE, invalid source format */ size = MAX_PATH;

1 0

James Hawkins : msi: Fix the INSTALLPROPERTY_LASTUSEDTYPE case.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 8b540d2670afe2c7c75c51b0cb6ae97169444323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b540d2670afe2c7c75c51b0c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Feb 24 20:05:45 2008 -0600 msi: Fix the INSTALLPROPERTY_LASTUSEDTYPE case. --- dlls/msi/source.c | 51 +++++++++++++++++-------------------------- dlls/msi/tests/install.c | 9 ++----- dlls/msi/tests/source.c | 54 +++++++++++++++------------------------------ 3 files changed, 41 insertions(+), 73 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 16e247c..184ea2b 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -402,7 +402,8 @@ UINT WINAPI MsiSourceListGetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, RegQueryValueExW(media, szProperty, 0, 0, (LPBYTE)szValue, pcchValue); RegCloseKey(media); } - else if (!lstrcmpW(szProperty, INSTALLPROPERTY_LASTUSEDSOURCEW)) + else if (!lstrcmpW(szProperty, INSTALLPROPERTY_LASTUSEDSOURCEW) || + !lstrcmpW(szProperty, INSTALLPROPERTY_LASTUSEDTYPEW)) { rc = RegQueryValueExW(sourcekey, INSTALLPROPERTY_LASTUSEDSOURCEW, 0, 0, NULL, &size); @@ -423,11 +424,26 @@ UINT WINAPI MsiSourceListGetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, return ERROR_SUCCESS; } - ptr = strrchrW(source, ';'); - if (!ptr) + if (!lstrcmpW(szProperty, INSTALLPROPERTY_LASTUSEDTYPEW)) + { + if (*source != 'n' && *source != 'u' && *source != 'm') + { + msi_free(source); + RegCloseKey(sourcekey); + return ERROR_SUCCESS; + } + ptr = source; + source[1] = '\0'; + } else - ptr++; + { + ptr = strrchrW(source, ';'); + if (!ptr) + ptr = source; + else + ptr++; + } if (szValue) { @@ -440,33 +456,6 @@ UINT WINAPI MsiSourceListGetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, *pcchValue = lstrlenW(ptr); msi_free(source); } - else if (strcmpW(INSTALLPROPERTY_LASTUSEDTYPEW, szProperty)==0) - { - LPWSTR buffer; - DWORD size = 0; - - RegQueryValueExW(sourcekey, INSTALLPROPERTY_LASTUSEDSOURCEW, 0, 0, - NULL, &size); - if (size == 0) - rc = ERROR_UNKNOWN_PROPERTY; - else - { - buffer = msi_alloc(size); - rc = RegQueryValueExW(sourcekey, INSTALLPROPERTY_LASTUSEDSOURCEW, - 0, 0, (LPBYTE)buffer,&size); - if (*pcchValue < 1) - { - rc = ERROR_MORE_DATA; - *pcchValue = 1; - } - else - { - szValue[0] = buffer[0]; - rc = ERROR_SUCCESS; - } - msi_free(buffer); - } - } else if (strcmpW(INSTALLPROPERTY_PACKAGENAMEW, szProperty)==0) { *pcchValue = *pcchValue * sizeof(WCHAR); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index b62e625..5be95db 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3025,12 +3025,9 @@ static void test_publishsourcelist(void) lstrcpyA(value, "aaa"); r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDTYPE, value, &size); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(value, "n"), "Expected \"n\", got \"%s\"\n", value); - ok(size == 1, "Expected 1, got %d\n", size); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, "n"), "Expected \"n\", got \"%s\"\n", value); + ok(size == 1, "Expected 1, got %d\n", size); size = MAX_PATH; lstrcpyA(value, "aaa"); diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 76720da..7c8b4d7 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -454,12 +454,9 @@ static void test_MsiSourceListGetInfo(void) r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDTYPE, value, &size); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(value, ""), "Expected \"\", got \"%s\"\n", value); - ok(size == 0, "Expected 0, got %d\n", size); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, ""), "Expected \"\", got \"%s\"\n", value); + ok(size == 0, "Expected 0, got %d\n", size); data = "x;y;z"; res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ, @@ -471,12 +468,9 @@ static void test_MsiSourceListGetInfo(void) r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDTYPE, value, &size); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(value, ""), "Expected \"\", got \"%s\"\n", value); - ok(size == 0, "Expected 0, got %d\n", size); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, ""), "Expected \"\", got \"%s\"\n", value); + ok(size == 0, "Expected 0, got %d\n", size); data = "n;y;z"; res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ, @@ -488,12 +482,9 @@ static void test_MsiSourceListGetInfo(void) r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDTYPE, value, &size); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(value, "n"), "Expected \"n\", got \"%s\"\n", value); - ok(size == 1, "Expected 1, got %d\n", size); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, "n"), "Expected \"n\", got \"%s\"\n", value); + ok(size == 1, "Expected 1, got %d\n", size); data = "negatory"; res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ, @@ -505,12 +496,9 @@ static void test_MsiSourceListGetInfo(void) r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDTYPE, value, &size); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(value, "n"), "Expected \"n\", got \"%s\"\n", value); - ok(size == 1, "Expected 1, got %d\n", size); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, "n"), "Expected \"n\", got \"%s\"\n", value); + ok(size == 1, "Expected 1, got %d\n", size); data = "megatron"; res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ, @@ -522,12 +510,9 @@ static void test_MsiSourceListGetInfo(void) r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDTYPE, value, &size); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(value, "m"), "Expected \"m\", got \"%s\"\n", value); - ok(size == 1, "Expected 1, got %d\n", size); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, "m"), "Expected \"m\", got \"%s\"\n", value); + ok(size == 1, "Expected 1, got %d\n", size); data = "useless"; res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ, @@ -539,12 +524,9 @@ static void test_MsiSourceListGetInfo(void) r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDTYPE, value, &size); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(value, "u"), "Expected \"u\", got \"%s\"\n", value); - ok(size == 1, "Expected 1, got %d\n", size); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, "u"), "Expected \"u\", got \"%s\"\n", value); + ok(size == 1, "Expected 1, got %d\n", size); RegDeleteValueA(media, "MediaPackage"); RegDeleteValueA(media, "DiskPrompt");

1 0

James Hawkins : msi: Factorize and fix the INSTALLPROPERTY_MEDIAPACKAGEPATH case.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: d41cae07d5fef2e64898b42ea1052b7754c54d1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d41cae07d5fef2e64898b42ea… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Feb 24 20:04:19 2008 -0600 msi: Factorize and fix the INSTALLPROPERTY_MEDIAPACKAGEPATH case. --- dlls/msi/source.c | 39 ++++++++++++++++++--------------------- dlls/msi/tests/install.c | 9 +++------ dlls/msi/tests/source.c | 19 +++++++++++++------ 3 files changed, 34 insertions(+), 33 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 66a3af1..9ae4a65 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -352,9 +352,12 @@ UINT WINAPI MsiSourceListGetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, LPDWORD pcchValue) { WCHAR squished_pc[GUID_SIZE]; - HKEY sourcekey; + HKEY sourcekey, media; UINT rc; + static const WCHAR mediapack[] = { + 'M','e','d','i','a','P','a','c','k','a','g','e',0}; + TRACE("%s %s\n", debugstr_w(szProduct), debugstr_w(szProperty)); if (!szProduct || !squash_guid(szProduct, squished_pc)) @@ -381,27 +384,21 @@ UINT WINAPI MsiSourceListGetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, if (rc != ERROR_SUCCESS) return rc; - if (strcmpW(szProperty, INSTALLPROPERTY_MEDIAPACKAGEPATHW) == 0) - { - HKEY key; - rc = OpenMediaSubkey(sourcekey, &key, FALSE); - if (rc == ERROR_SUCCESS) - rc = RegQueryValueExW(key, INSTALLPROPERTY_MEDIAPACKAGEPATHW, - 0, 0, (LPBYTE)szValue, pcchValue); - if (rc != ERROR_SUCCESS && rc != ERROR_MORE_DATA) - rc = ERROR_UNKNOWN_PROPERTY; - RegCloseKey(key); - } - else if (strcmpW(szProperty, INSTALLPROPERTY_DISKPROMPTW) ==0) + if (!lstrcmpW(szProperty, INSTALLPROPERTY_MEDIAPACKAGEPATHW) || + !lstrcmpW(szProperty, INSTALLPROPERTY_DISKPROMPTW)) { - HKEY key; - rc = OpenMediaSubkey(sourcekey, &key, FALSE); - if (rc == ERROR_SUCCESS) - rc = RegQueryValueExW(key, INSTALLPROPERTY_DISKPROMPTW, 0, 0, - (LPBYTE)szValue, pcchValue); - if (rc != ERROR_SUCCESS && rc != ERROR_MORE_DATA) - rc = ERROR_UNKNOWN_PROPERTY; - RegCloseKey(key); + rc = OpenMediaSubkey(sourcekey, &media, FALSE); + if (rc != ERROR_SUCCESS) + { + RegCloseKey(sourcekey); + return ERROR_SUCCESS; + } + + if (!lstrcmpW(szProperty, INSTALLPROPERTY_MEDIAPACKAGEPATHW)) + szProperty = mediapack; + + RegQueryValueExW(media, szProperty, 0, 0, (LPBYTE)szValue, pcchValue); + RegCloseKey(media); } else if (strcmpW(szProperty, INSTALLPROPERTY_LASTUSEDSOURCEW)==0) { diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 1fbb6ee..963d3d8 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2998,12 +2998,9 @@ static void test_publishsourcelist(void) lstrcpyA(value, "aaa"); r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_MEDIAPACKAGEPATH, value, &size); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(value, ""), "Expected \"\", got \"%s\"\n", value); - ok(size == 0, "Expected 0, got %d\n", size); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, ""), "Expected \"\", got \"%s\"\n", value); + ok(size == 0, "Expected 0, got %d\n", size); size = MAX_PATH; lstrcpyA(value, "aaa"); diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 4d2b925..00a869a 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -332,6 +332,16 @@ static void test_MsiSourceListGetInfo(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(size == 11, "Expected 11, got %d\n", size); + /* INSTALLPROPERTY_MEDIAPACKAGEPATH, media key does not exist */ + size = MAX_PATH; + lstrcpyA(value, "aaa"); + r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_MEDIAPACKAGEPATH, + value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, ""), "Expected \"\", got \"%s\"\n", value); + ok(size == 0, "Expected 0, got %d\n", size); + res = RegCreateKeyA(hkey, "Media", &media); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -345,12 +355,9 @@ static void test_MsiSourceListGetInfo(void) r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_MEDIAPACKAGEPATH, value, &size); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(value, "path"), "Expected \"path\", got \"%s\"\n", value); - ok(size == 4, "Expected 4, got %d\n", size); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, "path"), "Expected \"path\", got \"%s\"\n", value); + ok(size == 4, "Expected 4, got %d\n", size); /* INSTALLPROPERTY_DISKPROMPT */ data = "prompt";

1 0

James Hawkins : msi: Simplify the check for a valid product code.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: f178985db3fc492acee7b589bc0f46b78bb74b9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f178985db3fc492acee7b589b… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Feb 24 20:03:24 2008 -0600 msi: Simplify the check for a valid product code. --- dlls/msi/source.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index c373df2..66a3af1 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -351,16 +351,13 @@ UINT WINAPI MsiSourceListGetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, LPCWSTR szProperty, LPWSTR szValue, LPDWORD pcchValue) { + WCHAR squished_pc[GUID_SIZE]; HKEY sourcekey; UINT rc; TRACE("%s %s\n", debugstr_w(szProduct), debugstr_w(szProperty)); - if (!szProduct || !*szProduct) - return ERROR_INVALID_PARAMETER; - - if (lstrlenW(szProduct) != GUID_SIZE - 1 || - (szProduct[0] != '{' && szProduct[GUID_SIZE - 2] != '}')) + if (!szProduct || !squash_guid(szProduct, squished_pc)) return ERROR_INVALID_PARAMETER; if (szValue && !pcchValue)

1 0