May 2016 - Wine-Commits - list.winehq.org

Maarten Lankhorst : dsound: Mix float natively.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: 09890d7142a2c612b025ab9ff60358d036f9999b URL: http://source.winehq.org/git/wine.git/?a=commit;h=09890d7142a2c612b025ab9ff… Author: Maarten Lankhorst <wine(a)mblankhorst.nl> Date: Thu May 12 08:43:44 2016 -0500 dsound: Mix float natively. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 1 - dlls/dsound/dsound_convert.c | 20 +---------------- dlls/dsound/dsound_private.h | 4 ++-- dlls/dsound/mixer.c | 53 ++++++++++++++++++++++++-------------------- dlls/dsound/primary.c | 14 +----------- 5 files changed, 33 insertions(+), 59 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 2d145a6..0b5c3b4 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -238,7 +238,6 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) IAudioStreamVolume_Release(device->volume); HeapFree(GetProcessHeap(), 0, device->tmp_buffer); - HeapFree(GetProcessHeap(), 0, device->mix_buffer); HeapFree(GetProcessHeap(), 0, device->buffer); RtlDeleteResource(&device->buffer_list_lock); device->mixlock.DebugInfo->Spare[0] = 0; diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 5accba6..4ae83ba 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -263,27 +263,9 @@ static void norm32(float *src, INT *dst, unsigned len) } } -static void normieee32(float *src, float *dst, unsigned len) -{ - TRACE("%p - %p %d\n", src, dst, len); - len /= 4; - while (len--) - { - if(*src > 1) - *dst = 1; - else if(*src < -1) - *dst = -1; - else - *dst = *src; - ++dst; - ++src; - } -} - -const normfunc normfunctions[5] = { +const normfunc normfunctions[4] = { (normfunc)norm8, (normfunc)norm16, (normfunc)norm24, (normfunc)norm32, - (normfunc)normieee32 }; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 918839e..b980453 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -49,7 +49,7 @@ extern const bitsgetfunc getbpp[5] DECLSPEC_HIDDEN; void putieee32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void mixieee32(float *src, float *dst, unsigned samples) DECLSPEC_HIDDEN; typedef void (*normfunc)(const void *, void *, unsigned); -extern const normfunc normfunctions[5] DECLSPEC_HIDDEN; +extern const normfunc normfunctions[4] DECLSPEC_HIDDEN; typedef struct _DSVOLUMEPAN { @@ -87,7 +87,7 @@ struct DirectSoundDevice int speaker_num[DS_MAX_CHANNELS]; int num_speakers; int lfe_channel; - float *mix_buffer, *tmp_buffer; + float *tmp_buffer; DWORD tmp_buffer_len, mix_buffer_len; DSVOLUMEPAN volpan; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 6ac4e3d..dec8ffd 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -468,7 +468,7 @@ static void DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, INT frames) * writepos = position (offset) in device buffer to write at * fraglen = number of bytes to mix */ -static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD fraglen) +static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD writepos, DWORD fraglen) { INT len = fraglen; float *ibuf; @@ -493,7 +493,7 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO /* Apply volume if needed */ DSOUND_MixerVol(dsb, frames); - mixieee32(ibuf, dsb->device->mix_buffer, frames * dsb->device->pwfx->nChannels); + mixieee32(ibuf, mix_buffer, frames * dsb->device->pwfx->nChannels); /* check for notification positions */ if (dsb->dsbd.dwFlags & DSBCAPS_CTRLPOSITIONNOTIFY && @@ -517,7 +517,7 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO * * Returns: the number of bytes beyond the writepos that were mixed. */ -static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD mixlen) +static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD writepos, DWORD mixlen) { DWORD primary_done = 0; @@ -544,7 +544,7 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD mi /* First try to mix to the end of the buffer if possible * Theoretically it would allow for better optimization */ - primary_done += DSOUND_MixInBuffer(dsb, writepos, mixlen); + primary_done += DSOUND_MixInBuffer(dsb, mix_buffer, writepos, mixlen); TRACE("total mixed data=%d\n", primary_done); @@ -559,14 +559,12 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD mi * writepos = the current safe-to-write position in the primary buffer * mixlen = the maximum amount to mix into the primary buffer * (beyond the current writepos) - * recover = true if the sound device may have been reset and the write - * position in the device buffer changed * all_stopped = reports back if all buffers have stopped * * Returns: the length beyond the writepos that was mixed to. */ -static void DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD writepos, DWORD mixlen, BOOL recover, BOOL *all_stopped) +static void DSOUND_MixToPrimary(const DirectSoundDevice *device, float *mix_buffer, DWORD writepos, DWORD mixlen, BOOL *all_stopped) { INT i; IDirectSoundBufferImpl *dsb; @@ -574,7 +572,7 @@ static void DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD writepos, /* unless we find a running buffer, all have stopped */ *all_stopped = TRUE; - TRACE("(%d,%d,%d)\n", writepos, mixlen, recover); + TRACE("(%d,%d)\n", writepos, mixlen); for (i = 0; i < device->nrofbuffers; i++) { dsb = device->buffers[i]; @@ -594,7 +592,7 @@ static void DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD writepos, dsb->state = STATE_PLAYING; /* mix next buffer into the main buffer */ - DSOUND_MixOne(dsb, writepos, mixlen); + DSOUND_MixOne(dsb, mix_buffer, writepos, mixlen); *all_stopped = FALSE; } @@ -646,8 +644,7 @@ done: * secondary->buffer (secondary format) * =[Resample]=> device->tmp_buffer (float format) * =[Volume]=> device->tmp_buffer (float format) - * =[Mix]=> device->mix_buffer (float format) - * =[Reformat]=> device->buffer (device format) + * =[Reformat]=> device->buffer (device format, skipped on float) */ static void DSOUND_PerformMix(DirectSoundDevice *device) { @@ -686,7 +683,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) if (device->priolevel != DSSCL_WRITEPRIMARY) { BOOL all_stopped = FALSE; int nfiller; - DWORD bpp = device->pwfx->wBitsPerSample>>3; + void *buffer = NULL; /* the sound of silence */ nfiller = device->pwfx->wBitsPerSample == 8 ? 128 : 0; @@ -700,24 +697,32 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) TRACE("Buffer restarting\n"); } - memset(device->mix_buffer, nfiller, maxq); + hr = IAudioRenderClient_GetBuffer(device->render, maxq / block, (void*)&buffer); + if(FAILED(hr)){ + WARN("GetBuffer failed: %08x\n", hr); + LeaveCriticalSection(&device->mixlock); + return; + } - /* do the mixing */ - DSOUND_MixToPrimary(device, writepos, maxq, TRUE, &all_stopped); + memset(buffer, nfiller, maxq); - if (maxq + writepos > device->buflen) { - DWORD todo = device->buflen - writepos; + if (!device->normfunction) + DSOUND_MixToPrimary(device, buffer, writepos, maxq, &all_stopped); + else { + memset(device->buffer, nfiller, device->buflen); - device->normfunction(device->mix_buffer, device->buffer + writepos, todo); - DSOUND_WaveQueue(device, device->buffer + writepos, todo); + /* do the mixing */ + DSOUND_MixToPrimary(device, (float*)device->buffer, writepos, maxq, &all_stopped); - device->normfunction(device->mix_buffer + todo / bpp, device->buffer, (maxq - todo)); - DSOUND_WaveQueue(device, device->buffer, maxq - todo); - } else { - device->normfunction(device->mix_buffer, device->buffer + writepos, maxq); - DSOUND_WaveQueue(device, device->buffer + writepos, maxq); + device->normfunction(device->buffer, buffer, maxq); } + hr = IAudioRenderClient_ReleaseBuffer(device->render, maxq / block, 0); + if(FAILED(hr)) + ERR("ReleaseBuffer failed: %08x\n", hr); + + device->pad += maxq; + if (maxq) { if (device->state == STATE_STARTING || device->state == STATE_STOPPED) { diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index bdab0ee..1925d0c 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -338,11 +338,7 @@ HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) device->buflen = ds_hel_buflen; device->buflen -= device->buflen % device->pwfx->nBlockAlign; - HeapFree(GetProcessHeap(), 0, device->mix_buffer); device->mix_buffer_len = (device->buflen / (device->pwfx->wBitsPerSample / 8)) * sizeof(float); - device->mix_buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, device->mix_buffer_len); - if (!device->mix_buffer) - return DSERR_OUTOFMEMORY; if (device->state == STATE_PLAYING) device->state = STATE_STARTING; else if (device->state == STATE_STOPPING) device->state = STATE_STOPPED; @@ -370,21 +366,13 @@ HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) (device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && IsEqualGUID(&((WAVEFORMATEXTENSIBLE*)device->pwfx)->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))) - device->normfunction = normfunctions[4]; + device->normfunction = NULL; else device->normfunction = normfunctions[device->pwfx->wBitsPerSample/8 - 1]; FillMemory(device->buffer, device->buflen, (device->pwfx->wBitsPerSample == 8) ? 128 : 0); - FillMemory(device->mix_buffer, device->mix_buffer_len, 0); device->playpos = 0; - if (device->pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || - (device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&((WAVEFORMATEXTENSIBLE*)device->pwfx)->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))) - device->normfunction = normfunctions[4]; - else - device->normfunction = normfunctions[device->pwfx->wBitsPerSample/8 - 1]; - for (i = 0; i < device->nrofbuffers; i++) { RtlAcquireResourceExclusive(&dsb[i]->lock, TRUE); DSOUND_RecalcFormat(dsb[i]);

1 0

Maarten Lankhorst : dsound: Use AudioClient for position.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: 95287ac2dfb3bd64e1b65aadbdf7e375af2607d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95287ac2dfb3bd64e1b65aadb… Author: Maarten Lankhorst <wine(a)mblankhorst.nl> Date: Thu May 12 08:43:34 2016 -0500 dsound: Use AudioClient for position. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_private.h | 1 - dlls/dsound/primary.c | 35 +++++++++++++---------------------- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 018f024..918839e 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -75,7 +75,6 @@ struct DirectSoundDevice DSCAPS drvcaps; DWORD priolevel, sleeptime; PWAVEFORMATEX pwfx, primary_pwfx; - UINT playing_offs_bytes, in_mmdev_bytes; LPBYTE buffer; DWORD writelead, buflen, aclen, fraglen, state, playpos, pad; int nrofbuffers; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index a3851e2..bdab0ee 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -480,23 +480,6 @@ HRESULT DSOUND_PrimaryStop(DirectSoundDevice *device) return DS_OK; } -HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LPDWORD writepos) -{ - TRACE("(%p,%p,%p)\n", device, playpos, writepos); - - /* check if playpos was requested */ - if (playpos) - *playpos = device->playing_offs_bytes; - - /* check if writepos was requested */ - if (writepos) - /* the writepos is the first non-queued position */ - *writepos = (device->playing_offs_bytes + device->in_mmdev_bytes) % device->buflen; - - TRACE("playpos = %d, writepos = %d (%p, time=%d)\n", playpos?*playpos:-1, writepos?*writepos:-1, device, GetTickCount()); - return DS_OK; -} - WAVEFORMATEX *DSOUND_CopyFormat(const WAVEFORMATEX *wfex) { WAVEFORMATEX *pwfx; @@ -824,7 +807,9 @@ static ULONG WINAPI PrimaryBufferImpl_Release(IDirectSoundBuffer *iface) static HRESULT WINAPI PrimaryBufferImpl_GetCurrentPosition(IDirectSoundBuffer *iface, DWORD *playpos, DWORD *writepos) { - HRESULT hres; + HRESULT hres = DS_OK; + UINT32 pad = 0; + UINT32 mixpos; IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); DirectSoundDevice *device = This->device; TRACE("(%p,%p,%p)\n", iface, playpos, writepos); @@ -832,17 +817,23 @@ static HRESULT WINAPI PrimaryBufferImpl_GetCurrentPosition(IDirectSoundBuffer *i /* **** */ EnterCriticalSection(&(device->mixlock)); - hres = DSOUND_PrimaryGetPosition(device, playpos, writepos); + if (device->client) + hres = IAudioClient_GetCurrentPadding(device->client, &pad); if (hres != DS_OK) { - WARN("DSOUND_PrimaryGetPosition failed\n"); + WARN("IAudioClient_GetCurrentPadding failed\n"); LeaveCriticalSection(&(device->mixlock)); return hres; } + mixpos = (device->playpos + pad * device->pwfx->nBlockAlign) % device->buflen; + if (playpos) + *playpos = mixpos; if (writepos) { - if (device->state != STATE_STOPPED) + *writepos = mixpos; + if (device->state != STATE_STOPPED) { /* apply the documented 10ms lead to writepos */ *writepos += device->writelead; - while (*writepos >= device->buflen) *writepos -= device->buflen; + *writepos %= device->buflen; + } } LeaveCriticalSection(&(device->mixlock));

1 0

Maarten Lankhorst : dsound: Use AudioClient buffer statistics.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: 569ed159b0ab31121d9aab95bf1d3ac49675f1ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=569ed159b0ab31121d9aab95b… Author: Maarten Lankhorst <wine(a)mblankhorst.nl> Date: Thu May 12 08:43:23 2016 -0500 dsound: Use AudioClient buffer statistics. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 1 - dlls/dsound/dsound_main.c | 6 -- dlls/dsound/dsound_private.h | 7 +- dlls/dsound/mixer.c | 240 +++++++++++-------------------------------- dlls/dsound/primary.c | 60 ++++------- 5 files changed, 82 insertions(+), 232 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=569ed159b0ab31121d9aa…

1 0

Ken Thomases : winemac: Extract some logic into a new function, sync_window_z_order().
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: 321a1511da6b1eb63cd646e1d77a8d69790d3cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=321a1511da6b1eb63cd646e1d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 12 18:50:45 2016 -0500 winemac: Extract some logic into a new function, sync_window_z_order(). Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index bb82927..0d6ef53 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -785,6 +785,16 @@ static void hide_window(struct macdrv_win_data *data) /*********************************************************************** + * sync_window_z_order + */ +static void sync_window_z_order(struct macdrv_win_data *data) +{ + if (data->on_screen) + show_window(data); +} + + +/*********************************************************************** * get_region_data * * Calls GetRegionData on the given region and converts the rectangle @@ -878,8 +888,8 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c TRACE("win %p/%p whole_rect %s frame %s\n", data->hwnd, data->cocoa_window, wine_dbgstr_rect(&data->whole_rect), wine_dbgstr_cgrect(frame)); - if (data->on_screen && (!(swp_flags & SWP_NOZORDER) || (swp_flags & SWP_SHOWWINDOW))) - show_window(data); + if (!(swp_flags & SWP_NOZORDER) || (swp_flags & SWP_SHOWWINDOW)) + sync_window_z_order(data); }

1 0

Ken Thomases : winemac: When a child window' s client area is equal to its whole area, use a single Cocoa view for both.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: 053b4a81ed56be72d66323f81302c519cec922e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=053b4a81ed56be72d66323f81… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 12 18:50:47 2016 -0500 winemac: When a child window's client area is equal to its whole area, use a single Cocoa view for both. This should be a common case and will reduce the number of Cocoa views. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 57 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 47 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 59d7763..0d507f4 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -746,14 +746,24 @@ static void destroy_cocoa_window(struct macdrv_win_data *data) */ static void create_cocoa_view(struct macdrv_win_data *data) { + BOOL equal = !memcmp(&data->window_rect, &data->client_rect, sizeof(data->whole_rect)); + CGRect frame = cgrect_from_rect(data->window_rect); + data->shaped = FALSE; data->whole_rect = data->window_rect; TRACE("creating %p window %s whole %s client %s\n", data->hwnd, wine_dbgstr_rect(&data->window_rect), wine_dbgstr_rect(&data->whole_rect), wine_dbgstr_rect(&data->client_rect)); - data->cocoa_view = macdrv_create_view(cgrect_from_rect(data->whole_rect)); + if (!equal) + data->cocoa_view = macdrv_create_view(frame); create_client_cocoa_view(data); + if (equal) + { + data->cocoa_view = data->client_cocoa_view; + macdrv_set_view_hidden(data->cocoa_view, TRUE); + macdrv_set_view_frame(data->cocoa_view, frame); + } } @@ -768,7 +778,8 @@ static void destroy_cocoa_view(struct macdrv_win_data *data) TRACE("win %p Cocoa view %p\n", data->hwnd, data->cocoa_view); - macdrv_dispose_view(data->cocoa_view); + if (data->cocoa_view != data->client_cocoa_view) + macdrv_dispose_view(data->cocoa_view); data->cocoa_view = NULL; data->on_screen = FALSE; } @@ -1007,7 +1018,7 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c const RECT *old_whole_rect) { CGRect frame = cgrect_from_rect(data->whole_rect); - RECT rect; + BOOL force_z_order = FALSE; if (data->cocoa_window) { @@ -1020,11 +1031,37 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c macdrv_set_cocoa_window_frame(data->cocoa_window, &frame); } else - macdrv_set_view_frame(data->cocoa_view, frame); + { + BOOL were_equal = (data->cocoa_view == data->client_cocoa_view); + BOOL now_equal = !memcmp(&data->whole_rect, &data->client_rect, sizeof(data->whole_rect)); - rect = data->client_rect; - OffsetRect(&rect, -data->whole_rect.left, -data->whole_rect.top); - macdrv_set_view_frame(data->client_cocoa_view, cgrect_from_rect(rect)); + if (were_equal && !now_equal) + { + data->cocoa_view = macdrv_create_view(frame); + macdrv_set_view_hidden(data->cocoa_view, !data->on_screen); + macdrv_set_view_superview(data->client_cocoa_view, data->cocoa_view, NULL, NULL, NULL); + macdrv_set_view_hidden(data->client_cocoa_view, FALSE); + force_z_order = TRUE; + } + else if (!were_equal && now_equal) + { + macdrv_dispose_view(data->cocoa_view); + data->cocoa_view = data->client_cocoa_view; + macdrv_set_view_hidden(data->cocoa_view, !data->on_screen); + macdrv_set_view_frame(data->cocoa_view, frame); + force_z_order = TRUE; + } + else + macdrv_set_view_frame(data->cocoa_view, frame); + } + + if (data->cocoa_view != data->client_cocoa_view) + { + RECT rect = data->client_rect; + OffsetRect(&rect, -data->whole_rect.left, -data->whole_rect.top); + macdrv_set_view_frame(data->client_cocoa_view, cgrect_from_rect(rect)); + TRACE("win %p/%p client %s\n", data->hwnd, data->client_cocoa_view, wine_dbgstr_rect(&rect)); + } if (old_window_rect && old_whole_rect && (IsRectEmpty(old_window_rect) != IsRectEmpty(&data->window_rect) || @@ -1032,11 +1069,11 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c old_window_rect->top - old_whole_rect->top != data->window_rect.top - data->whole_rect.top)) sync_window_region(data, (HRGN)1); - TRACE("win %p/%p whole_rect %s frame %s client %s\n", data->hwnd, + TRACE("win %p/%p whole_rect %s frame %s\n", data->hwnd, data->cocoa_window ? (void*)data->cocoa_window : (void*)data->cocoa_view, - wine_dbgstr_rect(&data->whole_rect), wine_dbgstr_cgrect(frame), wine_dbgstr_rect(&rect)); + wine_dbgstr_rect(&data->whole_rect), wine_dbgstr_cgrect(frame)); - if (!(swp_flags & SWP_NOZORDER) || (swp_flags & SWP_SHOWWINDOW)) + if (force_z_order || !(swp_flags & SWP_NOZORDER) || (swp_flags & SWP_SHOWWINDOW)) sync_window_z_order(data); }

1 0

Jacek Caban : wininet: Get rid of test_http1_1 test.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: 1d834438ca1a490ab7e3725c6dbed17461790b92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d834438ca1a490ab7e3725c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 18:48:23 2016 +0200 wininet: Get rid of test_http1_1 test. I can only guess what author meant to test, but those are useless in their current shape and we already have better persistent connection tests anyway. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b09f20d..1b4ce3b 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2041,7 +2041,6 @@ static DWORD CALLBACK server_thread(LPVOID param) int last_request = 0; char host_header[22]; char host_header_override[30]; - static BOOL test_b = FALSE; static int test_no_cache = 0; WSAStartup(MAKEWORD(1,1), &wsaData); @@ -2190,13 +2189,6 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof notokmsg-1, 0); } - if (!test_b && strstr(buffer, "/testB HTTP/1.1")) - { - test_b = TRUE; - send(c, okmsg, sizeof okmsg-1, 0); - recvfrom(c, buffer, sizeof buffer, 0, NULL, NULL); - send(c, okmsg, sizeof okmsg-1, 0); - } if (strstr(buffer, "/testC")) { if (strstr(buffer, "Cookie: cookie=biscuit")) @@ -3098,37 +3090,6 @@ static void test_header_override(int port) InternetCloseHandle(ses); } -static void test_http1_1(int port) -{ - HINTERNET ses, con, req; - BOOL ret; - - ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); - ok(ses != NULL, "InternetOpen failed\n"); - - con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); - ok(con != NULL, "InternetConnect failed\n"); - - req = HttpOpenRequestA(con, NULL, "/testB", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); - ok(req != NULL, "HttpOpenRequest failed\n"); - - ret = HttpSendRequestA(req, NULL, 0, NULL, 0); - if (ret) - { - InternetCloseHandle(req); - - req = HttpOpenRequestA(con, NULL, "/testB", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); - ok(req != NULL, "HttpOpenRequest failed\n"); - - ret = HttpSendRequestA(req, NULL, 0, NULL, 0); - ok(ret, "HttpSendRequest failed\n"); - } - - InternetCloseHandle(req); - InternetCloseHandle(con); - InternetCloseHandle(ses); -} - static void test_connection_closing(int port) { HINTERNET session, connection, req; @@ -4840,7 +4801,6 @@ static void test_http_connection(void) test_basic_request(si.port, "GET", "/testF"); test_connection_header(si.port); test_header_override(si.port); - test_http1_1(si.port); test_cookie_header(si.port); test_basic_authentication(si.port); test_invalid_response_headers(si.port);

1 0

Jacek Caban : wininet: Updated winehq.org cert info.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: f6714f3832541250476989ad579523b4e8b28f67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6714f3832541250476989ad5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 18:46:21 2016 +0200 wininet: Updated winehq.org cert info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index fde2254..3f65784 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4876,14 +4876,11 @@ typedef struct { } cert_struct_test_t; static const cert_struct_test_t test_winehq_org_cert = { - "GT98380011\r\n" - "See www.rapidssl.com/resources/cps (c)14\r\n" - "Domain Control Validated - RapidSSL(R)\r\n" "*.winehq.org", "US\r\n" "GeoTrust Inc.\r\n" - "RapidSSL SHA256 CA - G3" + "RapidSSL SHA256 CA" }; static const cert_struct_test_t test_winehq_com_cert = {

1 0

Ken Thomases : winemac: Mirror the hierarchy of Win32 child windows with Cocoa views.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: d91e568635c7cd23bd56f3ed688a2ba0b7219097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d91e568635c7cd23bd56f3ed6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 12 18:50:46 2016 -0500 winemac: Mirror the hierarchy of Win32 child windows with Cocoa views. This only really affects OpenGL child windows. GDI rendering to the window surface is still only blitted to the window's content view. The descendant views don't draw and so are transparent, letting the content view show through. Using Cocoa views for child windows fixes a problem where changes to the position and visibility of child GL windows didn't properly affect the Cocoa GL view. Hiding, showing, and moving the top-level window affected the Cocoa window and thus, indirectly, the GL view. Moving the child GL window itself was propagated to the GL view, so that worked. But hiding, showing, or moving any of the intervening ancestors of the child GL window didn't properly affect the GL view. Neither did hiding or showing the child GL window itself. This also slightly improves the clipping of the GL view by its ancestors, although it still doesn't work quite right due to Cocoa bugs. There are also remaining bugs with z-order among multiple GL views and clipping by overlapping siblings. I hope to eventually fix those using Core Animation layers, for which this is a prerequisite. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/macdrv.h | 7 +- dlls/winemac.drv/opengl.c | 159 ++++++---------------------------- dlls/winemac.drv/window.c | 213 +++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 222 insertions(+), 157 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d91e568635c7cd23bd56f…

1 0

Ken Thomases : winemac: Make show_window() and hide_window() tolerate being called when there's no Cocoa window.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: 225482f5ad3055d0d1ea7a68013d5d547d2c6a82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=225482f5ad3055d0d1ea7a680… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 12 18:50:44 2016 -0500 winemac: Make show_window() and hide_window() tolerate being called when there's no Cocoa window. Minor no-op refactoring that makes subsequent commits cleaner. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 74 +++++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index a48ac17..bb82927 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -731,40 +731,43 @@ static struct macdrv_win_data *macdrv_create_win_data(HWND hwnd, const RECT *win */ static void show_window(struct macdrv_win_data *data) { - HWND prev = NULL; - HWND next = NULL; - macdrv_window prev_window = NULL; - macdrv_window next_window = NULL; - BOOL activate = FALSE; - HWND hwndFocus; - - /* find window that this one must be after */ - prev = GetWindow(data->hwnd, GW_HWNDPREV); - while (prev && !((GetWindowLongW(prev, GWL_STYLE) & (WS_VISIBLE | WS_MINIMIZE)) == WS_VISIBLE && - (prev_window = macdrv_get_cocoa_window(prev, TRUE)))) - prev = GetWindow(prev, GW_HWNDPREV); - if (!prev_window) - { - /* find window that this one must be before */ - next = GetWindow(data->hwnd, GW_HWNDNEXT); - while (next && !((GetWindowLongW(next, GWL_STYLE) & (WS_VISIBLE | WS_MINIMIZE)) == WS_VISIBLE && - (next_window = macdrv_get_cocoa_window(next, TRUE)))) - next = GetWindow(next, GW_HWNDNEXT); - } - - TRACE("win %p/%p below %p/%p above %p/%p\n", - data->hwnd, data->cocoa_window, prev, prev_window, next, next_window); - - if (!prev_window) - activate = activate_on_focus_time && (GetTickCount() - activate_on_focus_time < 2000); - macdrv_order_cocoa_window(data->cocoa_window, prev_window, next_window, activate); - data->on_screen = TRUE; - - hwndFocus = GetFocus(); - if (hwndFocus && (data->hwnd == hwndFocus || IsChild(data->hwnd, hwndFocus))) - macdrv_SetFocus(hwndFocus); - if (activate) - activate_on_focus_time = 0; + if (data->cocoa_window) + { + HWND prev = NULL; + HWND next = NULL; + macdrv_window prev_window = NULL; + macdrv_window next_window = NULL; + BOOL activate = FALSE; + HWND hwndFocus; + + /* find window that this one must be after */ + prev = GetWindow(data->hwnd, GW_HWNDPREV); + while (prev && !((GetWindowLongW(prev, GWL_STYLE) & (WS_VISIBLE | WS_MINIMIZE)) == WS_VISIBLE && + (prev_window = macdrv_get_cocoa_window(prev, TRUE)))) + prev = GetWindow(prev, GW_HWNDPREV); + if (!prev_window) + { + /* find window that this one must be before */ + next = GetWindow(data->hwnd, GW_HWNDNEXT); + while (next && !((GetWindowLongW(next, GWL_STYLE) & (WS_VISIBLE | WS_MINIMIZE)) == WS_VISIBLE && + (next_window = macdrv_get_cocoa_window(next, TRUE)))) + next = GetWindow(next, GW_HWNDNEXT); + } + + TRACE("win %p/%p below %p/%p above %p/%p\n", + data->hwnd, data->cocoa_window, prev, prev_window, next, next_window); + + if (!prev_window) + activate = activate_on_focus_time && (GetTickCount() - activate_on_focus_time < 2000); + macdrv_order_cocoa_window(data->cocoa_window, prev_window, next_window, activate); + data->on_screen = TRUE; + + hwndFocus = GetFocus(); + if (hwndFocus && (data->hwnd == hwndFocus || IsChild(data->hwnd, hwndFocus))) + macdrv_SetFocus(hwndFocus); + if (activate) + activate_on_focus_time = 0; + } } @@ -775,7 +778,8 @@ static void hide_window(struct macdrv_win_data *data) { TRACE("win %p/%p\n", data->hwnd, data->cocoa_window); - macdrv_hide_cocoa_window(data->cocoa_window); + if (data->cocoa_window) + macdrv_hide_cocoa_window(data->cocoa_window); data->on_screen = FALSE; }

1 0

Nikolay Sivov : comctl32/imagelist: Simplify setting ImageList_DragEnter() return code.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: 833ff146c4611897085fafb36b09c41488ffedc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=833ff146c4611897085fafb36… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 12 23:00:26 2016 +0300 comctl32/imagelist: Simplify setting ImageList_DragEnter() return code. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index c34eb0a..a7301d1 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -930,11 +930,7 @@ ImageList_DragEnter (HWND hwndLock, INT x, INT y) InternalDrag.y = y; /* draw the drag image and save the background */ - if (!ImageList_DragShowNolock(TRUE)) { - return FALSE; - } - - return TRUE; + return ImageList_DragShowNolock(TRUE); }

1 0