August 2014 - Wine-commits - list.winehq.org

Vincent Povirk : mscoree: Factor out common code for calling .NET methods.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 1986e496c79915a14beac3050bef371a97ab0296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1986e496c79915a14beac3050… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 13 17:05:44 2014 -0500 mscoree: Factor out common code for calling .NET methods. --- dlls/mscoree/corruntimehost.c | 235 ++++++++++++++++-------------------------- 1 file changed, 91 insertions(+), 144 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index b44fb6a..ce73134 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -153,23 +153,25 @@ static void RuntimeHost_DeleteDomain(RuntimeHost *This, MonoDomain *domain) LeaveCriticalSection(&This->lock); } -static HRESULT RuntimeHost_GetIUnknownForDomain(RuntimeHost *This, MonoDomain *domain, IUnknown **punk) +static HRESULT RuntimeHost_Invoke(RuntimeHost *This, MonoDomain *domain, + const char *assemblyname, const char *namespace, const char *typename, const char *methodname, + MonoObject *obj, void **args, int arg_count, MonoObject **result) { - HRESULT hr; - void *args[1]; MonoAssembly *assembly; MonoImage *image; MonoClass *klass; MonoMethod *method; - MonoObject *appdomain_object; - IUnknown *unk; + MonoObject *exc; + static const char *get_hresult = "get_HResult"; + + *result = NULL; mono_thread_attach(domain); - assembly = mono_domain_assembly_open(domain, "mscorlib"); + assembly = mono_domain_assembly_open(domain, assemblyname); if (!assembly) { - ERR("Cannot load mscorlib\n"); + ERR("Cannot load assembly\n"); return E_FAIL; } @@ -180,29 +182,57 @@ static HRESULT RuntimeHost_GetIUnknownForDomain(RuntimeHost *This, MonoDomain *d return E_FAIL; } - klass = mono_class_from_name(image, "System", "AppDomain"); + klass = mono_class_from_name(image, namespace, typename); if (!klass) { ERR("Couldn't get class from image\n"); return E_FAIL; } - method = mono_class_get_method_from_name(klass, "get_CurrentDomain", 0); + method = mono_class_get_method_from_name(klass, methodname, arg_count); if (!method) { ERR("Couldn't get method from class\n"); return E_FAIL; } - args[0] = NULL; - appdomain_object = mono_runtime_invoke(method, NULL, args, NULL); - if (!appdomain_object) + *result = mono_runtime_invoke(method, obj, args, &exc); + if (exc) { - ERR("Couldn't get result pointer\n"); - return E_FAIL; + HRESULT hr; + MonoObject *hr_object; + + if (methodname != get_hresult) + { + /* Map the exception to an HRESULT. */ + hr = RuntimeHost_Invoke(This, domain, "mscorlib", "System", "Exception", get_hresult, + exc, NULL, 0, &hr_object); + if (SUCCEEDED(hr)) + hr = *(HRESULT*)mono_object_unbox(hr_object); + if (SUCCEEDED(hr)) + hr = E_FAIL; + } + else + hr = E_FAIL; + ERR("Method %s.%s raised an exception, hr=%x\n", namespace, typename, hr); + *result = NULL; + return hr; } - hr = RuntimeHost_GetIUnknownForObject(This, appdomain_object, &unk); + return S_OK; +} + +static HRESULT RuntimeHost_GetIUnknownForDomain(RuntimeHost *This, MonoDomain *domain, IUnknown **punk) +{ + HRESULT hr; + MonoObject *appdomain_object; + IUnknown *unk; + + hr = RuntimeHost_Invoke(This, domain, "mscorlib", "System", "AppDomain", "get_CurrentDomain", + NULL, NULL, 0, &appdomain_object); + + if (SUCCEEDED(hr)) + hr = RuntimeHost_GetIUnknownForObject(This, appdomain_object, &unk); if (SUCCEEDED(hr)) { @@ -219,10 +249,7 @@ void RuntimeHost_ExitProcess(RuntimeHost *This, INT exitcode) HRESULT hr; void *args[2]; MonoDomain *domain; - MonoAssembly *assembly; - MonoImage *image; - MonoClass *klass; - MonoMethod *method; + MonoObject *dummy; hr = RuntimeHost_GetDefaultDomain(This, &domain); if (FAILED(hr)) @@ -231,39 +258,10 @@ void RuntimeHost_ExitProcess(RuntimeHost *This, INT exitcode) return; } - mono_thread_attach(domain); - - assembly = mono_domain_assembly_open(domain, "mscorlib"); - if (!assembly) - { - ERR("Cannot load mscorlib\n"); - return; - } - - image = mono_assembly_get_image(assembly); - if (!image) - { - ERR("Couldn't get assembly image\n"); - return; - } - - klass = mono_class_from_name(image, "System", "Environment"); - if (!klass) - { - ERR("Couldn't get class from image\n"); - return; - } - - method = mono_class_get_method_from_name(klass, "Exit", 1); - if (!method) - { - ERR("Couldn't get method from class\n"); - return; - } - args[0] = &exitcode; args[1] = NULL; - mono_runtime_invoke(method, NULL, args, NULL); + RuntimeHost_Invoke(This, domain, "mscorlib", "System", "Environment", "Exit", + NULL, args, 1, &dummy); ERR("Process should have exited\n"); } @@ -629,13 +627,8 @@ static HRESULT WINAPI CLRRuntimeHost_ExecuteInDefaultAppDomain(ICLRRuntimeHost* RuntimeHost *This = impl_from_ICLRRuntimeHost( iface ); HRESULT hr; MonoDomain *domain; - MonoAssembly *assembly; - MonoImage *image; - MonoClass *klass; - MonoMethod *method; MonoObject *result; MonoString *str; - void *args[2]; char *filenameA = NULL, *classA = NULL, *methodA = NULL; char *argsA = NULL, *ns; @@ -643,66 +636,60 @@ static HRESULT WINAPI CLRRuntimeHost_ExecuteInDefaultAppDomain(ICLRRuntimeHost* debugstr_w(pwzTypeName), debugstr_w(pwzMethodName), debugstr_w(pwzArgument)); hr = RuntimeHost_GetDefaultDomain(This, &domain); - if(hr != S_OK) - { - ERR("Couldn't get Default Domain\n"); - return hr; - } - hr = E_FAIL; - - mono_thread_attach(domain); - - filenameA = WtoA(pwzAssemblyPath); - assembly = mono_domain_assembly_open(domain, filenameA); - if (!assembly) + if (SUCCEEDED(hr)) { - ERR("Cannot open assembly %s\n", filenameA); - goto cleanup; + mono_thread_attach(domain); + + filenameA = WtoA(pwzAssemblyPath); + if (!filenameA) hr = E_OUTOFMEMORY; } - image = mono_assembly_get_image(assembly); - if (!image) + if (SUCCEEDED(hr)) { - ERR("Couldn't get assembly image\n"); - goto cleanup; + classA = WtoA(pwzTypeName); + if (!classA) hr = E_OUTOFMEMORY; } - classA = WtoA(pwzTypeName); - ns = strrchr(classA, '.'); - *ns = '\0'; - klass = mono_class_from_name(image, classA, ns+1); - if (!klass) + if (SUCCEEDED(hr)) { - ERR("Couldn't get class from image\n"); - goto cleanup; + ns = strrchr(classA, '.'); + if (ns) + *ns = '\0'; + else + hr = E_INVALIDARG; } - methodA = WtoA(pwzMethodName); - method = mono_class_get_method_from_name(klass, methodA, 1); - if (!method) + if (SUCCEEDED(hr)) { - ERR("Couldn't get method from class\n"); - goto cleanup; + methodA = WtoA(pwzMethodName); + if (!methodA) hr = E_OUTOFMEMORY; } /* The .NET function we are calling has the following declaration * public static int functionName(String param) */ - argsA = WtoA(pwzArgument); - str = mono_string_new(domain, argsA); - args[0] = str; - args[1] = NULL; - result = mono_runtime_invoke(method, NULL, args, NULL); - if (!result) - ERR("Couldn't get result pointer\n"); - else + if (SUCCEEDED(hr)) { - *pReturnValue = *(DWORD*)mono_object_unbox(result); - hr = S_OK; + argsA = WtoA(pwzArgument); + if (!argsA) hr = E_OUTOFMEMORY; } -cleanup: + if (SUCCEEDED(hr)) + { + str = mono_string_new(domain, argsA); + if (!str) hr = E_OUTOFMEMORY; + } + + if (SUCCEEDED(hr)) + { + hr = RuntimeHost_Invoke(This, domain, filenameA, classA, ns+1, methodA, + NULL, (void**)&str, 1, &result); + } + + if (SUCCEEDED(hr)) + *pReturnValue = *(DWORD*)mono_object_unbox(result); + HeapFree(GetProcessHeap(), 0, filenameA); HeapFree(GetProcessHeap(), 0, classA); HeapFree(GetProcessHeap(), 0, argsA); @@ -807,60 +794,20 @@ HRESULT RuntimeHost_GetIUnknownForObject(RuntimeHost *This, MonoObject *obj, IUnknown **ppUnk) { MonoDomain *domain; - MonoAssembly *assembly; - MonoImage *image; - MonoClass *klass; - MonoMethod *method; MonoObject *result; - void *args[2]; + HRESULT hr; domain = mono_object_get_domain(obj); - assembly = mono_domain_assembly_open(domain, "mscorlib"); - if (!assembly) - { - ERR("Cannot load mscorlib\n"); - return E_FAIL; - } - - image = mono_assembly_get_image(assembly); - if (!image) - { - ERR("Couldn't get assembly image\n"); - return E_FAIL; - } + hr = RuntimeHost_Invoke(This, domain, "mscorlib", "System.Runtime.InteropServices", "Marshal", "GetIUnknownForObject", + NULL, (void**)&obj, 1, &result); - klass = mono_class_from_name(image, "System.Runtime.InteropServices", "Marshal"); - if (!klass) - { - ERR("Couldn't get class from image\n"); - return E_FAIL; - } - - method = mono_class_get_method_from_name(klass, "GetIUnknownForObject", 1); - if (!method) - { - ERR("Couldn't get method from class\n"); - return E_FAIL; - } - - args[0] = obj; - args[1] = NULL; - result = mono_runtime_invoke(method, NULL, args, NULL); - if (!result) - { - ERR("Couldn't get result pointer\n"); - return E_FAIL; - } - - *ppUnk = *(IUnknown**)mono_object_unbox(result); - if (!*ppUnk) - { - ERR("GetIUnknownForObject returned 0\n"); - return E_FAIL; - } + if (SUCCEEDED(hr)) + *ppUnk = *(IUnknown**)mono_object_unbox(result); + else + *ppUnk = NULL; - return S_OK; + return hr; } static void get_utf8_args(int *argc, char ***argv)

1 0

Nikolay Sivov : comctl32/pager: Reduce pointer scope so it doesn' t point to inner scope vars (PVS-Studio).
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 5741ebb8fdc5034734cfb96465e5f97ff326a18e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5741ebb8fdc5034734cfb9646… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 16 11:30:01 2014 +0400 comctl32/pager: Reduce pointer scope so it doesn't point to inner scope vars (PVS-Studio). --- dlls/comctl32/pager.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index 74bca5e..bd9eb68 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -753,7 +753,7 @@ static LRESULT PAGER_MouseMove (PAGER_INFO* infoPtr, INT keys, INT x, INT y) { POINT clpt, pt; - RECT wnrect, *btnrect = NULL; + RECT wnrect; BOOL topLeft = FALSE; INT btnstate = 0; INT hit; @@ -766,8 +766,9 @@ PAGER_MouseMove (PAGER_INFO* infoPtr, INT keys, INT x, INT y) ClientToScreen(infoPtr->hwndSelf, &pt); GetWindowRect(infoPtr->hwndSelf, &wnrect); if (PtInRect(&wnrect, pt)) { - RECT TLbtnrect, BRbtnrect; - PAGER_GetButtonRects(infoPtr, &TLbtnrect, &BRbtnrect, FALSE); + RECT topleft, bottomright, *rect = NULL; + + PAGER_GetButtonRects(infoPtr, &topleft, &bottomright, FALSE); clpt = pt; MapWindowPoints(0, infoPtr->hwndSelf, &clpt, 1); @@ -775,23 +776,23 @@ PAGER_MouseMove (PAGER_INFO* infoPtr, INT keys, INT x, INT y) if ((hit == PGB_TOPORLEFT) && (infoPtr->TLbtnState == PGF_NORMAL)) { topLeft = TRUE; - btnrect = &TLbtnrect; + rect = &topleft; infoPtr->TLbtnState = PGF_HOT; btnstate = infoPtr->TLbtnState; } else if ((hit == PGB_BOTTOMORRIGHT) && (infoPtr->BRbtnState == PGF_NORMAL)) { topLeft = FALSE; - btnrect = &BRbtnrect; + rect = &bottomright; infoPtr->BRbtnState = PGF_HOT; btnstate = infoPtr->BRbtnState; } /* If in one of the buttons the capture and draw buttons */ - if (btnrect) + if (rect) { TRACE("[%p] draw btn (%s), Capture %s, style %08x\n", - infoPtr->hwndSelf, wine_dbgstr_rect(btnrect), + infoPtr->hwndSelf, wine_dbgstr_rect(rect), (infoPtr->bCapture) ? "TRUE" : "FALSE", infoPtr->dwStyle); if (!infoPtr->bCapture) @@ -804,7 +805,7 @@ PAGER_MouseMove (PAGER_INFO* infoPtr, INT keys, INT x, INT y) SetTimer(infoPtr->hwndSelf, TIMERID1, 0x3e, 0); hdc = GetWindowDC(infoPtr->hwndSelf); /* OffsetRect(wnrect, 0 | 1, 0 | 1) */ - PAGER_DrawButton(hdc, infoPtr->clrBk, *btnrect, + PAGER_DrawButton(hdc, infoPtr->clrBk, *rect, infoPtr->dwStyle & PGS_HORZ, topLeft, btnstate); ReleaseDC(infoPtr->hwndSelf, hdc); return 0;

1 0

Nikolay Sivov : secur32/tests: Remove duplicated expression (PVS-Studio).
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 58a4aa59540f1dce0b3cd8598c71e7b64470c083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58a4aa59540f1dce0b3cd8598… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 16 12:42:58 2014 +0400 secur32/tests: Remove duplicated expression (PVS-Studio). --- dlls/secur32/tests/ntlm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 1e865ad..8adbbb4 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -1366,9 +1366,8 @@ START_TEST(ntlm) InitFunctionPtrs(); if(pFreeCredentialsHandle && pDeleteSecurityContext && - pDeleteSecurityContext && pAcquireCredentialsHandleA && - pInitializeSecurityContextA && pCompleteAuthToken && - pQuerySecurityPackageInfoA) + pAcquireCredentialsHandleA && pInitializeSecurityContextA && + pCompleteAuthToken && pQuerySecurityPackageInfoA) { if(!testAcquireCredentialsHandle()) goto cleanup;

1 0

Nikolay Sivov : odbccp32/tests: Remove test of always true conditions ( PVS-Studio).
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 44677f2f7847d78dc20f4ce8cb29df1262c18a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=44677f2f7847d78dc20f4ce8c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 16 13:20:49 2014 +0400 odbccp32/tests: Remove test of always true conditions (PVS-Studio). --- dlls/odbccp32/tests/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 40846e5..cfe9532 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -36,11 +36,11 @@ static void test_SQLConfigMode(void) bool_ret = SQLGetConfigMode(&config_mode); ok(bool_ret && config_mode == ODBC_BOTH_DSN, "Failed to get the initial SQLGetConfigMode or it was not both\n"); - bool_ret = SQLSetConfigMode(3); + /* try to set invalid mode */ + bool_ret = SQLSetConfigMode(ODBC_SYSTEM_DSN+1); sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); ok(!bool_ret && sql_ret == SQL_SUCCESS_WITH_INFO && error_code == ODBC_ERROR_INVALID_PARAM_SEQUENCE, "SQLSetConfigMode with invalid argument did not fail correctly\n"); - ok (ODBC_SYSTEM_DSN == 2 && ODBC_USER_DSN == 1 && ODBC_BOTH_DSN == 0, "SQLSetConfigMode modes not as expected\n"); for (i = ODBC_SYSTEM_DSN; i >= ODBC_BOTH_DSN; --i) { ok(SQLSetConfigMode((UWORD)i), "SQLSetConfigMode Failed to set config mode\n");

1 0

Nikolay Sivov : mshtml: Free buffer for empty strings too (PVS-Studio).
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 2ee84d5ae21868fbc74efb6e6f99c2bbdf011dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ee84d5ae21868fbc74efb6e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 16 13:53:13 2014 +0400 mshtml: Free buffer for empty strings too (PVS-Studio). --- dlls/mshtml/oleobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index ea8cea6..ca01288 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -375,7 +375,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite (void**)&uihandler2); if(SUCCEEDED(hres)) { hres = IDocHostUIHandler2_GetOverrideKeyPath(uihandler2, &override_key_path, 0); - if(hres == S_OK && override_key_path && override_key_path[0]) { + if(hres == S_OK && override_key_path) { if(override_key_path[0]) { /*FIXME: use override_key_path */ FIXME("override_key_path = %s\n", debugstr_w(override_key_path));

1 0

Nikolay Sivov : urlmon: Remove duplicated check (PVS-Studio).
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: f7322187fe6876b20be4cc20d9224c7e04dde94e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7322187fe6876b20be4cc20d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 16 14:00:21 2014 +0400 urlmon: Remove duplicated check (PVS-Studio). --- dlls/urlmon/sec_mgr.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 5c145ae..e1c7ec8 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -241,11 +241,9 @@ static BOOL matches_domain_pattern(LPCWSTR pattern, LPCWSTR str, BOOL implicit_w * * Doesn't match the pattern. */ - if(str_len > pattern_len) { - if(str[str_len-pattern_len-1] == '.' && !strcmpiW(str+(str_len-pattern_len), pattern)) { - matches = TRUE; - *matched = str+(str_len-pattern_len); - } + if(str[str_len-pattern_len-1] == '.' && !strcmpiW(str+(str_len-pattern_len), pattern)) { + matches = TRUE; + *matched = str+(str_len-pattern_len); } } else { /* The pattern doesn't have an implicit wildcard, or an explicit wildcard,

1 0

Nikolay Sivov : oleaut32: Remove duplicated expression (PVS-Studio).
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 6d3ca3dde47862779580f01a99fdc1ea4c0816f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d3ca3dde47862779580f01a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 16 12:37:16 2014 +0400 oleaut32: Remove duplicated expression (PVS-Studio). --- dlls/oleaut32/variant.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 7e19dcf..a00e16f 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -3016,7 +3016,6 @@ HRESULT WINAPI VarAnd(LPVARIANT left, LPVARIANT right, LPVARIANT result) else if (leftvt == VT_I4 || rightvt == VT_I4 || leftvt == VT_UINT || rightvt == VT_UINT || leftvt == VT_INT || rightvt == VT_INT || - leftvt == VT_UINT || rightvt == VT_UINT || leftvt == VT_R4 || rightvt == VT_R4 || leftvt == VT_R8 || rightvt == VT_R8 || leftvt == VT_CY || rightvt == VT_CY ||

1 0

Nikolay Sivov : oleaut32/tests: Remove redundant assignment (PVS-Studio).
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 6e9693edd9040d3d7dcade103b9704d72a7ec459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e9693edd9040d3d7dcade103… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 16 12:56:56 2014 +0400 oleaut32/tests: Remove redundant assignment (PVS-Studio). --- dlls/oleaut32/tests/vartest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index d139b42..5e0d66a 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2158,7 +2158,7 @@ static void test_VarAbs(void) V_VT(&vDst) = VT_EMPTY; hres = pVarAbs(&v,&vDst); - if (ExtraFlags[i] & (VT_ARRAY|VT_ARRAY) || + if (ExtraFlags[i] & VT_ARRAY || (!ExtraFlags[i] && (vt == VT_UNKNOWN || vt == VT_BSTR || vt == VT_DISPATCH || vt == VT_ERROR || vt == VT_RECORD))) {

1 0

Nikolay Sivov : oleaut32/tests: Remove redundant assignment (PVS-Studio).
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: baa8363f90a096e53f84f33359def4e38ce44ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=baa8363f90a096e53f84f3335… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 16 13:01:02 2014 +0400 oleaut32/tests: Remove redundant assignment (PVS-Studio). --- dlls/oleaut32/tests/vartest.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 5e0d66a..804fb76 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2332,7 +2332,6 @@ static void test_VarNot(void) VARNOT(BSTR, (BSTR)szTrue, BOOL, VARIANT_FALSE); VARNOT(BSTR, (BSTR)szFalse, BOOL, VARIANT_TRUE); - V_VT(&v) = VT_DECIMAL; S(U(*pdec)).sign = DECIMAL_NEG; S(U(*pdec)).scale = 0; pdec->Hi32 = 0;

1 0

Nikolay Sivov : oleaut32/tests: Remove duplicate code blocks (PVS-Studio).
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: b378baedaa23dd66f7fd0e122feda7323ebc819f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b378baedaa23dd66f7fd0e122… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 16 13:04:17 2014 +0400 oleaut32/tests: Remove duplicate code blocks (PVS-Studio). --- dlls/oleaut32/tests/vartest.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 804fb76..6acd4e2 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2902,9 +2902,6 @@ static void test_VarMod(void) } else if((l == VT_VARIANT) || (r == VT_VARIANT)) { hexpected = DISP_E_BADVARTYPE; - } else if(lFound && !rFound) - { - hexpected = DISP_E_BADVARTYPE; } else if(!lFound && !rFound) { hexpected = DISP_E_BADVARTYPE;

1 0