October 2009 - Wine-commits

Piotr Caban : jscript: Added some missing functions stubs.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 4781e055918933bc6ced399556c471a5e6a78abc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4781e055918933bc6ced39955… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Oct 6 13:11:25 2009 +0200 jscript: Added some missing functions stubs. --- dlls/jscript/date.c | 9 +++++++++ dlls/jscript/global.c | 27 +++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 213d994..c753587 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -52,6 +52,7 @@ static const WCHAR propertyIsEnumerableW[] = static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0}; static const WCHAR toUTCStringW[] = {'t','o','U','T','C','S','t','r','i','n','g',0}; +static const WCHAR toGMTStringW[] = {'t','o','G','M','T','S','t','r','i','n','g',0}; static const WCHAR toDateStringW[] = {'t','o','D','a','t','e','S','t','r','i','n','g',0}; static const WCHAR toTimeStringW[] = {'t','o','T','i','m','e','S','t','r','i','n','g',0}; static const WCHAR toLocaleDateStringW[] = {'t','o','L','o','c','a','l','e','D','a','t','e','S','t','r','i','n','g',0}; @@ -780,6 +781,13 @@ static HRESULT Date_toUTCString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return S_OK; } +static HRESULT Date_toGMTString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + FIXME("\n"); + return E_NOTIMPL; +} + /* ECMA-262 3rd Edition 15.9.5.3 */ static HRESULT dateobj_to_date_string(DateInstance *date, VARIANT *retv) { @@ -2062,6 +2070,7 @@ static const builtin_prop_t Date_props[] = { {setUTCMonthW, Date_setUTCMonth, PROPF_METHOD|2}, {setUTCSecondsW, Date_setUTCSeconds, PROPF_METHOD|2}, {toDateStringW, Date_toDateString, PROPF_METHOD}, + {toGMTStringW, Date_toGMTString, PROPF_METHOD}, {toLocaleDateStringW, Date_toLocaleDateString, PROPF_METHOD}, {toLocaleStringW, Date_toLocaleString, PROPF_METHOD}, {toLocaleTimeStringW, Date_toLocaleTimeString, PROPF_METHOD}, diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 366d738..5fd8114 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -69,6 +69,9 @@ static const WCHAR ScriptEngineBuildVersionW[] = static const WCHAR CollectGarbageW[] = {'C','o','l','l','e','c','t','G','a','r','b','a','g','e',0}; static const WCHAR MathW[] = {'M','a','t','h',0}; static const WCHAR encodeURIW[] = {'e','n','c','o','d','e','U','R','I',0}; +static const WCHAR decodeURIW[] = {'d','e','c','o','d','e','U','R','I',0}; +static const WCHAR encodeURIComponentW[] = {'e','n','c','o','d','e','U','R','I','C','o','m','p','o','n','e','n','t',0}; +static const WCHAR decodeURIComponentW[] = {'d','e','c','o','d','e','U','R','I','C','o','m','p','o','n','e','n','t',0}; static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; @@ -834,6 +837,27 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return S_OK; } +static HRESULT JSGlobal_decodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static const builtin_prop_t JSGlobal_props[] = { {ActiveXObjectW, JSGlobal_ActiveXObject, PROPF_CONSTR}, {ArrayW, JSGlobal_Array, PROPF_CONSTR}, @@ -862,7 +886,10 @@ static const builtin_prop_t JSGlobal_props[] = { {TypeErrorW, JSGlobal_TypeError, PROPF_CONSTR}, {URIErrorW, JSGlobal_URIError, PROPF_CONSTR}, {VBArrayW, JSGlobal_VBArray, PROPF_METHOD}, + {decodeURIW, JSGlobal_decodeURI, PROPF_METHOD}, + {decodeURIComponentW, JSGlobal_decodeURIComponent, PROPF_METHOD}, {encodeURIW, JSGlobal_encodeURI, PROPF_METHOD}, + {encodeURIComponentW, JSGlobal_encodeURIComponent, PROPF_METHOD}, {escapeW, JSGlobal_escape, PROPF_METHOD}, {evalW, JSGlobal_eval, PROPF_METHOD|1}, {isFiniteW, JSGlobal_isFinite, PROPF_METHOD},

1 0

Jörg Höhle : winmm/tests: Correct (IMA)ADPCM test .
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: ad75d9a21722a9516b50868b1ec18f0a6e74f508 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad75d9a21722a9516b50868b1… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Oct 6 06:37:06 2009 +0200 winmm/tests: Correct (IMA)ADPCM test. --- dlls/winmm/tests/wave.c | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 97544c0..8a9caf2 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -825,6 +825,7 @@ static void wave_out_test_device(UINT_PTR device) WAVEOUTCAPSW capsW; WAVEFORMATEX format, oformat; WAVEFORMATEXTENSIBLE wfex; + IMAADPCMWAVEFORMAT wfa; HWAVEOUT wout; MMRESULT rc; UINT f; @@ -1159,7 +1160,6 @@ static void wave_out_test_device(UINT_PTR device) format.nBlockAlign=format.nChannels*format.wBitsPerSample/8; format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign; format.cbSize=0; - oformat=format; rc=waveOutOpen(&wout,device,&format,0,0,CALLBACK_NULL|WAVE_FORMAT_DIRECT); ok(rc==MMSYSERR_NOERROR ||rc==WAVERR_BADFORMAT || rc==MMSYSERR_INVALFLAG || rc==MMSYSERR_INVALPARAM, @@ -1176,28 +1176,30 @@ static void wave_out_test_device(UINT_PTR device) trace("waveOutOpen(%s): WAVE_FORMAT_MULAW not supported\n", dev_name(device)); - format.wFormatTag=WAVE_FORMAT_ADPCM; - format.nChannels=2; - format.wBitsPerSample=4; - format.nSamplesPerSec=22050; - format.nBlockAlign=format.nChannels*format.wBitsPerSample/8; - format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign; - format.cbSize=0; - oformat=format; - rc=waveOutOpen(&wout,device,&format,0,0,CALLBACK_NULL|WAVE_FORMAT_DIRECT); + wfa.wfx.wFormatTag=WAVE_FORMAT_IMA_ADPCM; + wfa.wfx.nChannels=1; + wfa.wfx.nSamplesPerSec=11025; + wfa.wfx.nAvgBytesPerSec=5588; + wfa.wfx.nBlockAlign=256; + wfa.wfx.wBitsPerSample=4; /* see imaadp32.c */ + wfa.wfx.cbSize=2; + wfa.wSamplesPerBlock=505; + rc=waveOutOpen(&wout,device,&wfa.wfx,0,0,CALLBACK_NULL|WAVE_FORMAT_DIRECT); ok(rc==MMSYSERR_NOERROR ||rc==WAVERR_BADFORMAT || rc==MMSYSERR_INVALFLAG || rc==MMSYSERR_INVALPARAM, "waveOutOpen(%s): returned %s\n",dev_name(device),wave_out_error(rc)); if (rc==MMSYSERR_NOERROR) { waveOutClose(wout); - wave_out_test_deviceOut(device,1.0,1,0,&format,0,CALLBACK_EVENT, + /* TODO: teach wave_generate_* ADPCM + wave_out_test_deviceOut(device,1.0,1,0,&wfa.wfx,0,CALLBACK_EVENT, &capsA,winetest_interactive,TRUE,FALSE); - wave_out_test_deviceOut(device,1.0,10,0,&format,0,CALLBACK_EVENT, + wave_out_test_deviceOut(device,1.0,10,0,&wfa.wfx,0,CALLBACK_EVENT, &capsA,winetest_interactive,TRUE,FALSE); - wave_out_test_deviceOut(device,1.0,5,1,&format,0,CALLBACK_EVENT, + wave_out_test_deviceOut(device,1.0,5,1,&wfa.wfx,0,CALLBACK_EVENT, &capsA,winetest_interactive,TRUE,FALSE); + */ } else - trace("waveOutOpen(%s): WAVE_FORMAT_ADPCM not supported\n", + trace("waveOutOpen(%s): WAVE_FORMAT_IMA_ADPCM not supported\n", dev_name(device)); /* test if WAVEFORMATEXTENSIBLE supported */

1 0

Jörg Höhle : dsound: Enforce invariant about BlockAlign and nAvgBytesPerSec.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: dc3471ca0e7c2209ecf9758359cc62f9d958bf2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc3471ca0e7c2209ecf975835… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Oct 4 08:05:20 2009 +0200 dsound: Enforce invariant about BlockAlign and nAvgBytesPerSec. --- dlls/dsound/buffer.c | 32 ++++++------------------- dlls/dsound/capture.c | 11 +++----- dlls/dsound/dsound_private.h | 1 + dlls/dsound/primary.c | 53 +++++++++++++++++++++++++++++++++-------- 4 files changed, 55 insertions(+), 42 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 2d64341..4b486fd 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -957,7 +957,7 @@ HRESULT IDirectSoundBufferImpl_Create( LPWAVEFORMATEX wfex = dsbd->lpwfxFormat; HRESULT err = DS_OK; DWORD capf = 0; - int use_hw, alloc_size, cp_size; + int use_hw; TRACE("(%p,%p,%p)\n",device,pdsb,dsbd); if (dsbd->dwBufferBytes < DSBSIZE_MIN || dsbd->dwBufferBytes > DSBSIZE_MAX) { @@ -985,23 +985,13 @@ HRESULT IDirectSoundBufferImpl_Create( /* size depends on version */ CopyMemory(&dsb->dsbd, dsbd, dsbd->dwSize); - /* variable sized struct so calculate size based on format */ - if (wfex->wFormatTag == WAVE_FORMAT_PCM) { - alloc_size = sizeof(WAVEFORMATEX); - cp_size = sizeof(PCMWAVEFORMAT); - } else - alloc_size = cp_size = sizeof(WAVEFORMATEX) + wfex->cbSize; - - dsb->pwfx = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,alloc_size); + dsb->pwfx = DSOUND_CopyFormat(wfex); if (dsb->pwfx == NULL) { - WARN("out of memory\n"); HeapFree(GetProcessHeap(),0,dsb); *pdsb = NULL; return DSERR_OUTOFMEMORY; } - CopyMemory(dsb->pwfx, wfex, cp_size); - if (dsbd->dwBufferBytes % dsbd->lpwfxFormat->nBlockAlign) dsb->buflen = dsbd->dwBufferBytes + (dsbd->lpwfxFormat->nBlockAlign - @@ -1185,7 +1175,6 @@ HRESULT IDirectSoundBufferImpl_Duplicate( { IDirectSoundBufferImpl *dsb; HRESULT hres = DS_OK; - int size; TRACE("(%p,%p,%p)\n", device, pdsb, pdsb); dsb = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(*dsb)); @@ -1224,20 +1213,15 @@ HRESULT IDirectSoundBufferImpl_Duplicate( DSOUND_RecalcFormat(dsb); DSOUND_MixToTemporary(dsb, 0, dsb->buflen, FALSE); - /* variable sized struct so calculate size based on format */ - size = sizeof(WAVEFORMATEX) + pdsb->pwfx->cbSize; - - dsb->pwfx = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,size); + dsb->pwfx = DSOUND_CopyFormat(pdsb->pwfx); if (dsb->pwfx == NULL) { - WARN("out of memory\n"); - HeapFree(GetProcessHeap(),0,dsb->buffer); - HeapFree(GetProcessHeap(),0,dsb); - *ppdsb = NULL; - return DSERR_OUTOFMEMORY; + HeapFree(GetProcessHeap(),0,dsb->tmp_buffer); + HeapFree(GetProcessHeap(),0,dsb->buffer); + HeapFree(GetProcessHeap(),0,dsb); + *ppdsb = NULL; + return DSERR_OUTOFMEMORY; } - CopyMemory(dsb->pwfx, pdsb->pwfx, size); - RtlInitializeResource(&dsb->lock); /* register buffer */ diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 0e75dd7..95b38af 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1365,13 +1365,10 @@ HRESULT IDirectSoundCaptureBufferImpl_Create( wfex->nAvgBytesPerSec, wfex->nBlockAlign, wfex->wBitsPerSample, wfex->cbSize); - if (wfex->wFormatTag == WAVE_FORMAT_PCM) { - device->pwfx = HeapAlloc(GetProcessHeap(),0,sizeof(WAVEFORMATEX)); - CopyMemory(device->pwfx, wfex, sizeof(PCMWAVEFORMAT)); - device->pwfx->cbSize = 0; - } else { - device->pwfx = HeapAlloc(GetProcessHeap(),0,sizeof(WAVEFORMATEX)+wfex->cbSize); - CopyMemory(device->pwfx, wfex, sizeof(WAVEFORMATEX)+wfex->cbSize); + device->pwfx = DSOUND_CopyFormat(wfex); + if ( device->pwfx == NULL ) { + *ppobj = NULL; + return DSERR_OUTOFMEMORY; } *ppobj = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 221433f..e028358 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -437,6 +437,7 @@ HRESULT DSOUND_PrimaryDestroy(DirectSoundDevice *device); HRESULT DSOUND_PrimaryPlay(DirectSoundDevice *device); HRESULT DSOUND_PrimaryStop(DirectSoundDevice *device); HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LPDWORD writepos); +LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex); HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex, BOOL forced); HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave); diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index a57a5af..6b3ca35 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -17,6 +17,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + * TODO: + * When PrimarySetFormat (via ReopenDevice or PrimaryOpen) fails, + * it leaves dsound in unusable (not really open) state. */ #include <stdarg.h> @@ -437,11 +441,36 @@ HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LP return DS_OK; } +LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex) +{ + DWORD size = wfex->wFormatTag == WAVE_FORMAT_PCM ? + sizeof(WAVEFORMATEX) : sizeof(WAVEFORMATEX) + wfex->cbSize; + LPWAVEFORMATEX pwfx = HeapAlloc(GetProcessHeap(),0,size); + if (pwfx == NULL) { + WARN("out of memory\n"); + } else if (wfex->wFormatTag != WAVE_FORMAT_PCM) { + CopyMemory(pwfx, wfex, size); + } else { + CopyMemory(pwfx, wfex, sizeof(PCMWAVEFORMAT)); + pwfx->cbSize=0; + if (pwfx->nBlockAlign != pwfx->nChannels * pwfx->wBitsPerSample/8) { + WARN("Fixing bad nBlockAlign (%u)\n", pwfx->nBlockAlign); + pwfx->nBlockAlign = pwfx->nChannels * pwfx->wBitsPerSample/8; + } + if (pwfx->nAvgBytesPerSec != pwfx->nSamplesPerSec * pwfx->nBlockAlign) { + WARN("Fixing bad nAvgBytesPerSec (%u)\n", pwfx->nAvgBytesPerSec); + pwfx->nAvgBytesPerSec = pwfx->nSamplesPerSec * pwfx->nBlockAlign; + } + } + return pwfx; +} + HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex, BOOL forced) { HRESULT err = DSERR_BUFFERLOST; - int i, alloc_size, cp_size; + int i; DWORD nSamplesPerSec, bpp, chans; + LPWAVEFORMATEX oldpwfx; TRACE("(%p,%p)\n", device, wfex); if (device->priolevel == DSSCL_NORMAL) { @@ -464,19 +493,19 @@ HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex, RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); EnterCriticalSection(&(device->mixlock)); - if (wfex->wFormatTag == WAVE_FORMAT_PCM) { - alloc_size = sizeof(WAVEFORMATEX); - cp_size = sizeof(PCMWAVEFORMAT); - } else - alloc_size = cp_size = sizeof(WAVEFORMATEX) + wfex->cbSize; - - device->pwfx = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,device->pwfx,alloc_size); - nSamplesPerSec = device->pwfx->nSamplesPerSec; bpp = device->pwfx->wBitsPerSample; chans = device->pwfx->nChannels; - CopyMemory(device->pwfx, wfex, cp_size); + oldpwfx = device->pwfx; + device->pwfx = DSOUND_CopyFormat(wfex); + if (device->pwfx == NULL) { + device->pwfx = oldpwfx; + err = DSERR_OUTOFMEMORY; + goto done; + } + /* TODO: on failure below (bad format?), reinstall oldpwfx */ + HeapFree(GetProcessHeap(), 0, oldpwfx); if (!(device->drvdesc.dwFlags & DSDDESC_DOMMSYSTEMSETFORMAT) && device->hwbuf) { err = IDsDriverBuffer_SetFormat(device->hwbuf, device->pwfx); @@ -484,8 +513,10 @@ HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex, /* On bad format, try to re-create, big chance it will work then, only do this if we <HAVE> to */ if (forced && (device->pwfx->nSamplesPerSec/100 != wfex->nSamplesPerSec/100 || err == DSERR_BADFORMAT)) { + DWORD cp_size = wfex->wFormatTag == WAVE_FORMAT_PCM ? + sizeof(PCMWAVEFORMAT) : sizeof(WAVEFORMATEX) + wfex->cbSize; err = DSERR_BUFFERLOST; - CopyMemory(device->pwfx, wfex, cp_size); + CopyMemory(device->pwfx, wfex, cp_size); } if (err != DSERR_BUFFERLOST && FAILED(err)) {

1 0

Jörg Höhle : dsound: Correct deallocations when DuplicateSoundBuffer fails.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: de133ae00ebee624ac9c8e6d36fc8903d346df80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de133ae00ebee624ac9c8e6d3… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Oct 4 09:13:53 2009 +0200 dsound: Correct deallocations when DuplicateSoundBuffer fails. --- dlls/dsound/buffer.c | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 4b486fd..2a25d50 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1177,15 +1177,20 @@ HRESULT IDirectSoundBufferImpl_Duplicate( HRESULT hres = DS_OK; TRACE("(%p,%p,%p)\n", device, pdsb, pdsb); - dsb = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(*dsb)); - + dsb = HeapAlloc(GetProcessHeap(),0,sizeof(*dsb)); if (dsb == NULL) { WARN("out of memory\n"); *ppdsb = NULL; return DSERR_OUTOFMEMORY; } + CopyMemory(dsb, pdsb, sizeof(*dsb)); - CopyMemory(dsb, pdsb, sizeof(IDirectSoundBufferImpl)); + dsb->pwfx = DSOUND_CopyFormat(pdsb->pwfx); + if (dsb->pwfx == NULL) { + HeapFree(GetProcessHeap(),0,dsb); + *ppdsb = NULL; + return DSERR_OUTOFMEMORY; + } if (pdsb->hwbuf) { TRACE("duplicating hardware buffer\n"); @@ -1194,6 +1199,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( (LPVOID *)&dsb->hwbuf); if (FAILED(hres)) { WARN("IDsDriver_DuplicateSoundBuffer failed (%08x)\n", hres); + HeapFree(GetProcessHeap(),0,dsb->pwfx); HeapFree(GetProcessHeap(),0,dsb); *ppdsb = NULL; return hres; @@ -1213,15 +1219,6 @@ HRESULT IDirectSoundBufferImpl_Duplicate( DSOUND_RecalcFormat(dsb); DSOUND_MixToTemporary(dsb, 0, dsb->buflen, FALSE); - dsb->pwfx = DSOUND_CopyFormat(pdsb->pwfx); - if (dsb->pwfx == NULL) { - HeapFree(GetProcessHeap(),0,dsb->tmp_buffer); - HeapFree(GetProcessHeap(),0,dsb->buffer); - HeapFree(GetProcessHeap(),0,dsb); - *ppdsb = NULL; - return DSERR_OUTOFMEMORY; - } - RtlInitializeResource(&dsb->lock); /* register buffer */ @@ -1229,10 +1226,11 @@ HRESULT IDirectSoundBufferImpl_Duplicate( if (hres != DS_OK) { RtlDeleteResource(&dsb->lock); HeapFree(GetProcessHeap(),0,dsb->tmp_buffer); - HeapFree(GetProcessHeap(),0,dsb->buffer); + list_remove(&dsb->entry); + dsb->buffer->ref--; HeapFree(GetProcessHeap(),0,dsb->pwfx); HeapFree(GetProcessHeap(),0,dsb); - *ppdsb = 0; + dsb = NULL; } *ppdsb = dsb;

1 0

Vladimir Pankratov : jscript: Update Russian translation.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 910e3baee3ae0c81c231c39fa0c71ddee9bed6ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=910e3baee3ae0c81c231c39fa… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Oct 6 16:58:33 2009 +0500 jscript: Update Russian translation. --- dlls/jscript/jscript_Ru.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Ru.rc b/dlls/jscript/jscript_Ru.rc index a2bf3ce..95745bd 100644 --- a/dlls/jscript/jscript_Ru.rc +++ b/dlls/jscript/jscript_Ru.rc @@ -27,6 +27,7 @@ STRINGTABLE DISCARDABLE { IDS_TO_PRIMITIVE "Ошибка конвертирования объекта в примитивный тип" IDS_INVALID_CALL_ARG "Неверный вызов процедуры или аргумент" + IDS_CREATE_OBJ_ERROR "Сервер автоматизации не может создать объект" IDS_NO_PROPERTY "Объект не поддерживает это свойство или метод" IDS_ARG_NOT_OPT "Отсутствует обязательный аргумент" IDS_SYNTAX_ERROR "Синтаксическая ошибка" @@ -41,5 +42,8 @@ STRINGTABLE DISCARDABLE IDS_ILLEGAL_ASSIGN "Неверное присваивание" IDS_UNDEFINED "'|' не определён" IDS_NOT_BOOL "Ожидается объект типа 'bool'" + IDS_JSCRIPT_EXPECTED "Ожидается объект типа 'JScript'" + IDS_REGEXP_SYNTAX_ERROR "Синтаксическая ошибка в регулярном выражении" IDS_INVALID_LENGTH "Длиной массива должно быть конечное положительное число" + IDS_ARRAY_EXPECTED "Ожидается объект типа 'Array'" }

1 0

Paul Vriens : user32/tests: Fix some test failures with 9x/Me on VMware.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 7be2f6d985ab2488d38075d504b92bcc8ca235d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7be2f6d985ab2488d38075d50… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Oct 6 13:35:56 2009 +0200 user32/tests: Fix some test failures with 9x/Me on VMware. --- dlls/user32/tests/win.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 2a62400..63f25bc 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3242,6 +3242,7 @@ static void test_scrollwindow( HWND hwnd) rc2 = rc; rc2.top = ( rc2.top + rc2.bottom) / 2; ScrollWindowEx( hwnd, 0, - rc2.top, &rc2, NULL, NULL, NULL, SW_ERASE); + flush_events(FALSE); /* expected: black should have scrolled to the upper half */ colr = GetPixel( hdc, (rc2.left+rc2.right)/ 2, rc2.bottom / 4 ); ok ( colr == 0, "pixel should be black, color is %08x\n", colr); @@ -3261,6 +3262,7 @@ static void test_scrollwindow( HWND hwnd) rc3.left = rc3.right / 4; rc3.right -= rc3.right / 4; ScrollWindowEx( hwnd, 0, - rc2.top, &rc2, &rc3, NULL, NULL, SW_ERASE); + flush_events(FALSE); /* expected: black should have scrolled to the upper half */ colr = GetPixel( hdc, (rc2.left+rc2.right)/ 2, rc2.bottom / 4 ); ok ( colr == 0, "pixel should be black, color is %08x\n", colr);

1 0

Alexandre Julliard : wrc: Include unistd.h before the Windows headers.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: da3ee6650539fa89ea19cf4a509878fcafa82192 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da3ee6650539fa89ea19cf4a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 16:18:04 2009 +0200 wrc: Include unistd.h before the Windows headers. --- tools/wrc/parser.l | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 3ea04de..2cb7937 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -106,7 +106,9 @@ cident [a-zA-Z_][0-9a-zA-Z_]* #include <errno.h> #include <limits.h> -#ifndef HAVE_UNISTD_H +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#else #define YY_NO_UNISTD_H #endif

1 0

Alexandre Julliard : advapi32: Retrieve the current user SID from the server in lookup_user_account_name.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 07ec73fcaa80c754591e13e02bccff06fee742fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ec73fcaa80c754591e13e02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 16:49:22 2009 +0200 advapi32: Retrieve the current user SID from the server in lookup_user_account_name. --- dlls/advapi32/security.c | 30 +++++++++++++----------------- 1 files changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 9bb76d5..bff68a3 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2555,30 +2555,28 @@ LookupAccountNameA( static BOOL lookup_user_account_name(PSID Sid, PDWORD cbSid, LPWSTR ReferencedDomainName, LPDWORD cchReferencedDomainName, PSID_NAME_USE peUse ) { - /* Default implementation: Always return a default SID */ - SID_IDENTIFIER_AUTHORITY identifierAuthority = {SECURITY_NT_AUTHORITY}; + char buffer[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; + DWORD len = sizeof(buffer); + HANDLE token; BOOL ret; PSID pSid; static const WCHAR dm[] = {'D','O','M','A','I','N',0}; DWORD nameLen; LPCWSTR domainName; - ret = AllocateAndInitializeSid(&identifierAuthority, - 2, - SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, - &pSid); - - if (!ret) - return FALSE; - - if (!RtlValidSid(pSid)) + if (!OpenThreadToken(GetCurrentThread(), TOKEN_READ, TRUE, &token)) { - FreeSid(pSid); - return FALSE; + if (GetLastError() != ERROR_NO_TOKEN) return FALSE; + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &token)) return FALSE; } + ret = GetTokenInformation(token, TokenUser, buffer, len, &len); + CloseHandle( token ); + + if (!ret) return FALSE; + + pSid = ((TOKEN_USER *)buffer)->User.Sid; + if (Sid != NULL && (*cbSid >= GetLengthSid(pSid))) CopySid(*cbSid, Sid, pSid); if (*cbSid < GetLengthSid(pSid)) @@ -2605,8 +2603,6 @@ static BOOL lookup_user_account_name(PSID Sid, PDWORD cbSid, LPWSTR ReferencedDo if (ret) *peUse = SidTypeUser; - FreeSid(pSid); - return ret; }

1 0

Alexandre Julliard : include: Add support for building Wine with strict prototype checking.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 0e67f65cab65fb157adbe6196676279d71453e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e67f65cab65fb157adbe6196… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 12:30:49 2009 +0200 include: Add support for building Wine with strict prototype checking. --- dlls/msvfw32/msvideo_main.c | 2 +- include/mscoree.idl | 4 ++++ include/rpcndr.h | 4 ++++ include/vfw.h | 4 ++++ include/windef.h | 10 ++++++++-- include/wine/windef16.h | 10 ++++++++-- 6 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 6196fac..5217c58 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -472,7 +472,7 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode) /*********************************************************************** * ICOpenFunction [MSVFW32.@] */ -HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, FARPROC lpfnHandler) +HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, DRIVERPROC lpfnHandler) { ICOPEN icopen; WINE_HIC* whic; diff --git a/include/mscoree.idl b/include/mscoree.idl index aed31da..19749fb 100644 --- a/include/mscoree.idl +++ b/include/mscoree.idl @@ -27,7 +27,11 @@ cpp_quote("HRESULT WINAPI GetCORSystemDirectory(LPWSTR,DWORD,DWORD*);") cpp_quote("HRESULT WINAPI GetCORVersion(LPWSTR,DWORD,DWORD*);") cpp_quote("HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,DWORD,LPWSTR,DWORD,DWORD*,LPWSTR,DWORD,DWORD*);") cpp_quote("HRESULT WINAPI LoadLibraryShim(LPCWSTR,LPCWSTR,LPVOID,HMODULE*);") +cpp_quote("#ifdef WINE_STRICT_PROTOTYPES") +cpp_quote("typedef HRESULT (__stdcall *FLockClrVersionCallback)(void);") +cpp_quote("#else") cpp_quote("typedef HRESULT (__stdcall *FLockClrVersionCallback)();") +cpp_quote("#endif") cpp_quote("HRESULT WINAPI LockClrVersion(FLockClrVersionCallback,FLockClrVersionCallback*,FLockClrVersionCallback*);") typedef void* HDOMAINENUM; diff --git a/include/rpcndr.h b/include/rpcndr.h index 78c9a47..8fee143 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -383,7 +383,11 @@ typedef struct _MIDL_SYNTAX_INFO typedef void (__RPC_API *STUB_THUNK)( PMIDL_STUB_MESSAGE ); +#ifdef WINE_STRICT_PROTOTYPES +typedef LONG (__RPC_API *SERVER_ROUTINE)(void); +#else typedef LONG (__RPC_API *SERVER_ROUTINE)(); +#endif typedef struct _MIDL_SERVER_INFO_ { diff --git a/include/vfw.h b/include/vfw.h index ed62545..c0689fb 100644 --- a/include/vfw.h +++ b/include/vfw.h @@ -499,7 +499,11 @@ BOOL VFWAPI ICInstall(DWORD fccType, DWORD fccHandler, LPARAM lParam, LPSTR BOOL VFWAPI ICRemove(DWORD fccType, DWORD fccHandler, UINT wFlags); LRESULT VFWAPI ICGetInfo(HIC hic,ICINFO *picinfo, DWORD cb); HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode); +#ifdef WINE_STRICT_PROTOTYPES +HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, DRIVERPROC lpfnHandler); +#else HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, FARPROC lpfnHandler); +#endif LRESULT VFWAPI ICClose(HIC hic); HIC VFWAPI ICLocate(DWORD fccType, DWORD fccHandler, LPBITMAPINFOHEADER lpbiIn, LPBITMAPINFOHEADER lpbiOut, WORD wFlags); diff --git a/include/windef.h b/include/windef.h index 825255b..8f5ea30 100644 --- a/include/windef.h +++ b/include/windef.h @@ -227,7 +227,8 @@ typedef unsigned int ULONG, *PULONG; /* Note that Winelib is purely Win32. */ #ifdef __WINESRC__ -#define WINE_NO_UNICODE_MACROS +#define WINE_NO_UNICODE_MACROS 1 +#define WINE_STRICT_PROTOTYPES 1 #endif #ifdef WINE_NO_UNICODE_MACROS @@ -304,10 +305,15 @@ typedef HICON HCURSOR; /* Callback function pointers types */ +#ifdef WINE_STRICT_PROTOTYPES +typedef INT_PTR (CALLBACK *FARPROC)(void); +typedef INT_PTR (CALLBACK *NEARPROC)(void); +typedef INT_PTR (CALLBACK *PROC)(void); +#else typedef INT_PTR (CALLBACK *FARPROC)(); typedef INT_PTR (CALLBACK *NEARPROC)(); typedef INT_PTR (CALLBACK *PROC)(); - +#endif /* Macros to split words and longs. */ diff --git a/include/wine/windef16.h b/include/wine/windef16.h index 8c58aae..40d96ee 100644 --- a/include/wine/windef16.h +++ b/include/wine/windef16.h @@ -151,8 +151,6 @@ typedef struct typedef LRESULT (CALLBACK *DRIVERPROC16)(DWORD,HDRVR16,UINT16,LPARAM,LPARAM); typedef BOOL16 (CALLBACK *DLGPROC16)(HWND16,UINT16,WPARAM16,LPARAM); typedef INT16 (CALLBACK *EDITWORDBREAKPROC16)(LPSTR,INT16,INT16,INT16); -typedef LRESULT (CALLBACK *FARPROC16)(); -typedef INT16 (CALLBACK *PROC16)(); typedef BOOL16 (CALLBACK *GRAYSTRINGPROC16)(HDC16,LPARAM,INT16); typedef LRESULT (CALLBACK *HOOKPROC16)(INT16,WPARAM16,LPARAM); typedef BOOL16 (CALLBACK *PROPENUMPROC16)(HWND16,SEGPTR,HANDLE16); @@ -160,4 +158,12 @@ typedef VOID (CALLBACK *TIMERPROC16)(HWND16,UINT16,UINT16,DWORD); typedef LRESULT (CALLBACK *WNDENUMPROC16)(HWND16,LPARAM); typedef LRESULT (CALLBACK *WNDPROC16)(HWND16,UINT16,WPARAM16,LPARAM); +#ifdef WINE_STRICT_PROTOTYPES +typedef LRESULT (CALLBACK *FARPROC16)(void); +typedef INT16 (CALLBACK *PROC16)(void); +#else +typedef LRESULT (CALLBACK *FARPROC16)(); +typedef INT16 (CALLBACK *PROC16)(); +#endif + #endif /* __WINE_WINDEF16_H */

1 0

Alexandre Julliard : kernel32: Fix empty function prototypes.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: fe1374cc4c3f12f9fd40059830b9a21d3c78545e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe1374cc4c3f12f9fd4005983… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 12:56:33 2009 +0200 kernel32: Fix empty function prototypes. --- dlls/kernel32/kernel16_private.h | 6 +++--- dlls/kernel32/wowthunk.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/kernel16_private.h b/dlls/kernel32/kernel16_private.h index aada5b2..6ad2aea 100644 --- a/dlls/kernel32/kernel16_private.h +++ b/dlls/kernel32/kernel16_private.h @@ -114,7 +114,7 @@ typedef struct { WORD pushw_bp; /* pushw %bp */ BYTE pushl; /* pushl $target */ - void (*target)(); + void *target; WORD call; /* call CALLFROM16 */ short callfrom16; } ENTRYPOINT16; @@ -147,8 +147,8 @@ typedef struct _THHOOK HTASK16 LockTDB; /* 14 hLockedTask */ } THHOOK; -extern LONG __wine_call_from_16(); -extern void __wine_call_from_16_regs(); +extern LONG __wine_call_from_16(void); +extern void __wine_call_from_16_regs(void); extern THHOOK *pThhook; diff --git a/dlls/kernel32/wowthunk.c b/dlls/kernel32/wowthunk.c index 75351b6..080ce3a 100644 --- a/dlls/kernel32/wowthunk.c +++ b/dlls/kernel32/wowthunk.c @@ -48,11 +48,11 @@ WINE_DECLARE_DEBUG_CHANNEL(snoop); extern DWORD WINAPI wine_call_to_16( FARPROC16 target, DWORD cbArgs, PEXCEPTION_HANDLER handler ); extern void WINAPI wine_call_to_16_regs( CONTEXT86 *context, DWORD cbArgs, PEXCEPTION_HANDLER handler ); extern void __wine_call_to_16_ret(void); -extern void CALL32_CBClient_Ret(); -extern void CALL32_CBClientEx_Ret(); -extern void DPMI_PendingEventCheck(); -extern void DPMI_PendingEventCheck_Cleanup(); -extern void DPMI_PendingEventCheck_Return(); +extern void CALL32_CBClient_Ret(void); +extern void CALL32_CBClientEx_Ret(void); +extern void DPMI_PendingEventCheck(void); +extern void DPMI_PendingEventCheck_Cleanup(void); +extern void DPMI_PendingEventCheck_Return(void); extern BYTE __wine_call16_start[]; extern BYTE __wine_call16_end[];

1 0