November 2015 - Wine-commits

Mark Harmstone : winepulse: Return PKEY_AudioEndpoint_PhysicalSpeakers device prop.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: b56682cc49b3a6f4db03414d440dcd533b65d39d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b56682cc49b3a6f4db03414d4… Author: Mark Harmstone <mark(a)harmstone.com> Date: Tue Nov 3 16:22:28 2015 -0600 winepulse: Return PKEY_AudioEndpoint_PhysicalSpeakers device prop. Edited by Maarten Lankhorst: No support for multiple devices in winepulse yet. Synchronous static data initialization by Andrew Eikum <aeikum(a)codeweavers.com>. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 84 +++++++++++++++++++++++++++++++------------ 1 file changed, 61 insertions(+), 23 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 64e6c2a..9aa1537 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -79,6 +79,8 @@ static pthread_mutex_t pulse_lock; static pthread_cond_t pulse_cond = PTHREAD_COND_INITIALIZER; static struct list g_sessions = LIST_INIT(g_sessions); +static UINT g_phys_speakers_mask = 0; + /* Mixer format + period times */ static WAVEFORMATEXTENSIBLE pulse_fmt[2]; static REFERENCE_TIME pulse_min_period[2], pulse_def_period[2]; @@ -330,13 +332,44 @@ static const enum pa_channel_position pulse_pos_from_wfx[] = { PA_CHANNEL_POSITION_TOP_REAR_RIGHT }; +static DWORD pulse_channel_map_to_channel_mask(const pa_channel_map *map) { + int i; + DWORD mask = 0; + + for (i = 0; i < map->channels; ++i) + switch (map->map[i]) { + default: FIXME("Unhandled channel %s\n", pa_channel_position_to_string(map->map[i])); break; + case PA_CHANNEL_POSITION_FRONT_LEFT: mask |= SPEAKER_FRONT_LEFT; break; + case PA_CHANNEL_POSITION_MONO: + case PA_CHANNEL_POSITION_FRONT_CENTER: mask |= SPEAKER_FRONT_CENTER; break; + case PA_CHANNEL_POSITION_FRONT_RIGHT: mask |= SPEAKER_FRONT_RIGHT; break; + case PA_CHANNEL_POSITION_REAR_LEFT: mask |= SPEAKER_BACK_LEFT; break; + case PA_CHANNEL_POSITION_REAR_CENTER: mask |= SPEAKER_BACK_CENTER; break; + case PA_CHANNEL_POSITION_REAR_RIGHT: mask |= SPEAKER_BACK_RIGHT; break; + case PA_CHANNEL_POSITION_LFE: mask |= SPEAKER_LOW_FREQUENCY; break; + case PA_CHANNEL_POSITION_SIDE_LEFT: mask |= SPEAKER_SIDE_LEFT; break; + case PA_CHANNEL_POSITION_SIDE_RIGHT: mask |= SPEAKER_SIDE_RIGHT; break; + case PA_CHANNEL_POSITION_TOP_CENTER: mask |= SPEAKER_TOP_CENTER; break; + case PA_CHANNEL_POSITION_TOP_FRONT_LEFT: mask |= SPEAKER_TOP_FRONT_LEFT; break; + case PA_CHANNEL_POSITION_TOP_FRONT_CENTER: mask |= SPEAKER_TOP_FRONT_CENTER; break; + case PA_CHANNEL_POSITION_TOP_FRONT_RIGHT: mask |= SPEAKER_TOP_FRONT_RIGHT; break; + case PA_CHANNEL_POSITION_TOP_REAR_LEFT: mask |= SPEAKER_TOP_BACK_LEFT; break; + case PA_CHANNEL_POSITION_TOP_REAR_CENTER: mask |= SPEAKER_TOP_BACK_CENTER; break; + case PA_CHANNEL_POSITION_TOP_REAR_RIGHT: mask |= SPEAKER_TOP_BACK_RIGHT; break; + case PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER: mask |= SPEAKER_FRONT_LEFT_OF_CENTER; break; + case PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER: mask |= SPEAKER_FRONT_RIGHT_OF_CENTER; break; + } + + return mask; +} + static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt) { WAVEFORMATEX *wfx = &fmt->Format; pa_stream *stream; pa_channel_map map; pa_sample_spec ss; pa_buffer_attr attr; - int ret, i; + int ret; unsigned int length = 0; pa_channel_map_init_auto(&map, 2, PA_CHANNEL_MAP_ALSA); @@ -401,28 +434,7 @@ static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt) { else fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - fmt->dwChannelMask = 0; - for (i = 0; i < map.channels; ++i) - switch (map.map[i]) { - default: FIXME("Unhandled channel %s\n", pa_channel_position_to_string(map.map[i])); break; - case PA_CHANNEL_POSITION_FRONT_LEFT: fmt->dwChannelMask |= SPEAKER_FRONT_LEFT; break; - case PA_CHANNEL_POSITION_MONO: - case PA_CHANNEL_POSITION_FRONT_CENTER: fmt->dwChannelMask |= SPEAKER_FRONT_CENTER; break; - case PA_CHANNEL_POSITION_FRONT_RIGHT: fmt->dwChannelMask |= SPEAKER_FRONT_RIGHT; break; - case PA_CHANNEL_POSITION_REAR_LEFT: fmt->dwChannelMask |= SPEAKER_BACK_LEFT; break; - case PA_CHANNEL_POSITION_REAR_CENTER: fmt->dwChannelMask |= SPEAKER_BACK_CENTER; break; - case PA_CHANNEL_POSITION_REAR_RIGHT: fmt->dwChannelMask |= SPEAKER_BACK_RIGHT; break; - case PA_CHANNEL_POSITION_LFE: fmt->dwChannelMask |= SPEAKER_LOW_FREQUENCY; break; - case PA_CHANNEL_POSITION_SIDE_LEFT: fmt->dwChannelMask |= SPEAKER_SIDE_LEFT; break; - case PA_CHANNEL_POSITION_SIDE_RIGHT: fmt->dwChannelMask |= SPEAKER_SIDE_RIGHT; break; - case PA_CHANNEL_POSITION_TOP_CENTER: fmt->dwChannelMask |= SPEAKER_TOP_CENTER; break; - case PA_CHANNEL_POSITION_TOP_FRONT_LEFT: fmt->dwChannelMask |= SPEAKER_TOP_FRONT_LEFT; break; - case PA_CHANNEL_POSITION_TOP_FRONT_CENTER: fmt->dwChannelMask |= SPEAKER_TOP_FRONT_CENTER; break; - case PA_CHANNEL_POSITION_TOP_FRONT_RIGHT: fmt->dwChannelMask |= SPEAKER_TOP_FRONT_RIGHT; break; - case PA_CHANNEL_POSITION_TOP_REAR_LEFT: fmt->dwChannelMask |= SPEAKER_TOP_BACK_LEFT; break; - case PA_CHANNEL_POSITION_TOP_REAR_CENTER: fmt->dwChannelMask |= SPEAKER_TOP_BACK_CENTER; break; - case PA_CHANNEL_POSITION_TOP_REAR_RIGHT: fmt->dwChannelMask |= SPEAKER_TOP_BACK_RIGHT; break; - } + fmt->dwChannelMask = pulse_channel_map_to_channel_mask(&map); } static HRESULT pulse_connect(void) @@ -492,6 +504,14 @@ fail: return E_FAIL; } +/* For default Pulseaudio render device, OR together all of the + * PKEY_AudioEndpoint_PhysicalSpeakers values of the sinks. */ +static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata) +{ + if (i) + g_phys_speakers_mask |= pulse_channel_map_to_channel_mask(&i->channel_map); +} + /* some poorly-behaved applications call audio functions during DllMain, so we * have to do as much as possible without creating a new thread. this function * sets up a synchronous connection to verify the server is running and query @@ -501,6 +521,7 @@ static HRESULT pulse_test_connect(void) int len, ret; WCHAR path[PATH_MAX], *name; char *str; + pa_operation *o; pulse_ml = pa_mainloop_new(); @@ -549,6 +570,15 @@ static HRESULT pulse_test_connect(void) pulse_probe_settings(1, &pulse_fmt[0]); pulse_probe_settings(0, &pulse_fmt[1]); + g_phys_speakers_mask = 0; + o = pa_context_get_sink_info_list(pulse_ctx, &pulse_phys_speakers_cb, NULL); + if (o) { + while (pa_mainloop_iterate(pulse_ml, 1, &ret) >= 0 && + pa_operation_get_state(o) == PA_OPERATION_RUNNING) + {} + pa_operation_unref(o); + } + pa_context_unref(pulse_ctx); pulse_ctx = NULL; pa_mainloop_free(pulse_ml); @@ -3203,5 +3233,13 @@ HRESULT WINAPI AUDDRV_GetAudioSessionManager(IMMDevice *device, HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARIANT *out) { TRACE("%s, (%s,%u), %p\n", wine_dbgstr_guid(guid), wine_dbgstr_guid(&prop->fmtid), prop->pid, out); + + if (IsEqualGUID(guid, &pulse_render_guid) && IsEqualPropertyKey(*prop, PKEY_AudioEndpoint_PhysicalSpeakers)) { + out->vt = VT_UI4; + out->u.ulVal = g_phys_speakers_mask; + + return out->u.ulVal ? S_OK : E_FAIL; + } + return E_NOTIMPL; }

1 0

Andrew Eikum : winepulse: Prefer PulseAudio driver.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: a410990f7cb0fd7477d4594f8644428ca8873f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a410990f7cb0fd7477d4594f8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Nov 3 16:22:53 2015 -0600 winepulse: Prefer PulseAudio driver. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 9aa1537..b2f83c8 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -869,7 +869,7 @@ int WINAPI AUDDRV_GetPriority(void) pthread_mutex_lock(&pulse_lock); hr = pulse_test_connect(); pthread_mutex_unlock(&pulse_lock); - return SUCCEEDED(hr) ? Priority_Low : Priority_Unavailable; + return SUCCEEDED(hr) ? Priority_Preferred : Priority_Unavailable; } HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient **out)

1 0

Nikolay Sivov : dwrite: Apply run reading direction to advances and offsets on analysis creation.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: b6f1e74ced7aa0d9de9e71ec30e08e1c4408ca70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6f1e74ced7aa0d9de9e71ec3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 3 20:32:22 2015 +0300 dwrite: Apply run reading direction to advances and offsets on analysis creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 74 ++++++++++++++++-------------------------------------- 1 file changed, 21 insertions(+), 53 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 2c52840..9244978 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4097,31 +4097,16 @@ static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *a freetype_get_glyph_bbox(&glyph_bitmap); if (is_rtl) - OffsetRect(bbox, origin.x - advance->x, origin.y - advance->y); + OffsetRect(bbox, origin.x + advance->x, origin.y + advance->y); else OffsetRect(bbox, origin.x, origin.y); - if (advanceoffset) { - FLOAT offset_x = advanceoffset->x + ascenderoffset->x; - FLOAT offset_y = advanceoffset->y + ascenderoffset->y; - - if (is_rtl) { - offset_x *= -1.0f; - offset_y *= -1.0f; - } - - OffsetRect(bbox, offset_x, offset_y); - } + if (advanceoffset) + OffsetRect(bbox, advanceoffset->x + ascenderoffset->x, advanceoffset->y + ascenderoffset->y); UnionRect(&analysis->bounds, &analysis->bounds, bbox); - if (is_rtl) { - origin.x -= advance->x; - origin.y -= advance->y; - } - else { - origin.x += advance->x; - origin.y += advance->y; - } + origin.x += advance->x; + origin.y += advance->y; } IDWriteFontFace2_Release(fontface2); @@ -4218,14 +4203,8 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW freetype_get_glyph_bbox(&glyph_bitmap); if (IsRectEmpty(bbox)) { - if (is_rtl) { - origin.x -= advance->x; - origin.y -= advance->y; - } - else { - origin.x += advance->x; - origin.y += advance->y; - } + origin.x += advance->x; + origin.y += advance->y; continue; } @@ -4241,21 +4220,12 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW is_1bpp = freetype_get_glyph_bitmap(&glyph_bitmap); if (is_rtl) - OffsetRect(bbox, origin.x - advance->x, origin.y - advance->y); + OffsetRect(bbox, origin.x + advance->x, origin.y + advance->y); else OffsetRect(bbox, origin.x, origin.y); - if (advanceoffset) { - FLOAT offset_x = advanceoffset->x + ascenderoffset->x; - FLOAT offset_y = advanceoffset->y + ascenderoffset->y; - - if (is_rtl) { - offset_x *= -1.0f; - offset_y *= -1.0f; - } - - OffsetRect(bbox, offset_x, offset_y); - } + if (advanceoffset) + OffsetRect(bbox, advanceoffset->x + ascenderoffset->x, advanceoffset->y + ascenderoffset->y); OffsetRect(bbox, analysis->origin.x, analysis->origin.y); if (analysis->flags & RUNANALYSIS_USE_TRANSFORM) @@ -4297,14 +4267,8 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW heap_free(glyph_bitmap.buf); - if (is_rtl) { - origin.x -= advance->x; - origin.y -= advance->y; - } - else { - origin.x += advance->x; - origin.y += advance->y; - } + origin.x += advance->x; + origin.y += advance->y; } IDWriteFontFace2_Release(fontface2); @@ -4460,6 +4424,7 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA FLOAT originX, FLOAT originY, IDWriteGlyphRunAnalysis **ret) { struct dwrite_glyphrunanalysis *analysis; + FLOAT rtl_factor; UINT32 i; *ret = NULL; @@ -4521,6 +4486,8 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA analysis->run.glyphAdvances = NULL; analysis->run.glyphOffsets = NULL; + rtl_factor = run->bidiLevel & 1 ? -1.0f : 1.0f; + if (analysis->flags & RUNANALYSIS_USE_TRANSFORM) transform_2d_vec(&analysis->origin, &analysis->m); @@ -4528,7 +4495,7 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA if (run->glyphAdvances) { for (i = 0; i < run->glyphCount; i++) { - init_2d_vec(analysis->advances + i, run->glyphAdvances[i] * ppdip, run->isSideways); + init_2d_vec(analysis->advances + i, rtl_factor * run->glyphAdvances[i] * ppdip, run->isSideways); if (analysis->flags & RUNANALYSIS_USE_TRANSFORM) transform_2d_vec(analysis->advances + i, &analysis->m); } @@ -4550,7 +4517,7 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA hr = IDWriteFontFace1_GetDesignGlyphAdvances(fontface1, 1, run->glyphIndices + i, &a, run->isSideways); if (FAILED(hr)) a = 0; - init_2d_vec(analysis->advances + i, get_scaled_advance_width(a, run->fontEmSize, &metrics) * ppdip, + init_2d_vec(analysis->advances + i, rtl_factor * get_scaled_advance_width(a, run->fontEmSize, &metrics) * ppdip, run->isSideways); break; case DWRITE_MEASURING_MODE_GDI_CLASSIC: @@ -4560,7 +4527,7 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA if (FAILED(hr)) init_2d_vec(analysis->advances + i, 0.0f, FALSE); else - init_2d_vec(analysis->advances + i, floorf(a * run->fontEmSize * ppdip / metrics.designUnitsPerEm + 0.5f), + init_2d_vec(analysis->advances + i, rtl_factor * floorf(a * run->fontEmSize * ppdip / metrics.designUnitsPerEm + 0.5f), run->isSideways); break; default: @@ -4576,8 +4543,9 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA if (run->glyphOffsets) { for (i = 0; i < run->glyphCount; i++) { - init_2d_vec(analysis->advanceoffsets + i, run->glyphOffsets[i].advanceOffset * ppdip, run->isSideways); - init_2d_vec(analysis->ascenderoffsets + i, run->glyphOffsets[i].ascenderOffset * ppdip, !run->isSideways); + init_2d_vec(analysis->advanceoffsets + i, rtl_factor * run->glyphOffsets[i].advanceOffset * ppdip, run->isSideways); + /* Positive ascender offset moves glyph up. Keep it orthogonal to advance direction. */ + init_2d_vec(analysis->ascenderoffsets + i, -run->glyphOffsets[i].ascenderOffset * ppdip, !run->isSideways); if (analysis->flags & RUNANALYSIS_USE_TRANSFORM) { transform_2d_vec(analysis->advanceoffsets + i, &analysis->m); transform_2d_vec(analysis->ascenderoffsets + i, &analysis->m);

1 0

Nikolay Sivov : dwrite/tests: Simple test to show that run analysis instances are not reused.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: a5127f5fc5ee12ec527f711cbcdeb33a35d66f3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5127f5fc5ee12ec527f711cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 3 22:05:25 2015 +0300 dwrite/tests: Simple test to show that run analysis instances are not reused. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 104e8e6..f6bca9c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3495,7 +3495,7 @@ static void test_CreateGlyphRunAnalysis(void) DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC, }; - IDWriteGlyphRunAnalysis *analysis; + IDWriteGlyphRunAnalysis *analysis, *analysis2; IDWriteFactory *factory; DWRITE_GLYPH_RUN run; IDWriteFontFace *face; @@ -3783,6 +3783,15 @@ static void test_CreateGlyphRunAnalysis(void) hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_ALIASED_1x1, &rect2); ok(hr == S_OK, "got 0x%08x\n", hr); ok((rect2.right - rect2.left) > (rect.right - rect.left), "got rect width %d\n", rect2.right - rect2.left); + + /* instances are not reused for same runs */ + hr = IDWriteFactory_CreateGlyphRunAnalysis(factory, &run, 1.0, &m, + DWRITE_RENDERING_MODE_ALIASED, DWRITE_MEASURING_MODE_NATURAL, + 0.0, 0.0, &analysis2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(analysis2 != analysis, "got %p, previous instance %p\n", analysis2, analysis); + IDWriteGlyphRunAnalysis_Release(analysis2); + IDWriteGlyphRunAnalysis_Release(analysis); IDWriteFontFace_Release(face);

1 0

Vincent Povirk : comdlg32: Add ES_AUTOHSCROLL style to filename text box.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: 30ac0f5a663fdb56c161a448d8c5de1d1a2a2dd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30ac0f5a663fdb56c161a448d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 3 13:27:30 2015 -0600 comdlg32: Add ES_AUTOHSCROLL style to filename text box. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/comdlg32.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc index f5c1c9e..5113e80 100644 --- a/dlls/comdlg32/comdlg32.rc +++ b/dlls/comdlg32/comdlg32.rc @@ -484,7 +484,7 @@ CAPTION "Open" FONT 8, "MS Shell Dlg" { LTEXT "File name:", IDC_FILENAMESTATIC, 160, 240, 60, 9, SS_RIGHT | WS_CLIPSIBLINGS - EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_CLIPSIBLINGS + EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_CLIPSIBLINGS | ES_AUTOHSCROLL LTEXT "Files of type:", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT | WS_CLIPSIBLINGS COMBOBOX IDC_FILETYPE, 226, 256, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL |

1 0

Alexandre Julliard : urlmon/tests: Use the same file as wininet for FTP testing.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: 27ea7102dc388fd7053e358cfe4bec76dc4ddf1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ea7102dc388fd7053e358cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 4 14:41:09 2015 +0900 urlmon/tests: Use the same file as wininet for FTP testing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 96ee6cc..ad27c3d 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2863,7 +2863,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) url_a = (flags & BINDTEST_INVALID_CN) ? "https://209.46.25.134/favicon.ico" : "https://test.winehq.org/tests/hello.html"; break; case FTP_TEST: - url_a = "ftp://ftp.winehq.org/pub/other/winelogo.xcf.tar.bz2"; + url_a = "ftp://ftp.winehq.org/welcome.msg"; break; default: url_a = "winetest:test";

1 0

Alexandre Julliard : configure: Use the correct help string macro.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: ef2d8ee221ee66deaca59758880ab0ffb2426f47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef2d8ee221ee66deaca597588… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 4 00:26:57 2015 +0900 configure: Use the correct help string macro. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 0814400..296a15f 100644 --- a/configure.ac +++ b/configure.ac @@ -72,7 +72,7 @@ AC_ARG_WITH(pcap, AS_HELP_STRING([--without-pcap],[do not use the Packet Ca AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG])) AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]), [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi]) -AC_ARG_WITH(pulse, AC_HELP_STRING([--without-pulse],[do not use PulseAudio sound support])) +AC_ARG_WITH(pulse, AS_HELP_STRING([--without-pulse],[do not use PulseAudio sound support])) AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])) AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)]))

1 0

Alexandre Julliard : makefiles: Generate rules for installing IDL headers.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: 316448cd4780855961f397a9947b3e2d16eb3463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=316448cd4780855961f397a99… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 4 14:57:37 2015 +0900 makefiles: Generate rules for installing IDL headers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 30 +++++------------------------- include/stdole2.idl | 3 +++ include/wine/winedxgi.idl | 2 ++ tools/make_makefiles | 16 +++------------- tools/makedep.c | 21 +++++++++++++++++++-- 5 files changed, 32 insertions(+), 40 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 682072c..e3c0acc 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -1,7 +1,4 @@ -PRIVATE_IDL_H_SRCS = \ - wine/winedxgi.idl - -PUBLIC_IDL_H_SRCS = \ +IDL_SRCS = \ activaut.idl \ activdbg.idl \ activscp.idl \ @@ -112,6 +109,7 @@ PUBLIC_IDL_H_SRCS = \ shldisp.idl \ shobjidl.idl \ shtypes.idl \ + stdole2.idl \ strmif.idl \ structuredquerycondition.idl \ taskschd.idl \ @@ -138,6 +136,7 @@ PUBLIC_IDL_H_SRCS = \ windows.foundation.idl \ wine/itss.idl \ wine/svcctl.idl \ + wine/winedxgi.idl \ winsxs.idl \ wmiutils.idl \ wmp.idl \ @@ -151,9 +150,6 @@ PUBLIC_IDL_H_SRCS = \ xaudio2fx.idl \ xmllite.idl -IDL_TLB_SRCS = \ - stdole2.idl - HEADER_SRCS = \ accctrl.h \ aclapi.h \ @@ -645,8 +641,6 @@ XTEMPLATE_SRCS = \ rmxftmpl.x SRCDIR_INCLUDES = \ - $(IDL_TLB_SRCS) \ - $(PUBLIC_IDL_H_SRCS) \ access.idl \ asynot.idl \ asysta.idl \ @@ -681,31 +675,17 @@ SRCDIR_INCLUDES = \ xmldom.idl \ xmldso.idl -IDL_H_SRCS = $(PUBLIC_IDL_H_SRCS) $(PRIVATE_IDL_H_SRCS) -IDL_SRCS = $(IDL_H_SRCS) $(IDL_TLB_SRCS) - -OBJDIR_INCLUDES = $(PUBLIC_IDL_H_SRCS:.idl=.h) - -all: $(IDL_H_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb) - -.PHONY: install install-dev uninstall - -install install-dev:: $(OBJDIR_INCLUDES) +install install-dev:: for f in $(SRCDIR_INCLUDES); do case $$f in \ wine/*) $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(includedir)/`expr $$f : 'wine/$.*$'` ;; \ msvcrt/*) $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(includedir)/$$f ;; \ *) $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(includedir)/windows/$$f ;; \ esac; done - for f in $(OBJDIR_INCLUDES); do case $$f in \ - wine/*) $(INSTALL_DATA) $$f $(DESTDIR)$(includedir)/`expr $$f : 'wine/$.*$'` ;; \ - msvcrt/*) $(INSTALL_DATA) $$f $(DESTDIR)$(includedir)/$$f ;; \ - *) $(INSTALL_DATA) $$f $(DESTDIR)$(includedir)/windows/$$f ;; \ - esac; done # Don't just do a rm -rf on $(includedir) -- don't want to wipe out # anything extra the user may have put there. uninstall:: - for f in $(SRCDIR_INCLUDES) $(OBJDIR_INCLUDES); do case $$f in \ + for f in $(SRCDIR_INCLUDES); do case $$f in \ wine/*) $(RM) $(DESTDIR)$(includedir)/`expr $$f : 'wine/$.*$'` ;; \ msvcrt/*) $(RM) $(DESTDIR)$(includedir)/$$f ;; \ *) $(RM) $(DESTDIR)$(includedir)/windows/$$f ;; \ diff --git a/include/stdole2.idl b/include/stdole2.idl index 81b5463..9839c4c 100644 --- a/include/stdole2.idl +++ b/include/stdole2.idl @@ -18,7 +18,10 @@ * */ +#if 0 +#pragma makedep install #pragma makedep typelib +#endif #include <olectl.h> diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 452f022..d13a2f1 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep header + import "dxgi.idl"; [ diff --git a/tools/make_makefiles b/tools/make_makefiles index 7229d06..b97f04e 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -373,16 +373,15 @@ sub assign_sources_to_makefiles(@) next if ($name =~ /\.in$/); if ($name =~ /^wine\// && !$exported_wine_headers{$name}) { - if ($private_idl_headers{$name}) { push @{${$make}{"=PRIVATE_IDL_H_SRCS"}}, $name; } + if ($private_idl_headers{$name}) { push @{${$make}{"=IDL_SRCS"}}, $name; } next; } - if ($name =~ /stdole2\.idl$/) { push @{${$make}{"=IDL_TLB_SRCS"}}, $name; } - elsif ($private_idl_headers{$name}) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; } + if ($private_idl_headers{$name}) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; } elsif ($name =~ /\.h$/) { push @{${$make}{"=HEADER_SRCS"}}, $name; } elsif ($name =~ /\.x$/) { push @{${$make}{"=XTEMPLATE_SRCS"}}, $name; } elsif ($name =~ /\.rh$/) { push @{${$make}{"=HEADER_SRCS"}}, $name; } elsif ($name =~ /\.inl$/) { push @{${$make}{"=HEADER_SRCS"}}, $name; } - elsif ($name =~ /\.idl$/) { push @{${$make}{"=PUBLIC_IDL_H_SRCS"}}, $name; } + elsif ($name =~ /\.idl$/) { push @{${$make}{"=IDL_SRCS"}}, $name; } else { die "unknown file $name in include dir"; } } else @@ -432,12 +431,6 @@ sub assign_sources_to_makefiles(@) } } - # add extra variables to include source list - my $make = $makefiles{"include/Makefile"}; - unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(PUBLIC_IDL_H_SRCS)"; - unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(IDL_TLB_SRCS)"; - unshift @{${$make}{"=IDL_SRCS"}}, "\$(IDL_H_SRCS) \$(IDL_TLB_SRCS)"; - # preserve shared source files from the parent makefile foreach my $file (@makefiles) { @@ -556,9 +549,6 @@ sub update_makefiles(@) replace_makefile_variable( $file, "IMPLIB_SRCS" ); replace_makefile_variable( $file, "MANPAGES" ); next unless $file eq "include/Makefile"; - replace_makefile_variable( $file, "PRIVATE_IDL_H_SRCS" ); - replace_makefile_variable( $file, "PUBLIC_IDL_H_SRCS" ); - replace_makefile_variable( $file, "IDL_TLB_SRCS" ); replace_makefile_variable( $file, "SRCDIR_INCLUDES" ); } diff --git a/tools/makedep.c b/tools/makedep.c index d2d39a6..9ea3fb6 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1702,6 +1702,10 @@ static void add_generated_sources( struct makefile *make ) { add_generated_source( make, replace_extension( source->name, ".idl", "_r.res" ), NULL ); } + if (!source->file->flags && strendswith( source->name, ".idl" )) + { + add_generated_source( make, replace_extension( source->name, ".idl", ".h" ), NULL ); + } if (strendswith( source->name, ".x" )) { add_generated_source( make, replace_extension( source->name, ".x", ".h" ), NULL ); @@ -2035,8 +2039,8 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t struct strarray targets = empty_strarray; char *dest; - if (!source->file->flags || find_include_file( make, strmake( "%s.h", obj ))) - source->file->flags |= FLAG_IDL_HEADER; + if (!source->file->flags) source->file->flags |= FLAG_IDL_HEADER | FLAG_INSTALL; + if (find_include_file( make, strmake( "%s.h", obj ))) source->file->flags |= FLAG_IDL_HEADER; for (i = 0; i < sizeof(idl_outputs) / sizeof(idl_outputs[0]); i++) { @@ -2046,6 +2050,19 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t strarray_add( &targets, dest ); } if (source->file->flags & FLAG_IDL_PROXY) strarray_add( &dlldata_files, source->name ); + if (source->file->flags & FLAG_INSTALL) + { + strarray_add( &make->install_dev_rules, xstrdup( source->filename )); + strarray_add( &make->install_dev_rules, + strmake( "D$(includedir)/%s.idl", get_include_install_path( obj ) )); + if (source->file->flags & FLAG_IDL_HEADER) + { + strarray_add( &make->install_dev_rules, strmake( "%s.h", obj )); + strarray_add( &make->install_dev_rules, + strmake( "d$(includedir)/%s.h", get_include_install_path( obj ) )); + } + } + if (!targets.count) continue; output_filenames_obj_dir( make, targets ); output( ": %s\n", tools_path( make, "widl" )); output( "\t%s -o $@", tools_path( make, "widl" ) );

1 0

Alexandre Julliard : makefiles: Generate rules for installing IDL include files.
by Alexandre Julliard 04 Nov '15

04 Nov '15

1 0

Alexandre Julliard : makefiles: Get rid of the obsolete IMPLIB_SRCS variable.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: cc0420ac3115d04c724d3d3ee4913d38146dcb63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc0420ac3115d04c724d3d3ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 4 17:23:03 2015 +0900 makefiles: Get rid of the obsolete IMPLIB_SRCS variable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/Makefile.in | 2 -- tools/make_makefiles | 9 ++------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index 2851f5b..5d287a3 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in @@ -16,8 +16,6 @@ C_SRCS = \ keyboard.c \ mouse.c -IMPLIB_SRCS = data_formats.c - IDL_SRCS = dinput_classes.idl RC_SRCS = dinput.rc diff --git a/tools/make_makefiles b/tools/make_makefiles index 1525769..28e448a 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -207,7 +207,7 @@ sub parse_makefile($) ${$make{"=flags"}}{"implib"} = 1 if $var eq "IMPORTLIB"; next; } - if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_SRCS|IMPLIB_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|FONT_SRCS|IN_SRCS|PROGRAMS|EXTRA_TARGETS|MANPAGES|INSTALL_LIB|INSTALL_DEV)\s*=\s*(.*)/) + if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|FONT_SRCS|IN_SRCS|PROGRAMS|EXTRA_TARGETS|MANPAGES|INSTALL_LIB|INSTALL_DEV)\s*=\s*(.*)/) { my $var = $1; my @list = split(/\s+/, $2); @@ -345,11 +345,7 @@ sub assign_sources_to_makefiles(@) elsif ($name =~ /\.sfd$/) { push @{${$make}{"=FONT_SRCS"}}, $name; } elsif ($name =~ /\.c$/) { - if (defined $flags{"implib"}) - { - push @{${$make}{"=IMPLIB_SRCS"}}, $name; - ${${$make}{"=flags"}}{"staticimplib"} = 1; - } + ${${$make}{"=flags"}}{"staticimplib"} = 1 if defined $flags{"implib"}; push @{${$make}{"=C_SRCS"}}, $name; } elsif ($name =~ /\.h$/) @@ -500,7 +496,6 @@ sub update_makefiles(@) replace_makefile_variable( $file, "HEADER_SRCS" ); replace_makefile_variable( $file, "XTEMPLATE_SRCS" ); replace_makefile_variable( $file, "IN_SRCS" ); - replace_makefile_variable( $file, "IMPLIB_SRCS" ); replace_makefile_variable( $file, "MANPAGES" ); }

1 0