August 2013 - Wine-Commits - list.winehq.org

Jeff Klein : winealsa.drv: Implement IMarshal for IAudioClient.
by Alexandre Julliard Aug. 2, 2013

Aug. 2, 2013

Module: wine Branch: master Commit: 4e565b0ef0ed03accc9993ae7572da9ec38cdaca URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e565b0ef0ed03accc9993ae7… Author: Jeff Klein <jeffrey.a.klein(a)gmail.com> Date: Thu Aug 1 21:54:19 2013 -0400 winealsa.drv: Implement IMarshal for IAudioClient. --- dlls/winealsa.drv/mmdevdrv.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index ce4b2c8..ba70b02 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -100,6 +100,7 @@ struct ACImpl { snd_pcm_format_t alsa_format; IMMDevice *parent; + IUnknown *pUnkFTMarshal; EDataFlow dataflow; WAVEFORMATEX *fmt; @@ -772,6 +773,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient static int handle_underrun = 1; char alsa_name[256]; EDataFlow dataflow; + HRESULT hr; TRACE("%s %p %p\n", debugstr_guid(guid), dev, out); @@ -798,6 +800,13 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient return E_UNEXPECTED; } + hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, + (IUnknown **)&This->pUnkFTMarshal); + if (FAILED(hr)) { + HeapFree(GetProcessHeap(), 0, This); + return hr; + } + This->dataflow = dataflow; if(handle_underrun && ((lconf = make_handle_underrun_config(alsa_name)))){ err = snd_pcm_open_lconf(&This->pcm_handle, alsa_name, stream, SND_PCM_NONBLOCK, lconf); @@ -848,6 +857,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface, REFIID riid, void **ppv) { + ACImpl *This = impl_from_IAudioClient(iface); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); if(!ppv) @@ -855,6 +865,9 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface, *ppv = NULL; if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioClient)) *ppv = iface; + else if(IsEqualIID(riid, &IID_IMarshal)) + return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); + if(*ppv){ IUnknown_AddRef((IUnknown*)*ppv); return S_OK; @@ -881,6 +894,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface) if(!ref){ IAudioClient_Stop(iface); IMMDevice_Release(This->parent); + IUnknown_Release(This->pUnkFTMarshal); This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); snd_pcm_drop(This->pcm_handle); @@ -2418,6 +2432,7 @@ static const IAudioClientVtbl AudioClient_Vtbl = static HRESULT WINAPI AudioRenderClient_QueryInterface( IAudioRenderClient *iface, REFIID riid, void **ppv) { + ACImpl *This = impl_from_IAudioRenderClient(iface); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); if(!ppv) @@ -2427,6 +2442,9 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface( if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioRenderClient)) *ppv = iface; + else if(IsEqualIID(riid, &IID_IMarshal)) + return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); + if(*ppv){ IUnknown_AddRef((IUnknown*)*ppv); return S_OK; @@ -2582,6 +2600,7 @@ static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { static HRESULT WINAPI AudioCaptureClient_QueryInterface( IAudioCaptureClient *iface, REFIID riid, void **ppv) { + ACImpl *This = impl_from_IAudioCaptureClient(iface); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); if(!ppv) @@ -2591,6 +2610,9 @@ static HRESULT WINAPI AudioCaptureClient_QueryInterface( if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioCaptureClient)) *ppv = iface; + else if(IsEqualIID(riid, &IID_IMarshal)) + return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); + if(*ppv){ IUnknown_AddRef((IUnknown*)*ppv); return S_OK;

1 0

Rico Schüller : d3dx9/tests: Test all registers set by the constant table.
by Alexandre Julliard Aug. 2, 2013

Aug. 2, 2013

Module: wine Branch: master Commit: b9b6b0585f5cfa72d4ed3974a1f5ab9122339111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9b6b0585f5cfa72d4ed3974a… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Aug 1 22:53:35 2013 +0200 d3dx9/tests: Test all registers set by the constant table. --- dlls/d3dx9_36/tests/shader.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 171d62c..7235fad 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -5912,6 +5912,25 @@ static UINT registerset_compare(IDirect3DDevice9 *device, BOOL is_vs, D3DXREGIST return err; } +static UINT registerset_compare_all(IDirect3DDevice9 *device, BOOL is_vs, D3DXREGISTER_SET regset, + UINT start, UINT in_count, const DWORD *expected) +{ + D3DXREGISTER_SET regsets[] = {D3DXRS_BOOL, D3DXRS_INT4, D3DXRS_FLOAT4}; + UINT err = 0, i; + + for (i = 0; i < sizeof(regsets) / sizeof(*regsets); i++) + { + if (regset == regsets[i]) + err += registerset_compare(device, is_vs, regset, start, in_count, expected); + else + err += registerset_compare(device, is_vs, regsets[i], 0, 0, NULL); + + err += registerset_compare(device, !is_vs, regsets[i], 0, 0, NULL); + } + + return err; +} + static HRESULT registerset_apply(ID3DXConstantTable *ctable, IDirect3DDevice9 *device, D3DXHANDLE constant, UINT index, DWORD count, enum Type type) { @@ -6095,7 +6114,7 @@ static void test_registerset(void) ok(hr == D3D_OK, "Set* \"%s\" index %u, count %u failed, got %x, expected %x\n", tablename, i, test->in_count_min, hr, D3D_OK); - ret = registerset_compare(device, is_vs, registerset_data[k].regset, + ret = registerset_compare_all(device, is_vs, registerset_data[k].regset, registerset_data[k].start, test->out_count, test->out); ok(ret == 0, "Get*ShaderConstant \"%s\" index %u, count %u failed\n", tablename, i, test->in_count_min); @@ -6107,7 +6126,7 @@ static void test_registerset(void) ok(hr == D3D_OK, "Set* \"%s\" index %u, count %u failed, got %x, expected %x\n", tablename, i, test->in_count_max, hr, D3D_OK); - ret = registerset_compare(device, is_vs, registerset_data[k].regset, + ret = registerset_compare_all(device, is_vs, registerset_data[k].regset, registerset_data[k].start, test->out_count, test->out); ok(ret == 0, "Get*ShaderConstant \"%s\" index %u, count %u failed\n", tablename, i, test->in_count_max); }

1 0

Rico Schüller : d3dx9: Track ID3DXEffect::Begin/End().
by Alexandre Julliard Aug. 2, 2013

Aug. 2, 2013

Module: wine Branch: master Commit: 3ff2255a83494f4a1b3391d63083e7056d185106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ff2255a83494f4a1b3391d63… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Aug 1 22:48:11 2013 +0200 d3dx9: Track ID3DXEffect::Begin/End(). --- dlls/d3dx9_36/effect.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0be0d1e..2c8eedf 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -176,6 +176,7 @@ struct ID3DXEffectImpl struct ID3DXEffectPool *pool; struct d3dx_technique *active_technique; struct d3dx_pass *active_pass; + BOOL started; ID3DXBaseEffect *base_effect; }; @@ -3470,6 +3471,7 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW } *passes = technique->pass_count; + This->started = TRUE; return D3D_OK; } @@ -3526,13 +3528,15 @@ static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface) return D3DERR_INVALIDCALL; } -static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect* iface) +static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); - FIXME("(%p)->(): stub\n", This); + FIXME("iface %p partial stub\n", iface); - return E_NOTIMPL; + This->started = FALSE; + + return D3D_OK; } static HRESULT WINAPI ID3DXEffectImpl_GetDevice(ID3DXEffect *iface, struct IDirect3DDevice9 **device)

1 0

Nikolay Sivov : oledb32: Use heap helpers for allocation.
by Alexandre Julliard Aug. 2, 2013

Aug. 2, 2013

Module: wine Branch: master Commit: 75bde26bea637f5bb08a7447dbcf360b4b808c37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75bde26bea637f5bb08a7447d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 2 09:53:58 2013 +0400 oledb32: Use heap helpers for allocation. --- dlls/oledb32/convert.c | 6 ++---- dlls/oledb32/datainit.c | 12 ++++-------- dlls/oledb32/errorinfo.c | 4 ++-- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 8875057..fba9025 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -103,9 +103,7 @@ static ULONG WINAPI convert_Release(IDataConvert* iface) ref = InterlockedDecrement(&This->ref); if(ref == 0) - { - HeapFree(GetProcessHeap(), 0, This); - } + heap_free(This); return ref; } @@ -1548,7 +1546,7 @@ HRESULT create_oledb_convert(IUnknown *outer, void **obj) if(outer) return CLASS_E_NOAGGREGATION; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if(!This) return E_OUTOFMEMORY; This->IDataConvert_iface.lpVtbl = &convert_vtbl; diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 58bd812..9fe3c4f 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -173,9 +173,7 @@ static ULONG WINAPI dbinit_Release(IDBInitialize *iface) ref = InterlockedDecrement(&This->ref); if(ref == 0) - { - HeapFree(GetProcessHeap(), 0, This); - } + heap_free(This); return ref; } @@ -215,7 +213,7 @@ static HRESULT create_db_init(void **obj) *obj = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if(!This) return E_OUTOFMEMORY; This->IDBInitialize_iface.lpVtbl = &dbinit_vtbl; @@ -266,9 +264,7 @@ static ULONG WINAPI datainit_Release(IDataInitialize *iface) ref = InterlockedDecrement(&This->ref); if(ref == 0) - { - HeapFree(GetProcessHeap(), 0, This); - } + heap_free(This); return ref; } @@ -818,7 +814,7 @@ HRESULT create_data_init(IUnknown *outer, void **obj) *obj = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if(!This) return E_OUTOFMEMORY; This->IDataInitialize_iface.lpVtbl = &datainit_vtbl; diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index 4e65ce5..eef2b37 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -117,7 +117,7 @@ static ULONG WINAPI IErrorInfoImpl_Release(IErrorInfo* iface) SysFreeString(This->source); SysFreeString(This->description); SysFreeString(This->help_file); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return ref; } @@ -340,7 +340,7 @@ HRESULT create_error_info(IUnknown *outer, void **obj) if(outer) return CLASS_E_NOAGGREGATION; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if(!This) return E_OUTOFMEMORY; This->IErrorInfo_iface.lpVtbl = &ErrorInfoVtbl;

1 0

Stefan Dösinger : ddraw: Fix double to float conversion warnings.
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

Module: wine Branch: master Commit: c0faf86fff1ebd052f9564a728bbcbd9af58fbd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0faf86fff1ebd052f9564a72… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 1 19:49:15 2013 +0200 ddraw: Fix double to float conversion warnings. --- dlls/ddraw/device.c | 2 +- dlls/ddraw/executebuffer.c | 18 ++++++++---------- dlls/ddraw/viewport.c | 8 ++++---- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 09880dd..449b5b8 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4391,7 +4391,7 @@ static DWORD in_plane(UINT plane, D3DVECTOR normal, D3DVALUE origin_plane, D3DVE { float distance, norm; - norm = sqrt( normal.u1.x * normal.u1.x + normal.u2.y * normal.u2.y + normal.u3.z * normal.u3.z ); + norm = sqrtf(normal.u1.x * normal.u1.x + normal.u2.y * normal.u2.y + normal.u3.z * normal.u3.z); distance = ( origin_plane + normal.u1.x * center.u1.x + normal.u2.y * center.u2.y + normal.u3.z * center.u3.z ) / norm; if ( fabs( distance ) < radius ) return D3DSTATUS_CLIPUNIONLEFT << plane; diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 2925cfa..04ea257 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -381,11 +381,10 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, dst->u7.tu = src->u7.tu; dst->u8.tv = src->u8.tv; - /* Now, the matrix multiplication */ - dst->u1.sx = (src->u1.x * mat._11) + (src->u2.y * mat._21) + (src->u3.z * mat._31) + (1.0 * mat._41); - dst->u2.sy = (src->u1.x * mat._12) + (src->u2.y * mat._22) + (src->u3.z * mat._32) + (1.0 * mat._42); - dst->u3.sz = (src->u1.x * mat._13) + (src->u2.y * mat._23) + (src->u3.z * mat._33) + (1.0 * mat._43); - dst->u4.rhw = (src->u1.x * mat._14) + (src->u2.y * mat._24) + (src->u3.z * mat._34) + (1.0 * mat._44); + dst->u1.sx = (src->u1.x * mat._11) + (src->u2.y * mat._21) + (src->u3.z * mat._31) + mat._41; + dst->u2.sy = (src->u1.x * mat._12) + (src->u2.y * mat._22) + (src->u3.z * mat._32) + mat._42; + dst->u3.sz = (src->u1.x * mat._13) + (src->u2.y * mat._23) + (src->u3.z * mat._33) + mat._43; + dst->u4.rhw = (src->u1.x * mat._14) + (src->u2.y * mat._24) + (src->u3.z * mat._34) + mat._44; dst->u1.sx = dst->u1.sx / dst->u4.rhw * Viewport->dvScaleX + Viewport->dwX + Viewport->dwWidth / 2; @@ -424,11 +423,10 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, dst->u7.tu = src->u6.tu; dst->u8.tv = src->u7.tv; - /* Now, the matrix multiplication */ - dst->u1.sx = (src->u1.x * mat._11) + (src->u2.y * mat._21) + (src->u3.z * mat._31) + (1.0 * mat._41); - dst->u2.sy = (src->u1.x * mat._12) + (src->u2.y * mat._22) + (src->u3.z * mat._32) + (1.0 * mat._42); - dst->u3.sz = (src->u1.x * mat._13) + (src->u2.y * mat._23) + (src->u3.z * mat._33) + (1.0 * mat._43); - dst->u4.rhw = (src->u1.x * mat._14) + (src->u2.y * mat._24) + (src->u3.z * mat._34) + (1.0 * mat._44); + dst->u1.sx = (src->u1.x * mat._11) + (src->u2.y * mat._21) + (src->u3.z * mat._31) + mat._41; + dst->u2.sy = (src->u1.x * mat._12) + (src->u2.y * mat._22) + (src->u3.z * mat._32) + mat._42; + dst->u3.sz = (src->u1.x * mat._13) + (src->u2.y * mat._23) + (src->u3.z * mat._33) + mat._43; + dst->u4.rhw = (src->u1.x * mat._14) + (src->u2.y * mat._24) + (src->u3.z * mat._34) + mat._44; dst->u1.sx = dst->u1.sx / dst->u4.rhw * Viewport->dvScaleX + Viewport->dwX + Viewport->dwWidth / 2; diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index f9eddda..95df63f 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -428,10 +428,10 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, outH = lpData->lpHOut; for(i = 0; i < dwVertexCount; i++) { - x = (in[0] * mat._11) + (in[1] * mat._21) + (in[2] * mat._31) + (1.0 * mat._41); - y = (in[0] * mat._12) + (in[1] * mat._22) + (in[2] * mat._32) + (1.0 * mat._42); - z = (in[0] * mat._13) + (in[1] * mat._23) + (in[2] * mat._33) + (1.0 * mat._43); - w = (in[0] * mat._14) + (in[1] * mat._24) + (in[2] * mat._34) + (1.0 * mat._44); + x = (in[0] * mat._11) + (in[1] * mat._21) + (in[2] * mat._31) + mat._41; + y = (in[0] * mat._12) + (in[1] * mat._22) + (in[2] * mat._32) + mat._42; + z = (in[0] * mat._13) + (in[1] * mat._23) + (in[2] * mat._33) + mat._43; + w = (in[0] * mat._14) + (in[1] * mat._24) + (in[2] * mat._34) + mat._44; if(dwFlags & D3DTRANSFORM_CLIPPED) {

1 0

Stefan Dösinger : wined3d: Avoid calculating 1 / ( fog_end - fog_start) in the shader.
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

Module: wine Branch: master Commit: ba61730daa6a614ef07128a69a0bbca819e716b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba61730daa6a614ef07128a69… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 1 12:25:55 2013 +0200 wined3d: Avoid calculating 1 / (fog_end - fog_start) in the shader. --- dlls/wined3d/glsl_shader.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e1fe0ee..cbf2c60 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4502,8 +4502,7 @@ static void shader_glsl_generate_fog_code(struct wined3d_shader_buffer *buffer, return; case WINED3D_FFP_PS_FOG_LINEAR: - /* Fog = (gl_Fog.end - gl_FogFragCoord) / (gl_Fog.end - gl_Fog.start) */ - shader_addline(buffer, "float Fog = (gl_Fog.end - gl_FogFragCoord) / (gl_Fog.end - gl_Fog.start);\n"); + shader_addline(buffer, "float Fog = (gl_Fog.end - gl_FogFragCoord) * gl_Fog.scale;\n"); break; case WINED3D_FFP_PS_FOG_EXP:

1 0

Dmitry Timoshkov : windowscodecs: Workaround libtiff bug when it defines toff_t as 32-bit for 32-bit builds.
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

Module: wine Branch: master Commit: 3894493a76cb766c4322f09a1d12b9723d3d3759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3894493a76cb766c4322f09a1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 1 22:04:28 2013 +0900 windowscodecs: Workaround libtiff bug when it defines toff_t as 32-bit for 32-bit builds. --- dlls/windowscodecs/tiffformat.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 62f1ad7..e252ced 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -44,6 +44,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); #ifdef SONAME_LIBTIFF +/* Workaround for broken libtiff 4.x headers on some 64-bit hosts which + * define TIFF_UINT64_T/toff_t as 32-bit for 32-bit builds, while they + * are supposed to be always 64-bit. + * TIFF_UINT64_T doesn't exist in libtiff 3.x, it was introduced in 4.x. + */ +#ifdef TIFF_UINT64_T +# undef toff_t +# define toff_t UINT64 +#endif + static CRITICAL_SECTION init_tiff_cs; static CRITICAL_SECTION_DEBUG init_tiff_cs_debug = { @@ -209,8 +219,8 @@ static TIFF* tiff_open_stream(IStream *stream, const char *mode) IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); return pTIFFClientOpen("<IStream object>", mode, stream, tiff_stream_read, - tiff_stream_write, tiff_stream_seek, tiff_stream_close, - tiff_stream_size, tiff_stream_map, tiff_stream_unmap); + tiff_stream_write, (void *)tiff_stream_seek, tiff_stream_close, + (void *)tiff_stream_size, (void *)tiff_stream_map, (void *)tiff_stream_unmap); } typedef struct {

1 0

Qian Hong : imm32: Fixed ImmUnlockIMCC.
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

Module: wine Branch: master Commit: 00289d5b91d7c5f63643a4d21996989f68678ef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00289d5b91d7c5f63643a4d21… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Aug 1 14:32:54 2013 +0800 imm32: Fixed ImmUnlockIMCC. --- dlls/imm32/imm.c | 3 ++- dlls/imm32/tests/imm32.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 284d49e..5aee6ea 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2665,7 +2665,8 @@ BOOL WINAPI ImmUnlockIMCC(HIMCC imcc) IMCCInternal *internal; internal = imcc; - internal->dwLock --; + if (internal->dwLock) + internal->dwLock --; return (internal->dwLock!=0); } diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 9d41cc7..26101a4 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -728,9 +728,9 @@ static void test_ImmGetIMCCLockCount(void) count = ImmGetIMCCLockCount(imcc); ok(count == 0, "expect 0, returned %d\n", count); ret = ImmUnlockIMCC(imcc); - todo_wine ok(ret == FALSE, "expect FALSE, ret %d\n", ret); + ok(ret == FALSE, "expect FALSE, ret %d\n", ret); count = ImmGetIMCCLockCount(imcc); - todo_wine ok(count == 0, "expect 0, returned %d\n", count); + ok(count == 0, "expect 0, returned %d\n", count); ImmDestroyIMCC(imcc); }

1 0

Bruno Jesus : ws2_32: Simplify WINSOCK_EnterSingleProtocolA using the W version.
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

Module: wine Branch: master Commit: 75fc88452c069803e32ddd76129202aa18db37d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fc88452c069803e32ddd761… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Aug 1 00:30:30 2013 -0300 ws2_32: Simplify WINSOCK_EnterSingleProtocolA using the W version. --- dlls/ws2_32/protocol.c | 106 +++++------------------------------------------- 1 files changed, 10 insertions(+), 96 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index fa72de8..98e7c38 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -53,12 +53,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); /* names of the protocols */ -static const CHAR NameIpx[] = "IPX"; -static const CHAR NameSpx[] = "SPX"; -static const CHAR NameSpxII[] = "SPX II"; -static const CHAR NameTcp[] = "TCP/IP"; -static const CHAR NameUdp[] = "UDP/IP"; - static const WCHAR NameIpxW[] = {'I', 'P', 'X', '\0'}; static const WCHAR NameSpxW[] = {'S', 'P', 'X', '\0'}; static const WCHAR NameSpxIIW[] = {'S', 'P', 'X', ' ', 'I', 'I', '\0'}; @@ -194,100 +188,20 @@ static INT WINSOCK_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) */ static INT WINSOCK_EnterSingleProtocolA( INT protocol, WSAPROTOCOL_INFOA* info ) { + WSAPROTOCOL_INFOW infow; + INT ret; memset( info, 0, sizeof(WSAPROTOCOL_INFOA) ); - info->iProtocol = protocol; - switch (protocol) + ret = WINSOCK_EnterSingleProtocolW( protocol, &infow ); + if (ret != SOCKET_ERROR) { - case WS_IPPROTO_TCP: - info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_EXPEDITED_DATA | - XP1_GRACEFUL_CLOSE | XP1_GUARANTEED_ORDER | - XP1_GUARANTEED_DELIVERY; - info->ProviderId = ProviderIdIP; - info->dwCatalogEntryId = 0x3e9; - info->ProtocolChain.ChainLen = 1; - info->iVersion = 2; - info->iAddressFamily = WS_AF_INET; - info->iMaxSockAddr = 0x10; - info->iMinSockAddr = 0x10; - info->iSocketType = WS_SOCK_STREAM; - strcpy( info->szProtocol, NameTcp ); - break; - - case WS_IPPROTO_UDP: - info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_SUPPORT_BROADCAST | - XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | - XP1_CONNECTIONLESS; - info->ProviderId = ProviderIdIP; - info->dwCatalogEntryId = 0x3ea; - info->ProtocolChain.ChainLen = 1; - info->iVersion = 2; - info->iAddressFamily = WS_AF_INET; - info->iMaxSockAddr = 0x10; - info->iMinSockAddr = 0x10; - info->iSocketType = WS_SOCK_DGRAM; - info->dwMessageSize = 0xffbb; - strcpy( info->szProtocol, NameUdp ); - break; - - case NSPROTO_IPX: - info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_SUPPORT_BROADCAST | - XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | - XP1_CONNECTIONLESS; - info->ProviderId = ProviderIdIPX; - info->dwCatalogEntryId = 0x406; - info->ProtocolChain.ChainLen = 1; - info->iVersion = 2; - info->iAddressFamily = WS_AF_IPX; - info->iMaxSockAddr = 0x10; - info->iMinSockAddr = 0x0e; - info->iSocketType = WS_SOCK_DGRAM; - info->iProtocolMaxOffset = 0xff; - info->dwMessageSize = 0x240; - strcpy( info->szProtocol, NameIpx ); - break; - - case NSPROTO_SPX: - info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_PSEUDO_STREAM | - XP1_MESSAGE_ORIENTED | XP1_GUARANTEED_ORDER | - XP1_GUARANTEED_DELIVERY; - info->ProviderId = ProviderIdSPX; - info->dwCatalogEntryId = 0x407; - info->ProtocolChain.ChainLen = 1; - info->iVersion = 2; - info->iAddressFamily = WS_AF_IPX; - info->iMaxSockAddr = 0x10; - info->iMinSockAddr = 0x0e; - info->iSocketType = 5; - info->dwMessageSize = 0xffffffff; - strcpy( info->szProtocol, NameSpx ); - break; - - case NSPROTO_SPXII: - info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_GRACEFUL_CLOSE | - XP1_PSEUDO_STREAM | XP1_MESSAGE_ORIENTED | - XP1_GUARANTEED_ORDER | XP1_GUARANTEED_DELIVERY; - info->ProviderId = ProviderIdSPX; - info->dwCatalogEntryId = 0x409; - info->ProtocolChain.ChainLen = 1; - info->iVersion = 2; - info->iAddressFamily = WS_AF_IPX; - info->iMaxSockAddr = 0x10; - info->iMinSockAddr = 0x0e; - info->iSocketType = 5; - info->dwMessageSize = 0xffffffff; - strcpy( info->szProtocol, NameSpxII ); - break; - - default: - if ((protocol == ISOPROTO_TP4) || (protocol == NSPROTO_SPX)) - FIXME("Protocol <%s> not implemented\n", - (protocol == ISOPROTO_TP4) ? "ISOPROTO_TP4" : "NSPROTO_SPX"); - else - FIXME("unknown Protocol <0x%08x>\n", protocol); - return SOCKET_ERROR; + /* convert the structure from W to A */ + memcpy( info, &infow, FIELD_OFFSET( WSAPROTOCOL_INFOA, szProtocol ) ); + WideCharToMultiByte( CP_ACP, 0, infow.szProtocol, -1, + info->szProtocol, WSAPROTOCOL_LEN+1, NULL, NULL ); } - return 1; + + return ret; } /*****************************************************************************

1 0

Piotr Caban : msvcrt: Added _swprintf_s_l implementation.
by Alexandre Julliard Aug. 1, 2013

Aug. 1, 2013

Module: wine Branch: master Commit: a51ffcd442678ce019a52bd5b95d99d0b7eab4ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a51ffcd442678ce019a52bd5b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 1 13:55:39 2013 +0200 msvcrt: Added _swprintf_s_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 16 ++++++++++++++++ 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 9d4cc80..7e602ef 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1371,7 +1371,7 @@ @ stub _swprintf_c_l @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) msvcrt._swprintf_p_l -@ stub _swprintf_s_l +@ varargs _swprintf_s_l(ptr long wstr ptr) msvcrt._swprintf_s_l @ varargs _swscanf_l(wstr wstr ptr) msvcrt._swscanf_l @ varargs _swscanf_s_l(wstr wstr ptr) msvcrt._swscanf_s_l @ extern _sys_errlist msvcrt._sys_errlist diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 6e97edb..6c2da4c 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1733,7 +1733,7 @@ @ stub _swprintf_c_l @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) msvcrt._swprintf_p_l -@ stub _swprintf_s_l +@ varargs _swprintf_s_l(ptr long wstr ptr) msvcrt._swprintf_s_l @ varargs _swscanf_l(wstr wstr ptr) msvcrt._swscanf_l @ varargs _swscanf_s_l(wstr wstr ptr) msvcrt._swscanf_s_l @ extern _sys_errlist msvcrt._sys_errlist diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8d91d66..ec886eb 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1049,7 +1049,7 @@ @ stub _swprintf_c @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) msvcrt._swprintf_p_l -@ stub _swprintf_s_l +@ varargs _swprintf_s_l(ptr long wstr ptr) msvcrt._swprintf_s_l @ varargs _swscanf_l(wstr wstr ptr) msvcrt._swscanf_l @ varargs _swscanf_s_l(wstr wstr ptr) msvcrt._swscanf_s_l @ extern _sys_errlist msvcrt._sys_errlist diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9469587..d5eebb4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1025,7 +1025,7 @@ @ stub _swprintf_c_l @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) msvcrt._swprintf_p_l -@ stub _swprintf_s_l +@ varargs _swprintf_s_l(ptr long wstr ptr) msvcrt._swprintf_s_l @ varargs _swscanf_l(wstr wstr ptr) msvcrt._swscanf_l @ varargs _swscanf_s_l(wstr wstr ptr) msvcrt._swscanf_s_l @ extern _sys_errlist msvcrt._sys_errlist diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 975afe0..7511129 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -993,7 +993,7 @@ # stub _swprintf_c(ptr long str) # stub _swprintf_c_l(ptr long str ptr) @ varargs _swprintf_p_l(ptr long wstr ptr) MSVCRT_swprintf_p_l -# stub _swprintf_s_l(ptr long str ptr) +@ varargs _swprintf_s_l(ptr long wstr ptr) MSVCRT__swprintf_s_l @ varargs _swscanf_l(wstr wstr ptr) MSVCRT__swscanf_l @ varargs _swscanf_s_l(wstr wstr ptr) MSVCRT__swscanf_s_l @ extern _sys_errlist MSVCRT__sys_errlist diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 3df7c02..ca4fba6 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -947,6 +947,22 @@ int CDECL MSVCRT_swprintf_s(MSVCRT_wchar_t *str, MSVCRT_size_t numberOfElements, } /********************************************************************* + * _swprintf_s_l (MSVCRT.@) + */ +int CDECL MSVCRT__swprintf_s_l(MSVCRT_wchar_t *str, MSVCRT_size_t numberOfElements, + const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, ... ) +{ + __ms_va_list ap; + int r; + + __ms_va_start(ap, locale); + r = MSVCRT_vsnwprintf_s_l(str, numberOfElements, INT_MAX, format, locale, ap); + __ms_va_end(ap); + + return r; +} + +/********************************************************************* * _vswprintf (MSVCRT.@) */ int CDECL MSVCRT_vswprintf( MSVCRT_wchar_t* str, const MSVCRT_wchar_t* format, __ms_va_list args )

1 0