February 2008 - Wine-Commits

James Hawkins : msi: Return ERROR_UNKNOWN_PATCH if dwOptions contains MSICODE_PATCH.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: d37ac289db2b43c515d2694a06f52a08ccff0c82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37ac289db2b43c515d2694a0… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Feb 19 02:08:55 2008 -0600 msi: Return ERROR_UNKNOWN_PATCH if dwOptions contains MSICODE_PATCH. --- dlls/msi/source.c | 2 +- dlls/msi/tests/source.c | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 887c702..f129c5f 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -413,7 +413,7 @@ UINT WINAPI MsiSourceListSetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, if (dwOptions & MSICODE_PATCH) { FIXME("Unhandled options MSICODE_PATCH\n"); - return ERROR_FUNCTION_FAILED; + return ERROR_UNKNOWN_PATCH; } if (szUserSid) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 90d4b0c..f25b476 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -1452,23 +1452,16 @@ static void test_MsiSourceListSetInfo(void) r = MsiSourceListSetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PATCH, INSTALLPROPERTY_MEDIAPACKAGEPATH, "path"); - todo_wine - { - ok(r == ERROR_UNKNOWN_PATCH, - "Expected ERROR_UNKNOWN_PATCH, got %d\n", r); - } + ok(r == ERROR_UNKNOWN_PATCH, + "Expected ERROR_UNKNOWN_PATCH, got %d\n", r); /* dwOptions is both MSICODE_PRODUCT and MSICODE_PATCH */ r = MsiSourceListSetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT | MSICODE_PATCH | MSISOURCETYPE_URL, INSTALLPROPERTY_MEDIAPACKAGEPATH, "path"); - todo_wine - { - ok(r == ERROR_UNKNOWN_PATCH, - "Expected ERROR_SUCCESS, got %d\n", r); - } - + ok(r == ERROR_UNKNOWN_PATCH, + "Expected ERROR_SUCCESS, got %d\n", r); /* dwOptions has both MSISOURCETYPE_NETWORK and MSISOURCETYPE_URL */ r = MsiSourceListSetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED,

1 0

James Hawkins : msi: Add tests for MsiSourceListSetInfo.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 10be16f33a57b1919c179d133551a2b4b949ee8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=10be16f33a57b1919c179d133… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Feb 19 00:58:10 2008 -0600 msi: Add tests for MsiSourceListSetInfo. --- dlls/msi/msi.spec | 2 +- dlls/msi/source.c | 37 +++- dlls/msi/tests/automation.c | 2 +- dlls/msi/tests/source.c | 495 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 533 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10be16f33a57b1919c179…

1 0

James Hawkins : msi: Validate the szProduct parameter of MsiSourceListSetInfo.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: f83d0498881e1eb051c7bb47139fd595002b08b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f83d0498881e1eb051c7bb471… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Feb 19 02:08:11 2008 -0600 msi: Validate the szProduct parameter of MsiSourceListSetInfo. --- dlls/msi/source.c | 3 ++- dlls/msi/tests/source.c | 22 ++++++---------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 03b8b61..887c702 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -394,13 +394,14 @@ UINT WINAPI MsiSourceListSetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, MSIINSTALLCONTEXT dwContext, DWORD dwOptions, LPCWSTR szProperty, LPCWSTR szValue) { + WCHAR squished_pc[GUID_SIZE]; HKEY sourcekey; UINT rc; TRACE("%s %s %x %x %s %s\n", debugstr_w(szProduct), debugstr_w(szUserSid), dwContext, dwOptions, debugstr_w(szProperty), debugstr_w(szValue)); - if (!szProduct || lstrlenW(szProduct) > 39) + if (!szProduct || !squash_guid(szProduct, squished_pc)) return ERROR_INVALID_PARAMETER; if (!szProperty) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 8028de3..90d4b0c 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -1398,7 +1398,6 @@ static void test_MsiSourceListSetInfo(void) LONG res; UINT r; - create_test_guid(prodcode, prod_squashed); get_user_sid(&usersid); @@ -1415,33 +1414,24 @@ static void test_MsiSourceListSetInfo(void) r = MsiSourceListSetInfoA("", usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, INSTALLPROPERTY_MEDIAPACKAGEPATH, "path"); - 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 = MsiSourceListSetInfoA("garbage", usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, INSTALLPROPERTY_MEDIAPACKAGEPATH, "path"); - 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 = MsiSourceListSetInfoA("51CD2AD5-0482-4C46-8DDD-0ED1022AA1AA", usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, INSTALLPROPERTY_MEDIAPACKAGEPATH, "path"); - 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 = MsiSourceListSetInfoA("{51CD2AD5-0482-4C46-8DDD-0ED1022AA1AA}",

1 0

Francois Gouget : wininet: Document HttpAddRequestHeadersW()' s handling of the trailing '\0'. Fix tracing of the corresponding header strings as they may not be '\0' terminated.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: abfa73b5c13edb0acab57f7e4d0f43e7189620bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=abfa73b5c13edb0acab57f7e4… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 19 00:18:02 2008 +0100 wininet: Document HttpAddRequestHeadersW()'s handling of the trailing '\0'. Fix tracing of the corresponding header strings as they may not be '\0' terminated. --- dlls/wininet/http.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f27f828..86154a5 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -594,7 +594,7 @@ static BOOL WINAPI HTTP_HttpAddRequestHeadersW(LPWININETHTTPREQW lpwhr, BOOL bSuccess = FALSE; DWORD len; - TRACE("copying header: %s\n", debugstr_w(lpszHeader)); + TRACE("copying header: %s\n", debugstr_wn(lpszHeader, dwHeaderLength)); if( dwHeaderLength == ~0U ) len = strlenW(lpszHeader); @@ -650,6 +650,12 @@ static BOOL WINAPI HTTP_HttpAddRequestHeadersW(LPWININETHTTPREQW lpwhr, * * Adds one or more HTTP header to the request handler * + * NOTE + * On Windows if dwHeaderLength includes the trailing '\0', then + * HttpAddRequestHeadersW() adds it too. However this results in an + * invalid Http header which is rejected by some servers so we probably + * don't need to match Windows on that point. + * * RETURNS * TRUE on success * FALSE on failure @@ -661,8 +667,7 @@ BOOL WINAPI HttpAddRequestHeadersW(HINTERNET hHttpRequest, BOOL bSuccess = FALSE; LPWININETHTTPREQW lpwhr; - TRACE("%p, %s, %i, %i\n", hHttpRequest, debugstr_w(lpszHeader), dwHeaderLength, - dwModifier); + TRACE("%p, %s, %i, %i\n", hHttpRequest, debugstr_wn(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier); if (!lpszHeader) return TRUE; @@ -698,8 +703,7 @@ BOOL WINAPI HttpAddRequestHeadersA(HINTERNET hHttpRequest, LPWSTR hdr; BOOL r; - TRACE("%p, %s, %i, %i\n", hHttpRequest, debugstr_a(lpszHeader), dwHeaderLength, - dwModifier); + TRACE("%p, %s, %i, %i\n", hHttpRequest, debugstr_an(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier); len = MultiByteToWideChar( CP_ACP, 0, lpszHeader, dwHeaderLength, NULL, 0 ); hdr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) );

1 0

Francois Gouget : wininet/tests: Don't include the trailing '\0' in dwHeadersLength otherwise HttpSendRequestEx() sends it too which some servers object to.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 1fa0e443e356af0d544e2315790fbb36ef500db3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fa0e443e356af0d544e23157… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 19 00:20:50 2008 +0100 wininet/tests: Don't include the trailing '\0' in dwHeadersLength otherwise HttpSendRequestEx() sends it too which some servers object to. --- dlls/wininet/tests/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 4aed85d..fb561c4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -894,8 +894,8 @@ static void HttpSendRequestEx_test(void) BufferIn.dwStructSize = sizeof( INTERNET_BUFFERS); BufferIn.Next = (LPINTERNET_BUFFERS)0xdeadcab; BufferIn.lpcszHeader = szContentType; - BufferIn.dwHeadersLength = sizeof(szContentType); - BufferIn.dwHeadersTotal = sizeof(szContentType); + BufferIn.dwHeadersLength = sizeof(szContentType)-1; + BufferIn.dwHeadersTotal = sizeof(szContentType)-1; BufferIn.lpvBuffer = szPostData; BufferIn.dwBufferLength = 3; BufferIn.dwBufferTotal = sizeof(szPostData)-1;

1 0

Francois Gouget : advapi32/tests: Check whether RegGetValue() '\0' -terminates the buffer when retrieving a zero-byte string value.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 7a585f3c378ce3e3f8c0374f7674c22f4cdef42d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a585f3c378ce3e3f8c0374f7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 19 00:21:09 2008 +0100 advapi32/tests: Check whether RegGetValue() '\0'-terminates the buffer when retrieving a zero-byte string value. --- dlls/advapi32/tests/registry.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index d8be5c8..1180818 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -426,6 +426,8 @@ static void create_test_entries(void) "RegSetValueExA failed\n"); ok(!RegSetValueExA(hkey_main,"TP1_SZ",0,REG_SZ, (const BYTE *)sTestpath1, strlen(sTestpath1)+1), "RegSetValueExA failed\n"); + ok(!RegSetValueExA(hkey_main,"TP1_ZB_SZ",0,REG_SZ, NULL, 0), + "RegSetValueExA failed\n"); ok(!RegSetValueExA(hkey_main,"TP2_EXP_SZ",0,REG_EXPAND_SZ, (const BYTE *)sTestpath2, strlen(sTestpath2)+1), "RegSetValueExA failed\n"); ok(!RegSetValueExA(hkey_main,"DWORD",0,REG_DWORD, (const BYTE *)qw, 4), @@ -770,6 +772,17 @@ static void test_get_value(void) "strlen(sTestpath1)=%d size=%d\n", lstrlenA(sTestpath1), size); ok(type == REG_SZ, "type=%d\n", type); + /* Query REG_SZ using RRF_RT_REG_SZ on a zero-byte value (ok) */ + strcpy(buf, sTestpath1); + type = 0xdeadbeef; + size = sizeof(buf); + ret = pRegGetValueA(hkey_main, NULL, "TP1_ZB_SZ", RRF_RT_REG_SZ, &type, buf, &size); + ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); + /* v5.2.3790.1830 (2003 SP1) returns sTestpath1 length + 2 here. */ + ok(size == 0, "size=%d\n", size); + ok(type == REG_SZ, "type=%d\n", type); + ok(!strcmp(sTestpath1, buf), "sTestpath=\"%s\" buf=\"%s\"\n", sTestpath1, buf); + /* Query REG_SZ using RRF_RT_REG_SZ|RRF_NOEXPAND (ok) */ buf[0] = 0; type = 0xdeadbeef; size = sizeof(buf); ret = pRegGetValueA(hkey_main, NULL, "TP1_SZ", RRF_RT_REG_SZ|RRF_NOEXPAND, &type, buf, &size);

1 0

Rob Shearman : msi: Remove some unused functions.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 9b5d3677dff7ffdd974a6c2f5cb9d77b0b92c829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b5d3677dff7ffdd974a6c2f5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 18 19:37:18 2008 +0000 msi: Remove some unused functions. --- dlls/msi/msipriv.h | 2 -- dlls/msi/registry.c | 43 ------------------------------------------- 2 files changed, 0 insertions(+), 45 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index a735025..e23261b 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -749,12 +749,10 @@ extern UINT MSIREG_OpenUninstallKey(LPCWSTR szProduct, HKEY* key, BOOL create); extern UINT MSIREG_DeleteUninstallKey(LPCWSTR szProduct); extern UINT MSIREG_OpenUserProductsKey(LPCWSTR szProduct, HKEY* key, BOOL create); extern UINT MSIREG_OpenUserPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create); -extern UINT MSIREG_OpenFeatures(HKEY* key); extern UINT MSIREG_OpenFeaturesKey(LPCWSTR szProduct, HKEY* key, BOOL create); extern UINT MSIREG_OpenUserDataFeaturesKey(LPCWSTR szProduct, HKEY *key, BOOL create); extern UINT MSIREG_OpenComponents(HKEY* key); extern UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create); -extern UINT MSIREG_OpenComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create); extern UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, HKEY *key, BOOL create); extern UINT MSIREG_OpenProductsKey(LPCWSTR szProduct, HKEY* key, BOOL create); extern UINT MSIREG_OpenPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 5c9c251..a3b63b5 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -52,14 +52,6 @@ static const WCHAR szUserFeatures_fmt[] = { 'F','e','a','t','u','r','e','s','\\', '%','s',0}; -static const WCHAR szInstaller_Features[] = { -'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','\\', -'F','e','a','t','u','r','e','s',0 }; - static const WCHAR szUserDataFeatures_fmt[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -87,15 +79,6 @@ static const WCHAR szInstaller_Components[] = { 'I','n','s','t','a','l','l','e','r','\\', 'C','o','m','p','o','n','e','n','t','s',0 }; -static const WCHAR szInstaller_Components_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','\\', -'C','o','m','p','o','n','e','n','t','s','\\', -'%','s',0}; - static const WCHAR szUser_Components_fmt[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -608,11 +591,6 @@ UINT MSIREG_DeleteUserFeaturesKey(LPCWSTR szProduct) return RegDeleteTreeW(HKEY_CURRENT_USER, keypath); } -UINT MSIREG_OpenFeatures(HKEY* key) -{ - return RegCreateKeyW(HKEY_LOCAL_MACHINE,szInstaller_Features,key); -} - UINT MSIREG_OpenFeaturesKey(LPCWSTR szProduct, HKEY* key, BOOL create) { UINT rc; @@ -669,27 +647,6 @@ UINT MSIREG_OpenComponents(HKEY* key) return RegCreateKeyW(HKEY_LOCAL_MACHINE,szInstaller_Components,key); } -UINT MSIREG_OpenComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create) -{ - UINT rc; - WCHAR squished_cc[GUID_SIZE]; - WCHAR keypath[0x200]; - - TRACE("%s\n",debugstr_w(szComponent)); - if (!squash_guid(szComponent,squished_cc)) - return ERROR_FUNCTION_FAILED; - TRACE("squished (%s)\n", debugstr_w(squished_cc)); - - sprintfW(keypath,szInstaller_Components_fmt,squished_cc); - - if (create) - rc = RegCreateKeyW(HKEY_LOCAL_MACHINE,keypath,key); - else - rc = RegOpenKeyW(HKEY_LOCAL_MACHINE,keypath,key); - - return rc; -} - UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create) { UINT rc;

1 0

Francois Gouget : advapi32/tests: Remove an obsolete comment: Wine' s on-disk registry format now supports string values with no trailing '\0'.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 6843da68e7afa6d31891daba3c44a3ae267e5399 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6843da68e7afa6d31891daba3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 19 00:21:00 2008 +0100 advapi32/tests: Remove an obsolete comment: Wine's on-disk registry format now supports string values with no trailing '\0'. --- dlls/advapi32/tests/registry.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 4122326..d8be5c8 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -334,9 +334,6 @@ static void test_set_value(void) /* Test RegSetValueExA with a 'zero-byte' string (as Office 2003 does). * Surprisingly enough we're supposed to get zero bytes out of it. - * FIXME: Wine's on-disk file format does not differentiate this with - * regular empty strings but there's no way to test as it requires - * stopping the wineserver. */ ret = RegSetValueExA(hkey_main, name1A, 0, REG_SZ, (const BYTE *)emptyA, 0); ok(ret == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%d\n", ret, GetLastError());

1 0

Francois Gouget : msi: Use 'HKCU\Software\Microsoft\MS Setup (ACME)' as a source for the default user and company names before falling back to the RegisteredXXX values . Fix the conformance test accordingly.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 4a7bedfe756206756ff6c2eed09949913f651564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a7bedfe756206756ff6c2eed… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 19 00:17:24 2008 +0100 msi: Use 'HKCU\Software\Microsoft\MS Setup (ACME)' as a source for the default user and company names before falling back to the RegisteredXXX values. Fix the conformance test accordingly. --- dlls/msi/package.c | 52 +++++++++++++++++++++++++++------------------ dlls/msi/tests/package.c | 23 ++++++++++++++++---- 2 files changed, 49 insertions(+), 26 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 685a28d..2ffbfb5 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -347,9 +347,8 @@ static VOID set_installer_properties(MSIPACKAGE *package) DWORD verval; WCHAR verstr[10], bufstr[20]; HDC dc; - LPWSTR check; HKEY hkey; - LONG res; + LPWSTR username, companyname; SYSTEM_INFO sys_info; SYSTEMTIME systemtime; LANGID langid; @@ -424,6 +423,14 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szIntFormat[] = {'%','d',0}; static const WCHAR szIntel[] = { 'I','n','t','e','l',0 }; static const WCHAR szAllUsers[] = { 'A','L','L','U','S','E','R','S',0 }; + static const WCHAR szUserInfo[] = { + 'S','O','F','T','W','A','R','E','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'M','S',' ','S','e','t','u','p',' ','(','A','C','M','E',')','\\', + 'U','s','e','r',' ','I','n','f','o',0 + }; + static const WCHAR szDefName[] = { 'D','e','f','N','a','m','e',0 }; + static const WCHAR szDefCompany[] = { 'D','e','f','C','o','m','p','a','n','y',0 }; static const WCHAR szCurrentVersion[] = { 'S','O','F','T','W','A','R','E','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -587,27 +594,33 @@ static VOID set_installer_properties(MSIPACKAGE *package) ReleaseDC(0, dc); /* USERNAME and COMPANYNAME */ - res = RegOpenKeyW( HKEY_LOCAL_MACHINE, szCurrentVersion, &hkey ); - if (res != ERROR_SUCCESS) - return; + username = msi_dup_property( package, szUSERNAME ); + companyname = msi_dup_property( package, szCOMPANYNAME ); - check = msi_dup_property( package, szUSERNAME ); - if (!check) + if ((!username || !companyname) && + RegOpenKeyW( HKEY_CURRENT_USER, szUserInfo, &hkey ) == ERROR_SUCCESS) { - LPWSTR user = msi_reg_get_val_str( hkey, szRegisteredUser ); - MSI_SetPropertyW( package, szUSERNAME, user ); - msi_free( user ); + if (!username && + (username = msi_reg_get_val_str( hkey, szDefName ))) + MSI_SetPropertyW( package, szUSERNAME, username ); + if (!companyname && + (companyname = msi_reg_get_val_str( hkey, szDefCompany ))) + MSI_SetPropertyW( package, szCOMPANYNAME, companyname ); + CloseHandle( hkey ); } - - msi_free( check ); - - check = msi_dup_property( package, szCOMPANYNAME ); - if (!check) + if ((!username || !companyname) && + RegOpenKeyW( HKEY_LOCAL_MACHINE, szCurrentVersion, &hkey ) == ERROR_SUCCESS) { - LPWSTR company = msi_reg_get_val_str( hkey, szRegisteredOrg ); - MSI_SetPropertyW( package, szCOMPANYNAME, company ); - msi_free( company ); + if (!username && + (username = msi_reg_get_val_str( hkey, szRegisteredUser ))) + MSI_SetPropertyW( package, szUSERNAME, username ); + if (!companyname && + (companyname = msi_reg_get_val_str( hkey, szRegisteredOrg ))) + MSI_SetPropertyW( package, szCOMPANYNAME, companyname ); + CloseHandle( hkey ); } + msi_free( username ); + msi_free( companyname ); if ( set_user_sid_prop( package ) != ERROR_SUCCESS) ERR("Failed to set the UserSID property\n"); @@ -634,9 +647,6 @@ static VOID set_installer_properties(MSIPACKAGE *package) sprintfW(bufstr, szIntFormat, langid); MSI_SetPropertyW( package, szUserLangID, bufstr ); - - msi_free( check ); - CloseHandle( hkey ); } static UINT msi_load_summary_properties( MSIPACKAGE *package ) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 9d1f8b8..3d50a8f 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -4698,7 +4698,7 @@ static void test_installprops(void) CHAR buf[MAX_PATH]; DWORD size, type; LANGID langid; - HKEY hkey; + HKEY hkey1, hkey2; UINT r; GetCurrentDirectory(MAX_PATH, path); @@ -4718,11 +4718,18 @@ static void test_installprops(void) ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); ok( !lstrcmp(buf, path), "Expected %s, got %s\n", path, buf); - RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", &hkey); + RegOpenKey(HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\MS Setup (ACME)\\User Info", &hkey1); + + RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", &hkey2); size = MAX_PATH; type = REG_SZ; - RegQueryValueEx(hkey, "RegisteredOwner", NULL, &type, (LPBYTE)path, &size); + if (RegQueryValueEx(hkey1, "DefName", NULL, &type, (LPBYTE)path, &size) != ERROR_SUCCESS) + { + size = MAX_PATH; + type = REG_SZ; + RegQueryValueEx(hkey2, "RegisteredOwner", NULL, &type, (LPBYTE)path, &size); + } size = MAX_PATH; r = MsiGetProperty(hpkg, "USERNAME", buf, &size); @@ -4731,7 +4738,12 @@ static void test_installprops(void) size = MAX_PATH; type = REG_SZ; - RegQueryValueEx(hkey, "RegisteredOrganization", NULL, &type, (LPBYTE)path, &size); + if (RegQueryValueEx(hkey1, "DefCompany", NULL, &type, (LPBYTE)path, &size) != ERROR_SUCCESS) + { + size = MAX_PATH; + type = REG_SZ; + RegQueryValueEx(hkey2, "RegisteredOrganization", NULL, &type, (LPBYTE)path, &size); + } size = MAX_PATH; r = MsiGetProperty(hpkg, "COMPANYNAME", buf, &size); @@ -4771,7 +4783,8 @@ static void test_installprops(void) ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); ok( !lstrcmpA(buf, path), "Expected \"%s\", got \"%s\"\n", path, buf); - CloseHandle(hkey); + CloseHandle(hkey1); + CloseHandle(hkey2); MsiCloseHandle(hpkg); DeleteFile(msifile); }

1 0

Rob Shearman : advpack: Fix buffer overrun in convert_file_list.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 3055239f69b19a3212ab8237c2c6a92ca674d3db URL: http://source.winehq.org/git/wine.git/?a=commit;h=3055239f69b19a3212ab8237c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 18 19:37:27 2008 +0000 advpack: Fix buffer overrun in convert_file_list. --- dlls/advpack/files.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index f351bb4..5003239 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -564,9 +564,7 @@ static LPSTR convert_file_list(LPCSTR FileList, DWORD *dwNumFiles) dwLen = last - first + 3; /* room for double-null termination */ szConvertedList = HeapAlloc(GetProcessHeap(), 0, dwLen); lstrcpynA(szConvertedList, first, dwLen - 1); - szConvertedList[dwLen - 1] = '\0'; - szConvertedList[dwLen] = '\0'; /* empty list */ if (!lstrlenA(szConvertedList))

1 0