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

Nikolay Sivov : dwrite: Partial implementation of GetGdiCompatibleGlyphMetrics().
by Alexandre Julliard July 16, 2015

July 16, 2015

Module: wine Branch: master Commit: a3f2b6b8566de7c2c32db621c00d485fff39daa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3f2b6b8566de7c2c32db621c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 15 19:59:46 2015 +0300 dwrite: Partial implementation of GetGdiCompatibleGlyphMetrics(). --- dlls/dwrite/font.c | 53 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9b7a50f..74023c3 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -600,14 +600,48 @@ static HRESULT WINAPI dwritefontface_GetGdiCompatibleMetrics(IDWriteFontFace2 *i return hr; } -static HRESULT WINAPI dwritefontface_GetGdiCompatibleGlyphMetrics(IDWriteFontFace2 *iface, FLOAT emSize, FLOAT pixels_per_dip, - DWRITE_MATRIX const *transform, BOOL use_gdi_natural, UINT16 const *glyph_indices, UINT32 glyph_count, +static inline int round_metric(FLOAT metric) +{ + return (int)floorf(metric + 0.5f); +} + +static HRESULT WINAPI dwritefontface_GetGdiCompatibleGlyphMetrics(IDWriteFontFace2 *iface, FLOAT emSize, FLOAT ppdip, + DWRITE_MATRIX const *m, BOOL use_gdi_natural, UINT16 const *glyphs, UINT32 glyph_count, DWRITE_GLYPH_METRICS *metrics, BOOL is_sideways) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p)->(%f %f %p %d %p %u %p %d): stub\n", This, emSize, pixels_per_dip, transform, use_gdi_natural, glyph_indices, + FLOAT scale; + HRESULT hr; + UINT32 i; + + TRACE("(%p)->(%.2f %.2f %p %d %p %u %p %d)\n", This, emSize, ppdip, m, use_gdi_natural, glyphs, glyph_count, metrics, is_sideways); - return E_NOTIMPL; + + if (m && memcmp(m, &identity, sizeof(*m))) + FIXME("transform is not supported, %s\n", debugstr_matrix(m)); + + scale = emSize * ppdip / This->metrics.designUnitsPerEm; + + for (i = 0; i < glyph_count; i++) { + DWRITE_GLYPH_METRICS *ret = metrics + i; + DWRITE_GLYPH_METRICS design; + + hr = IDWriteFontFace2_GetDesignGlyphMetrics(iface, glyphs + i, 1, &design, is_sideways); + if (FAILED(hr)) + return hr; + +#define SCALE_METRIC(x) ret->x = round_metric(round_metric((design.x) * scale) / scale) + SCALE_METRIC(leftSideBearing); + SCALE_METRIC(advanceWidth); + SCALE_METRIC(rightSideBearing); + SCALE_METRIC(topSideBearing); + SCALE_METRIC(advanceHeight); + SCALE_METRIC(bottomSideBearing); + SCALE_METRIC(verticalOriginY); +#undef SCALE_METRIC + } + + return S_OK; } static void WINAPI dwritefontface1_GetMetrics(IDWriteFontFace2 *iface, DWRITE_FONT_METRICS1 *metrics) @@ -617,11 +651,6 @@ static void WINAPI dwritefontface1_GetMetrics(IDWriteFontFace2 *iface, DWRITE_FO *metrics = This->metrics; } -static inline int round_metric(FLOAT metric) -{ - return (int)floorf(metric + 0.5f); -} - static HRESULT WINAPI dwritefontface1_GetGdiCompatibleMetrics(IDWriteFontFace2 *iface, FLOAT em_size, FLOAT pixels_per_dip, const DWRITE_MATRIX *m, DWRITE_FONT_METRICS1 *metrics) { @@ -733,6 +762,7 @@ static HRESULT WINAPI dwritefontface1_GetGdiCompatibleGlyphAdvances(IDWriteFontF BOOL is_sideways, UINT32 glyph_count, UINT16 const *glyphs, INT32 *advances) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); + FLOAT scale; HRESULT hr; UINT32 i; @@ -742,14 +772,13 @@ static HRESULT WINAPI dwritefontface1_GetGdiCompatibleGlyphAdvances(IDWriteFontF if (m && memcmp(m, &identity, sizeof(*m))) FIXME("transform is not supported, %s\n", debugstr_matrix(m)); - for (i = 0; i < glyph_count; i++) { - FLOAT scale; + scale = em_size * ppdip / This->metrics.designUnitsPerEm; + for (i = 0; i < glyph_count; i++) { hr = IDWriteFontFace2_GetDesignGlyphAdvances(iface, 1, glyphs + i, advances + i, is_sideways); if (FAILED(hr)) return hr; - scale = em_size * ppdip / This->metrics.designUnitsPerEm; #define SCALE_METRIC(x) x = round_metric(round_metric((x) * scale) / scale) SCALE_METRIC(advances[i]); #undef SCALE_METRIC

1 0

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

July 16, 2015

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 : msi: Don't call CloseServiceHandle() with an invalid handle.
by Alexandre Julliard July 16, 2015

July 16, 2015

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 : advapi32: Don't call CloseServiceHandle() with an invalid handle.
by Alexandre Julliard July 16, 2015

July 16, 2015

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

Nikolay Sivov : dwrite: Round advances returned from GetGdiCompatibleGlyphPlacements().
by Alexandre Julliard July 16, 2015

July 16, 2015

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: Properly pass measuring mode to renderer.
by Alexandre Julliard July 16, 2015

July 16, 2015

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

Sebastian Lackner : configure: Do not assume gcc strength reduce bug when cross-compiling.
by Alexandre Julliard July 16, 2015

July 16, 2015

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

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard July 16, 2015

July 16, 2015

Module: wine Branch: master Commit: 0bc85e0aff1fb9fd24ce6df497c79dc6f22b7653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bc85e0aff1fb9fd24ce6df49… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jul 16 00:36:18 2015 +0900 po: Update Japanese translation. --- po/ja.po | 390 +++++++++++++++------------------------------------------------ 1 file changed, 89 insertions(+), 301 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0bc85e0aff1fb9fd24ce6…

1 0

Piotr Caban : shell32: Handle executable with space in path in SHELL_execute.
by Alexandre Julliard July 16, 2015

July 16, 2015

Module: wine Branch: master Commit: 663f9f4b217a50cb5c6c1a6f94f348e047bc2747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=663f9f4b217a50cb5c6c1a6f9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 17:34:05 2015 +0200 shell32: Handle executable with space in path in SHELL_execute. --- dlls/shell32/shlexec.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 9865005..2505981 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1554,7 +1554,6 @@ static void do_error_dialog( UINT_PTR retval, HWND hwnd ) */ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) { - static const WCHAR wSpace[] = {' ',0}; static const WCHAR wWww[] = {'w','w','w',0}; static const WCHAR wHttp[] = {'h','t','t','p',':','/','/',0}; static const DWORD unsupportedFlags = @@ -1763,7 +1762,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) TRACE("execute:%s,%s,%s\n", debugstr_w(wszApplicationName), debugstr_w(wszParameters), debugstr_w(wszDir)); lpFile = sei_tmp.lpFile; wcmd = wcmdBuffer; - len = lstrlenW(wszApplicationName) + 1; + len = lstrlenW(wszApplicationName) + 3; if (sei_tmp.lpParameters[0]) len += 1 + lstrlenW(wszParameters); if (len > wcmdLen) @@ -1771,10 +1770,14 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) wcmd = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); wcmdLen = len; } - strcpyW(wcmd, wszApplicationName); + wcmd[0] = '\"'; + len = lstrlenW(wszApplicationName); + memcpy(wcmd+1, wszApplicationName, len * sizeof(WCHAR)); + len++; + wcmd[len++] = '\"'; if (sei_tmp.lpParameters[0]) { - strcatW(wcmd, wSpace); - strcatW(wcmd, wszParameters); + wcmd[len++] = ' '; + strcpyW(wcmd+len, wszParameters); } retval = execfunc(wcmd, NULL, FALSE, &sei_tmp, sei);

1 0

Piotr Caban : shell32: Remove code for separating arguments from file path.
by Alexandre Julliard July 16, 2015

July 16, 2015

Module: wine Branch: master Commit: 8e853a3e908fcdcae276defc26a08800d9fec7ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e853a3e908fcdcae276defc2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 17:33:57 2015 +0200 shell32: Remove code for separating arguments from file path. --- dlls/shell32/shlexec.c | 84 ++++---------------------------------------- dlls/shell32/tests/shlexec.c | 20 ++++------- 2 files changed, 12 insertions(+), 92 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 2d9690a..9865005 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1423,11 +1423,10 @@ static UINT_PTR SHELL_execute_class( LPCWSTR wszApplicationName, LPSHELLEXECUTEI return rslt; } -static BOOL SHELL_translate_idlist( LPSHELLEXECUTEINFOW sei, LPWSTR wszParameters, DWORD parametersLen, LPWSTR wszApplicationName, DWORD dwApplicationNameLen ) +static void SHELL_translate_idlist( LPSHELLEXECUTEINFOW sei, LPWSTR wszParameters, DWORD parametersLen, LPWSTR wszApplicationName, DWORD dwApplicationNameLen ) { static const WCHAR wExplorer[] = {'e','x','p','l','o','r','e','r','.','e','x','e',0}; WCHAR buffer[MAX_PATH]; - BOOL appKnownSingular = FALSE; /* last chance to translate IDList: now also allow CLSID paths */ if (SUCCEEDED(SHELL_GetPathFromIDListForExecuteW(sei->lpIDList, buffer, sizeof(buffer)/sizeof(WCHAR)))) { @@ -1441,7 +1440,6 @@ static BOOL SHELL_translate_idlist( LPSHELLEXECUTEINFOW sei, LPWSTR wszParameter ERR("application len exceeds buffer size (%i > %i), truncating\n", lstrlenW(wExplorer) + 1, dwApplicationNameLen); lstrcpynW(wszApplicationName, wExplorer, dwApplicationNameLen); - appKnownSingular = TRUE; sei->fMask &= ~SEE_MASK_INVOKEIDLIST; } else { @@ -1461,12 +1459,10 @@ static BOOL SHELL_translate_idlist( LPSHELLEXECUTEINFOW sei, LPWSTR wszParameter buffer, target, sei->lpIDList, NULL, &resultLen); if (resultLen > dwApplicationNameLen) ERR("Argify buffer not large enough... truncating\n"); - appKnownSingular = FALSE; } sei->fMask &= ~SEE_MASK_INVOKEIDLIST; } } - return appKnownSingular; } static UINT_PTR SHELL_quote_and_execute( LPCWSTR wcmd, LPCWSTR wszParameters, LPCWSTR wszKeyname, LPCWSTR wszApplicationName, LPWSTR env, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out, SHELL_ExecuteW32 execfunc ) @@ -1574,12 +1570,10 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) DWORD wcmdLen = sizeof(wcmdBuffer) / sizeof(WCHAR); DWORD len; SHELLEXECUTEINFOW sei_tmp; /* modifiable copy of SHELLEXECUTEINFO struct */ - WCHAR wfileName[MAX_PATH]; WCHAR *env; WCHAR wszKeyname[256]; LPCWSTR lpFile; UINT_PTR retval = SE_ERR_NOASSOC; - BOOL appKnownSingular = FALSE; /* make a local copy of the LPSHELLEXECUTEINFO structure and work with this from now on */ sei_tmp = *sei; @@ -1607,7 +1601,6 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) memcpy(wszApplicationName, sei_tmp.lpFile+1, (l+1)*sizeof(WCHAR)); if (wszApplicationName[l-1] == '\"') wszApplicationName[l-1] = '\0'; - appKnownSingular = TRUE; TRACE("wszApplicationName=%s\n",debugstr_w(wszApplicationName)); } else { DWORD l = strlenW(sei_tmp.lpFile)+1; @@ -1678,7 +1671,6 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) } SHGetPathFromIDListW(sei_tmp.lpIDList, wszApplicationName); - appKnownSingular = TRUE; TRACE("-- idlist=%p (%s)\n", sei_tmp.lpIDList, debugstr_w(wszApplicationName)); } @@ -1710,10 +1702,10 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) /* Has the IDList not yet been translated? */ if (sei_tmp.fMask & SEE_MASK_IDLIST) { - appKnownSingular = SHELL_translate_idlist( &sei_tmp, wszParameters, - parametersLen, - wszApplicationName, - dwApplicationNameLen ); + SHELL_translate_idlist( &sei_tmp, wszParameters, + parametersLen, + wszApplicationName, + dwApplicationNameLen ); } /* convert file URLs */ @@ -1746,7 +1738,6 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) HeapFree(GetProcessHeap(), 0, wszApplicationName); dwApplicationNameLen = len + 1; wszApplicationName = buf; - /* appKnownSingular unmodified */ sei_tmp.lpFile = wszApplicationName; } @@ -1770,70 +1761,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) /* Else, try to execute the filename */ TRACE("execute:%s,%s,%s\n", debugstr_w(wszApplicationName), debugstr_w(wszParameters), debugstr_w(wszDir)); - - /* separate out command line arguments from executable file name */ - if (!*sei_tmp.lpParameters && !appKnownSingular) { - /* If the executable path is quoted, handle the rest of the command line as parameters. */ - if (sei_tmp.lpFile[0] == '"') { - LPWSTR src = wszApplicationName/*sei_tmp.lpFile*/ + 1; - LPWSTR dst = wfileName; - LPWSTR end; - - /* copy the unquoted executable path to 'wfileName' */ - while(*src && *src!='"') - *dst++ = *src++; - - *dst = '\0'; - - if (*src == '"') { - end = ++src; - - while(isspace(*src)) - ++src; - } else - end = src; - - /* copy the parameter string to 'wszParameters' */ - strcpyW(wszParameters, src); - - /* terminate previous command string after the quote character */ - *end = '\0'; - lpFile = wfileName; - } - else - { - /* If the executable name is not quoted, we have to use this search loop here, - that in CreateProcess() is not sufficient because it does not handle shell links. */ - WCHAR buffer[MAX_PATH], xlpFile[MAX_PATH]; - LPWSTR space, s; - - LPWSTR beg = wszApplicationName/*sei_tmp.lpFile*/; - for(s=beg; (space=strchrW(s, ' ')); s=space+1) { - int idx = space-sei_tmp.lpFile; - memcpy(buffer, sei_tmp.lpFile, idx * sizeof(WCHAR)); - buffer[idx] = '\0'; - - /*FIXME This finds directory paths if the targeted file name contains spaces. */ - if (SearchPathW(*sei_tmp.lpDirectory? sei_tmp.lpDirectory: NULL, buffer, wszExe, sizeof(xlpFile)/sizeof(xlpFile[0]), xlpFile, NULL)) - { - /* separate out command from parameter string */ - LPCWSTR p = space + 1; - - while(isspaceW(*p)) - ++p; - - strcpyW(wszParameters, p); - *space = '\0'; - - break; - } - } - - lpFile = sei_tmp.lpFile; - } - } else - lpFile = sei_tmp.lpFile; - + lpFile = sei_tmp.lpFile; wcmd = wcmdBuffer; len = lstrlenW(wszApplicationName) + 1; if (sei_tmp.lpParameters[0]) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 5189d2e..e3b245a 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -902,7 +902,7 @@ static filename_tests_t filename_tests[]= {"QuotedUpperL", "%s\\test file.shlexec", 0x0, 33}, /* Test file masked due to space */ - {NULL, "%s\\masked file.shlexec", 0x1, 33}, + {NULL, "%s\\masked file.shlexec", 0x0, 33}, /* Test if quoting prevents the masking */ {NULL, "%s\\masked file.shlexec", 0x40, 33}, @@ -933,7 +933,7 @@ static void test_lpFile_parsed(void) /* existing "drawback_file.noassoc" prevents finding "drawback_file.noassoc foo.shlexec" on wine */ sprintf(fileA, "%s\\drawback_file.noassoc foo.shlexec", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); - todo_wine ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); /* if quoted, existing "drawback_file.noassoc" not prevents finding "drawback_file.noassoc foo.shlexec" on wine */ sprintf(fileA, "\"%s\\drawback_file.noassoc foo.shlexec\"", tmpdir); @@ -1542,18 +1542,10 @@ static void test_filename(void) } if (rc > 32) rc=33; - if ((test->todo & 0x1)==0) - { - ok(rc==test->rc || - broken(quotedfile && rc == SE_ERR_FNF), /* NT4 */ - "%s failed: rc=%ld err=%u\n", shell_call, - rc, GetLastError()); - } - else todo_wine - { - ok(rc==test->rc, "%s failed: rc=%ld err=%u\n", shell_call, - rc, GetLastError()); - } + ok(rc==test->rc || + broken(quotedfile && rc == SE_ERR_FNF), /* NT4 */ + "%s failed: rc=%ld err=%u\n", shell_call, + rc, GetLastError()); if (rc == 33) { const char* verb;

1 0