October 2009 - Wine-Commits

Alexandre Julliard : wrc: Include unistd.h before the Windows headers.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

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

Paul Vriens : user32/tests: Fix some test failures with 9x/Me on VMware.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

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

Jörg Höhle : dsound: Enforce invariant about BlockAlign and nAvgBytesPerSec.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

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 : winmm/tests: Correct (IMA)ADPCM test .
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

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

Piotr Caban : jscript: Added some missing functions stubs.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

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

Piotr Caban : jscript: Added Global.escape() implementation.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: de0a875146932f109ab170f177c808b45f732fd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de0a875146932f109ab170f17… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Oct 6 13:11:18 2009 +0200 jscript: Added Global.escape() implementation. --- dlls/jscript/global.c | 68 +++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 13 ++++++++ 2 files changed, 79 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index bc39940..366d738 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -296,8 +296,72 @@ static HRESULT JSGlobal_Enumerator(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + BSTR ret, str; + const WCHAR *ptr; + DWORD len = 0, i, size; + char buf[4]; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) { + ret = SysAllocString(undefinedW); + if(!ret) + return E_OUTOFMEMORY; + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + } + + return S_OK; + } + + hres = to_string(ctx, get_arg(dp, 0), ei, &str); + if(FAILED(hres)) + return hres; + + for(ptr=str; *ptr; ptr++) { + if(isalnumW(*ptr) || *ptr=='*' || *ptr=='@' || *ptr=='-' || *ptr=='_' + || *ptr=='+' || *ptr=='.' || *ptr=='/') + len++; + else { + size = WideCharToMultiByte(CP_UTF8, 0, ptr, 1, NULL, 0, NULL, NULL)*3; + if(!size) { + FIXME("throw Error\n"); + return E_FAIL; + } + len += size; + } + } + + ret = SysAllocStringLen(NULL, len); + if(!ret) + return E_OUTOFMEMORY; + + len = 0; + for(ptr=str; *ptr; ptr++) { + if(isalnumW(*ptr) || *ptr=='*' || *ptr=='@' || *ptr=='-' || *ptr=='_' + || *ptr=='+' || *ptr=='.' || *ptr=='/') + ret[len++] = *ptr; + else { + size = WideCharToMultiByte(CP_UTF8, 0, ptr, 1, buf, sizeof(buf), NULL, NULL); + for(i=0; i<size; i++) { + ret[len++] = '%'; + ret[len++] = int_to_char(buf[i] >> 4); + ret[len++] = int_to_char(buf[i] & 0xf); + } + } + } + + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + } + else + SysFreeString(ret); + + return S_OK; } /* ECMA-262 3rd Edition 15.1.2.1 */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index ae118c2..268820c 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -58,6 +58,15 @@ ok(tmp === "undefined", "encodeURI() = " + tmp); tmp = encodeURI("abc", "test"); ok(tmp === "abc", "encodeURI('abc') = " + tmp); +tmp = escape("abc"); +ok(tmp === "abc", "escape('abc') = " + tmp); +tmp = escape(""); +ok(tmp === "", "escape('') = " + tmp); +tmp = escape("a1b c!d+e(a)*-_+./,"); +ok(tmp === "a1b%20c%21d+e(a)*-_+./%2C", "escape('a1b c!d+e(a)*-_+./,') = " + tmp); +tmp = escape(); +ok(tmp === "undefined", "escape() = " + tmp); + tmp = unescape("abc"); ok(tmp === "abc", "unescape('abc') = " + tmp); tmp = unescape(""); @@ -69,6 +78,10 @@ ok(tmp === "undefined", "unescape() = " + tmp); tmp = unescape("%54%65s%u0074"); ok(tmp === "Test", "unescape('%54%65s%u0074') = " + tmp); +tmp = "aA1~`!@#$%^&*()_+=-][{}';:/.,<>?\|"; +ok(escape(tmp) === "aA1%7E%60%21@%23%24%25%5E%26*%28%29_+%3D-%5D%5B%7B%7D%27%3B%3A/.%2C%3C%3E%3F%7C", "escape('" + tmp + "') = " + escape(tmp)); +ok(unescape(escape(tmp)) === tmp, "unescape(escape('" + tmp + "')) = " + unescape(escape(tmp))); + tmp = "" + new Object(); ok(tmp === "[object Object]", "'' + new Object() = " + tmp); (tmp = new Array).f = Object.prototype.toString;

1 0

Jörg Höhle : dsound: Correct deallocations when DuplicateSoundBuffer fails.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

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 Oct. 6, 2009

Oct. 6, 2009

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

Andrey Turkin : ntdll: Add stub for NtSetInformationThread( ThreadHideFromDebugger).
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: be910d973a432495a8372476f3c9a5547feb8602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be910d973a432495a8372476f… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Tue Oct 6 13:34:48 2009 +0400 ntdll: Add stub for NtSetInformationThread(ThreadHideFromDebugger). --- dlls/ntdll/thread.c | 4 ++++ include/winternl.h | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index dab1c1d..30a299d 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1227,6 +1227,10 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, SERVER_END_REQ; } return status; + case ThreadHideFromDebugger: + /* pretend the call succeeded to satisfy some code protectors */ + return STATUS_SUCCESS; + case ThreadBasicInformation: case ThreadTimes: case ThreadPriority: diff --git a/include/winternl.h b/include/winternl.h index d35adea..a6fea7d 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -760,6 +760,7 @@ typedef enum _THREADINFOCLASS { ThreadPriorityBoost, ThreadSetTlsArrayAddress, ThreadIsIoPending, + ThreadHideFromDebugger, MaxThreadInfoClass } THREADINFOCLASS;

1 0

Matteo Bruni : wpp: Handle remaining memory allocation failures.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 9086c59d3265e160b1f935ac0578790231e0e398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9086c59d3265e160b1f935ac0… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Mon Sep 28 21:32:39 2009 +0200 wpp: Handle remaining memory allocation failures. --- include/wine/wpp.h | 7 +++-- libs/wpp/preproc.c | 51 ++++++++++++++++++++++++++++++++++++++++------- libs/wpp/wpp.c | 44 +++++++++++++++++++++++++++++++++------- libs/wpp/wpp_private.h | 2 +- 4 files changed, 84 insertions(+), 20 deletions(-) diff --git a/include/wine/wpp.h b/include/wine/wpp.h index 10b71e0..86575b1 100644 --- a/include/wine/wpp.h +++ b/include/wine/wpp.h @@ -23,12 +23,13 @@ #include <stdio.h> -extern void wpp_add_define( const char *name, const char *value ); +/* Return value == 0 means successful execution */ +extern int wpp_add_define( const char *name, const char *value ); extern void wpp_del_define( const char *name ); -extern void wpp_add_cmdline_define( const char *value ); +extern int wpp_add_cmdline_define( const char *value ); extern void wpp_set_debug( int lex_debug, int parser_debug, int msg_debug ); extern void wpp_set_pedantic( int on ); -extern void wpp_add_include_path( const char *path ); +extern int wpp_add_include_path( const char *path ); extern char *wpp_find_include( const char *name, const char *parent_name ); extern int wpp_parse( const char *input, FILE *output ); extern int wpp_parse_temp( const char *input, const char *output_base, char **output_name ); diff --git a/libs/wpp/preproc.c b/libs/wpp/preproc.c index 1d9aed6..cd46fc2 100644 --- a/libs/wpp/preproc.c +++ b/libs/wpp/preproc.c @@ -82,8 +82,8 @@ void *pp_xmalloc(size_t size) res = malloc(size); if(res == NULL) { - fprintf(stderr, "Virtual memory exhausted.\n"); - exit(2); + /* Set the error flag */ + pp_status.state = 1; } return res; } @@ -96,8 +96,8 @@ void *pp_xrealloc(void *p, size_t size) res = realloc(p, size); if(res == NULL) { - fprintf(stderr, "Virtual memory exhausted.\n"); - exit(2); + /* Set the error flag */ + pp_status.state = 1; } return res; } @@ -177,13 +177,16 @@ static void free_pp_entry( pp_entry_t *ppp, int idx ) } /* push a new (empty) define state */ -void pp_push_define_state(void) +int pp_push_define_state(void) { pp_def_state_t *state = pp_xmalloc( sizeof(*state) ); + if(!state) + return 1; memset( state->defines, 0, sizeof(state->defines) ); state->next = pp_def_state; pp_def_state = state; + return 0; } /* pop the current define state */ @@ -349,10 +352,12 @@ pp_entry_t *pp_add_macro(char *id, marg_t *args[], int nargs, mtext_t *exp) static char **includepath; static int nincludepath = 0; -void wpp_add_include_path(const char *path) +int wpp_add_include_path(const char *path) { char *tok; char *cpy = pp_xstrdup(path); + if(!cpy) + return 1; tok = strtok(cpy, INCLUDESEPARATOR); while(tok) @@ -360,7 +365,14 @@ void wpp_add_include_path(const char *path) if(*tok) { char *dir; char *cptr; + char **new_path; + dir = pp_xstrdup(tok); + if(!dir) + { + free(cpy); + return 1; + } for(cptr = dir; *cptr; cptr++) { /* Convert to forward slash */ @@ -372,13 +384,21 @@ void wpp_add_include_path(const char *path) *cptr = '\0'; /* Add to list */ + new_path = pp_xrealloc(includepath, (nincludepath+1) * sizeof(*includepath)); + if(!new_path) + { + free(dir); + free(cpy); + return 1; + } + includepath = new_path; + includepath[nincludepath] = dir; nincludepath++; - includepath = pp_xrealloc(includepath, nincludepath * sizeof(*includepath)); - includepath[nincludepath-1] = dir; } tok = strtok(NULL, INCLUDESEPARATOR); } free(cpy); + return 0; } char *wpp_find_include(const char *name, const char *parent_name) @@ -390,6 +410,8 @@ char *wpp_find_include(const char *name, const char *parent_name) int i, fd; cpy = pp_xmalloc(strlen(name)+1); + if(!cpy) + return NULL; cptr = cpy; for(ccptr = name; *ccptr; ccptr++) @@ -415,6 +437,11 @@ char *wpp_find_include(const char *name, const char *parent_name) if ((p = strrchr( parent_name, '/' ))) p++; else p = parent_name; path = pp_xmalloc( (p - parent_name) + strlen(cpy) + 1 ); + if(!path) + { + free(cpy); + return NULL; + } memcpy( path, parent_name, p - parent_name ); strcpy( path + (p - parent_name), cpy ); fd = open( path, O_RDONLY ); @@ -430,6 +457,11 @@ char *wpp_find_include(const char *name, const char *parent_name) for(i = 0; i < nincludepath; i++) { path = pp_xmalloc(strlen(includepath[i]) + strlen(cpy) + 2); + if(!path) + { + free(cpy); + return NULL; + } strcpy(path, includepath[i]); strcat(path, "/"); strcat(path, cpy); @@ -630,11 +662,14 @@ static void generic_msg(const char *s, const char *t, const char *n, va_list ap) if(n) { cpy = pp_xstrdup(n); + if(!cpy) + goto end; for (p = cpy; *p; p++) if(!isprint(*p)) *p = ' '; fprintf(stderr, " near '%s'", cpy); free(cpy); } } +end: #endif fprintf(stderr, "\n"); } diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index a7597ec..e3541fe 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -62,15 +62,17 @@ static void add_special_defines(void) pp_add_define( pp_xstrdup("__TIME__"), pp_xstrdup(buf) ); ppp = pp_add_define( pp_xstrdup("__FILE__"), pp_xstrdup("") ); - ppp->type = def_special; + if(ppp) + ppp->type = def_special; ppp = pp_add_define( pp_xstrdup("__LINE__"), pp_xstrdup("") ); - ppp->type = def_special; + if(ppp) + ppp->type = def_special; } /* add a define to the preprocessor list */ -void wpp_add_define( const char *name, const char *value ) +int wpp_add_define( const char *name, const char *value ) { struct define *def; @@ -80,17 +82,35 @@ void wpp_add_define( const char *name, const char *value ) { if (!strcmp( def->name, name )) { + char *new_value = pp_xstrdup(value); + if(!new_value) + return 1; free( def->value ); - def->value = pp_xstrdup(value); - return; + def->value = new_value; + + return 0; } } def = pp_xmalloc( sizeof(*def) ); + if(!def) + return 1; def->next = cmdline_defines; def->name = pp_xstrdup(name); + if(!def->name) + { + free(def); + return 1; + } def->value = pp_xstrdup(value); + if(!def->value) + { + free(def->name); + free(def); + return 1; + } cmdline_defines = def; + return 0; } @@ -112,13 +132,17 @@ void wpp_del_define( const char *name ) /* add a command-line define of the form NAME=VALUE */ -void wpp_add_cmdline_define( const char *value ) +int wpp_add_cmdline_define( const char *value ) { + char *p; char *str = pp_xstrdup(value); - char *p = strchr( str, '=' ); + if(!str) + return 1; + p = strchr( str, '=' ); if (p) *p++ = 0; wpp_add_define( str, p ); free( str ); + return 0; } @@ -146,7 +170,9 @@ int wpp_parse( const char *input, FILE *output ) pp_status.input = NULL; pp_status.state = 0; - pp_push_define_state(); + ret = pp_push_define_state(); + if(ret) + return ret; add_cmdline_defines(); add_special_defines(); @@ -182,6 +208,8 @@ int wpp_parse_temp( const char *input, const char *output_base, char **output_na if (!output_base || !output_base[0]) output_base = "wpptmp"; temp_name = pp_xmalloc( strlen(output_base) + 8 ); + if(!temp_name) + return 1; strcpy( temp_name, output_base ); strcat( temp_name, ".XXXXXX" ); diff --git a/libs/wpp/wpp_private.h b/libs/wpp/wpp_private.h index b485d70..c0b95a4 100644 --- a/libs/wpp/wpp_private.h +++ b/libs/wpp/wpp_private.h @@ -202,7 +202,7 @@ void *pp_xmalloc(size_t); void *pp_xrealloc(void *, size_t); char *pp_xstrdup(const char *str); pp_entry_t *pplookup(const char *ident); -void pp_push_define_state(void); +int pp_push_define_state(void); void pp_pop_define_state(void); pp_entry_t *pp_add_define(char *def, char *text); pp_entry_t *pp_add_macro(char *ident, marg_t *args[], int nargs, mtext_t *exp);

1 0