November 2012 - Wine-Commits

Matteo Bruni : d3dcompiler: Allow a comma at the end of an initializer.
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

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: Don' t take the sign as part of the numeric token.
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

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

Jörg Höhle : winmm: Call IsFormatSupported for WAVE_FORMAT_QUERY only.
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

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

Jörg Höhle : winmm: Avoid generic MMSYSERR_ERROR during initialisation.
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

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

Sam Edwards : d3d8/tests: Add test for IDirect3DDevice8_Reset with BackBufferWidth/Height = 0.
by Alexandre Julliard Nov. 8, 2012

Nov. 8, 2012

Module: wine Branch: master Commit: 9fb27d7a059600c911471155e0069af318f3122c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb27d7a059600c911471155e… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Wed Nov 7 14:45:46 2012 -0700 d3d8/tests: Add test for IDirect3DDevice8_Reset with BackBufferWidth/Height = 0. --- dlls/d3d8/tests/device.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 8cd150f..b98a84a 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1018,6 +1018,7 @@ static void test_reset(void) IDirect3D8 *d3d8 = NULL; UINT mode_count = 0; HWND window = NULL; + RECT winrect; D3DVIEWPORT8 vp; D3DCAPS8 caps; DWORD shader; @@ -1218,6 +1219,51 @@ static void test_reset(void) surface_desc.Height); IDirect3DSurface8_Release(surface); + winrect.left = 0; + winrect.top = 0; + winrect.right = 200; + winrect.bottom = 150; + ok(AdjustWindowRect(&winrect, WS_OVERLAPPEDWINDOW, FALSE), "AdjustWindowRect failed\n"); + ok(SetWindowPos(window, NULL, 0, 0, + winrect.right-winrect.left, + winrect.bottom-winrect.top, + SWP_NOMOVE|SWP_NOZORDER), + "SetWindowPos failed\n"); + + memset(&d3dpp, 0, sizeof(d3dpp)); + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.Windowed = TRUE; + d3dpp.BackBufferWidth = 0; + d3dpp.BackBufferHeight = 0; + d3dpp.BackBufferFormat = d3ddm.Format; + hr = IDirect3DDevice8_Reset(device1, &d3dpp); + ok(SUCCEEDED(hr), "Reset failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_TestCooperativeLevel(device1); + ok(SUCCEEDED(hr), "TestCooperativeLevel failed, hr %#x.\n", hr); + + memset(&vp, 0, sizeof(vp)); + hr = IDirect3DDevice8_GetViewport(device1, &vp); + ok(SUCCEEDED(hr), "GetViewport failed, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(vp.X == 0, "D3DVIEWPORT->X = %u, expected 0.\n", vp.X); + ok(vp.Y == 0, "D3DVIEWPORT->Y = %u, expected 0.\n", vp.Y); + todo_wine ok(vp.Width == 200, "D3DVIEWPORT->Width = %u, expected 200.\n", vp.Width); + todo_wine ok(vp.Height == 150, "D3DVIEWPORT->Height = %u, expected 150.\n", vp.Height); + ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %.8e, expected 0.\n", vp.MinZ); + ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %.8e, expected 1.\n", vp.MaxZ); + } + + hr = IDirect3DDevice8_GetRenderTarget(device1, &surface); + ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); + ok(hr == D3D_OK, "GetDesc failed, hr %#x.\n", hr); + todo_wine ok(surface_desc.Width == 200, "Back buffer width is %u, expected 200.\n", + surface_desc.Width); + todo_wine ok(surface_desc.Height == 150, "Back buffer height is %u, expected 150.\n", + surface_desc.Height); + IDirect3DSurface8_Release(surface); + memset(&d3dpp, 0, sizeof(d3dpp)); d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = TRUE;

1 0

Detlef Riekenberg : mstask: Implement SetTargetComputer.
by Alexandre Julliard Nov. 8, 2012

Nov. 8, 2012

Module: wine Branch: master Commit: 5bff2fb66b46ab1834354b57baca262861b74e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bff2fb66b46ab1834354b57b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Nov 8 00:12:47 2012 +0100 mstask: Implement SetTargetComputer. --- dlls/mstask/task_scheduler.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index 44609b8..5657e43 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -85,8 +85,27 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_SetTargetComputer( ITaskScheduler* iface, LPCWSTR pwszComputer) { - FIXME("%p, %s: stub\n", iface, debugstr_w(pwszComputer)); - return E_NOTIMPL; + TaskSchedulerImpl *This = impl_from_ITaskScheduler(iface); + WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 3]; /* extra space for two '\' and a zero */ + DWORD len = MAX_COMPUTERNAME_LENGTH + 1; /* extra space for a zero */ + + TRACE("(%p)->(%s)\n", This, debugstr_w(pwszComputer)); + + /* NULL is an alias for the local computer */ + if (!pwszComputer) + return S_OK; + + buffer[0] = '\\'; + buffer[1] = '\\'; + if (GetComputerNameW(buffer + 2, &len)) + { + if (!lstrcmpiW(buffer, pwszComputer) || /* full unc name */ + !lstrcmpiW(buffer + 2, pwszComputer)) /* name without backslash */ + return S_OK; + } + + FIXME("remote computer %s not supported\n", debugstr_w(pwszComputer)); + return HRESULT_FROM_WIN32(ERROR_BAD_NETPATH); } static HRESULT WINAPI MSTASK_ITaskScheduler_GetTargetComputer(

1 0

André Hentschel : winhlp32: Mark up fallthrough switch case (coverity).
by Alexandre Julliard Nov. 8, 2012

Nov. 8, 2012

Module: wine Branch: master Commit: bc240bd323187fd5ba92e854adf51c391c834523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc240bd323187fd5ba92e854a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 7 23:19:21 2012 +0100 winhlp32: Mark up fallthrough switch case (coverity). --- programs/winhlp32/winhelp.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index b905807..5e854f6 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -1480,6 +1480,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, break; default: WINE_FIXME("Unsupported %d\n", win->font_scale); + /* fall through */ case 1: CheckMenuItem(hMenu, MNID_CTXT_FONTS_NORMAL, MF_BYCOMMAND|MF_CHECKED);

1 0

Frédéric Delanoy : d3drm: Fix a leak (coverity).
by Alexandre Julliard Nov. 8, 2012

Nov. 8, 2012

Module: wine Branch: master Commit: 1ae9acb0df361face1b9c4f58fbd1af3ed840454 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae9acb0df361face1b9c4f58… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 8 10:37:31 2012 +0100 d3drm: Fix a leak (coverity). --- dlls/d3drm/frame.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index e4c7cfc..764cf58 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -2702,7 +2702,10 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent, IUnknown** ret_ifa hr = IDirect3DRMFrame_QueryInterface(parent, &IID_IDirect3DRMFrame3, (void**)&p); if (hr != S_OK) + { + HeapFree(GetProcessHeap(), 0, object); return hr; + } IDirect3DRMFrame_Release(parent); IDirect3DRMFrame3_AddChild(p, &object->IDirect3DRMFrame3_iface); }

1 0

Józef Kucia : d3dx9: Handle NULL arguments in D3DXVec3Unproject.
by Alexandre Julliard Nov. 8, 2012

Nov. 8, 2012

Module: wine Branch: master Commit: 3e264ced0f2502093940ddda21ecbd024b7dd815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e264ced0f2502093940ddda2… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Nov 8 13:45:55 2012 +0100 d3dx9: Handle NULL arguments in D3DXVec3Unproject. --- dlls/d3dx9_36/math.c | 14 +++++--------- dlls/d3dx9_36/tests/math.c | 12 ++++++++++++ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 78317e8..0aebff0 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1936,16 +1936,12 @@ D3DXVECTOR3* WINAPI D3DXVec3Unproject(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, TRACE("(%p, %p, %p, %p, %p, %p)\n", pout, pv, pviewport, pprojection, pview, pworld); - if (pworld) - { - D3DXMatrixMultiply(&m, pworld, pview); - D3DXMatrixMultiply(&m, &m, pprojection); - } - else - { - D3DXMatrixMultiply(&m, pview, pprojection); - } + D3DXMatrixIdentity(&m); + if (pworld) D3DXMatrixMultiply(&m, &m, pworld); + if (pview) D3DXMatrixMultiply(&m, &m, pview); + if (pprojection) D3DXMatrixMultiply(&m, &m, pprojection); D3DXMatrixInverse(&m, NULL, &m); + *pout = *pv; if (pviewport) { diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 9bcd42c..53262b7 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1401,6 +1401,18 @@ static void D3DXVector3Test(void) D3DXMatrixMultiply(&mat,&world,&view); D3DXVec3Unproject(&gotvec,&u,&viewport,&projection,&mat,NULL); expect_vec3(expectedvec,gotvec); + /* Projection matrix can be omitted */ + D3DXMatrixMultiply(&mat,&view,&projection); + D3DXVec3Unproject(&gotvec,&u,&viewport,NULL,&mat,&world); + expect_vec3(expectedvec,gotvec); + /* View matrix can be omitted */ + D3DXMatrixMultiply(&mat,&world,&view); + D3DXVec3Unproject(&gotvec,&u,&viewport,&projection,NULL,&mat); + expect_vec3(expectedvec,gotvec); + /* All matrices can be omitted */ + expectedvec.x = -1.002500f; expectedvec.y = 0.997059f; expectedvec.z = 2.571429f; + D3DXVec3Unproject(&gotvec,&u,&viewport,NULL,NULL,NULL); + expect_vec3(expectedvec,gotvec); /* Viewport can be omitted */ expectedvec.x = -11.018396f; expectedvec.y = 3.218991f; expectedvec.z = 1.380329f; D3DXVec3Unproject(&gotvec,&u,NULL,&projection,&view,&world);

1 0

Józef Kucia : d3dx9: Handle NULL arguments in D3DXVec3Project.
by Alexandre Julliard Nov. 8, 2012

Nov. 8, 2012

Module: wine Branch: master Commit: a5d5650730eb56dc0136d64ee9d20b544963173e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d5650730eb56dc0136d64ee… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Nov 8 13:45:54 2012 +0100 d3dx9: Handle NULL arguments in D3DXVec3Project. --- dlls/d3dx9_36/math.c | 21 +++++++++++++-------- dlls/d3dx9_36/tests/math.c | 32 ++++++++++++++++++++++++++------ 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 117bb84..78317e8 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1809,17 +1809,22 @@ D3DXVECTOR3* WINAPI D3DXVec3Normalize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv) D3DXVECTOR3* WINAPI D3DXVec3Project(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, CONST D3DVIEWPORT9 *pviewport, CONST D3DXMATRIX *pprojection, CONST D3DXMATRIX *pview, CONST D3DXMATRIX *pworld) { D3DXMATRIX m; - D3DXVECTOR3 out; TRACE("(%p, %p, %p, %p, %p, %p)\n", pout, pv, pviewport, pprojection, pview, pworld); - D3DXMatrixMultiply(&m, pworld, pview); - D3DXMatrixMultiply(&m, &m, pprojection); - D3DXVec3TransformCoord(&out, pv, &m); - out.x = pviewport->X + ( 1.0f + out.x ) * pviewport->Width / 2.0f; - out.y = pviewport->Y + ( 1.0f - out.y ) * pviewport->Height / 2.0f; - out.z = pviewport->MinZ + out.z * ( pviewport->MaxZ - pviewport->MinZ ); - *pout = out; + D3DXMatrixIdentity(&m); + if (pworld) D3DXMatrixMultiply(&m, &m, pworld); + if (pview) D3DXMatrixMultiply(&m, &m, pview); + if (pprojection) D3DXMatrixMultiply(&m, &m, pprojection); + + D3DXVec3TransformCoord(pout, pv, &m); + + if (pviewport) + { + pout->x = pviewport->X + ( 1.0f + pout->x ) * pviewport->Width / 2.0f; + pout->y = pviewport->Y + ( 1.0f - pout->y ) * pviewport->Height / 2.0f; + pout->z = pviewport->MinZ + pout->z * ( pviewport->MaxZ - pviewport->MinZ ); + } return pout; } diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 533c6d7..9bcd42c 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1331,12 +1331,6 @@ static void D3DXVector3Test(void) D3DXVec3Normalize(&gotvec,&nul); expect_vec3(expectedvec,gotvec); -/*_______________D3DXVec3Project_________________________*/ - expectedvec.x = 1135.721924f; expectedvec.y = 147.086914f; expectedvec.z = 0.153412f; - D3DXMatrixPerspectiveFovLH(&projection,D3DX_PI/4.0f,20.0f/17.0f,1.0f,1000.0f); - D3DXVec3Project(&gotvec,&u,&viewport,&projection,&view,&world); - expect_vec3(expectedvec,gotvec); - /*_______________D3DXVec3Scale____________________________*/ expectedvec.x = -58.5f; expectedvec.y = -39.0f; expectedvec.z = -13.0f; D3DXVec3Scale(&gotvec,&u,scale); @@ -1372,6 +1366,32 @@ static void D3DXVector3Test(void) D3DXVec3TransformNormal(&gotvec,&u,&mat); expect_vec3(expectedvec,gotvec); +/*_______________D3DXVec3Project_________________________*/ + expectedvec.x = 1135.721924f; expectedvec.y = 147.086914f; expectedvec.z = 0.153412f; + D3DXMatrixPerspectiveFovLH(&projection,D3DX_PI/4.0f,20.0f/17.0f,1.0f,1000.0f); + D3DXVec3Project(&gotvec,&u,&viewport,&projection,&view,&world); + expect_vec3(expectedvec,gotvec); + /* World matrix can be omitted */ + D3DXMatrixMultiply(&mat,&world,&view); + D3DXVec3Project(&gotvec,&u,&viewport,&projection,&mat,NULL); + expect_vec3(expectedvec,gotvec); + /* Projection matrix can be omitted */ + D3DXMatrixMultiply(&mat,&view,&projection); + D3DXVec3Project(&gotvec,&u,&viewport,NULL,&mat,&world); + expect_vec3(expectedvec,gotvec); + /* View matrix can be omitted */ + D3DXMatrixMultiply(&mat,&world,&view); + D3DXVec3Project(&gotvec,&u,&viewport,&projection,NULL,&mat); + expect_vec3(expectedvec,gotvec); + /* All matrices can be omitted */ + expectedvec.x = 4010.000000f; expectedvec.y = -1695.000000f; expectedvec.z = 1.600000f; + D3DXVec3Project(&gotvec,&u,&viewport,NULL,NULL,NULL); + expect_vec3(expectedvec,gotvec); + /* Viewport can be omitted */ + expectedvec.x = 1.814305f; expectedvec.y = 0.582097f; expectedvec.z = -0.066555f; + D3DXVec3Project(&gotvec,&u,NULL,&projection,&view,&world); + expect_vec3(expectedvec,gotvec); + /*_______________D3DXVec3Unproject_________________________*/ expectedvec.x = -2.913411f; expectedvec.y = 1.593215f; expectedvec.z = 0.380724f; D3DXMatrixPerspectiveFovLH(&projection,D3DX_PI/4.0f,20.0f/17.0f,1.0f,1000.0f);

1 0