November 2014 - Wine-commits

Bruno Jesus : comctl32/tests: Remove a dead assignment in misc.c (Cppcheck ).
by Alexandre Julliard 03 Nov '14

03 Nov '14

Module: wine Branch: master Commit: a2818db03b9c74ac1ca5f0f0cd2df13dcd7501c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2818db03b9c74ac1ca5f0f0c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 23:43:57 2014 -0200 comctl32/tests: Remove a dead assignment in misc.c (Cppcheck). --- dlls/comctl32/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 69a7db4..280b46c 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -75,7 +75,7 @@ static void test_GetPtrAW(void) static char dest[MAX_PATH]; int sourcelen; int destsize = MAX_PATH; - int count = -1; + int count; sourcelen = strlen(source) + 1;

1 0

Bruno Jesus : mciavi32: Initialize a variable (Cppcheck).
by Alexandre Julliard 03 Nov '14

03 Nov '14

Module: wine Branch: master Commit: 47554b8c6363fbd300496db25e947c74c1303910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47554b8c6363fbd300496db25… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 23:44:23 2014 -0200 mciavi32: Initialize a variable (Cppcheck). --- dlls/mciavi32/info.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mciavi32/info.c b/dlls/mciavi32/info.c index 668464c..f679778 100644 --- a/dlls/mciavi32/info.c +++ b/dlls/mciavi32/info.c @@ -74,7 +74,7 @@ DWORD MCIAVI_ConvertTimeFormatToFrame(WINE_MCIAVI* wma, DWORD val) DWORD MCIAVI_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS lpParms) { WINE_MCIAVI* wma = MCIAVI_mciGetOpenDev(wDevID); - DWORD ret; + DWORD ret = MCIERR_UNSUPPORTED_FUNCTION; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); @@ -175,7 +175,6 @@ DWORD MCIAVI_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS l /* w2k does not know MAX_WINDOWS or MAX/MINIMUM_RATE */ default: FIXME("Unknown capability (%08x) !\n", lpParms->dwItem); - ret = MCIERR_UNSUPPORTED_FUNCTION; break; } }

1 0

Bruno Jesus : crypt32: Remove dead assignments in cert.c (Cppcheck).
by Alexandre Julliard 03 Nov '14

03 Nov '14

Module: wine Branch: master Commit: 9df1f2fa8741df0d3c1d96a4a6c5b42abe0b6544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9df1f2fa8741df0d3c1d96a4a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 23:44:29 2014 -0200 crypt32: Remove dead assignments in cert.c (Cppcheck). --- dlls/crypt32/cert.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index c35f504..0cda2c4 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -984,7 +984,7 @@ static BOOL container_matches_cert(PCCERT_CONTEXT pCert, LPCSTR container, { CRYPT_KEY_PROV_INFO copy; WCHAR containerW[MAX_PATH]; - BOOL matches = FALSE; + BOOL matches; MultiByteToWideChar(CP_ACP, 0, container, -1, containerW, sizeof(containerW) / sizeof(containerW[0])); @@ -1142,7 +1142,7 @@ static BOOL cert_prov_info_matches_cert(PCCERT_CONTEXT pCert) BOOL WINAPI CryptFindCertificateKeyProvInfo(PCCERT_CONTEXT pCert, DWORD dwFlags, void *pvReserved) { - BOOL matches = FALSE; + BOOL matches; TRACE("(%p, %08x, %p)\n", pCert, dwFlags, pvReserved); @@ -2887,7 +2887,7 @@ static void CRYPT_SetBitInField(struct BitField *field, DWORD bit) static BOOL CRYPT_IsBitInFieldSet(const struct BitField *field, DWORD bit) { - BOOL set = FALSE; + BOOL set; DWORD indexIndex = bit / BITS_PER_DWORD; assert(field->cIndexes); @@ -3099,7 +3099,6 @@ static void CertContext_SetKeyProvInfo(PCCERT_CONTEXT context, CryptMemFree(szProvider); } } - size = sizeof(info.dwKeySpec); /* in case no CRYPT_KEY_PROV_INFO given, * we always use AT_SIGNATURE key spec */

1 0

Bruno Jesus : compobj.dll16: Remove dead assignments in compobj.c ( Cppcheck).
by Alexandre Julliard 03 Nov '14

03 Nov '14

Module: wine Branch: master Commit: 00a6a1ac2fdbbf76c1d0458864f9c1cc14cc90c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00a6a1ac2fdbbf76c1d045886… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 23:44:39 2014 -0200 compobj.dll16: Remove dead assignments in compobj.c (Cppcheck). --- dlls/compobj.dll16/compobj.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index ed36564..6261c13 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -668,18 +668,17 @@ HRESULT WINAPI CLSIDFromProgID16(LPCOLESTR16 progid, LPCLSID riid) { char *buf,buf2[80]; LONG buf2len; - HRESULT err; HKEY xhkey; buf = HeapAlloc(GetProcessHeap(),0,strlen(progid)+8); sprintf(buf,"%s\\CLSID",progid); - if ((err=RegOpenKeyA(HKEY_CLASSES_ROOT,buf,&xhkey))) { + if (RegOpenKeyA(HKEY_CLASSES_ROOT,buf,&xhkey)) { HeapFree(GetProcessHeap(),0,buf); return CO_E_CLASSSTRING; } HeapFree(GetProcessHeap(),0,buf); buf2len = sizeof(buf2); - if ((err=RegQueryValueA(xhkey,NULL,buf2,&buf2len))) { + if (RegQueryValueA(xhkey,NULL,buf2,&buf2len)) { RegCloseKey(xhkey); return CO_E_CLASSSTRING; }

1 0

Marcus Meissner : dwrite: Fixed memory leak on error (Coverity).
by Alexandre Julliard 03 Nov '14

03 Nov '14

Module: wine Branch: master Commit: a423cbdd5e18552df2da73a1c6bcf6511796bc23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a423cbdd5e18552df2da73a1c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Nov 2 11:10:22 2014 +0100 dwrite: Fixed memory leak on error (Coverity). --- dlls/dwrite/font.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8420fdc..ed0a760 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1476,8 +1476,10 @@ HRESULT create_font_collection(IDWriteFactory* factory, IDWriteFontFileEnumerato init_font_data(factory, file, i, face_type, font_data); hr = get_filestream_from_file(file, &stream); - if (FAILED(hr)) + if (FAILED(hr)) { + heap_free (font_data); return hr; + } /* get family name from font file */ name_table = NULL;

1 0

Michael Stefaniuc : crypt32/tests: Avoid an always true ok() condition ( PVS-Studio).
by Alexandre Julliard 03 Nov '14

03 Nov '14

Module: wine Branch: master Commit: 25b4a92813f8ec44d5c0c6112c135f0b903c8e47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b4a92813f8ec44d5c0c6112… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 22:28:15 2014 +0100 crypt32/tests: Avoid an always true ok() condition (PVS-Studio). --- dlls/crypt32/tests/ctl.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c index 55bbc6e..79a60f8 100644 --- a/dlls/crypt32/tests/ctl.c +++ b/dlls/crypt32/tests/ctl.c @@ -390,20 +390,8 @@ static void testAddCTLToStore(void) signedCTLWithCTLInnerContentAndBadSig, sizeof(signedCTLWithCTLInnerContentAndBadSig), CERT_STORE_ADD_NEW, NULL); - if (ret) - { - /* win9x */ - ok(GetLastError() == CRYPT_E_NOT_FOUND || - GetLastError() == OSS_DATA_ERROR /* some win98 */, - "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); - } - else - { - ok(!ret && (GetLastError() == CRYPT_E_EXISTS || - GetLastError() == OSS_DATA_ERROR), - "expected CRYPT_E_EXISTS or OSS_DATA_ERROR, got %d %08x\n", ret, - GetLastError()); - } + ok(!ret && (GetLastError() == CRYPT_E_EXISTS || GetLastError() == OSS_DATA_ERROR), + "expected CRYPT_E_EXISTS or OSS_DATA_ERROR, got %d %08x\n", ret, GetLastError()); CertCloseStore(store, 0); store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,

1 0

Michael Stefaniuc : d3d8/tests: Remove an always false condition ( PVS-Studio).
by Alexandre Julliard 03 Nov '14

03 Nov '14

Module: wine Branch: master Commit: 4a67e66a3dd5473dbddf37a535673b95451801d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a67e66a3dd5473dbddf37a53… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 22:29:55 2014 +0100 d3d8/tests: Remove an always false condition (PVS-Studio). --- dlls/d3d8/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index ba73bb6..163110c 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -66,7 +66,7 @@ static DWORD getPixelColor(IDirect3DDevice8 *device, UINT x, UINT y) return 0xdeadbeef; } hr = IDirect3DTexture8_GetSurfaceLevel(tex, 0, &surf); - if(FAILED(hr) || !tex ) /* This is not a test */ + if (FAILED(hr)) /* This is not a test */ { trace("Can't get surface from texture, hr=%#08x\n", hr); ret = 0xdeadbeee;

1 0

Michael Stefaniuc : gdi32: Remove a basically unused variable (PVS-Studio) .
by Alexandre Julliard 03 Nov '14

03 Nov '14

Module: wine Branch: master Commit: b5a405af2f8034811bc120698fb0cbd0b9fa3dc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5a405af2f8034811bc120698… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 22:31:29 2014 +0100 gdi32: Remove a basically unused variable (PVS-Studio). --- dlls/gdi32/freetype.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d49a3f8..924f5f3 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6937,7 +6937,6 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, INT x, src_pitch, src_width, src_height, rgb_interval, hmul, vmul; INT x_shift, y_shift; BOOL rgb; - FT_LcdFilter lcdfilter = FT_LCD_FILTER_DEFAULT; FT_Render_Mode render_mode = (format == WINE_GGO_HRGB_BITMAP || format == WINE_GGO_HBGR_BITMAP)? FT_RENDER_MODE_LCD: FT_RENDER_MODE_LCD_V; @@ -6948,20 +6947,17 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, return GDI_ERROR; } - if ( lcdfilter == FT_LCD_FILTER_DEFAULT || lcdfilter == FT_LCD_FILTER_LIGHT ) + if ( render_mode == FT_RENDER_MODE_LCD) { - if ( render_mode == FT_RENDER_MODE_LCD) - { - gm.gmBlackBoxX += 2; - gm.gmptGlyphOrigin.x -= 1; - left -= (1 << 6); - } - else - { - gm.gmBlackBoxY += 2; - gm.gmptGlyphOrigin.y += 1; - top += (1 << 6); - } + gm.gmBlackBoxX += 2; + gm.gmptGlyphOrigin.x -= 1; + left -= (1 << 6); + } + else + { + gm.gmBlackBoxY += 2; + gm.gmptGlyphOrigin.y += 1; + top += (1 << 6); } width = gm.gmBlackBoxX; @@ -6981,7 +6977,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, pFT_Outline_Transform (&ft_face->glyph->outline, &transMatTategaki); if ( pFT_Library_SetLcdFilter ) - pFT_Library_SetLcdFilter( library, lcdfilter ); + pFT_Library_SetLcdFilter( library, FT_LCD_FILTER_DEFAULT ); pFT_Render_Glyph (ft_face->glyph, render_mode); src = ft_face->glyph->bitmap.buffer;

1 0

Amine Khaldi : gdi32/tests: Add basic tests for the handling of dwCount parameter in ExtCreateRegion.
by Alexandre Julliard 03 Nov '14

03 Nov '14

Module: wine Branch: master Commit: b9f18b343150aac717f1aa9f6bf02bd98183003b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9f18b343150aac717f1aa9f6… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Sun Nov 2 23:40:42 2014 +0100 gdi32/tests: Add basic tests for the handling of dwCount parameter in ExtCreateRegion. --- dlls/gdi32/tests/clipping.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index e90f2f4..64f2a1d 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -184,11 +184,12 @@ static void test_ExtCreateRegion(void) { static const RECT empty_rect; static const RECT rc = { 111, 222, 333, 444 }; + static const RECT arc[2] = { {0, 0, 10, 10}, {10, 10, 20, 20}}; static const RECT rc_xformed = { 76, 151, 187, 262 }; union { RGNDATA data; - char buf[sizeof(RGNDATAHEADER) + sizeof(RECT)]; + char buf[sizeof(RGNDATAHEADER) + 2 * sizeof(RECT)]; } rgn; HRGN hrgn; XFORM xform; @@ -224,6 +225,20 @@ static void test_ExtCreateRegion(void) rgn.data.rdh.iType = RDH_RECTANGLES; rgn.data.rdh.dwSize = sizeof(rgn.data.rdh); + /* sizeof(RGNDATAHEADER) is large enough */ + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, sizeof(RGNDATAHEADER), &rgn.data); + ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); + verify_region(hrgn, &empty_rect); + DeleteObject(hrgn); + + /* Cannot be smaller than sizeof(RGNDATAHEADER) */ + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, sizeof(RGNDATAHEADER) - 1, &rgn.data); + todo_wine + ok(!hrgn, "ExtCreateRegion should fail\n"); + ok(GetLastError() == 0xdeadbeef, "0xdeadbeef, got %u\n", GetLastError()); + SetLastError(0xdeadbeef); hrgn = ExtCreateRegion(NULL, sizeof(rgn), &rgn.data); ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); @@ -234,6 +249,13 @@ static void test_ExtCreateRegion(void) SetRectEmpty(&rgn.data.rdh.rcBound); memcpy(rgn.data.Buffer, &rc, sizeof(rc)); + /* With a single rect this seems to work... */ + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, sizeof(RGNDATAHEADER) + sizeof(RECT) - 1, &rgn.data); + ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); + verify_region(hrgn, &rc); + DeleteObject(hrgn); + SetLastError(0xdeadbeef); hrgn = ExtCreateRegion(NULL, sizeof(rgn), &rgn.data); ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); @@ -267,6 +289,18 @@ static void test_ExtCreateRegion(void) ok(hrgn != 0, "ExtCreateRegion error %u/%x\n", GetLastError(), GetLastError()); verify_region(hrgn, &rc_xformed); DeleteObject(hrgn); + + rgn.data.rdh.nCount = 2; + SetRectEmpty(&rgn.data.rdh.rcBound); + memcpy(rgn.data.Buffer, arc, sizeof(arc)); + + /* Buffer cannot be smaller than sizeof(RGNDATAHEADER) + 2 * sizeof(RECT) */ + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, sizeof(RGNDATAHEADER) + 2 * sizeof(RECT) - 1, &rgn.data); + todo_wine + ok(!hrgn, "ExtCreateRegion should fail\n"); + ok(GetLastError() == 0xdeadbeef, "0xdeadbeef, got %u\n", GetLastError()); + } static void test_GetClipRgn(void)

1 0

Austin English : msi: Add stubs for MsiRemovePatches(A/W).
by Alexandre Julliard 03 Nov '14

03 Nov '14

Module: wine Branch: master Commit: d2bc004264a9e140005758165a770f4b32165fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2bc004264a9e140005758165… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Nov 2 20:28:02 2014 -0600 msi: Add stubs for MsiRemovePatches(A/W). --- dlls/msi/msi.c | 18 ++++++++++++++++++ dlls/msi/msi.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 433776d..6589ca9 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -4244,3 +4244,21 @@ UINT WINAPI Migrate10CachedPackagesW(void* a, void* b, void* c, DWORD d) FIXME("%p,%p,%p,%08x\n", a, b, c, d); return ERROR_SUCCESS; } + +/*********************************************************************** + * MsiRemovePatchesA [MSI.@] + */ +UINT WINAPI MsiRemovePatchesA(LPCSTR patchlist, LPCSTR product, INSTALLTYPE type, LPCSTR propertylist) +{ + FIXME("(%s %s %d %s\n", debugstr_a(patchlist), debugstr_a(product), type, debugstr_a(propertylist)); + return ERROR_SUCCESS; +} + +/*********************************************************************** + * MsiRemovePatchesW [MSI.@] + */ +UINT WINAPI MsiRemovePatchesW(LPCWSTR patchlist, LPCWSTR product, INSTALLTYPE type, LPCWSTR propertylist) +{ + FIXME("(%s %s %d %s\n", debugstr_w(patchlist), debugstr_w(product), type, debugstr_w(propertylist)); + return ERROR_SUCCESS; +} diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index a2b1007..2d065b1 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -230,8 +230,8 @@ 234 stub MsiDeleteUserDataW 235 stub Migrate10CachedPackagesA 236 stdcall Migrate10CachedPackagesW(ptr ptr ptr long) -237 stub MsiRemovePatchesA -238 stub MsiRemovePatchesW +237 stdcall MsiRemovePatchesA(str str long str) +238 stdcall MsiRemovePatchesW(wstr wstr long wstr) 239 stdcall MsiApplyMultiplePatchesA(str str str) 240 stdcall MsiApplyMultiplePatchesW(wstr wstr wstr) 241 stub MsiExtractPatchXMLDataA

1 0