November 2012 - Wine-commits

Jörg Höhle : winmm: Prefer using MMSYSERR_* over AUDCLNT_E_* from mmdevapi.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: 6086c7be194ddfbff1d588640994bce3a051e4b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6086c7be194ddfbff1d588640… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Jan 10 18:47:17 2012 +0100 winmm: Prefer using MMSYSERR_* over AUDCLNT_E_* from mmdevapi. --- dlls/winmm/waveform.c | 37 ++++++++++++------------------------- 1 files changed, 12 insertions(+), 25 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 9bcabe2..37d1d4f 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1702,7 +1702,7 @@ exit: } } -static HRESULT WINMM_BeginPlaying(WINMM_Device *device) +static MMRESULT WINMM_BeginPlaying(WINMM_Device *device) { HRESULT hr; @@ -1719,11 +1719,11 @@ static HRESULT WINMM_BeginPlaying(WINMM_Device *device) if(FAILED(hr) && hr != AUDCLNT_E_NOT_STOPPED){ device->stopped = TRUE; WARN("Start failed: %08x\n", hr); - return hr; + return MMSYSERR_ERROR; } } - return S_OK; + return MMSYSERR_NOERROR; } static LRESULT WINMM_Pause(HWAVE hwave) @@ -2577,7 +2577,7 @@ UINT WINAPI waveOutUnprepareHeader(HWAVEOUT hWaveOut, UINT WINAPI waveOutWrite(HWAVEOUT hWaveOut, WAVEHDR *header, UINT uSize) { WINMM_Device *device; - HRESULT hr; + MMRESULT mr; TRACE("(%p, %p, %u)\n", hWaveOut, header, uSize); @@ -2598,7 +2598,6 @@ UINT WINAPI waveOutWrite(HWAVEOUT hWaveOut, WAVEHDR *header, UINT uSize) if(device->acm_handle){ ACMSTREAMHEADER *ash = (ACMSTREAMHEADER*)header->reserved; - MMRESULT mr; ash->cbSrcLength = header->dwBufferLength; mr = acmStreamConvert(device->acm_handle, ash, 0); @@ -2625,15 +2624,11 @@ UINT WINAPI waveOutWrite(HWAVEOUT hWaveOut, WAVEHDR *header, UINT uSize) header->dwFlags &= ~WHDR_DONE; header->dwFlags |= WHDR_INQUEUE; - hr = WINMM_BeginPlaying(device); - if(FAILED(hr)){ - LeaveCriticalSection(&device->lock); - return MMSYSERR_ERROR; - } + mr = WINMM_BeginPlaying(device); LeaveCriticalSection(&device->lock); - return MMSYSERR_NOERROR; + return mr; } /************************************************************************** @@ -2683,7 +2678,7 @@ UINT WINAPI waveOutReset(HWAVEOUT hWaveOut) UINT WINAPI waveOutRestart(HWAVEOUT hWaveOut) { WINMM_Device *device; - HRESULT hr; + MMRESULT mr; TRACE("(%p)\n", hWaveOut); @@ -2694,15 +2689,11 @@ UINT WINAPI waveOutRestart(HWAVEOUT hWaveOut) device->stopped = TRUE; - hr = WINMM_BeginPlaying(device); - if(FAILED(hr)){ - LeaveCriticalSection(&device->lock); - return MMSYSERR_ERROR; - } + mr = WINMM_BeginPlaying(device); LeaveCriticalSection(&device->lock); - return MMSYSERR_NOERROR; + return mr; } /************************************************************************** @@ -3255,7 +3246,7 @@ UINT WINAPI waveInReset(HWAVEIN hWaveIn) UINT WINAPI waveInStart(HWAVEIN hWaveIn) { WINMM_Device *device; - HRESULT hr; + MMRESULT mr; TRACE("(%p)\n", hWaveIn); @@ -3264,15 +3255,11 @@ UINT WINAPI waveInStart(HWAVEIN hWaveIn) if(!WINMM_ValidateAndLock(device)) return MMSYSERR_INVALHANDLE; - hr = WINMM_BeginPlaying(device); - if(FAILED(hr)){ - LeaveCriticalSection(&device->lock); - return MMSYSERR_ERROR; - } + mr = WINMM_BeginPlaying(device); LeaveCriticalSection(&device->lock); - return MMSYSERR_NOERROR; + return mr; } /**************************************************************************

1 0

Jörg Höhle : winmm: Avoid generic MMSYSERR_ERROR during initialisation.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: e3e0bfca204e601cc8e82653950c314739d32b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3e0bfca204e601cc8e826539… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jan 12 17:02:46 2012 +0100 winmm: Avoid generic MMSYSERR_ERROR during initialisation. --- dlls/winmm/waveform.c | 60 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 45 insertions(+), 15 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 37d1d4f..48f53a5 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -379,6 +379,29 @@ static inline void WINMM_NotifyClient(WINMM_CBInfo *info, WORD msg, DWORD_PTR pa msg, info->user, param1, param2); } +static MMRESULT hr2mmr(HRESULT hr) +{ + switch(hr){ + case S_OK: + case AUDCLNT_E_NOT_STOPPED: + return MMSYSERR_NOERROR; + case AUDCLNT_E_UNSUPPORTED_FORMAT: + return WAVERR_BADFORMAT; + case AUDCLNT_E_DEVICE_IN_USE: + return MMSYSERR_ALLOCATED; + case AUDCLNT_E_ENDPOINT_CREATE_FAILED: + return MMSYSERR_NOTENABLED; + case E_OUTOFMEMORY: + return MMSYSERR_NOMEM; + case E_POINTER: + case E_INVALIDARG: + return MMSYSERR_INVALPARAM; + case AUDCLNT_E_DEVICE_INVALIDATED: /* DSERR_BUFFERLOST */ + default: + return FAILED(hr) ? MMSYSERR_ERROR : MMSYSERR_NOERROR; + } +} + static HRESULT WINMM_GetFriendlyName(IMMDevice *device, WCHAR *out, UINT outlen) { @@ -898,7 +921,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, WINMM_OpenInfo *info) { WAVEFORMATEX *closer_fmt = NULL, fmt, *passed_fmt; - LRESULT ret = MMSYSERR_ERROR; + LRESULT ret = MMSYSERR_NOMEM; HRESULT hr; hr = IMMDeviceEnumerator_GetDevice(g_devenum, mmdevice->dev_id, @@ -907,13 +930,18 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, WARN("Device %s (%s) unavailable: %08x\n", wine_dbgstr_w(mmdevice->dev_id), wine_dbgstr_w(mmdevice->out_caps.szPname), hr); + ret = MMSYSERR_NODRIVER; goto error; } + /* this is where winexyz.drv opens the audio device */ hr = IMMDevice_Activate(device->device, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&device->client); if(FAILED(hr)){ WARN("Activate failed: %08x\n", hr); + ret = hr2mmr(hr); + if(ret == MMSYSERR_ERROR) + ret = MMSYSERR_NOTENABLED; goto error; } @@ -945,6 +973,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, CoTaskMemFree(closer_fmt); if(FAILED(hr) && hr != AUDCLNT_E_UNSUPPORTED_FORMAT){ WARN("IsFormatSupported failed: %08x\n", hr); + ret = hr2mmr(hr); goto error; } if(hr == S_FALSE || hr == AUDCLNT_E_UNSUPPORTED_FORMAT){ @@ -962,6 +991,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, 10 * 100000, 50000, passed_fmt, &device->parent->session); if(FAILED(hr)){ WARN("Initialize failed: %08x\n", hr); + ret = hr2mmr(hr); goto error; } @@ -1038,7 +1068,7 @@ static LRESULT WOD_Open(WINMM_OpenInfo *info) { WINMM_MMDevice *mmdevice; WINMM_Device *device = NULL; - LRESULT ret = MMSYSERR_ERROR; + LRESULT ret; HRESULT hr; TRACE("(%u, %p, %08x)\n", info->req_device, info, info->flags); @@ -1111,7 +1141,7 @@ static LRESULT WID_Open(WINMM_OpenInfo *info) { WINMM_MMDevice *mmdevice; WINMM_Device *device = NULL; - LRESULT ret = MMSYSERR_ERROR; + LRESULT ret; HRESULT hr; TRACE("(%u, %p, %08x)\n", info->req_device, info, info->flags); @@ -2378,7 +2408,7 @@ UINT WINAPI waveOutGetDevCapsW(UINT_PTR uDeviceID, LPWAVEOUTCAPSW lpCaps, hr = WINMM_InitMMDevices(); if(FAILED(hr)) - return MMSYSERR_ERROR; + return MMSYSERR_NODRIVER; if (lpCaps == NULL) return MMSYSERR_INVALPARAM; @@ -2474,7 +2504,7 @@ MMRESULT WINAPI waveOutOpen(LPHWAVEOUT lphWaveOut, UINT uDeviceID, dwCallback, dwInstance, dwFlags); if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; + return MMSYSERR_NODRIVER; if(!lphWaveOut && !(dwFlags & WAVE_FORMAT_QUERY)) return MMSYSERR_INVALPARAM; @@ -2939,7 +2969,7 @@ static UINT get_device_interface(UINT msg, BOOL is_out, UINT index, WCHAR *out, WINMM_QueryInterfaceInfo info; if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; + return MMSYSERR_NODRIVER; info.is_out = is_out; info.index = index; @@ -3021,7 +3051,7 @@ UINT WINAPI waveInGetDevCapsW(UINT_PTR uDeviceID, LPWAVEINCAPSW lpCaps, UINT uSi hr = WINMM_InitMMDevices(); if(FAILED(hr)) - return MMSYSERR_ERROR; + return MMSYSERR_NODRIVER; if(!lpCaps) return MMSYSERR_INVALPARAM; @@ -3096,7 +3126,7 @@ MMRESULT WINAPI waveInOpen(HWAVEIN* lphWaveIn, UINT uDeviceID, dwCallback, dwInstance, dwFlags); if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; + return MMSYSERR_NODRIVER; if(!lphWaveIn && !(dwFlags & WAVE_FORMAT_QUERY)) return MMSYSERR_INVALPARAM; @@ -3445,7 +3475,7 @@ UINT WINAPI mixerGetDevCapsW(UINT_PTR uDeviceID, LPMIXERCAPSW lpCaps, UINT uSize hr = WINMM_InitMMDevices(); if(FAILED(hr)) - return MMSYSERR_ERROR; + return MMSYSERR_NODRIVER; if(!lpCaps) return MMSYSERR_INVALPARAM; @@ -3490,7 +3520,7 @@ UINT WINAPI mixerOpen(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, hr = WINMM_InitMMDevices(); if(FAILED(hr)) - return MMSYSERR_ERROR; + return MMSYSERR_NODRIVER; if(!lphMix) return MMSYSERR_INVALPARAM; @@ -3539,7 +3569,7 @@ UINT WINAPI mixerGetID(HMIXEROBJ hmix, LPUINT lpid, DWORD fdwID) hr = WINMM_InitMMDevices(); if(FAILED(hr)) - return MMSYSERR_ERROR; + return MMSYSERR_NODRIVER; if(!lpid) return MMSYSERR_INVALPARAM; @@ -3567,7 +3597,7 @@ UINT WINAPI mixerGetControlDetailsW(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdW hr = WINMM_InitMMDevices(); if(FAILED(hr)) - return MMSYSERR_ERROR; + return MMSYSERR_NODRIVER; if(!lpmcdW) return MMSYSERR_INVALPARAM; @@ -3754,7 +3784,7 @@ UINT WINAPI mixerGetLineControlsW(HMIXEROBJ hmix, LPMIXERLINECONTROLSW lpmlcW, hr = WINMM_InitMMDevices(); if(FAILED(hr)) - return MMSYSERR_ERROR; + return MMSYSERR_NODRIVER; if(fdwControls & ~(MIXER_GETLINECONTROLSF_ALL | MIXER_GETLINECONTROLSF_ONEBYID | @@ -3972,7 +4002,7 @@ UINT WINAPI mixerGetLineInfoW(HMIXEROBJ hmix, LPMIXERLINEW lpmliW, DWORD fdwInfo hr = WINMM_InitMMDevices(); if(FAILED(hr)) - return MMSYSERR_ERROR; + return MMSYSERR_NODRIVER; if(!lpmliW || lpmliW->cbStruct < sizeof(MIXERLINEW)) return MMSYSERR_INVALPARAM; @@ -4098,7 +4128,7 @@ UINT WINAPI mixerSetControlDetails(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcd, TRACE("(%p, %p, %x)\n", hmix, lpmcd, fdwDetails); if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; + return MMSYSERR_NODRIVER; if((fdwDetails & MIXER_SETCONTROLDETAILSF_QUERYMASK) == MIXER_SETCONTROLDETAILSF_CUSTOM)

1 0

Jörg Höhle : winmm: Call IsFormatSupported for WAVE_FORMAT_QUERY only.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: f5628373e5102ebda7be9df8482f743206dfac77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5628373e5102ebda7be9df84… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jan 12 22:29:42 2012 +0100 winmm: Call IsFormatSupported for WAVE_FORMAT_QUERY only. --- dlls/winmm/waveform.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 48f53a5..9dd2c20 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -920,7 +920,7 @@ static MMRESULT WINMM_MapDevice(WINMM_OpenInfo *info, BOOL is_out) static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, WINMM_OpenInfo *info) { - WAVEFORMATEX *closer_fmt = NULL, fmt, *passed_fmt; + WAVEFORMATEX fmt, *passed_fmt; LRESULT ret = MMSYSERR_NOMEM; HRESULT hr; @@ -967,21 +967,14 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, }else passed_fmt = info->format; - hr = IAudioClient_IsFormatSupported(device->client, - AUDCLNT_SHAREMODE_SHARED, passed_fmt, &closer_fmt); - if(closer_fmt) - CoTaskMemFree(closer_fmt); - if(FAILED(hr) && hr != AUDCLNT_E_UNSUPPORTED_FORMAT){ - WARN("IsFormatSupported failed: %08x\n", hr); - ret = hr2mmr(hr); - goto error; - } - if(hr == S_FALSE || hr == AUDCLNT_E_UNSUPPORTED_FORMAT){ - ret = WAVERR_BADFORMAT; - goto error; - } if(info->flags & WAVE_FORMAT_QUERY){ - ret = MMSYSERR_NOERROR; + WAVEFORMATEX *closer_fmt = NULL; + + hr = IAudioClient_IsFormatSupported(device->client, + AUDCLNT_SHAREMODE_SHARED, passed_fmt, &closer_fmt); + if(closer_fmt) + CoTaskMemFree(closer_fmt); + ret = hr == S_FALSE ? WAVERR_BADFORMAT : hr2mmr(hr); goto error; } @@ -990,7 +983,8 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST, 10 * 100000, 50000, passed_fmt, &device->parent->session); if(FAILED(hr)){ - WARN("Initialize failed: %08x\n", hr); + if(hr != AUDCLNT_E_UNSUPPORTED_FORMAT) + WARN("Initialize failed: %08x\n", hr); ret = hr2mmr(hr); goto error; }

1 0

Frédéric Delanoy : ole32: Fix some leaks ( coverity).
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: 780228b6cac5bd3bcc1afd1901924b27283b10b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=780228b6cac5bd3bcc1afd190… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 9 10:17:41 2012 +0100 ole32: Fix some leaks (coverity). --- dlls/ole32/storage32.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index d2e9f69..8498eaf 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8769,13 +8769,14 @@ HRESULT WINAPI ReadFmtUserTypeStg (LPSTORAGE pstg, CLIPFORMAT* pcf, LPOLESTR* lp /* ok, success... now we just need to store what we found */ if( pcf ) *pcf = RegisterClipboardFormatW( szOleTypeName ); - CoTaskMemFree( szOleTypeName ); if( lplpszUserType ) *lplpszUserType = szCLSIDName; - CoTaskMemFree( szProgIDName ); end: + CoTaskMemFree( szCLSIDName ); + CoTaskMemFree( szOleTypeName ); + CoTaskMemFree( szProgIDName ); IStream_Release( stm ); return r;

1 0

Jacek Caban : jscript: Fixed leak in disp_propget.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: 74a83150aba9dee39eba7a3013560d2d8bc839f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a83150aba9dee39eba7a301… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 9 11:48:34 2012 +0100 jscript: Fixed leak in disp_propget. --- dlls/jscript/dispex.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index f68a031..8bc4d1d 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1413,7 +1413,9 @@ HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t *val if(FAILED(hres)) return hres; - return variant_to_jsval(&var, val); + hres = variant_to_jsval(&var, val); + VariantClear(&var); + return hres; } HRESULT jsdisp_delete_idx(jsdisp_t *obj, DWORD idx)

1 0

Matteo Bruni : wined3d: Ensure GL_FRAGMENT_PROGRAM_ARB is enabled when using ARB shaders.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: b532284a9ec23cd3663761e3dd83d355754cc2cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b532284a9ec23cd3663761e3d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 9 15:20:34 2012 +0100 wined3d: Ensure GL_FRAGMENT_PROGRAM_ARB is enabled when using ARB shaders. --- dlls/wined3d/arb_program_shader.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index aa89d59..6328fdf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4676,13 +4676,12 @@ static void shader_arb_select(const struct wined3d_context *context, enum wined3 checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, priv->current_fprogram_id);"); if (!priv->use_arbfp_fixed_func) - { priv->fragment_pipe->enable_extension(gl_info, FALSE); - /* Enable OpenGL fragment programs. */ - gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB); - checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);"); - } + /* Enable OpenGL fragment programs. */ + gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB); + checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);"); + TRACE("(%p) : Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB\n", device, priv->current_fprogram_id);

1 0

Matteo Bruni : wined3d: Pop control frames in disabled if branches ( ARB shader backend).
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: a7956c4c4f8f2abd673f9e5cbb159419e1d003be URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7956c4c4f8f2abd673f9e5cb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 9 15:20:35 2012 +0100 wined3d: Pop control frames in disabled if branches (ARB shader backend). --- dlls/wined3d/arb_program_shader.c | 52 ++++++++++++++++++++++++------------- 1 files changed, 34 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6328fdf..6ea73c0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5395,6 +5395,29 @@ static void free_recorded_instruction(struct list *list) } } +static void pop_control_frame(const struct wined3d_shader_instruction *ins) +{ + struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; + struct control_frame *control_frame; + + if (ins->handler_idx == WINED3DSIH_ENDLOOP || ins->handler_idx == WINED3DSIH_ENDREP) + { + struct list *e = list_head(&priv->control_frames); + control_frame = LIST_ENTRY(e, struct control_frame, entry); + list_remove(&control_frame->entry); + HeapFree(GetProcessHeap(), 0, control_frame); + priv->loop_depth--; + } + else if (ins->handler_idx == WINED3DSIH_ENDIF) + { + /* Non-ifc ENDIFs were already handled previously. */ + struct list *e = list_head(&priv->control_frames); + control_frame = LIST_ENTRY(e, struct control_frame, entry); + list_remove(&control_frame->entry); + HeapFree(GetProcessHeap(), 0, control_frame); + } +} + static void shader_arb_handle_instruction(const struct wined3d_shader_instruction *ins) { SHADER_HANDLER hw_fct; struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; @@ -5564,6 +5587,8 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio return; /* Instruction is handled. */ } /* In case of an ifc, generate a HW shader instruction */ + if (control_frame->type != IFC) + ERR("Control frame does not match.\n"); } else if(ins->handler_idx == WINED3DSIH_ENDIF) { @@ -5578,9 +5603,16 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio HeapFree(GetProcessHeap(), 0, control_frame); return; /* Instruction is handled */ } + /* In case of an ifc, generate a HW shader instruction */ + if (control_frame->type != IFC) + ERR("Control frame does not match.\n"); } - if(priv->muted) return; + if(priv->muted) + { + pop_control_frame(ins); + return; + } /* Select handler */ hw_fct = shader_arb_instruction_handler_table[ins->handler_idx]; @@ -5593,23 +5625,7 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio } hw_fct(ins); - if(ins->handler_idx == WINED3DSIH_ENDLOOP || ins->handler_idx == WINED3DSIH_ENDREP) - { - struct list *e = list_head(&priv->control_frames); - control_frame = LIST_ENTRY(e, struct control_frame, entry); - list_remove(&control_frame->entry); - HeapFree(GetProcessHeap(), 0, control_frame); - priv->loop_depth--; - } - else if(ins->handler_idx == WINED3DSIH_ENDIF) - { - /* Non-ifc ENDIFs don't reach that place because of the return in the if block above */ - struct list *e = list_head(&priv->control_frames); - control_frame = LIST_ENTRY(e, struct control_frame, entry); - list_remove(&control_frame->entry); - HeapFree(GetProcessHeap(), 0, control_frame); - } - + pop_control_frame(ins); shader_arb_add_instruction_modifiers(ins); }

1 0

Matteo Bruni : d3dcompiler: Don' t take the sign as part of the numeric token.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: a5203e1a79d49cb363cbe90bf33a3f274e96443a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5203e1a79d49cb363cbe90bf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 9 15:20:36 2012 +0100 d3dcompiler: Don't take the sign as part of the numeric token. --- dlls/d3dcompiler_43/hlsl.l | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.l b/dlls/d3dcompiler_43/hlsl.l index 49fb042..f40e3c9 100644 --- a/dlls/d3dcompiler_43/hlsl.l +++ b/dlls/d3dcompiler_43/hlsl.l @@ -184,15 +184,15 @@ row_major {return KW_ROW_MAJOR; } return NEW_IDENTIFIER; } -[+-]?[0-9]*\.[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F]? { +[0-9]*\.[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F]? { hlsl_lval.floatval = atof(yytext); return C_FLOAT; } -[+-]?[0-9]+\.([eE][+-]?[0-9]+)?[h|H|f|F]? { +[0-9]+\.([eE][+-]?[0-9]+)?[h|H|f|F]? { hlsl_lval.floatval = atof(yytext); return C_FLOAT; } -[+-]?[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F] { +[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F] { hlsl_lval.floatval = atof(yytext); return C_FLOAT; } @@ -204,7 +204,7 @@ row_major {return KW_ROW_MAJOR; } sscanf(yytext, "0%o", &hlsl_lval.intval); return C_INTEGER; } -\-?[0-9]+ { +[0-9]+ { hlsl_lval.intval = (atoi(yytext)); return C_INTEGER; }

1 0

Matteo Bruni : d3dcompiler: Allow a comma at the end of an initializer.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: 0d2a27af40137ced1fc4e441295d27b00498af28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d2a27af40137ced1fc4e4412… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 9 15:20:37 2012 +0100 d3dcompiler: Allow a comma at the end of an initializer. --- dlls/d3dcompiler_43/hlsl.y | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 6200b96..b2740f6 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1585,6 +1585,10 @@ complex_initializer: initializer_expr { $$ = $2; } + | '{' initializer_expr_list ',' '}' + { + $$ = $2; + } initializer_expr: assignment_expr {

1 0

Matteo Bruni : d3dcompiler: Skip stray semicolons outside of functions.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: feda13db337aceacb6f61bccb2b560f3cc094e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feda13db337aceacb6f61bccb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 9 15:20:38 2012 +0100 d3dcompiler: Skip stray semicolons outside of functions. --- dlls/d3dcompiler_43/hlsl.y | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index b2740f6..6c360ec 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1065,6 +1065,10 @@ hlsl_prog: /* empty */ | hlsl_prog preproc_directive { } + | hlsl_prog ';' + { + TRACE("Skipping stray semicolon.\n"); + } preproc_directive: PRE_LINE STRING {

1 0