July 2015 - Wine-commits - list.winehq.org

Sebastian Lackner : configure: Do not assume gcc strength reduce bug when cross-compiling.
by Alexandre Julliard 16 Jul '15

16 Jul '15

Module: wine Branch: master Commit: 2498bc17d270310b6e615a7e3521bd8738f26ad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2498bc17d270310b6e615a7e3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 16 01:57:37 2015 +0200 configure: Do not assume gcc strength reduce bug when cross-compiling. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 64dedf5..0472c80 100755 --- a/configure +++ b/configure @@ -13832,7 +13832,7 @@ if ${ac_cv_c_gcc_strength_bug+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : - ac_cv_c_gcc_strength_bug="yes" + ac_cv_c_gcc_strength_bug="no" else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ diff --git a/configure.ac b/configure.ac index 3eaec29..9aab130 100644 --- a/configure.ac +++ b/configure.ac @@ -1797,7 +1797,7 @@ then for(i=0; i<4 - 1; i++) L[[i]] = L[[i + 1]]; L[[i]] = 4; return (Array[[1]] != -2 || L[[2]] != 3)]])], - [ac_cv_c_gcc_strength_bug="no"],[ac_cv_c_gcc_strength_bug="yes"],[ac_cv_c_gcc_strength_bug="yes"]) ) + [ac_cv_c_gcc_strength_bug="no"],[ac_cv_c_gcc_strength_bug="yes"],[ac_cv_c_gcc_strength_bug="no"]) ) if test "$ac_cv_c_gcc_strength_bug" = "yes" then EXTRACFLAGS="$EXTRACFLAGS -fno-strength-reduce"

1 0

Nikolay Sivov : dwrite: Properly pass measuring mode to renderer.
by Alexandre Julliard 16 Jul '15

16 Jul '15

Module: wine Branch: master Commit: e68c6389b13af107f81952d61bf850b48d43c592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e68c6389b13af107f81952d61… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 16 13:10:54 2015 +0300 dwrite: Properly pass measuring mode to renderer. --- dlls/dwrite/layout.c | 32 ++++++++++++--------- dlls/dwrite/tests/layout.c | 71 +++++++++++++++++++++++++++++++++++++--------- 2 files changed, 76 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e68c6389b13af107f8195…

1 0

Nikolay Sivov : dwrite/tests: Some tests for CreateGdiCompatibleTextLayout ().
by Alexandre Julliard 16 Jul '15

16 Jul '15

Module: wine Branch: master Commit: a92390f707202352c12c6bc7f301bfe5c6bbbb15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a92390f707202352c12c6bc7f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 16 13:11:25 2015 +0300 dwrite/tests: Some tests for CreateGdiCompatibleTextLayout(). --- dlls/dwrite/tests/layout.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index a2a5d39..1494d59 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -785,6 +785,16 @@ static void test_CreateTextLayout(void) IDWriteFactory_Release(factory); } +static DWRITE_MATRIX layoutcreate_transforms[] = { + { 1.0, 0.0, 0.0, 1.0, 0.0, 0.0 }, + { 1.0, 0.0, 0.0, 1.0, 0.3, 0.2 }, + { 1.0, 0.0, 0.0, 1.0,-0.3,-0.2 }, + + { 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 }, + { 1.0, 0.0, 0.0, 0.0, 0.0, 0.0 }, + { 1.0, 2.0, 0.5, 1.0, 0.0, 0.0 }, +}; + static void test_CreateGdiCompatibleTextLayout(void) { static const WCHAR strW[] = {'s','t','r','i','n','g',0}; @@ -793,6 +803,7 @@ static void test_CreateGdiCompatibleTextLayout(void) IDWriteFactory *factory; FLOAT dimension; HRESULT hr; + int i; factory = create_factory(); @@ -839,6 +850,24 @@ static void test_CreateGdiCompatibleTextLayout(void) ok(dimension == 100.0, "got %f\n", dimension); IDWriteTextLayout_Release(layout); + + /* negative, zero ppdip */ + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 1, format, 100.0, 100.0, -1.0, NULL, FALSE, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextLayout_Release(layout); + + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 1, format, 100.0, 100.0, 0.0, NULL, FALSE, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextLayout_Release(layout); + + /* transforms */ + for (i = 0; i < sizeof(layoutcreate_transforms)/sizeof(layoutcreate_transforms[0]); i++) { + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 1, format, 100.0, 100.0, 1.0, + &layoutcreate_transforms[i], FALSE, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextLayout_Release(layout); + } + IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Round advances returned from GetGdiCompatibleGlyphPlacements().
by Alexandre Julliard 16 Jul '15

16 Jul '15

Module: wine Branch: master Commit: 2132a060ead591ee2ce70296282e2076ec2de214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2132a060ead591ee2ce702962… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 16 13:11:54 2015 +0300 dwrite: Round advances returned from GetGdiCompatibleGlyphPlacements(). --- dlls/dwrite/analyzer.c | 16 ++++---- dlls/dwrite/tests/analyzer.c | 90 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 3417109..62893e6 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -21,6 +21,8 @@ #define COBJMACROS +#include <math.h> + #include "dwrite_private.h" #include "scripts.h" @@ -1066,7 +1068,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWriteTextAnalyzer2 *iface, WCHAR const* text, UINT16 const* clustermap, DWRITE_SHAPING_TEXT_PROPERTIES* props, UINT32 text_len, UINT16 const* glyphs, DWRITE_SHAPING_GLYPH_PROPERTIES const* glyph_props, - UINT32 glyph_count, IDWriteFontFace *fontface, FLOAT emSize, FLOAT pixels_per_dip, + UINT32 glyph_count, IDWriteFontFace *fontface, FLOAT emSize, FLOAT ppdip, DWRITE_MATRIX const* transform, BOOL use_gdi_natural, BOOL is_sideways, BOOL is_rtl, DWRITE_SCRIPT_ANALYSIS const* analysis, WCHAR const* locale, DWRITE_TYPOGRAPHIC_FEATURES const** features, UINT32 const* feature_range_lengths, UINT32 feature_ranges, FLOAT *advances, DWRITE_GLYPH_OFFSET *offsets) @@ -1077,7 +1079,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite UINT32 i; TRACE("(%s %p %p %u %p %p %u %p %.2f %.2f %p %d %d %d %p %s %p %p %u %p %p)\n", debugstr_wn(text, text_len), - clustermap, props, text_len, glyphs, glyph_props, glyph_count, fontface, emSize, pixels_per_dip, + clustermap, props, text_len, glyphs, glyph_props, glyph_count, fontface, emSize, ppdip, transform, use_gdi_natural, is_sideways, is_rtl, analysis, debugstr_w(locale), features, feature_range_lengths, feature_ranges, advances, offsets); @@ -1090,7 +1092,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite return hr; } - hr = IDWriteFontFace_GetGdiCompatibleMetrics(fontface, emSize, pixels_per_dip, transform, &metrics); + hr = IDWriteFontFace_GetGdiCompatibleMetrics(fontface, emSize, ppdip, transform, &metrics); if (FAILED(hr)) { IDWriteFontFace1_Release(fontface1); WARN("failed to get compat metrics, 0x%08x\n", hr); @@ -1099,12 +1101,12 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite for (i = 0; i < glyph_count; i++) { INT32 a; - hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, emSize, pixels_per_dip, + hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, emSize, ppdip, transform, use_gdi_natural, is_sideways, 1, &glyphs[i], &a); if (FAILED(hr)) - a = 0; - - advances[i] = get_scaled_advance_width(a, emSize, &metrics); + advances[i] = 0.0; + else + advances[i] = floorf(a * emSize * ppdip / metrics.designUnitsPerEm + 0.5f) / ppdip; offsets[i].advanceOffset = 0.0; offsets[i].ascenderOffset = 0.0; } diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index a3eaa38..402787f 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -22,6 +22,8 @@ #include <assert.h> #include <stdio.h> +#include <limits.h> +#include <math.h> #include "initguid.h" #include "windows.h" @@ -1878,6 +1880,93 @@ todo_wine { IDWriteTextAnalyzer1_Release(analyzer1); } +static inline BOOL float_eq(FLOAT left, FLOAT right) +{ + int x = *(int *)&left; + int y = *(int *)&right; + + if (x < 0) + x = INT_MIN - x; + if (y < 0) + y = INT_MIN - y; + + return abs(x - y) <= 8; +} + +static void test_GetGdiCompatibleGlyphPlacements(void) +{ + static const WCHAR strW[] = {'A',0}; + DWRITE_SHAPING_GLYPH_PROPERTIES glyphprops[1]; + DWRITE_SHAPING_TEXT_PROPERTIES textprops[1]; + DWRITE_SCRIPT_ANALYSIS sa = { 0 }; + IDWriteTextAnalyzer *analyzer; + IDWriteFontFace *fontface; + UINT16 clustermap[1]; + HRESULT hr; + UINT32 count; + UINT16 glyphs[1]; + FLOAT advance; + DWRITE_GLYPH_OFFSET offsets[1]; + DWRITE_FONT_METRICS fontmetrics; + FLOAT emsize; + + hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + fontface = create_fontface(); + + IDWriteFontFace_GetMetrics(fontface, &fontmetrics); + + count = 0; + hr = IDWriteTextAnalyzer_GetGlyphs(analyzer, strW, 1, fontface, + FALSE, FALSE, &sa, NULL, NULL, NULL, NULL, 0, 1, clustermap, + textprops, glyphs, glyphprops, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 1, "got %u\n", count); + + for (emsize = 12.0; emsize <= 20.0; emsize += 1.0) { + FLOAT compatadvance, expected, ppdip; + DWRITE_GLYPH_METRICS metrics; + + hr = IDWriteTextAnalyzer_GetGlyphPlacements(analyzer, strW, clustermap, + textprops, 1, glyphs, glyphprops, count, fontface, emsize, FALSE, FALSE, + &sa, NULL, NULL, NULL, 0, &advance, offsets); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(advance > 0.0, "got %f\n", advance); + + /* 1 ppdip, no transform */ + ppdip = 1.0; + hr = IDWriteFontFace_GetGdiCompatibleGlyphMetrics(fontface, emsize, ppdip, NULL, FALSE, + glyphs, 1, &metrics, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + expected = floorf(metrics.advanceWidth * emsize * ppdip / fontmetrics.designUnitsPerEm + 0.5f) / ppdip; + hr = IDWriteTextAnalyzer_GetGdiCompatibleGlyphPlacements(analyzer, strW, + clustermap, textprops, 1, glyphs, glyphprops, count, fontface, emsize, + ppdip, NULL, FALSE, FALSE, FALSE, &sa, NULL, NULL, NULL, 0, &compatadvance, offsets); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(compatadvance == expected, "%.0f: got advance %f, expected %f, natural %f\n", emsize, + compatadvance, expected, advance); + + /* 1.2 ppdip, no transform */ + ppdip = 1.2; + hr = IDWriteFontFace_GetGdiCompatibleGlyphMetrics(fontface, emsize, ppdip, NULL, FALSE, + glyphs, 1, &metrics, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + expected = floorf(metrics.advanceWidth * emsize * ppdip / fontmetrics.designUnitsPerEm + 0.5f) / ppdip; + hr = IDWriteTextAnalyzer_GetGdiCompatibleGlyphPlacements(analyzer, strW, + clustermap, textprops, 1, glyphs, glyphprops, count, fontface, emsize, + ppdip, NULL, FALSE, FALSE, FALSE, &sa, NULL, NULL, NULL, 0, &compatadvance, offsets); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(float_eq(compatadvance, expected), "%.0f: got advance %f, expected %f, natural %f\n", emsize, + compatadvance, expected, advance); + } + + IDWriteFontFace_Release(fontface); + IDWriteTextAnalyzer_Release(analyzer); +} + START_TEST(analyzer) { HRESULT hr; @@ -1904,6 +1993,7 @@ START_TEST(analyzer) test_ApplyCharacterSpacing(); test_GetGlyphOrientationTransform(); test_GetBaseline(); + test_GetGdiCompatibleGlyphPlacements(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Fix vector transformation in GetGlyphOrientationTransform().
by Alexandre Julliard 16 Jul '15

16 Jul '15

Module: wine Branch: master Commit: 42ed6ddd303c01d54709ab9d4b8b69f1e1184b03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42ed6ddd303c01d54709ab9d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 16 13:12:29 2015 +0300 dwrite: Fix vector transformation in GetGlyphOrientationTransform(). --- dlls/dwrite/analyzer.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 62893e6..eedb41d 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1507,22 +1507,8 @@ static HRESULT WINAPI dwritetextanalyzer2_GetGlyphOrientationTransform(IDWriteTe /* shift components represent transform necessary to get from original point to rotated one in new coordinate system */ if ((originX != 0.0 || originY != 0.0) && angle != DWRITE_GLYPH_ORIENTATION_ANGLE_0_DEGREES) { - const DWRITE_MATRIX *p; - - switch (angle) { - case DWRITE_GLYPH_ORIENTATION_ANGLE_90_DEGREES: - angle = DWRITE_GLYPH_ORIENTATION_ANGLE_270_DEGREES; - break; - case DWRITE_GLYPH_ORIENTATION_ANGLE_270_DEGREES: - angle = DWRITE_GLYPH_ORIENTATION_ANGLE_90_DEGREES; - break; - default: - ; - } - - p = &transforms[angle]; - m->dx = originX - (p->m11 * originX + p->m12 * originY); - m->dy = originY - (p->m21 * originX + p->m22 * originY); + m->dx = originX - (m->m11 * originX + m->m21 * originY); + m->dy = originY - (m->m12 * originX + m->m22 * originY); } return S_OK;

1 0

Daniel Lehman : msvcp90: Implement time_get<char> ctors and dtors ( Valgrind).
by Alexandre Julliard 16 Jul '15

16 Jul '15

Module: wine Branch: master Commit: a38d2ee10d41324305b5f0062dad233b7cc45178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a38d2ee10d41324305b5f0062… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Jun 22 17:45:28 2015 -0700 msvcp90: Implement time_get<char> ctors and dtors (Valgrind). --- dlls/msvcp90/locale.c | 84 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 65 insertions(+), 19 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f9a42e6..5bd10eb 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -9665,38 +9665,79 @@ extern const vtable_ptr MSVCP_time_get_char_vtable; DEFINE_THISCALL_WRAPPER(time_get_char__Init, 8) void __thiscall time_get_char__Init(time_get_char *this, const _Locinfo *locinfo) { - FIXME("(%p %p) stub\n", this, locinfo); -} + const char *months; + const char *days; + int len; -/* ??0?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@IAE(a)PBDI@Z */ -/* ??0?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@IEAA(a)PEBD_K@Z */ -DEFINE_THISCALL_WRAPPER(time_get_char_ctor_name, 12) -time_get_char* __thiscall time_get_char_ctor_name(time_get_char *this, const char *name, unsigned int refs) -{ - FIXME("(%p %p %d) stub\n", this, name, refs); - this->facet.vtable = &MSVCP_time_get_char_vtable; - return NULL; + TRACE("(%p %p)\n", this, locinfo); + + days = _Locinfo__Getdays(locinfo); + len = strlen(days)+1; + this->days = MSVCRT_operator_new(len); + if(!this->days) + { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + memcpy((char*)this->days, days, len); + + months = _Locinfo__Getmonths(locinfo); + len = strlen(months)+1; + this->months = MSVCRT_operator_new(len); + if(!this->months) + { + MSVCRT_operator_delete((char*)this->days); + + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + memcpy((char*)this->months, months, len); + + this->dateorder = _Locinfo__Getdateorder(locinfo); + _Locinfo__Getcvt(locinfo, &this->cvt); } /* ??0?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ /* ??0?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QEAA(a)AEBV_Locinfo@1(a)_K@Z */ DEFINE_THISCALL_WRAPPER(time_get_char_ctor_locinfo, 12) time_get_char* __thiscall time_get_char_ctor_locinfo(time_get_char *this, - const _Locinfo *locinfo, unsigned int refs) + const _Locinfo *locinfo, MSVCP_size_t refs) { - FIXME("(%p %p %d) stub\n", this, locinfo, refs); + TRACE("(%p %p %lu)\n", this, locinfo, refs); + locale_facet_ctor_refs(&this->facet, refs); this->facet.vtable = &MSVCP_time_get_char_vtable; - return NULL; + time_get_char__Init(this, locinfo); + return this; +} + +/* ??0?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@IAE(a)PBDI@Z */ +/* ??0?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@IEAA(a)PEBD_K@Z */ +DEFINE_THISCALL_WRAPPER(time_get_char_ctor_name, 12) +time_get_char* __thiscall time_get_char_ctor_name(time_get_char *this, const char *name, MSVCP_size_t refs) +{ + _Locinfo locinfo; + + TRACE("(%p %s %lu)\n", this, name, refs); + + _Locinfo_ctor_cstr(&locinfo, name); + time_get_char_ctor_locinfo(this, &locinfo, refs); + _Locinfo_dtor(&locinfo); + return this; } /* ??0?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QAE(a)I@Z */ /* ??0?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QEAA(a)_K@Z */ DEFINE_THISCALL_WRAPPER(time_get_char_ctor_refs, 8) -time_get_char* __thiscall time_get_char_ctor_refs(time_get_char *this, unsigned int refs) +time_get_char* __thiscall time_get_char_ctor_refs(time_get_char *this, MSVCP_size_t refs) { - FIXME("(%p %d) stub\n", this, refs); - this->facet.vtable = &MSVCP_time_get_char_vtable; - return NULL; + _Locinfo locinfo; + + TRACE("(%p %lu)\n", this, refs); + + _Locinfo_ctor(&locinfo); + time_get_char_ctor_locinfo(this, &locinfo, refs); + _Locinfo_dtor(&locinfo); + return this; } /* ??_F?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QAEXXZ */ @@ -9712,7 +9753,10 @@ time_get_char* __thiscall time_get_char_ctor(time_get_char *this) DEFINE_THISCALL_WRAPPER(time_get_char__Tidy, 4) void __thiscall time_get_char__Tidy(time_get_char *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + MSVCRT_operator_delete((char*)this->days); + MSVCRT_operator_delete((char*)this->months); } /* ??1?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MAE(a)XZ */ @@ -9720,7 +9764,9 @@ void __thiscall time_get_char__Tidy(time_get_char *this) DEFINE_THISCALL_WRAPPER(time_get_char_dtor, 4) /* virtual */ void __thiscall time_get_char_dtor(time_get_char *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + time_get_char__Tidy(this); } DEFINE_THISCALL_WRAPPER(time_get_char_vector_dtor, 8)

1 0

Huw Davies : advapi32: Don't call CloseServiceHandle() with an invalid handle.
by Alexandre Julliard 16 Jul '15

16 Jul '15

Module: wine Branch: master Commit: 3e55f1d2cc673d55ee342ff168a335b321501ee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e55f1d2cc673d55ee342ff16… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 16 11:56:05 2015 +0100 advapi32: Don't call CloseServiceHandle() with an invalid handle. --- dlls/advapi32/security.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index c2ce1e1..b632577 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -431,8 +431,10 @@ static inline DWORD get_security_service( LPWSTR full_service_name, DWORD access err = SERV_OpenSCManagerW( NULL, NULL, access, (SC_HANDLE *)&manager ); if (err == ERROR_SUCCESS) + { err = SERV_OpenServiceW( manager, full_service_name, access, (SC_HANDLE *)service ); - CloseServiceHandle( manager ); + CloseServiceHandle( manager ); + } return err; }

1 0

Huw Davies : msi: Don't call CloseServiceHandle() with an invalid handle.
by Alexandre Julliard 16 Jul '15

16 Jul '15

Module: wine Branch: master Commit: fed41f530666f508c645e2c33b52563e8756be21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fed41f530666f508c645e2c33… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 16 11:56:06 2015 +0100 msi: Don't call CloseServiceHandle() with an invalid handle. --- dlls/msi/action.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index c90114c..c0ab23d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5876,8 +5876,8 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) if (image_path != file->TargetPath) msi_free(image_path); done: - CloseServiceHandle(service); - CloseServiceHandle(hscm); + if (service) CloseServiceHandle(service); + if (hscm) CloseServiceHandle(hscm); msi_free(name); msi_free(disp); msi_free(sd.lpDescription); @@ -6051,8 +6051,8 @@ done: msi_ui_actiondata( package, szStartServices, uirow ); msiobj_release( &uirow->hdr ); - CloseServiceHandle(service); - CloseServiceHandle(scm); + if (service) CloseServiceHandle(service); + if (scm) CloseServiceHandle(scm); msi_free(name); msi_free(args); @@ -6161,8 +6161,8 @@ static UINT stop_service( LPCWSTR name ) WARN("Failed to stop service (%s): %d\n", debugstr_w(name), GetLastError()); done: - CloseServiceHandle(service); - CloseServiceHandle(scm); + if (service) CloseServiceHandle(service); + if (scm) CloseServiceHandle(scm); return ERROR_SUCCESS; } @@ -6299,8 +6299,8 @@ done: msi_ui_actiondata( package, szDeleteServices, uirow ); msiobj_release( &uirow->hdr ); - CloseServiceHandle( service ); - CloseServiceHandle( scm ); + if (service) CloseServiceHandle( service ); + if (scm) CloseServiceHandle( scm ); msi_free( name ); msi_free( display_name );

1 0

Huw Davies : net: Don't call CloseServiceHandle() with an invalid handle.
by Alexandre Julliard 16 Jul '15

16 Jul '15

Module: wine Branch: master Commit: 3e7f0e685b79ad507dbd821f84c1ce392c32095c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e7f0e685b79ad507dbd821f8… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 16 11:56:07 2015 +0100 net: Don't call CloseServiceHandle() with an invalid handle. --- programs/net/net.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/net/net.c b/programs/net/net.c index 7149ea8..2e540ea 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -220,8 +220,11 @@ static BOOL StopService(SC_HANDLE SCManager, SC_HANDLE serviceHandle) { output_string(STRING_STOP_DEP, dependencies[counter].lpDisplayName); dependent_serviceHandle = OpenServiceW(SCManager, dependencies[counter].lpServiceName, SC_MANAGER_ALL_ACCESS); - if(dependent_serviceHandle) result = StopService(SCManager, dependent_serviceHandle); - CloseServiceHandle(dependent_serviceHandle); + if(dependent_serviceHandle) + { + result = StopService(SCManager, dependent_serviceHandle); + CloseServiceHandle(dependent_serviceHandle); + } if(!result) output_string(STRING_CANT_STOP, dependencies[counter].lpDisplayName); } }

1 0

Huw Davies : wbemprox: Don't call CloseServiceHandle() with an invalid handle.
by Alexandre Julliard 16 Jul '15

16 Jul '15

Module: wine Branch: master Commit: 125f3151cb30ebce6473368552be3bbc786ff18a URL: http://source.winehq.org/git/wine.git/?a=commit;h=125f3151cb30ebce647336855… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 16 11:56:08 2015 +0100 wbemprox: Don't call CloseServiceHandle() with an invalid handle. --- dlls/wbemprox/service.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/service.c b/dlls/wbemprox/service.c index 95a21b5..b096c5c 100644 --- a/dlls/wbemprox/service.c +++ b/dlls/wbemprox/service.c @@ -69,11 +69,11 @@ static HRESULT control_service( const WCHAR *name, DWORD control, VARIANT *retva goto done; } if (!ControlService( service, control, &status )) error = map_error( GetLastError() ); + CloseServiceHandle( service ); done: set_variant( VT_UI4, error, NULL, retval ); - CloseServiceHandle( service ); - CloseServiceHandle( manager ); + if (manager) CloseServiceHandle( manager ); return S_OK; } @@ -183,11 +183,11 @@ static HRESULT start_service( const WCHAR *name, VARIANT *retval ) goto done; } if (!StartServiceW( service, 0, NULL )) error = map_error( GetLastError() ); + CloseServiceHandle( service ); done: set_variant( VT_UI4, error, NULL, retval ); - CloseServiceHandle( service ); - CloseServiceHandle( manager ); + if (manager) CloseServiceHandle( manager ); return S_OK; }

1 0