wine-commits May 2016

wine-commits@winehq.org

4 participants
542 discussions

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

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

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: 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

Piotr Caban : msvcp110: Fix num_put<char> structure layout.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 77184106c8c2bff7db9ea5d20b3b3330196befc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77184106c8c2bff7db9ea5d20… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 10 15:24:12 2016 +0200 msvcp110: Fix num_put<char> structure layout. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 37 ++++++++++++++++++++++++++++++++----- dlls/msvcp90/msvcp90.h | 2 ++ 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 89465b5..06b2ca1 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -7124,7 +7124,9 @@ DEFINE_THISCALL_WRAPPER(num_put_char__Init, 8) void __thiscall num_put_char__Init(num_put *this, const _Locinfo *locinfo) { TRACE("(%p %p)\n", this, locinfo); +#if _MSVCP_VER < 110 _Locinfo__Getcvt(locinfo, &this->cvt); +#endif } /* ??0?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QAE@ABV_Locinfo@1@I@Z */ @@ -7869,7 +7871,9 @@ DEFINE_THISCALL_WRAPPER(num_put_wchar__Init, 8) void __thiscall num_put_wchar__Init(num_put *this, const _Locinfo *locinfo) { TRACE("(%p %p)\n", this, locinfo); +#if _MSVCP_VER < 110 _Locinfo__Getcvt(locinfo, &this->cvt); +#endif } /* ??0?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@QAE@ABV_Locinfo@1@I@Z */ @@ -8104,6 +8108,7 @@ ostreambuf_iterator_wchar* __cdecl num_put_wchar__Put(const num_put *this, ostre return ret; } +#if _MSVCP_VER < 110 /* ?_Putc@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@PBDI@Z */ /* ?_Putc@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@PEBD_K@Z */ /* ?_Putc@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator@GU?$char_traits@G@std@@@2@V32@PBDI@Z */ @@ -8124,6 +8129,7 @@ ostreambuf_iterator_wchar* __cdecl num_put_wchar__Putc(const num_put *this, ostr *ret = dest; return ret; } +#endif /* ?_Putgrouped@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@PBDI_W@Z */ /* ?_Putgrouped@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@PEBD_K_W@Z */ @@ -8208,6 +8214,27 @@ ostreambuf_iterator_wchar* __cdecl num_put_short__Fput(const num_put *this, ostr return NULL; } +#if _MSVCP_VER < 110 +static void num_put_wchar_wide_put(const num_put *this, + ostreambuf_iterator_wchar *dest, ios_base *base, + const char *buf, MSVCP_size_t count) +{ + num_put_wchar__Putc(this, dest, *dest, buf, count); +} +#else +static void num_put_wchar_wide_put(const num_put *this, + ostreambuf_iterator_wchar *dest, ios_base *base, + const char *buf, MSVCP_size_t count) +{ + ctype_wchar *ctype; + MSVCP_size_t i; + + ctype = ctype_wchar_use_facet(IOS_LOCALE(base)); + for(i=0; i<count; i++) + ostreambuf_iterator_wchar_put(dest, ctype_wchar_widen_ch(ctype, buf[i])); +} +#endif + /* TODO: This function should be removed when num_put_wchar__Fput is implemented */ static ostreambuf_iterator_wchar* num_put__fput(const num_put *this, ostreambuf_iterator_wchar *ret, ostreambuf_iterator_wchar dest, ios_base *base, wchar_t fill, char *buf, @@ -8258,7 +8285,7 @@ static ostreambuf_iterator_wchar* num_put__fput(const num_put *this, ostreambuf_ base->wide = 0; if((adjustfield & FMTFLAG_internal) && (buf[0]=='-' || buf[0]=='+')) { - num_put_wchar__Putc(this, &dest, dest, buf, 1); + num_put_wchar_wide_put(this, &dest, base, buf, 1); buf++; } if(adjustfield != FMTFLAG_left) { @@ -8272,7 +8299,7 @@ static ostreambuf_iterator_wchar* num_put__fput(const num_put *this, ostreambuf_ else if(!buf[i]) num_put_wchar__Rep(this, &dest, dest, sep, 1); else - num_put_wchar__Putc(this, &dest, dest, buf+i, 1); + num_put_wchar_wide_put(this, &dest, base, buf+i, 1); } return num_put_wchar__Rep(this, ret, dest, fill, pad); @@ -8351,10 +8378,10 @@ static ostreambuf_iterator_wchar* num_put__Iput(const num_put *this, ostreambuf_ base->wide = 0; if((adjustfield & FMTFLAG_internal) && (buf[0]=='-' || buf[0]=='+')) { - num_put_wchar__Putc(this, &dest, dest, buf, 1); + num_put_wchar_wide_put(this, &dest, base, buf, 1); buf++; }else if((adjustfield & FMTFLAG_internal) && (buf[1]=='x' || buf[1]=='X')) { - num_put_wchar__Putc(this, &dest, dest, buf, 2); + num_put_wchar_wide_put(this, &dest, base, buf, 2); buf += 2; } if(adjustfield != FMTFLAG_left) { @@ -8366,7 +8393,7 @@ static ostreambuf_iterator_wchar* num_put__Iput(const num_put *this, ostreambuf_ if(!buf[i]) num_put_wchar__Rep(this, &dest, dest, sep, 1); else - num_put_wchar__Putc(this, &dest, dest, buf+i, 1); + num_put_wchar_wide_put(this, &dest, base, buf+i, 1); } return num_put_wchar__Rep(this, ret, dest, fill, pad); diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 4a42332..aa7322f 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -550,7 +550,9 @@ istreambuf_iterator_wchar *__thiscall num_get_wchar_get_bool(const num_get*, ist /* class num_put<wchar> */ typedef struct { locale_facet facet; +#if _MSVCP_VER < 110 _Cvtvec cvt; +#endif } num_put; num_put* num_put_char_use_facet(const locale*);

1 0

Piotr Caban : msvcp110: Use locale_string:: assign instead of freeing and allocating new object in _Locinfo__W_Getdays.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 40a59a968a9818321c9534cb858c4e1f06ccc9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40a59a968a9818321c9534cb8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 10 15:24:08 2016 +0200 msvcp110: Use locale_string::assign instead of freeing and allocating new object in _Locinfo__W_Getdays. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 0a06da2..89465b5 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -86,9 +86,9 @@ LCID* __cdecl ___lc_handle_func(void); #define locale_string_wchar _Yarn_wchar #define locale_string_wchar_ctor(this) _Yarn_wchar_ctor(this) -#define locale_string_wchar_ctor_cstr(this,str) _Yarn_wchar_ctor(this); _Yarn_wchar_op_assign_cstr(this,str) #define locale_string_wchar_dtor(this) _Yarn_wchar_dtor(this) #define locale_string_wchar_c_str(this) _Yarn_wchar__C_str(this) +#define locale_string_wchar_assign(this,str) _Yarn_wchar_op_assign_cstr(this,str) #endif typedef int category; @@ -850,8 +850,7 @@ const wchar_t* __thiscall _Locinfo__W_Getdays(const _Locinfo *this) TRACE("(%p)\n", this); if(wdays) { - locale_string_wchar_dtor((locale_string_wchar *)&this->wdays); - locale_string_wchar_ctor_cstr((locale_string_wchar *)&this->wdays, wdays); + locale_string_wchar_assign((locale_string_wchar *)&this->wdays, wdays); free(wdays); } @@ -886,8 +885,7 @@ const wchar_t* __thiscall _Locinfo__W_Getmonths(const _Locinfo *this) TRACE("(%p)\n", this); if(wmonths) { - locale_string_wchar_dtor((locale_string_wchar *)&this->wmonths); - locale_string_wchar_ctor_cstr((locale_string_wchar *)&this->wmonths, wmonths); + locale_string_wchar_assign((locale_string_wchar *)&this->wmonths, wmonths); free(wmonths); }

1 0

Piotr Caban : msvcp110: Don't allocate empty buffers in _Locinfo:: _Locinfo_ctor.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 5a427e5124d0ca587a363d37d98cfd625d702365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a427e5124d0ca587a363d37d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 10 15:24:04 2016 +0200 msvcp110: Don't allocate empty buffers in _Locinfo::_Locinfo_ctor. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 13 ++++++------- dlls/msvcp90/msvcp90.h | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 24cacc7..0a06da2 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -69,6 +69,7 @@ LCID* __cdecl ___lc_handle_func(void); #if _MSVCP_VER < 100 #define locale_string basic_string_char +#define locale_string_char_ctor(this) MSVCP_basic_string_char_ctor(this) #define locale_string_char_ctor_cstr(this,str) MSVCP_basic_string_char_ctor_cstr(this,str) #define locale_string_char_copy_ctor(this,copy) MSVCP_basic_string_char_copy_ctor(this,copy) #define locale_string_char_dtor(this) MSVCP_basic_string_char_dtor(this) @@ -76,6 +77,7 @@ LCID* __cdecl ___lc_handle_func(void); #define locale_string_char_assign(this,assign) MSVCP_basic_string_char_assign(this,assign) #else #define locale_string _Yarn_char +#define locale_string_char_ctor(this) _Yarn_char_ctor(this) #define locale_string_char_ctor_cstr(this,str) _Yarn_char_ctor_cstr(this,str) #define locale_string_char_copy_ctor(this,copy) _Yarn_char_copy_ctor(this,copy) #define locale_string_char_dtor(this) _Yarn_char_dtor(this) @@ -512,9 +514,6 @@ void* __thiscall _Timevec__Getptr(_Timevec *this) _Locinfo* __cdecl _Locinfo__Locinfo_ctor_cat_cstr(_Locinfo *locinfo, int category, const char *locstr) { const char *locale = NULL; -#if _MSVCP_VER >= 110 - static const wchar_t empty[] = { '\0' }; -#endif /* This function is probably modifying more global objects */ FIXME("(%p %d %s) semi-stub\n", locinfo, category, locstr); @@ -523,11 +522,11 @@ _Locinfo* __cdecl _Locinfo__Locinfo_ctor_cat_cstr(_Locinfo *locinfo, int categor throw_exception(EXCEPTION_RUNTIME_ERROR, "bad locale name"); _Lockit_ctor_locktype(&locinfo->lock, _LOCK_LOCALE); - locale_string_char_ctor_cstr(&locinfo->days, ""); - locale_string_char_ctor_cstr(&locinfo->months, ""); + locale_string_char_ctor(&locinfo->days); + locale_string_char_ctor(&locinfo->months); #if _MSVCP_VER >= 110 - locale_string_wchar_ctor_cstr(&locinfo->wdays, empty); - locale_string_wchar_ctor_cstr(&locinfo->wmonths, empty); + locale_string_wchar_ctor(&locinfo->wdays); + locale_string_wchar_ctor(&locinfo->wmonths); #endif locale_string_char_ctor_cstr(&locinfo->oldlocname, setlocale(LC_ALL, NULL)); diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 2d0f4f8..4a42332 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -142,6 +142,7 @@ typedef struct char null_str; } _Yarn_char; +_Yarn_char* __thiscall _Yarn_char_ctor(_Yarn_char*); _Yarn_char* __thiscall _Yarn_char_ctor_cstr(_Yarn_char*, const char*); _Yarn_char* __thiscall _Yarn_char_copy_ctor(_Yarn_char*, const _Yarn_char*); const char* __thiscall _Yarn_char_c_str(const _Yarn_char*);

1 0

Piotr Caban : msvcp110: Fix Yarn::operator=(const char*) implementation.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: f8a0f90effcb0ff2d5f453079c47f4881483744a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8a0f90effcb0ff2d5f453079… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 10 15:23:58 2016 +0200 msvcp110: Fix Yarn::operator=(const char*) implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/string.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 9f0d7fe..e102020 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1644,17 +1644,19 @@ _Yarn_char* __thiscall _Yarn_char_op_assign_cstr(_Yarn_char *this, const char *s { TRACE("(%p %p)\n", this, str); - _Yarn_char__Tidy(this); - - if(str) { - MSVCP_size_t len = strlen(str); - - this->str = MSVCRT_operator_new((len+1)*sizeof(char)); - if(!this->str) { - ERR("out of memory\n"); - return NULL; + if(str != this->str) { + _Yarn_char__Tidy(this); + + if(str) { + MSVCP_size_t len = strlen(str); + + this->str = MSVCRT_operator_new((len+1)*sizeof(char)); + if(!this->str) { + ERR("out of memory\n"); + return NULL; + } + memcpy(this->str, str, (len+1)*sizeof(char)); } - memcpy(this->str, str, (len+1)*sizeof(char)); } return this; } @@ -1762,17 +1764,19 @@ _Yarn_wchar* __thiscall _Yarn_wchar_op_assign_cstr(_Yarn_wchar *this, const wcha { TRACE("(%p %p)\n", this, str); - _Yarn_wchar__Tidy(this); + if(str != this->str) { + _Yarn_wchar__Tidy(this); - if(str) { - MSVCP_size_t len = wcslen(str); + if(str) { + MSVCP_size_t len = wcslen(str); - this->str = MSVCRT_operator_new((len+1)*sizeof(wchar_t)); - if(!this->str) { - ERR("out of memory\n"); - return NULL; + this->str = MSVCRT_operator_new((len+1)*sizeof(wchar_t)); + if(!this->str) { + ERR("out of memory\n"); + return NULL; + } + memcpy(this->str, str, (len+1)*sizeof(wchar_t)); } - memcpy(this->str, str, (len+1)*sizeof(wchar_t)); } return this; }

1 0

Kirill K. Smirnov : mciavi32: Propely handle Heap[Re]Alloc failure.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: ed79f458174d9db8e41d2b166fcc8acde7dfdeb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed79f458174d9db8e41d2b166… Author: Kirill K. Smirnov <kirill.k.smirnov(a)gmail.com> Date: Sun May 8 19:10:44 2016 +0300 mciavi32: Propely handle Heap[Re]Alloc failure. Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciavi32/mmoutput.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/mciavi32/mmoutput.c b/dlls/mciavi32/mmoutput.c index d3badb6..c932ab4 100644 --- a/dlls/mciavi32/mmoutput.c +++ b/dlls/mciavi32/mmoutput.c @@ -229,14 +229,16 @@ static BOOL MCIAVI_AddFrame(WINE_MCIAVI* wma, LPMMCKINFO mmck, alb->numAudioBlocks, mmck->cksize); if (wma->lpWaveFormat) { if (alb->numAudioBlocks >= alb->numAudioAllocated) { - alb->numAudioAllocated += 32; - if (!wma->lpAudioIndex) - wma->lpAudioIndex = HeapAlloc(GetProcessHeap(), 0, - alb->numAudioAllocated * sizeof(struct MMIOPos)); - else - wma->lpAudioIndex = HeapReAlloc(GetProcessHeap(), 0, wma->lpAudioIndex, - alb->numAudioAllocated * sizeof(struct MMIOPos)); - if (!wma->lpAudioIndex) return FALSE; + DWORD newsize = alb->numAudioAllocated + 32; + struct MMIOPos* newindex; + + if (!wma->lpAudioIndex) + newindex = HeapAlloc(GetProcessHeap(), 0, newsize * sizeof(struct MMIOPos)); + else + newindex = HeapReAlloc(GetProcessHeap(), 0, wma->lpAudioIndex, newsize * sizeof(struct MMIOPos)); + if (!newindex) return FALSE; + alb->numAudioAllocated = newsize; + wma->lpAudioIndex = newindex; } wma->lpAudioIndex[alb->numAudioBlocks].dwOffset = mmck->dwDataOffset; wma->lpAudioIndex[alb->numAudioBlocks].dwSize = mmck->cksize;

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 407c57705413394049839bacb7a4dcc19ceeb619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=407c57705413394049839bacb… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 8 20:25:07 2016 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/po/ja.po b/po/ja.po index 335c624..604cc42 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-02-19 21:25+0900\n" +"PO-Revision-Date: 2016-05-05 15:32+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -11612,26 +11612,28 @@ msgid "Are you sure you want to delete the registry key '%1'?" msgstr "本当にレジストリキー '%1' を削除しますか?" #: reg.rc:52 -#, fuzzy -#| msgid "reg: The option [/d] must be followed by a valid integer\n" msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "reg: /d オプションのあとに正しい整数値を指定してください\n" +msgstr "reg: /d オプションのあとに正しい文字列を指定してください\n" #: reg.rc:53 msgid "" "reg: Unable to delete all registry values in '%1'. An unexpected error " "occurred.\n" msgstr "" +"reg: '%1' にある一部のレジストリ値を削除できませんでした。予期しない\n" +"エラーが発生しました。\n" #: reg.rc:54 msgid "" "reg: Unable to complete the specified operation. An unexpected error " "occurred.\n" msgstr "" +"reg: 指定された操作を完了できませんでした。予期しないエラーが発生しまし\n" +"た。\n" #: reg.rc:55 msgid "Search complete. Number of matches found: %1!d!\n" -msgstr "" +msgstr "検索が完了しました。該当箇所の数: %1!d!\n" #: regedit.rc:34 msgid "&Registry"

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2016