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

Hugh McMaster : reg/tests: Add tests for 'reg add/delete/query /?'.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 1348d9e97b1e83c99b68e0c9b592798038dc7f41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1348d9e97b1e83c99b68e0c9b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 11 11:05:14 2016 +0000 reg/tests: Add tests for 'reg add/delete/query /?'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 3237025..c59f08f 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -90,6 +90,9 @@ static void test_add(void) run_reg_exe("reg add", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg add /?", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); @@ -453,6 +456,9 @@ static void test_delete(void) run_reg_exe("reg delete", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg delete /?", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegCreateKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL); ok(err == ERROR_SUCCESS, "got %d\n", err); @@ -512,6 +518,9 @@ static void test_query(void) run_reg_exe("reg query", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg query /?", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + /* Create a test key */ err = RegCreateKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &key, NULL); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Maarten Lankhorst : dsound: Use AudioClient buffer statistics.
by Alexandre Julliard 14 May '16

14 May '16

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

Maarten Lankhorst : dsound: Use AudioClient for position.
by Alexandre Julliard 14 May '16

14 May '16

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: Mix float natively.
by Alexandre Julliard 14 May '16

14 May '16

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

Andrew Eikum : powrprof: Stub PowerSetActiveScheme.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: b51aaa40dc1b51f668c5c9cc806e260e45191f37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b51aaa40dc1b51f668c5c9cc8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 12 14:21:47 2016 -0500 powrprof: Stub PowerSetActiveScheme. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/powrprof/powrprof.c | 6 ++++++ dlls/powrprof/powrprof.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 7327fdf..a1d1092 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -303,6 +303,12 @@ DWORD WINAPI PowerGetActiveScheme(HKEY UserRootPowerKey, GUID **polguid) return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI PowerSetActiveScheme(HKEY UserRootPowerKey, GUID *polguid) +{ + FIXME("(%p,%s) stub!\n", UserRootPowerKey, wine_dbgstr_guid(polguid)); + return ERROR_SUCCESS; +} + DWORD WINAPI PowerReadDCValue(HKEY RootPowerKey, const GUID *Scheme, const GUID *SubGroup, const GUID *PowerSettings, PULONG Type, PUCHAR Buffer, DWORD *BufferSize) { FIXME("(%p,%s,%s,%s,%p,%p,%p) stub!\n", RootPowerKey, debugstr_guid(Scheme), debugstr_guid(SubGroup), debugstr_guid(PowerSettings), Type, Buffer, BufferSize); diff --git a/dlls/powrprof/powrprof.spec b/dlls/powrprof/powrprof.spec index cb1d487..f513f04 100644 --- a/dlls/powrprof/powrprof.spec +++ b/dlls/powrprof/powrprof.spec @@ -11,6 +11,7 @@ @ stdcall IsPwrShutdownAllowed () @ stdcall IsPwrSuspendAllowed () @ stdcall PowerGetActiveScheme (ptr ptr) +@ stdcall PowerSetActiveScheme (ptr ptr) @ stdcall PowerReadDCValue (ptr ptr ptr ptr ptr ptr ptr) @ stdcall ReadGlobalPwrPolicy (ptr) @ stdcall ReadProcessorPwrScheme (long ptr)

1 0

Nikolay Sivov : comctl32/header: Use proper return type for HDM_CREATEDRAGIMAGE handler.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: ac75a00b0dccf56396c6ee13e3cb4a91a1b5c397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac75a00b0dccf56396c6ee13e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 12 23:00:03 2016 +0300 comctl32/header: Use proper return type for HDM_CREATEDRAGIMAGE handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/header.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 7c632f3..fb6a815 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1005,7 +1005,7 @@ HEADER_FreeCallbackItems(HEADER_ITEM *lpItem) lpItem->iImage = I_IMAGECALLBACK; } -static LRESULT +static HIMAGELIST HEADER_CreateDragImage (HEADER_INFO *infoPtr, INT iItem) { HEADER_ITEM *lpItem; @@ -1019,7 +1019,7 @@ HEADER_CreateDragImage (HEADER_INFO *infoPtr, INT iItem) HFONT hFont; if (iItem >= infoPtr->uNumItem) - return FALSE; + return NULL; if (!infoPtr->bRectsValid) HEADER_SetItemBounds(infoPtr); @@ -1047,12 +1047,12 @@ HEADER_CreateDragImage (HEADER_INFO *infoPtr, INT iItem) DeleteDC(hMemoryDC); if (hMemory == NULL) /* if anything failed */ - return FALSE; - + return NULL; + himl = ImageList_Create(width, height, ILC_COLORDDB, 1, 1); ImageList_Add(himl, hMemory, NULL); DeleteObject(hMemory); - return (LRESULT)himl; + return himl; } static LRESULT @@ -1836,7 +1836,7 @@ HEADER_MouseMove (HEADER_INFO *infoPtr, LPARAM lParam) { if (!HEADER_SendNotifyWithHDItemT(infoPtr, HDN_BEGINDRAG, infoPtr->iMoveItem, NULL)) { - HIMAGELIST hDragItem = (HIMAGELIST)HEADER_CreateDragImage(infoPtr, infoPtr->iMoveItem); + HIMAGELIST hDragItem = HEADER_CreateDragImage(infoPtr, infoPtr->iMoveItem); if (hDragItem != NULL) { HEADER_ITEM *lpItem = &infoPtr->items[infoPtr->iMoveItem]; @@ -2067,7 +2067,7 @@ HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) /* case HDM_CLEARFILTER: */ case HDM_CREATEDRAGIMAGE: - return HEADER_CreateDragImage (infoPtr, (INT)wParam); + return (LRESULT)HEADER_CreateDragImage (infoPtr, (INT)wParam); case HDM_DELETEITEM: return HEADER_DeleteItem (infoPtr, (INT)wParam);

1 0

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

14 May '16

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

Ken Thomases : winemac: Remove the assumption that OpenGL views are always immediate subviews of the window content view.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 742734b44f6d622053dca8f241c61f28ab7892c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=742734b44f6d622053dca8f24… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 12 18:50:39 2016 -0500 winemac: Remove the assumption that OpenGL views are always immediate subviews of the window content view. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 81 +++++++++++++++++++++++++++++++++++------ 1 file changed, 70 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index aee9981..ec5eb2b 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -290,6 +290,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { NSMutableArray* glContexts; NSMutableArray* pendingGlContexts; + BOOL _cachedHasGLDescendant; + BOOL _cachedHasGLDescendantValid; BOOL clearedGlSurface; NSMutableAttributedString* markedText; @@ -454,6 +456,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) addGLContext:(WineOpenGLContext*)context { + BOOL hadContext = [self hasGLContext]; if (!glContexts) glContexts = [[NSMutableArray alloc] init]; if (!pendingGlContexts) @@ -475,13 +478,18 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [self setNeedsDisplay:YES]; } + if (!hadContext) + [self invalidateHasGLDescendant]; [(WineWindow*)[self window] updateForGLSubviews]; } - (void) removeGLContext:(WineOpenGLContext*)context { + BOOL hadContext = [self hasGLContext]; [glContexts removeObjectIdenticalTo:context]; [pendingGlContexts removeObjectIdenticalTo:context]; + if (hadContext && ![self hasGLContext]) + [self invalidateHasGLDescendant]; [(WineWindow*)[self window] updateForGLSubviews]; } @@ -496,6 +504,40 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi return [glContexts count] || [pendingGlContexts count]; } + - (BOOL) _hasGLDescendant + { + if ([self hasGLContext]) + return YES; + for (WineContentView* view in [self subviews]) + { + if ([view hasGLDescendant]) + return YES; + } + return NO; + } + + - (BOOL) hasGLDescendant + { + if (!_cachedHasGLDescendantValid) + { + _cachedHasGLDescendant = [self _hasGLDescendant]; + _cachedHasGLDescendantValid = YES; + } + return _cachedHasGLDescendant; + } + + - (void) invalidateHasGLDescendant + { + BOOL invalidateAncestors = _cachedHasGLDescendantValid; + _cachedHasGLDescendantValid = NO; + if (invalidateAncestors && self != [[self window] contentView]) + { + WineContentView* superview = (WineContentView*)[self superview]; + if ([superview isKindOfClass:[WineContentView class]]) + [superview invalidateHasGLDescendant]; + } + } + - (void) wine_getBackingSize:(int*)outBackingSize { @synchronized(self) { @@ -560,6 +602,28 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi return NSFocusRingTypeNone; } + - (void) didAddSubview:(NSView*)subview + { + if ([subview isKindOfClass:[WineContentView class]]) + { + WineContentView* view = (WineContentView*)subview; + if (!view->_cachedHasGLDescendantValid || view->_cachedHasGLDescendant) + [self invalidateHasGLDescendant]; + } + [super didAddSubview:subview]; + } + + - (void) willRemoveSubview:(NSView*)subview + { + if ([subview isKindOfClass:[WineContentView class]]) + { + WineContentView* view = (WineContentView*)subview; + if (!view->_cachedHasGLDescendantValid || view->_cachedHasGLDescendant) + [self invalidateHasGLDescendant]; + } + [super willRemoveSubview:subview]; + } + /* * ---------- NSTextInputClient methods ---------- */ @@ -1606,7 +1670,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (BOOL) needsTransparency { return self.shape || self.colorKeyed || self.usePerPixelAlpha || - (gl_surface_mode == GL_SURFACE_BEHIND && [[self.contentView valueForKeyPath:@"subviews.(a)max.hasGLContext"] boolValue]); + (gl_surface_mode == GL_SURFACE_BEHIND && [(WineContentView*)self.contentView hasGLDescendant]); } - (void) checkTransparency @@ -2194,17 +2258,12 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { NSRect contentRect = [[self contentView] frame]; BOOL coveredByGLView = FALSE; - for (WineContentView* view in [[self contentView] subviews]) + WineContentView* view = (WineContentView*)[[self contentView] hitTest:NSMakePoint(NSMidX(contentRect), NSMidY(contentRect))]; + if ([view isKindOfClass:[WineContentView class]] && [view hasGLContext]) { - if ([view hasGLContext]) - { - NSRect frame = [view convertRect:[view bounds] toView:nil]; - if (NSContainsRect(frame, contentRect)) - { - coveredByGLView = TRUE; - break; - } - } + NSRect frame = [view convertRect:[view bounds] toView:nil]; + if (NSContainsRect(frame, contentRect)) + coveredByGLView = TRUE; } if (coveredByGLView)

1 0

Ken Thomases : winemac: Add function macdrv_set_view_superview().
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 8223756ba4f41f4c662a36af71c984e4415a6332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8223756ba4f41f4c662a36af7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 12 18:50:40 2016 -0500 winemac: Add function macdrv_set_view_superview(). This allows for nesting views in a hierarchy rather than only ever adding them as direct subviews of the window content view. This functionality will be used in subsequent commits. This takes over some of the functionality of macdrv_set_view_window_and_frame(), which will be removed in a subsequent commit. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 52 +++++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/opengl.c | 3 ++- 3 files changed, 55 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index ec5eb2b..7aba872 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -3323,6 +3323,58 @@ void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGRect rec } /*********************************************************************** + * macdrv_set_view_superview + * + * Move a view to a new superview and position it relative to its + * siblings. If p is non-NULL, the view is ordered behind it. + * Otherwise, the view is ordered above n. If s is NULL, use the + * content view of w as the new superview. + */ +void macdrv_set_view_superview(macdrv_view v, macdrv_view s, macdrv_window w, macdrv_view p, macdrv_view n) +{ + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + WineContentView* view = (WineContentView*)v; + WineContentView* superview = (WineContentView*)s; + WineWindow* window = (WineWindow*)w; + WineContentView* prev = (WineContentView*)p; + WineContentView* next = (WineContentView*)n; + + if (!superview) + superview = [window contentView]; + + OnMainThread(^{ + if (superview == [view superview]) + { + NSArray* subviews = [superview subviews]; + NSUInteger index = [subviews indexOfObjectIdenticalTo:view]; + if (!prev && !next && index == 0) + return; + if (prev && index > 0 && [subviews objectAtIndex:index - 1] == prev) + return; + if (!prev && next && index + 1 < [subviews count] && [subviews objectAtIndex:index + 1] == next) + return; + } + + WineWindow* oldWindow = (WineWindow*)[view window]; + WineWindow* newWindow = (WineWindow*)[superview window]; + + [view removeFromSuperview]; + if (prev) + [superview addSubview:view positioned:NSWindowBelow relativeTo:prev]; + else + [superview addSubview:view positioned:NSWindowAbove relativeTo:next]; + + if (oldWindow != newWindow) + { + [oldWindow updateForGLSubviews]; + [newWindow updateForGLSubviews]; + } + }); + + [pool release]; +} + +/*********************************************************************** * macdrv_add_view_opengl_context * * Add an OpenGL context to the list being tracked for each view. diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 2c06bea..6e70d6d 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -514,6 +514,7 @@ extern void macdrv_set_window_min_max_sizes(macdrv_window w, CGSize min_size, CG extern macdrv_view macdrv_create_view(macdrv_window w, CGRect rect) DECLSPEC_HIDDEN; extern void macdrv_dispose_view(macdrv_view v) DECLSPEC_HIDDEN; extern void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGRect rect) DECLSPEC_HIDDEN; +extern void macdrv_set_view_superview(macdrv_view v, macdrv_view s, macdrv_window w, macdrv_view p, macdrv_view n) DECLSPEC_HIDDEN; extern void macdrv_add_view_opengl_context(macdrv_view v, macdrv_opengl_context c) DECLSPEC_HIDDEN; extern void macdrv_remove_view_opengl_context(macdrv_view v, macdrv_opengl_context c) DECLSPEC_HIDDEN; extern int macdrv_get_view_backing_size(macdrv_view v, int backing_size[2]) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index fbdc645..0039f0a 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1735,7 +1735,8 @@ void set_gl_view_parent(HWND hwnd, HWND parent) return; } - macdrv_set_view_window_and_frame(data->gl_view, cocoa_window, cgrect_from_rect(data->gl_rect)); + macdrv_set_view_superview(data->gl_view, NULL, cocoa_window, NULL, NULL); + macdrv_set_view_window_and_frame(data->gl_view, NULL, cgrect_from_rect(data->gl_rect)); mark_contexts_for_moved_view(data->gl_view); }

1 0

Ken Thomases : winemac: Change macdrv_set_view_window_and_frame() to macdrv_set_view_frame().
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 587bdb8db7ea40dfcb441a602b0aac1ab1c61a4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=587bdb8db7ea40dfcb441a602… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 12 18:50:41 2016 -0500 winemac: Change macdrv_set_view_window_and_frame() to macdrv_set_view_frame(). Remove the no-longer-used functionality of potentially moving the view from one window to another. That has been taken over by macdrv_set_view_superview(). Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 28 ++++------------------------ dlls/winemac.drv/macdrv_cocoa.h | 2 +- dlls/winemac.drv/opengl.c | 4 ++-- 3 files changed, 7 insertions(+), 27 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 7aba872..d0b92f1 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -3266,39 +3266,22 @@ void macdrv_dispose_view(macdrv_view v) } /*********************************************************************** - * macdrv_set_view_window_and_frame - * - * Move a view to a new window and/or position within its window. If w - * is NULL, leave the view in its current window and just change its - * frame. + * macdrv_set_view_frame */ -void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGRect rect) +void macdrv_set_view_frame(macdrv_view v, CGRect rect) { NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; WineContentView* view = (WineContentView*)v; - WineWindow* window = (WineWindow*)w; if (CGRectIsNull(rect)) rect = CGRectZero; OnMainThread(^{ - BOOL changedWindow = (window && window != [view window]); NSRect newFrame = NSRectFromCGRect(cgrect_mac_from_win(rect)); NSRect oldFrame = [view frame]; - BOOL needUpdateWindowForGLSubviews = FALSE; - - if (changedWindow) - { - WineWindow* oldWindow = (WineWindow*)[view window]; - [view removeFromSuperview]; - [oldWindow updateForGLSubviews]; - [[window contentView] addSubview:view]; - needUpdateWindowForGLSubviews = TRUE; - } if (!NSEqualRects(oldFrame, newFrame)) { - if (!changedWindow) - [[view superview] setNeedsDisplayInRect:oldFrame]; + [[view superview] setNeedsDisplayInRect:oldFrame]; if (NSEqualPoints(oldFrame.origin, newFrame.origin)) [view setFrameSize:newFrame.size]; else if (NSEqualSizes(oldFrame.size, newFrame.size)) @@ -3306,17 +3289,14 @@ void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGRect rec else [view setFrame:newFrame]; [view setNeedsDisplay:YES]; - needUpdateWindowForGLSubviews = TRUE; if (retina_enabled) { int backing_size[2] = { 0 }; [view wine_setBackingSize:backing_size]; } - } - - if (needUpdateWindowForGLSubviews) [(WineWindow*)[view window] updateForGLSubviews]; + } }); [pool release]; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 6e70d6d..331fca7 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -513,7 +513,7 @@ extern void macdrv_give_cocoa_window_focus(macdrv_window w, int activate) DECLSP extern void macdrv_set_window_min_max_sizes(macdrv_window w, CGSize min_size, CGSize max_size) DECLSPEC_HIDDEN; extern macdrv_view macdrv_create_view(macdrv_window w, CGRect rect) DECLSPEC_HIDDEN; extern void macdrv_dispose_view(macdrv_view v) DECLSPEC_HIDDEN; -extern void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGRect rect) DECLSPEC_HIDDEN; +extern void macdrv_set_view_frame(macdrv_view v, CGRect rect) DECLSPEC_HIDDEN; extern void macdrv_set_view_superview(macdrv_view v, macdrv_view s, macdrv_window w, macdrv_view p, macdrv_view n) DECLSPEC_HIDDEN; extern void macdrv_add_view_opengl_context(macdrv_view v, macdrv_opengl_context c) DECLSPEC_HIDDEN; extern void macdrv_remove_view_opengl_context(macdrv_view v, macdrv_opengl_context c) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 0039f0a..f6a656f 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1736,7 +1736,7 @@ void set_gl_view_parent(HWND hwnd, HWND parent) } macdrv_set_view_superview(data->gl_view, NULL, cocoa_window, NULL, NULL); - macdrv_set_view_window_and_frame(data->gl_view, NULL, cgrect_from_rect(data->gl_rect)); + macdrv_set_view_frame(data->gl_view, cgrect_from_rect(data->gl_rect)); mark_contexts_for_moved_view(data->gl_view); } @@ -4430,7 +4430,7 @@ void sync_gl_view(struct macdrv_win_data *data) if (get_gl_view_window_rect(data, NULL, &rect) && memcmp(&data->gl_rect, &rect, sizeof(rect))) { TRACE("Setting GL view %p frame to %s\n", data->gl_view, wine_dbgstr_rect(&rect)); - macdrv_set_view_window_and_frame(data->gl_view, NULL, cgrect_from_rect(rect)); + macdrv_set_view_frame(data->gl_view, cgrect_from_rect(rect)); data->gl_rect = rect; mark_contexts_for_moved_view(data->gl_view); }

1 0