February 2011 - Wine-Commits

Nikolay Sivov : oleaut32: Fix sizeof() usage (Coverity).
by Alexandre Julliard Feb. 25, 2011

Feb. 25, 2011

Module: wine Branch: master Commit: f801abef485f82c47c36ae27b35c4b2d28659db9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f801abef485f82c47c36ae27b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 25 12:22:54 2011 +0300 oleaut32: Fix sizeof() usage (Coverity). --- dlls/oleaut32/olepropframe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index 011fde1..61655f9 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -221,7 +221,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) GetDeviceCaps(hdc, LOGPIXELSY), 72); font_desc.lfCharSet = DEFAULT_CHARSET; memcpy(font_desc.lfFaceName, property_sheet_dialog_data+1, - sizeof(WCHAR*)*(lstrlenW(property_sheet_dialog_data+1)+1)); + sizeof(WCHAR)*(lstrlenW(property_sheet_dialog_data+1)+1)); hfont = CreateFontIndirectW(&font_desc); if(hfont) {

1 0

Nikolay Sivov : comctl32/ipaddress: Use array index after range check ( Coverity).
by Alexandre Julliard Feb. 25, 2011

Feb. 25, 2011

Module: wine Branch: master Commit: 653b31047db321daf55f2614bce3df9bd61e3dd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=653b31047db321daf55f2614b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 25 12:01:12 2011 +0300 comctl32/ipaddress: Use array index after range check (Coverity). --- dlls/comctl32/ipaddress.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 1f41f91..ee8a31d 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -384,15 +384,16 @@ static void IPADDRESS_SetFocusToField (const IPADDRESS_INFO *infoPtr, INT index) static BOOL IPADDRESS_ConstrainField (const IPADDRESS_INFO *infoPtr, int currentfield) { - const IPPART_INFO *part = &infoPtr->Part[currentfield]; - WCHAR field[10]; static const WCHAR fmt[] = { '%', 'd', 0 }; + const IPPART_INFO *part; int curValue, newValue; + WCHAR field[10]; TRACE("(currentfield=%d)\n", currentfield); if (currentfield < 0 || currentfield > 3) return FALSE; + part = &infoPtr->Part[currentfield]; if (!GetWindowTextW (part->EditHwnd, field, 4)) return FALSE; curValue = atoiW(field);

1 0

Austin English : oleaut32/tests: Fix a couple of todo_wine's.
by Alexandre Julliard Feb. 25, 2011

Feb. 25, 2011

Module: wine Branch: master Commit: af0c217752b0148a528c744a771bdb0f114ac03b URL: http://source.winehq.org/git/wine.git/?a=commit;h=af0c217752b0148a528c744a7… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 24 16:08:34 2011 -0800 oleaut32/tests: Fix a couple of todo_wine's. --- dlls/oleaut32/olepicture.c | 4 ++-- dlls/oleaut32/tests/olepicture.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 6d264d1..8081785 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -2299,7 +2299,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, hFile = CreateFileW(file_candidate, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); if (hFile == INVALID_HANDLE_VALUE) - return E_UNEXPECTED; + return INET_E_RESOURCE_NOT_FOUND; dwFileSize = GetFileSize(hFile, NULL); if (dwFileSize != INVALID_FILE_SIZE ) @@ -2318,7 +2318,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, CloseHandle(hFile); if (!hGlobal) - return E_UNEXPECTED; + return INET_E_RESOURCE_NOT_FOUND; hRes = CreateStreamOnHGlobal(hGlobal, TRUE, &stream); if (FAILED(hRes)) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 3422e79..5cc078c 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -844,13 +844,13 @@ static void test_OleLoadPicturePath(void) /* Try with a nonexistent file. */ hres = OleLoadPicturePath(temp_fileW + 8, NULL, 0, 0, &IID_IPicture, (void **)&pic); - todo_wine ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ + ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ broken(hres == E_UNEXPECTED) || /* NT4 */ broken(hres == E_FAIL), /*Win2k */ "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres); hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); - todo_wine ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ + ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ broken(hres == E_UNEXPECTED) || /* NT4 */ broken(hres == E_FAIL), /* Win2k */ "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres); @@ -880,7 +880,7 @@ static void test_OleLoadPicturePath(void) /* Try with a nonexistent file. */ hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); - todo_wine ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ + ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ broken(hres == E_UNEXPECTED) || /* NT4 */ broken(hres == E_FAIL), /* Win2k */ "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres);

1 0

Austin English : oleaut32/tests: Remove win9x hacks.
by Alexandre Julliard Feb. 25, 2011

Feb. 25, 2011

Module: wine Branch: master Commit: 28e1b942bd0329c18a1f8d5c600b54e531dcf315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28e1b942bd0329c18a1f8d5c6… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 24 15:55:45 2011 -0800 oleaut32/tests: Remove win9x hacks. --- dlls/oleaut32/tests/olepicture.c | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 52dbb73..3422e79 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -798,9 +798,8 @@ static void test_OleLoadPicturePath(void) hres = OleLoadPicturePath(emptyW, NULL, 0, 0, NULL, (void **)&pic); todo_wine ok(hres == INET_E_UNKNOWN_PROTOCOL || /* XP/Vista+ */ - hres == E_UNEXPECTED || /* NT4/Win95 */ - hres == E_FAIL || /* Win95 OSR2 */ - hres == E_OUTOFMEMORY, /* Win98/Win2k/Win2k3 */ + broken(hres == E_UNEXPECTED) || /* NT4 */ + broken(hres == E_OUTOFMEMORY), /* Win2k/Win2k3 */ "Expected OleLoadPicturePath to return INET_E_UNKNOWN_PROTOCOL, got 0x%08x\n", hres); ok(pic == NULL, "Expected the output interface pointer to be NULL, got %p\n", pic); @@ -809,9 +808,8 @@ static void test_OleLoadPicturePath(void) hres = OleLoadPicturePath(emptyW, NULL, 0, 0, &IID_IPicture, (void **)&pic); todo_wine ok(hres == INET_E_UNKNOWN_PROTOCOL || /* XP/Vista+ */ - hres == E_UNEXPECTED || /* NT4/Win95 */ - hres == E_FAIL || /* Win95 OSR2 */ - hres == E_OUTOFMEMORY, /* Win98/Win2k/Win2k3 */ + broken(hres == E_UNEXPECTED) || /* NT4 */ + broken(hres == E_OUTOFMEMORY), /* Win2k/Win2k3 */ "Expected OleLoadPicturePath to return INET_E_UNKNOWN_PROTOCOL, got 0x%08x\n", hres); ok(pic == NULL, "Expected the output interface pointer to be NULL, got %p\n", pic); @@ -829,7 +827,7 @@ static void test_OleLoadPicturePath(void) /* Try a normal DOS path. */ hres = OleLoadPicturePath(temp_fileW + 8, NULL, 0, 0, &IID_IPicture, (void **)&pic); ok(hres == S_OK || - broken(hres == E_UNEXPECTED), /* NT4/Win95 */ + broken(hres == E_UNEXPECTED), /* NT4 */ "Expected OleLoadPicturePath to return S_OK, got 0x%08x\n", hres); if (pic) IPicture_Release(pic); @@ -837,7 +835,7 @@ static void test_OleLoadPicturePath(void) /* Try a DOS path with tacked on "file:". */ hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); ok(hres == S_OK || - broken(hres == E_UNEXPECTED), /* NT4/Win95 */ + broken(hres == E_UNEXPECTED), /* NT4 */ "Expected OleLoadPicturePath to return S_OK, got 0x%08x\n", hres); if (pic) IPicture_Release(pic); @@ -846,15 +844,15 @@ static void test_OleLoadPicturePath(void) /* Try with a nonexistent file. */ hres = OleLoadPicturePath(temp_fileW + 8, NULL, 0, 0, &IID_IPicture, (void **)&pic); - ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ - hres == E_UNEXPECTED || /* NT4/Win95 */ - hres == E_FAIL, /* Win9x/Win2k */ + todo_wine ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ + broken(hres == E_UNEXPECTED) || /* NT4 */ + broken(hres == E_FAIL), /*Win2k */ "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres); hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); - ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ - hres == E_UNEXPECTED || /* NT4/Win95 */ - hres == E_FAIL, /* Win9x/Win2k */ + todo_wine ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ + broken(hres == E_UNEXPECTED) || /* NT4 */ + broken(hres == E_FAIL), /* Win2k */ "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres); file = CreateFileA(temp_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, @@ -873,7 +871,7 @@ static void test_OleLoadPicturePath(void) hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); ok(hres == S_OK || - broken(hres == E_UNEXPECTED), /* NT4/Win95 */ + broken(hres == E_UNEXPECTED), /* NT4 */ "Expected OleLoadPicturePath to return S_OK, got 0x%08x\n", hres); if (pic) IPicture_Release(pic); @@ -882,9 +880,9 @@ static void test_OleLoadPicturePath(void) /* Try with a nonexistent file. */ hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); - ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ - hres == E_UNEXPECTED || /* NT4/Win95 */ - hres == E_FAIL, /* Win9x/Win2k */ + todo_wine ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ + broken(hres == E_UNEXPECTED) || /* NT4 */ + broken(hres == E_FAIL), /* Win2k */ "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres); }

1 0

Austin English : msxml3/tests: Remove win9x hacks.
by Alexandre Julliard Feb. 25, 2011

Feb. 25, 2011

Module: wine Branch: master Commit: 37e6dc0846ebd106f6a8e91b4cef2b3a33e438b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37e6dc0846ebd106f6a8e91b4… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 24 16:08:53 2011 -0800 msxml3/tests: Remove win9x hacks. --- dlls/msxml3/tests/domdoc.c | 21 +++++++-------------- 1 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 698b4b8..6aad135 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2738,11 +2738,8 @@ static void test_get_text(void) IXMLDOMNode_Release(nodeRoot); } - if (0) { - /* this test crashes on win9x */ r = IXMLDOMNodeList_QueryInterface(node_list, &IID_IDispatch, NULL); ok( r == E_INVALIDARG, "ret %08x\n", r ); - } r = IXMLDOMNodeList_get_length( node_list, NULL ); ok( r == E_INVALIDARG, "ret %08x\n", r ); @@ -3381,19 +3378,15 @@ static void test_XMLHTTP(void) method = SysAllocString(wszPOST); url = SysAllocString(wszUrl); -if (0) -{ - /* crashes on win98 */ hr = IXMLHttpRequest_put_onreadystatechange(pXMLHttpRequest, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); -} hr = IXMLHttpRequest_abort(pXMLHttpRequest); ok(hr == S_OK, "got 0x%08x\n", hr); /* send before open */ hr = IXMLHttpRequest_send(pXMLHttpRequest, dummy); - ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win9x, win2k */, "got 0x%08x\n", hr); + ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win2k */, "got 0x%08x\n", hr); /* initial status code */ hr = IXMLHttpRequest_get_status(pXMLHttpRequest, NULL); @@ -3401,7 +3394,7 @@ if (0) status = 0xdeadbeef; hr = IXMLHttpRequest_get_status(pXMLHttpRequest, &status); - ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win9x, win2k */, "got 0x%08x\n", hr); + ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win2k */, "got 0x%08x\n", hr); ok(status == 0xdeadbeef, "got %d\n", status); /* invalid parameters */ @@ -3418,13 +3411,13 @@ if (0) ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = IXMLHttpRequest_setRequestHeader(pXMLHttpRequest, _bstr_("header1"), NULL); - ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win9x, win2k */, "got 0x%08x\n", hr); + ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win2k */, "got 0x%08x\n", hr); hr = IXMLHttpRequest_setRequestHeader(pXMLHttpRequest, NULL, _bstr_("value1")); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = IXMLHttpRequest_setRequestHeader(pXMLHttpRequest, _bstr_("header1"), _bstr_("value1")); - ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win9x, win2k */, "got 0x%08x\n", hr); + ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win2k */, "got 0x%08x\n", hr); hr = IXMLHttpRequest_get_readyState(pXMLHttpRequest, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); @@ -3457,7 +3450,7 @@ if (0) /* status code after ::open() */ status = 0xdeadbeef; hr = IXMLHttpRequest_get_status(pXMLHttpRequest, &status); - ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win9x, win2k */, "got 0x%08x\n", hr); + ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win2k */, "got 0x%08x\n", hr); ok(status == 0xdeadbeef, "got %d\n", status); state = -1; @@ -3471,7 +3464,7 @@ if (0) state = -1; hr = IXMLHttpRequest_get_readyState(pXMLHttpRequest, &state); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(state == READYSTATE_UNINITIALIZED || broken(state == READYSTATE_LOADING) /* win98, win2k */, + ok(state == READYSTATE_UNINITIALIZED || broken(state == READYSTATE_LOADING) /* win2k */, "got %d, expected READYSTATE_UNINITIALIZED\n", state); hr = IXMLHttpRequest_open(pXMLHttpRequest, method, url, async, dummy, dummy); @@ -3506,7 +3499,7 @@ if (0) /* another ::send() after completed request */ hr = IXMLHttpRequest_send(pXMLHttpRequest, varbody); - ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win9x, win2k */, "got 0x%08x\n", hr); + ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win2k */, "got 0x%08x\n", hr); VariantClear(&varbody);

1 0

Austin English : msi/tests: Remove win9x hacks.
by Alexandre Julliard Feb. 25, 2011

Feb. 25, 2011

Module: wine Branch: master Commit: 05126ec24741dd9aba730313d188de8aa7b4cf2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=05126ec24741dd9aba730313d… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 24 16:07:00 2011 -0800 msi/tests: Remove win9x hacks. --- dlls/msi/tests/automation.c | 43 +++++++++++-------------------------------- 1 files changed, 11 insertions(+), 32 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index a85b29d..5deb2ae 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -415,17 +415,6 @@ static void delete_test_files(void) /* ok-like statement which takes two unicode strings or one unicode and one ANSI string as arguments */ static CHAR string1[MAX_PATH], string2[MAX_PATH]; -/* lstrcmpW is not supported on Win9x */ -static int strcmp_ww(const WCHAR* str1, const WCHAR* str2) -{ - CHAR str1A[MAX_PATH], str2A[MAX_PATH]; - - WideCharToMultiByte(CP_ACP, 0, str1, -1, str1A, MAX_PATH, NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, str2, -1, str2A, MAX_PATH, NULL, NULL); - - return lstrcmpA(str1A, str2A); -} - #define ok_w2(format, szString1, szString2) \ \ do { \ @@ -1886,7 +1875,7 @@ static void test_Session(IDispatch *pSession) memset(stringw, 0, sizeof(stringw)); hr = Session_PropertyGet(pSession, szProductName, stringw); ok(hr == S_OK, "Session_PropertyGet failed, hresult 0x%08x\n", hr); - if (strcmp_ww(stringw, szMSITEST) != 0) + if (lstrcmpW(stringw, szMSITEST) != 0) { len = WideCharToMultiByte(CP_ACP, 0, stringw, -1, string, MAX_PATH, NULL, NULL); ok(len, "WideCharToMultiByteChar returned error %d\n", GetLastError()); @@ -1899,7 +1888,7 @@ static void test_Session(IDispatch *pSession) memset(stringw, 0, sizeof(stringw)); hr = Session_PropertyGet(pSession, szProductName, stringw); ok(hr == S_OK, "Session_PropertyGet failed, hresult 0x%08x\n", hr); - if (strcmp_ww(stringw, szProductName) != 0) + if (lstrcmpW(stringw, szProductName) != 0) { len = WideCharToMultiByte(CP_ACP, 0, stringw, -1, string, MAX_PATH, NULL, NULL); ok(len, "WideCharToMultiByteChar returned error %d\n", GetLastError()); @@ -2259,7 +2248,7 @@ static void test_Installer_Products(BOOL bProductInstalled) ok(iValue == INSTALLSTATE_DEFAULT || iValue == INSTALLSTATE_ADVERTISED, "Installer_ProductState returned %d, expected %d or %d\n", iValue, INSTALLSTATE_DEFAULT, INSTALLSTATE_ADVERTISED); /* Not found our product code yet? Check */ - if (!bProductFound && !strcmp_ww(szString, szProductCode)) + if (!bProductFound && !lstrcmpW(szString, szProductCode)) bProductFound = TRUE; /* IEnumVARIANT::Next */ @@ -2560,25 +2549,15 @@ static void test_Installer_InstallProduct(void) res = find_registry_key(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData", "af054738b93a8cb43b12803b397f483b", access, &hkey); - ok(res == ERROR_SUCCESS || - broken(res == ERROR_FILE_NOT_FOUND), /* win9x */ - "Expected ERROR_SUCCESS, got %d\n", res); - if (res == ERROR_SUCCESS) - { - res = delete_registry_key(hkey, "af054738b93a8cb43b12803b397f483b", access); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - RegCloseKey(hkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - res = delete_key_portable(HKEY_LOCAL_MACHINE, - "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\Products\\af054738b93a8cb43b12803b397f483b", access); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - } - else - { - /* win9x defaults to a per-machine install. */ - delete_key_portable(HKEY_LOCAL_MACHINE, - "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\Products\\af054738b93a8cb43b12803b397f483b", access); - } + res = delete_registry_key(hkey, "af054738b93a8cb43b12803b397f483b", access); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + RegCloseKey(hkey); + + res = delete_key_portable(HKEY_LOCAL_MACHINE, + "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\Products\\af054738b93a8cb43b12803b397f483b", access); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); /* Remove registry keys written by PublishProduct standard action */ res = RegOpenKey(HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Installer", &hkey);

1 0

Paul Vriens : msi: Add a missing va_end() (Coverity).
by Alexandre Julliard Feb. 25, 2011

Feb. 25, 2011

Module: wine Branch: master Commit: 0d01212dac9a5760325386ea058d92f4cdc20a28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d01212dac9a5760325386ea0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Feb 25 09:20:15 2011 +0100 msi: Add a missing va_end() (Coverity). --- dlls/msi/helpers.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index d48dd69..ffbe58b 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -494,6 +494,8 @@ LPWSTR build_directory_name(DWORD count, ...) if( ((i+1)!=count) && dir[strlenW(dir)-1]!='\\') strcatW(dir, szBackSlash); } + va_end(va); + return dir; }

1 0

Nikolay Sivov : comctl32/listview: Fix dead condition (Coverity).
by Alexandre Julliard Feb. 25, 2011

Feb. 25, 2011

Module: wine Branch: master Commit: 1734577731233aa7d98abf611aac379449f52113 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1734577731233aa7d98abf611… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 25 11:55:50 2011 +0300 comctl32/listview: Fix dead condition (Coverity). --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 01c5864..60178b3 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -543,7 +543,7 @@ static BOOL textsetptrT(LPWSTR *dest, LPCWSTR src, BOOL isW) static inline int textcmpWT(LPCWSTR aw, LPCWSTR bt, BOOL isW) { if (!aw) return bt ? -1 : 0; - if (!bt) return aw ? 1 : 0; + if (!bt) return 1; if (aw == LPSTR_TEXTCALLBACKW) return bt == LPSTR_TEXTCALLBACKW ? 1 : -1; if (bt != LPSTR_TEXTCALLBACKW)

1 0

Nikolay Sivov : comctl32/rebar: Don' t use local variable with the same name as function parameter (Coverity).
by Alexandre Julliard Feb. 25, 2011

Feb. 25, 2011

Module: wine Branch: master Commit: 190f6ab158e45b8107953fcdeb1707e4d4b00118 URL: http://source.winehq.org/git/wine.git/?a=commit;h=190f6ab158e45b8107953fcde… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 25 11:50:01 2011 +0300 comctl32/rebar: Don't use local variable with the same name as function parameter (Coverity). --- dlls/comctl32/rebar.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 8e9c38b..74ed03d 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1524,9 +1524,10 @@ REBAR_SizeToHeight(REBAR_INFO *infoPtr, int height) for (i = prev_visible(infoPtr, infoPtr->uNumBands); i > 0; i = prev_visible(infoPtr, i)) { REBAR_BAND *lpBand = REBAR_GetBand(infoPtr, i); - int height = lpBand->rcBand.bottom - lpBand->rcBand.top; int cyBreakExtra; /* additional cy for the rebar after a RBBS_BREAK on this band */ + height = lpBand->rcBand.bottom - lpBand->rcBand.top; + if (infoPtr->dwStyle & RBS_VARHEIGHT) cyBreakExtra = lpBand->cyRowSoFar; /* 'height' => 'lpBand->cyRowSoFar' + 'height'*/ else

1 0

Nikolay Sivov : comctl32/datetime: Fix use of out-of-scope local buffer ( Coverity).
by Alexandre Julliard Feb. 25, 2011

Feb. 25, 2011

Module: wine Branch: master Commit: f8ba490e589a99a7e71fee6dd299e50e4dd40f3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8ba490e589a99a7e71fee6dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 25 11:38:28 2011 +0300 comctl32/datetime: Fix use of out-of-scope local buffer (Coverity). --- dlls/comctl32/datetime.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 1ac6ba7..ed625e9 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -277,10 +277,11 @@ DATETIME_UseFormat (DATETIME_INFO *infoPtr, LPCWSTR formattxt) static BOOL -DATETIME_SetFormatW (DATETIME_INFO *infoPtr, LPCWSTR lpszFormat) +DATETIME_SetFormatW (DATETIME_INFO *infoPtr, LPCWSTR format) { - if (!lpszFormat) { - WCHAR format_buf[80]; + WCHAR format_buf[80]; + + if (!format) { DWORD format_item; if (infoPtr->dwStyle & DTS_LONGDATEFORMAT) @@ -290,13 +291,13 @@ DATETIME_SetFormatW (DATETIME_INFO *infoPtr, LPCWSTR lpszFormat) else /* DTS_SHORTDATEFORMAT */ format_item = LOCALE_SSHORTDATE; GetLocaleInfoW(LOCALE_USER_DEFAULT, format_item, format_buf, sizeof(format_buf)/sizeof(format_buf[0])); - lpszFormat = format_buf; + format = format_buf; } - DATETIME_UseFormat (infoPtr, lpszFormat); + DATETIME_UseFormat (infoPtr, format); InvalidateRect (infoPtr->hwndSelf, NULL, TRUE); - return 1; + return TRUE; }

1 0