wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Jacek Caban : mshtml: Added IHTMLFrameBase:: marginWidth property implementation.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 81cdfc61fd6527d1640e871586f064d9dee6b38b URL: http://source.winehq.org/git/wine.git/?a=commit;h=81cdfc61fd6527d1640e87158… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 24 12:41:01 2012 +0200 mshtml: Added IHTMLFrameBase::marginWidth property implementation. --- dlls/mshtml/htmlframebase.c | 61 ++++++++++++++++++++++++++++++++++++++++--- dlls/mshtml/tests/dom.c | 34 ++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index 5431187..a11adca 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -273,15 +273,68 @@ static HRESULT WINAPI HTMLFrameBase_get_frameSpacing(IHTMLFrameBase *iface, VARI static HRESULT WINAPI HTMLFrameBase_put_marginWidth(IHTMLFrameBase *iface, VARIANT v) { HTMLFrameBase *This = impl_from_IHTMLFrameBase(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + if(V_VT(&v) != VT_BSTR) { + FIXME("unsupported %s\n", debugstr_variant(&v)); + return E_NOTIMPL; + } + + nsAString_InitDepend(&nsstr, V_BSTR(&v)); + if(This->nsframe) + nsres = nsIDOMHTMLFrameElement_SetMarginWidth(This->nsframe, &nsstr); + else + nsres = nsIDOMHTMLIFrameElement_SetMarginWidth(This->nsiframe, &nsstr); + nsAString_Finish(&nsstr); + return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; } static HRESULT WINAPI HTMLFrameBase_get_marginWidth(IHTMLFrameBase *iface, VARIANT *p) { HTMLFrameBase *This = impl_from_IHTMLFrameBase(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + HRESULT hres = S_OK; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + if(This->nsframe) + nsres = nsIDOMHTMLFrameElement_GetMarginWidth(This->nsframe, &nsstr); + else + nsres = nsIDOMHTMLIFrameElement_GetMarginWidth(This->nsiframe, &nsstr); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *str, *end; + + nsAString_GetData(&nsstr, &str); + + if(*str) { + BSTR ret; + + end = strstrW(str, pxW); + if(!end) + end = str+strlenW(str); + ret = SysAllocStringLen(str, end-str); + if(ret) { + V_VT(p) = VT_BSTR; + V_BSTR(p) = ret; + }else { + hres = E_OUTOFMEMORY; + } + }else { + V_VT(p) = VT_BSTR; + V_BSTR(p) = NULL; + } + }else { + ERR("GetMarginWidth failed: %08x\n", nsres); + hres = E_FAIL; + } + + nsAString_Finish(&nsstr); + return hres; } static HRESULT WINAPI HTMLFrameBase_put_marginHeight(IHTMLFrameBase *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f3dcc29..26567d2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4476,6 +4476,36 @@ static void _set_framebase_marginheight(unsigned line, IHTMLFrameBase *framebase ok_(__FILE__,line)(hres == S_OK, "put_marginHeight failed: %08x\n", hres); VariantClear(&v); } + +#define test_framebase_marginwidth(a,b) _test_framebase_marginwidth(__LINE__,a,b) +static void _test_framebase_marginwidth(unsigned line, IHTMLFrameBase *framebase, const char *exval) +{ + VARIANT v; + HRESULT hres; + + hres = IHTMLFrameBase_get_marginWidth(framebase, &v); + ok_(__FILE__,line)(hres == S_OK, "get_marginWidth failed: %08x\n", hres); + ok_(__FILE__,line)(V_VT(&v) == VT_BSTR, "V_VT(marginWidth) = %d\n", V_VT(&v)); + if(exval) + ok_(__FILE__,line)(!strcmp_wa(V_BSTR(&v), exval), "marginWidth = %s, expected %s\n", wine_dbgstr_w(V_BSTR(&v)), exval); + else + ok_(__FILE__,line)(!V_BSTR(&v), "marginWidth = %s, expected NULL\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); +} + +#define set_framebase_marginwidth(a,b) _set_framebase_marginwidth(__LINE__,a,b) +static void _set_framebase_marginwidth(unsigned line, IHTMLFrameBase *framebase, const char *val) +{ + VARIANT v; + HRESULT hres; + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr(val); + hres = IHTMLFrameBase_put_marginWidth(framebase, v); + ok_(__FILE__,line)(hres == S_OK, "put_marginWidth failed: %08x\n", hres); + VariantClear(&v); +} + static void test_framebase(IUnknown *unk) { IHTMLFrameBase *fbase; @@ -4529,6 +4559,10 @@ static void test_framebase(IUnknown *unk) set_framebase_marginheight(fbase, "1px"); test_framebase_marginheight(fbase, "1"); + test_framebase_marginwidth(fbase, NULL); + set_framebase_marginwidth(fbase, "2px"); + test_framebase_marginwidth(fbase, "2"); + IHTMLFrameBase_Release(fbase); }

1 0

Jacek Caban : mshtml: Added IHTMLFrameBase:: marginHeight property implementation.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 00d3126c2392ee64d73293addf6f737e85e732a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00d3126c2392ee64d73293add… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 24 12:40:43 2012 +0200 mshtml: Added IHTMLFrameBase::marginHeight property implementation. --- dlls/mshtml/htmlframebase.c | 62 ++++++++++++++++++++++++++++++++++++++++--- dlls/mshtml/tests/dom.c | 32 ++++++++++++++++++++++ 2 files changed, 90 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index acb493a..5431187 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static const WCHAR autoW[] = {'a','u','t','o',0}; static const WCHAR yesW[] = {'y','e','s',0}; static const WCHAR noW[] = {'n','o',0}; +static const WCHAR pxW[] = {'p','x',0}; HRESULT set_frame_doc(HTMLFrameBase *frame, nsIDOMDocument *nsdoc) { @@ -286,15 +287,68 @@ static HRESULT WINAPI HTMLFrameBase_get_marginWidth(IHTMLFrameBase *iface, VARIA static HRESULT WINAPI HTMLFrameBase_put_marginHeight(IHTMLFrameBase *iface, VARIANT v) { HTMLFrameBase *This = impl_from_IHTMLFrameBase(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + if(V_VT(&v) != VT_BSTR) { + FIXME("unsupported %s\n", debugstr_variant(&v)); + return E_NOTIMPL; + } + + nsAString_InitDepend(&nsstr, V_BSTR(&v)); + if(This->nsframe) + nsres = nsIDOMHTMLFrameElement_SetMarginHeight(This->nsframe, &nsstr); + else + nsres = nsIDOMHTMLIFrameElement_SetMarginHeight(This->nsiframe, &nsstr); + nsAString_Finish(&nsstr); + return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; } static HRESULT WINAPI HTMLFrameBase_get_marginHeight(IHTMLFrameBase *iface, VARIANT *p) { HTMLFrameBase *This = impl_from_IHTMLFrameBase(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + HRESULT hres = S_OK; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + if(This->nsframe) + nsres = nsIDOMHTMLFrameElement_GetMarginHeight(This->nsframe, &nsstr); + else + nsres = nsIDOMHTMLIFrameElement_GetMarginHeight(This->nsiframe, &nsstr); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *str, *end; + + nsAString_GetData(&nsstr, &str); + + if(*str) { + BSTR ret; + + end = strstrW(str, pxW); + if(!end) + end = str+strlenW(str); + ret = SysAllocStringLen(str, end-str); + if(ret) { + V_VT(p) = VT_BSTR; + V_BSTR(p) = ret; + }else { + hres = E_OUTOFMEMORY; + } + }else { + V_VT(p) = VT_BSTR; + V_BSTR(p) = NULL; + } + }else { + ERR("SetMarginHeight failed: %08x\n", nsres); + hres = E_FAIL; + } + + nsAString_Finish(&nsstr); + return hres; } static HRESULT WINAPI HTMLFrameBase_put_noResize(IHTMLFrameBase *iface, VARIANT_BOOL v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 20e9e4c..f3dcc29 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4448,6 +4448,34 @@ static void _test_framebase_put_name(unsigned line, IHTMLElement *elem, const ch IHTMLFrameBase_Release(fbase); } +#define test_framebase_marginheight(a,b) _test_framebase_marginheight(__LINE__,a,b) +static void _test_framebase_marginheight(unsigned line, IHTMLFrameBase *framebase, const char *exval) +{ + VARIANT v; + HRESULT hres; + + hres = IHTMLFrameBase_get_marginHeight(framebase, &v); + ok_(__FILE__,line)(hres == S_OK, "get_marginHeight failed: %08x\n", hres); + ok_(__FILE__,line)(V_VT(&v) == VT_BSTR, "V_VT(marginHeight) = %d\n", V_VT(&v)); + if(exval) + ok_(__FILE__,line)(!strcmp_wa(V_BSTR(&v), exval), "marginHeight = %s, expected %s\n", wine_dbgstr_w(V_BSTR(&v)), exval); + else + ok_(__FILE__,line)(!V_BSTR(&v), "marginHeight = %s, expected NULL\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); +} + +#define set_framebase_marginheight(a,b) _set_framebase_marginheight(__LINE__,a,b) +static void _set_framebase_marginheight(unsigned line, IHTMLFrameBase *framebase, const char *val) +{ + VARIANT v; + HRESULT hres; + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr(val); + hres = IHTMLFrameBase_put_marginHeight(framebase, v); + ok_(__FILE__,line)(hres == S_OK, "put_marginHeight failed: %08x\n", hres); + VariantClear(&v); +} static void test_framebase(IUnknown *unk) { IHTMLFrameBase *fbase; @@ -4497,6 +4525,10 @@ static void test_framebase(IUnknown *unk) ok(hres == S_OK, "get_frameBorder failed: %08x\n", hres); ok(!strcmp_wa(str, "1"), "frameBorder = %s, expected \"1\"\n", wine_dbgstr_w(str)); + test_framebase_marginheight(fbase, NULL); + set_framebase_marginheight(fbase, "1px"); + test_framebase_marginheight(fbase, "1"); + IHTMLFrameBase_Release(fbase); }

1 0

Akihiro Sagawa : ntdll: Calculate SystemProcessInformation' s ReturnLength and return it.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: bb4a31a8ed8396436e69d774fe804fde4f46c3eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb4a31a8ed8396436e69d774f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Oct 23 23:52:35 2012 +0900 ntdll: Calculate SystemProcessInformation's ReturnLength and return it. --- dlls/ntdll/nt.c | 7 ++++--- dlls/ntdll/tests/info.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 92db541..ab08190 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1739,9 +1739,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( /* spi->ti will be set later on */ - len += procstructlen; } - else ret = STATUS_INFO_LENGTH_MISMATCH; + len += procstructlen; } } SERVER_END_REQ; @@ -1751,7 +1750,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( if (ret == STATUS_NO_MORE_FILES) ret = STATUS_SUCCESS; break; } - else /* Length is already checked for */ + + if (Length >= len) { int i, j; @@ -1799,6 +1799,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( } } if (ret == STATUS_SUCCESS && last) last->NextEntryOffset = 0; + if (len > Length) ret = STATUS_INFO_LENGTH_MISMATCH; if (hSnap) NtClose(hSnap); } break; diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 5dba2da..c670731 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -289,7 +289,7 @@ static void test_query_process(void) ReturnLength = 0; status = pNtQuerySystemInformation(SystemProcessInformation, NULL, 0, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_LENGTH_MISMATCH got %08x\n", status); - todo_wine ok( ReturnLength > 0 || broken(ReturnLength == 0) /* NT4, Win2K */, + ok( ReturnLength > 0 || broken(ReturnLength == 0) /* NT4, Win2K */, "Expected a ReturnLength to show the needed length\n"); /* W2K3 and later returns the needed length, the rest returns 0, so we have to loop */

1 0

Akihiro Sagawa : ntdll: Add ReturnLength test for NtQuerySystemInformation with SystemProcessInformation .
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 3fc4e884739388d576909f54bc767f866f209953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fc4e884739388d576909f54b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Oct 23 23:52:33 2012 +0900 ntdll: Add ReturnLength test for NtQuerySystemInformation with SystemProcessInformation. --- dlls/ntdll/tests/info.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 333dc4a..5dba2da 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -285,8 +285,14 @@ static void test_query_process(void) ULONG SystemInformationLength = sizeof(SYSTEM_PROCESS_INFORMATION_PRIVATE); SYSTEM_PROCESS_INFORMATION_PRIVATE *spi, *spi_buf = HeapAlloc(GetProcessHeap(), 0, SystemInformationLength); - /* Only W2K3 returns the needed length, the rest returns 0, so we have to loop */ - + /* test ReturnLength */ + ReturnLength = 0; + status = pNtQuerySystemInformation(SystemProcessInformation, NULL, 0, &ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_LENGTH_MISMATCH got %08x\n", status); + todo_wine ok( ReturnLength > 0 || broken(ReturnLength == 0) /* NT4, Win2K */, + "Expected a ReturnLength to show the needed length\n"); + + /* W2K3 and later returns the needed length, the rest returns 0, so we have to loop */ for (;;) { status = pNtQuerySystemInformation(SystemProcessInformation, spi_buf, SystemInformationLength, &ReturnLength);

1 0

Michael Stefaniuc : user32: Use FIELD_OFFSET to calculate the size of a struct with variable length array .
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 8ab1fc5ff795a0f0a71e7779ca8f563c62198d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ab1fc5ff795a0f0a71e7779c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 24 10:26:02 2012 +0200 user32: Use FIELD_OFFSET to calculate the size of a struct with variable length array. --- dlls/user32/cursoricon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 62afa3d..8f6f9ce 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1330,7 +1330,7 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, } dir = (const CURSORICONFILEDIR*) bits; - if ( filesize < (sizeof(*dir) + sizeof(dir->idEntries[0])*(dir->idCount-1)) ) + if ( filesize < FIELD_OFFSET( CURSORICONFILEDIR, idEntries[dir->idCount] )) goto end; if ( fCursor )

1 0

Michael Stefaniuc : user32: Remove redundant sizeof check.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 7d4605db416c9a0748b2258982455f09c4db9c21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d4605db416c9a0748b225898… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 24 10:24:00 2012 +0200 user32: Remove redundant sizeof check. --- dlls/user32/cursoricon.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 6002bbb..62afa3d 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1330,9 +1330,6 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, } dir = (const CURSORICONFILEDIR*) bits; - if ( filesize < sizeof(*dir) ) - goto end; - if ( filesize < (sizeof(*dir) + sizeof(dir->idEntries[0])*(dir->idCount-1)) ) goto end;

1 0

Alexandre Julliard : fusion/tests: Remove a broken macro.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 7e50d67d7ea496371fab06d1b882b3c27c3bc23f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e50d67d7ea496371fab06d1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 24 11:38:34 2012 +0200 fusion/tests: Remove a broken macro. --- dlls/fusion/tests/fusion.c | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/fusion/tests/fusion.c b/dlls/fusion/tests/fusion.c index 6ebd455..3fc67ef 100644 --- a/dlls/fusion/tests/fusion.c +++ b/dlls/fusion/tests/fusion.c @@ -30,14 +30,6 @@ static HRESULT (WINAPI *pLoadLibraryShim)(LPCWSTR szDllName, LPCWSTR szVersion, static HRESULT (WINAPI *pGetCORVersion)(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength); -static CHAR string1[MAX_PATH], string2[MAX_PATH]; - -#define ok_w2(format, szString1, szString2) \ -\ - WideCharToMultiByte(CP_ACP, 0, szString1, -1, string1, MAX_PATH, NULL, NULL); \ - WideCharToMultiByte(CP_ACP, 0, szString2, -1, string2, MAX_PATH, NULL, NULL); \ - ok(!lstrcmpA(string1, string2), format, string1, string2) - static BOOL init_functionpointers(void) { HRESULT hr; @@ -127,14 +119,14 @@ static void test_GetCachePath(void) lstrcpyW(path, nochange); hr = pGetCachePath(ASM_CACHE_GAC, path, NULL); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); - ok_w2("Expected \"%s\", got \"%s\"\n", nochange, path); + ok( !lstrcmpW( nochange, path ), "Expected %s, got %s\n", wine_dbgstr_w(nochange), wine_dbgstr_w(path)); /* get the cache path */ lstrcpyW(path, nochange); size = MAX_PATH; hr = pGetCachePath(ASM_CACHE_GAC, path, &size); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok_w2("Expected \"%s\", got \"%s\"\n", cachepath, path); + ok( !lstrcmpW( cachepath, path ), "Expected %s, got %s\n", wine_dbgstr_w(cachepath), wine_dbgstr_w(path)); /* pcchPath has no room for NULL terminator */ lstrcpyW(path, nochange); @@ -142,7 +134,7 @@ static void test_GetCachePath(void) hr = pGetCachePath(ASM_CACHE_GAC, path, &size); ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); - ok_w2("Expected \"%s\", got \"%s\"\n", nochange, path); + ok( !lstrcmpW( nochange, path ), "Expected %s, got %s\n", wine_dbgstr_w(nochange), wine_dbgstr_w(path)); lstrcpyW(cachepath, windir); lstrcatW(cachepath, backslash); @@ -156,7 +148,7 @@ static void test_GetCachePath(void) broken(hr == E_INVALIDARG), /* .NET 1.1 */ "Expected S_OK, got %08x\n", hr); if (hr == S_OK) - ok_w2("Expected \"%s\", got \"%s\"\n", cachepath, path); + ok( !lstrcmpW( cachepath, path ), "Expected %s, got %s\n", wine_dbgstr_w(cachepath), wine_dbgstr_w(path)); if (pGetCORVersion) { @@ -191,7 +183,7 @@ static void test_GetCachePath(void) size = MAX_PATH; hr = pGetCachePath(ASM_CACHE_ZAP, path, &size); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok_w2("Expected \"%s\", got \"%s\"\n", cachepath, path); + ok( !lstrcmpW( cachepath, path ), "Expected %s, got %s\n", wine_dbgstr_w(cachepath), wine_dbgstr_w(path)); } /* two flags at once */ @@ -199,7 +191,7 @@ static void test_GetCachePath(void) size = MAX_PATH; hr = pGetCachePath(ASM_CACHE_GAC | ASM_CACHE_ROOT, path, &size); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); - ok_w2("Expected \"%s\", got \"%s\"\n", nochange, path); + ok( !lstrcmpW( nochange, path ), "Expected %s, got %s\n", wine_dbgstr_w(nochange), wine_dbgstr_w(path)); } START_TEST(fusion)

1 0

André Hentschel : d3dx9_36/tests: Fix sizeof to be more portable (coverity).
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 472010911dc111b48a68512c6d02d4cee0720ce8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=472010911dc111b48a68512c6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 03:31:55 2012 +0200 d3dx9_36/tests: Fix sizeof to be more portable (coverity). --- dlls/d3dx9_36/tests/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 563c759..97d7e2d 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -10167,7 +10167,7 @@ static void test_optimize_faces(void) DWORD j; DWORD *face_remap; face_remap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - tc[i].num_faces*sizeof(face_remap)); + tc[i].num_faces*sizeof(*face_remap)); hr = D3DXOptimizeFaces(tc[i].indices, tc[i].num_faces, tc[i].num_vertices, tc[i].indices_are_32bit,

1 0

André Hentschel : usp10: Add missing break in switch ( coverity).
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: c41bdf98bb7e0f19ec3d1923c33897a23ea47fa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c41bdf98bb7e0f19ec3d1923c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 02:05:47 2012 +0200 usp10: Add missing break in switch (coverity). --- dlls/usp10/opentype.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index fe4bde4..138890f 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1498,6 +1498,7 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, I if (advance.y) FIXME("Unhandled adjustment to Y advancement\n"); } + break; } case 2: {

1 0

André Hentschel : msi/tests: Make multiline macros blocks (coverity).
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 1e361aa8cb9b6f0030fd1b24e2a0b07c7de24b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e361aa8cb9b6f0030fd1b24e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 02:05:15 2012 +0200 msi/tests: Make multiline macros blocks (coverity). --- dlls/msi/tests/action.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 1fcb82d..0a825cd 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2610,36 +2610,46 @@ static void check_reg_dword5(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD e check_reg_str(prodkey, name, expected, TRUE, __LINE__); #define CHECK_DEL_REG_STR(prodkey, name, expected) \ - check_reg_str(prodkey, name, expected, TRUE, __LINE__); \ - RegDeleteValueA(prodkey, name); + do { \ + check_reg_str(prodkey, name, expected, TRUE, __LINE__); \ + RegDeleteValueA(prodkey, name); \ + } while(0) #define CHECK_REG_ISTR(prodkey, name, expected) \ check_reg_str(prodkey, name, expected, FALSE, __LINE__); #define CHECK_DEL_REG_ISTR(prodkey, name, expected) \ - check_reg_str(prodkey, name, expected, FALSE, __LINE__); \ - RegDeleteValueA(prodkey, name); + do { \ + check_reg_str(prodkey, name, expected, FALSE, __LINE__); \ + RegDeleteValueA(prodkey, name); \ + } while(0) #define CHECK_REG_DWORD(prodkey, name, expected) \ check_reg_dword(prodkey, name, expected, __LINE__); #define CHECK_DEL_REG_DWORD(prodkey, name, expected) \ - check_reg_dword(prodkey, name, expected, __LINE__); \ - RegDeleteValueA(prodkey, name); + do { \ + check_reg_dword(prodkey, name, expected, __LINE__); \ + RegDeleteValueA(prodkey, name); \ + } while(0) #define CHECK_REG_DWORD2(prodkey, name, expected1, expected2) \ check_reg_dword2(prodkey, name, expected1, expected2, __LINE__); #define CHECK_DEL_REG_DWORD2(prodkey, name, expected1, expected2) \ - check_reg_dword2(prodkey, name, expected1, expected2, __LINE__); \ - RegDeleteValueA(prodkey, name); + do { \ + check_reg_dword2(prodkey, name, expected1, expected2, __LINE__); \ + RegDeleteValueA(prodkey, name); \ + } while(0) #define CHECK_REG_DWORD4(prodkey, name, expected1, expected2, expected3, expected4) \ check_reg_dword4(prodkey, name, expected1, expected2, expected3, expected4, __LINE__); #define CHECK_DEL_REG_DWORD5(prodkey, name, expected1, expected2, expected3, expected4 ,expected5) \ - check_reg_dword5(prodkey, name, expected1, expected2, expected3, expected4, expected5, __LINE__); \ - RegDeleteValueA(prodkey, name); + do { \ + check_reg_dword5(prodkey, name, expected1, expected2, expected3, expected4, expected5, __LINE__); \ + RegDeleteValueA(prodkey, name); \ + } while(0) static void get_date_str(LPSTR date) {

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2012