November 2008 - Wine-commits

Henri Verbeet : wined3d: Const correctness fixes for ati_fragment_shader.c.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: 31d8b2762565b8292516b2383484276a171e5c90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31d8b2762565b8292516b2383… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 26 16:14:39 2008 +0100 wined3d: Const correctness fixes for ati_fragment_shader.c. --- dlls/wined3d/ati_fragment_shader.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 4cb551b..b2fb23b 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -159,7 +159,9 @@ static const char *debug_rep(GLuint rep) { } #define GLINFO_LOCATION (*gl_info) -static GLuint register_for_arg(DWORD arg, WineD3D_GL_Info *gl_info, unsigned int stage, GLuint *mod, GLuint *rep, GLuint tmparg) { +static GLuint register_for_arg(DWORD arg, const WineD3D_GL_Info *gl_info, + unsigned int stage, GLuint *mod, GLuint *rep, GLuint tmparg) +{ GLenum ret; if(mod) *mod = GL_NONE; @@ -224,7 +226,8 @@ static GLuint register_for_arg(DWORD arg, WineD3D_GL_Info *gl_info, unsigned int return ret; } -static GLuint find_tmpreg(struct texture_stage_op op[MAX_TEXTURES]) { +static GLuint find_tmpreg(const struct texture_stage_op op[MAX_TEXTURES]) +{ int lowest_read = -1; int lowest_write = -1; int i; @@ -284,7 +287,8 @@ static GLuint find_tmpreg(struct texture_stage_op op[MAX_TEXTURES]) { } } -static GLuint gen_ati_shader(struct texture_stage_op op[MAX_TEXTURES], WineD3D_GL_Info *gl_info) { +static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], const WineD3D_GL_Info *gl_info) +{ GLuint ret = GL_EXTCALL(glGenFragmentShadersATI(1)); unsigned int stage; GLuint arg0, arg1, arg2, extrarg;

1 0

Henri Verbeet : wined3d: Remove some unnecessary casts in process_vertices_strided().
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: f2b34c97cc79366bdfba89d9a1b93ddf9fe0706a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b34c97cc79366bdfba89d9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 26 16:14:39 2008 +0100 wined3d: Remove some unnecessary casts in process_vertices_strided(). lpData is already a pointer to BYTE. Note that the cast for the normal data was actually wrong. --- dlls/wined3d/device.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 55f1548..5f7ba6e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4276,7 +4276,7 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo ((DestFVF & WINED3DFVF_POSITION_MASK) == WINED3DFVF_XYZRHW ) ) { /* The position first */ float *p = - (float *) (((char *) lpStrideData->u.s.position.lpData) + i * lpStrideData->u.s.position.dwStride); + (float *)(lpStrideData->u.s.position.lpData + i * lpStrideData->u.s.position.dwStride); float x, y, z, rhw; TRACE("In: ( %06.2f %06.2f %06.2f )\n", p[0], p[1], p[2]); @@ -4392,7 +4392,7 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo } if (DestFVF & WINED3DFVF_NORMAL) { float *normal = - (float *) (((float *) lpStrideData->u.s.normal.lpData) + i * lpStrideData->u.s.normal.dwStride); + (float *)(lpStrideData->u.s.normal.lpData + i * lpStrideData->u.s.normal.dwStride); /* AFAIK this should go into the lighting information */ FIXME("Didn't expect the destination to have a normal\n"); copy_and_next(dest_ptr, normal, 3 * sizeof(float)); @@ -4403,7 +4403,7 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo if (DestFVF & WINED3DFVF_DIFFUSE) { DWORD *color_d = - (DWORD *) (((char *) lpStrideData->u.s.diffuse.lpData) + i * lpStrideData->u.s.diffuse.dwStride); + (DWORD *)(lpStrideData->u.s.diffuse.lpData + i * lpStrideData->u.s.diffuse.dwStride); if(!color_d) { static BOOL warned = FALSE; @@ -4434,7 +4434,7 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo if (DestFVF & WINED3DFVF_SPECULAR) { /* What's the color value in the feedback buffer? */ DWORD *color_s = - (DWORD *) (((char *) lpStrideData->u.s.specular.lpData) + i * lpStrideData->u.s.specular.dwStride); + (DWORD *)(lpStrideData->u.s.specular.lpData + i * lpStrideData->u.s.specular.dwStride); if(!color_s) { static BOOL warned = FALSE; @@ -4464,7 +4464,7 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo for (tex_index = 0; tex_index < numTextures; tex_index++) { float *tex_coord = - (float *) (((char *) lpStrideData->u.s.texCoords[tex_index].lpData) + + (float *)(lpStrideData->u.s.texCoords[tex_index].lpData + i * lpStrideData->u.s.texCoords[tex_index].dwStride); if(!tex_coord) { ERR("No source texture, but destination requests one\n");

1 0

Henri Verbeet : wined3d: Const correctness fixes for device.c.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: 449c219eb0aff21e35c26aec062c152e29e747fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=449c219eb0aff21e35c26aec0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 26 16:14:39 2008 +0100 wined3d: Const correctness fixes for device.c. --- dlls/wined3d/device.c | 56 +++++++++++++++++++++++++++------------------- include/wine/wined3d.idl | 2 +- 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5f7ba6e..2d891ff 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1934,7 +1934,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreatePixelShader(IWineD3DDevice *iface return hr; } -static HRESULT WINAPI IWineD3DDeviceImpl_CreatePalette(IWineD3DDevice *iface, DWORD Flags, PALETTEENTRY *PalEnt, IWineD3DPalette **Palette, IUnknown *Parent) { +static HRESULT WINAPI IWineD3DDeviceImpl_CreatePalette(IWineD3DDevice *iface, DWORD Flags, + const PALETTEENTRY *PalEnt, IWineD3DPalette **Palette, IUnknown *Parent) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; IWineD3DPaletteImpl *object; HRESULT hr; @@ -2773,7 +2775,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetTransform(IWineD3DDevice *iface, WIN } static HRESULT WINAPI IWineD3DDeviceImpl_MultiplyTransform(IWineD3DDevice *iface, WINED3DTRANSFORMSTATETYPE State, CONST WINED3DMATRIX* pMatrix) { - WINED3DMATRIX *mat = NULL; + const WINED3DMATRIX *mat = NULL; WINED3DMATRIX temp; /* Note: Using 'updateStateBlock' rather than 'stateblock' in the code @@ -3807,7 +3809,8 @@ static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) { } static void device_map_psamplers(IWineD3DDeviceImpl *This) { - DWORD *sampler_tokens = ((IWineD3DPixelShaderImpl *)This->stateBlock->pixelShader)->baseShader.reg_maps.samplers; + const DWORD *sampler_tokens = + ((IWineD3DPixelShaderImpl *)This->stateBlock->pixelShader)->baseShader.reg_maps.samplers; int i; for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { @@ -3821,7 +3824,9 @@ static void device_map_psamplers(IWineD3DDeviceImpl *This) { } } -static BOOL device_unit_free_for_vs(IWineD3DDeviceImpl *This, DWORD *pshader_sampler_tokens, DWORD *vshader_sampler_tokens, int unit) { +static BOOL device_unit_free_for_vs(IWineD3DDeviceImpl *This, const DWORD *pshader_sampler_tokens, + const DWORD *vshader_sampler_tokens, int unit) +{ int current_mapping = This->rev_tex_unit_map[unit]; if (current_mapping == -1) { @@ -3846,8 +3851,9 @@ static BOOL device_unit_free_for_vs(IWineD3DDeviceImpl *This, DWORD *pshader_sam } static void device_map_vsamplers(IWineD3DDeviceImpl *This, BOOL ps) { - DWORD *vshader_sampler_tokens = ((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->baseShader.reg_maps.samplers; - DWORD *pshader_sampler_tokens = NULL; + const DWORD *vshader_sampler_tokens = + ((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->baseShader.reg_maps.samplers; + const DWORD *pshader_sampler_tokens = NULL; int start = GL_LIMITS(combined_samplers) - 1; int i; @@ -4141,8 +4147,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetPixelShaderConstantF( } #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) -static HRESULT -process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCount, WineDirect3DVertexStridedData *lpStrideData, IWineD3DVertexBufferImpl *dest, DWORD dwFlags) { +static HRESULT process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCount, + const WineDirect3DVertexStridedData *lpStrideData, IWineD3DVertexBufferImpl *dest, DWORD dwFlags) +{ char *dest_ptr, *dest_conv = NULL, *dest_conv_addr = NULL; unsigned int i; DWORD DestFVF = dest->fvf; @@ -4174,7 +4181,7 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo return E_OUTOFMEMORY; } if(dest->vbo) { - void *src; + const void *src; GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, dest->vbo)); checkGLcall("glBindBufferARB"); src = GL_EXTCALL(glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_READ_ONLY_ARB)); @@ -4275,8 +4282,8 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo if ( ((DestFVF & WINED3DFVF_POSITION_MASK) == WINED3DFVF_XYZ ) || ((DestFVF & WINED3DFVF_POSITION_MASK) == WINED3DFVF_XYZRHW ) ) { /* The position first */ - float *p = - (float *)(lpStrideData->u.s.position.lpData + i * lpStrideData->u.s.position.dwStride); + const float *p = + (const float *)(lpStrideData->u.s.position.lpData + i * lpStrideData->u.s.position.dwStride); float x, y, z, rhw; TRACE("In: ( %06.2f %06.2f %06.2f )\n", p[0], p[1], p[2]); @@ -4391,8 +4398,8 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo if(dest_conv) dest_conv += sizeof(DWORD); } if (DestFVF & WINED3DFVF_NORMAL) { - float *normal = - (float *)(lpStrideData->u.s.normal.lpData + i * lpStrideData->u.s.normal.dwStride); + const float *normal = + (const float *)(lpStrideData->u.s.normal.lpData + i * lpStrideData->u.s.normal.dwStride); /* AFAIK this should go into the lighting information */ FIXME("Didn't expect the destination to have a normal\n"); copy_and_next(dest_ptr, normal, 3 * sizeof(float)); @@ -4402,8 +4409,8 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo } if (DestFVF & WINED3DFVF_DIFFUSE) { - DWORD *color_d = - (DWORD *)(lpStrideData->u.s.diffuse.lpData + i * lpStrideData->u.s.diffuse.dwStride); + const DWORD *color_d = + (const DWORD *)(lpStrideData->u.s.diffuse.lpData + i * lpStrideData->u.s.diffuse.dwStride); if(!color_d) { static BOOL warned = FALSE; @@ -4433,8 +4440,8 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo if (DestFVF & WINED3DFVF_SPECULAR) { /* What's the color value in the feedback buffer? */ - DWORD *color_s = - (DWORD *)(lpStrideData->u.s.specular.lpData + i * lpStrideData->u.s.specular.dwStride); + const DWORD *color_s = + (const DWORD *)(lpStrideData->u.s.specular.lpData + i * lpStrideData->u.s.specular.dwStride); if(!color_s) { static BOOL warned = FALSE; @@ -4463,8 +4470,8 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo } for (tex_index = 0; tex_index < numTextures; tex_index++) { - float *tex_coord = - (float *)(lpStrideData->u.s.texCoords[tex_index].lpData + + const float *tex_coord = + (const float *)(lpStrideData->u.s.texCoords[tex_index].lpData + i * lpStrideData->u.s.texCoords[tex_index].dwStride); if(!tex_coord) { ERR("No source texture, but destination requests one\n"); @@ -5019,7 +5026,7 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfa unsigned int i; WINED3DRECT curRect; RECT vp_rect; - WINED3DVIEWPORT *vp = &This->stateBlock->viewport; + const WINED3DVIEWPORT *vp = &This->stateBlock->viewport; UINT drawable_width, drawable_height; IWineD3DSurfaceImpl *depth_stencil = (IWineD3DSurfaceImpl *) This->stencilBufferTarget; IWineD3DSwapChainImpl *swapchain = NULL; @@ -6445,7 +6452,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetDepthStencilSurface(IWineD3DDevice } void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED3DRECT *src_rect, - IWineD3DSurface *dst_surface, WINED3DRECT *dst_rect, const WINED3DTEXTUREFILTERTYPE filter, BOOL flip) { + IWineD3DSurface *dst_surface, WINED3DRECT *dst_rect, const WINED3DTEXTUREFILTERTYPE filter, BOOL flip) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; GLbitfield mask = GL_COLOR_BUFFER_BIT; /* TODO: Support blitting depth/stencil surfaces */ IWineD3DSwapChain *src_swapchain, *dst_swapchain; @@ -6916,7 +6924,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_EvictManagedResources(IWineD3DDevice* return WINED3D_OK; } -static void updateSurfaceDesc(IWineD3DSurfaceImpl *surface, WINED3DPRESENT_PARAMETERS* pPresentationParameters) { +static void updateSurfaceDesc(IWineD3DSurfaceImpl *surface, const WINED3DPRESENT_PARAMETERS* pPresentationParameters) +{ IWineD3DDeviceImpl *This = surface->resource.wineD3DDevice; /* for GL_SUPPORT */ /* Reallocate proper memory for the front and back buffer and adjust their sizes */ @@ -6979,7 +6988,8 @@ static HRESULT WINAPI reset_unload_resources(IWineD3DResource *resource, void *d return S_OK; } -static BOOL is_display_mode_supported(IWineD3DDeviceImpl *This, WINED3DPRESENT_PARAMETERS *pp) { +static BOOL is_display_mode_supported(IWineD3DDeviceImpl *This, const WINED3DPRESENT_PARAMETERS *pp) +{ UINT i, count; WINED3DDISPLAYMODE m; HRESULT hr; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index fe88520..bd2826c 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2967,7 +2967,7 @@ interface IWineD3DDevice : IWineD3DBase ); HRESULT CreatePalette( [in] DWORD flags, - [in] PALETTEENTRY *palette_entry, + [in] const PALETTEENTRY *palette_entry, [out] IWineD3DPalette **palette, [in] IUnknown *parent );

1 0

Henri Verbeet : wined3d: Make minMipLookup_noFilter and magLookup_noFilter const.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: c7880e89165cc7e471c5db9114449b6a7fb4e818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7880e89165cc7e471c5db911… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 26 16:14:40 2008 +0100 wined3d: Make minMipLookup_noFilter and magLookup_noFilter const. Note that minMipLookup and magLookup aren't particularly safe to use, they're global arrays initialized from IWineD3DImpl_FillGLCaps(). The same goes for the other global dynamic lookup tables. --- dlls/wined3d/basetexture.c | 6 ++-- dlls/wined3d/device.c | 28 ++++++++++++------------ dlls/wined3d/directx.c | 46 +++++++++++++++++++++------------------ dlls/wined3d/surface.c | 4 +- dlls/wined3d/wined3d_private.h | 21 +++++++++++------- 5 files changed, 57 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c7880e89165cc7e471c5d…

1 0

Maarten Lankhorst : msacm: Fix pointer truncation.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: cdc377c1b421c6a4b96fb100fa97363363d8e550 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc377c1b421c6a4b96fb100f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Nov 24 16:20:12 2008 +0100 msacm: Fix pointer truncation. --- dlls/msacm32/driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index 481daf0..0287ebe 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -548,7 +548,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe adod.pszAliasName = padid->pszDriverAlias; adod.dnDevNode = 0; - pad->hDrvr = OpenDriver(padid->pszDriverAlias, NULL, (DWORD)&adod); + pad->hDrvr = OpenDriver(padid->pszDriverAlias, NULL, (DWORD_PTR)&adod); HeapFree(MSACM_hHeap, 0, section_name); if (!pad->hDrvr) @@ -573,7 +573,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe adod.pszAliasName = NULL; adod.dnDevNode = 0; - pad->pLocalDrvrInst = MSACM_OpenLocalDriver(padid->pLocalDriver, (DWORD)&adod); + pad->pLocalDrvrInst = MSACM_OpenLocalDriver(padid->pLocalDriver, (DWORD_PTR)&adod); if (!pad->pLocalDrvrInst) { ret = adod.dwError;

1 0

Maarten Lankhorst : dsound: 64-bit pointer fixes.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: 6b6b8d9bfaefe7bcd6e9c44add455e49903b7200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6b8d9bfaefe7bcd6e9c44ad… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Aug 10 07:52:09 2008 +0200 dsound: 64-bit pointer fixes. --- dlls/dsound/dsound_private.h | 2 +- dlls/dsound/mixer.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 2d87263..c16f1c1 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -456,7 +456,7 @@ void DSOUND_MixToTemporary(const IDirectSoundBufferImpl *dsb, DWORD writepos, DW DWORD DSOUND_secpos_to_bufpos(const IDirectSoundBufferImpl *dsb, DWORD secpos, DWORD secmixpos, DWORD* overshot); void CALLBACK DSOUND_timer(UINT timerID, UINT msg, DWORD_PTR dwUser, DWORD_PTR dw1, DWORD_PTR dw2); -void CALLBACK DSOUND_callback(HWAVEOUT hwo, UINT msg, DWORD dwUser, DWORD dw1, DWORD dw2); +void CALLBACK DSOUND_callback(HWAVEOUT hwo, UINT msg, DWORD_PTR dwUser, DWORD_PTR dw1, DWORD_PTR dw2); /* sound3d.c */ diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index efcb21b..3bcbce0 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -1026,10 +1026,10 @@ void CALLBACK DSOUND_timer(UINT timerID, UINT msg, DWORD_PTR dwUser, TRACE("completed processing at %d, duration = %d\n", end_time, end_time - start_time); } -void CALLBACK DSOUND_callback(HWAVEOUT hwo, UINT msg, DWORD dwUser, DWORD dw1, DWORD dw2) +void CALLBACK DSOUND_callback(HWAVEOUT hwo, UINT msg, DWORD_PTR dwUser, DWORD_PTR dw1, DWORD_PTR dw2) { DirectSoundDevice * device = (DirectSoundDevice*)dwUser; - TRACE("(%p,%x,%x,%x,%x)\n",hwo,msg,dwUser,dw1,dw2); + TRACE("(%p,%x,%lx,%lx,%lx)\n",hwo,msg,dwUser,dw1,dw2); TRACE("entering at %d, msg=%08x(%s)\n", GetTickCount(), msg, msg==MM_WOM_DONE ? "MM_WOM_DONE" : msg==MM_WOM_CLOSE ? "MM_WOM_CLOSE" : msg==MM_WOM_OPEN ? "MM_WOM_OPEN" : "UNKNOWN");

1 0

Jerome Gardou : d3dx8: Implement D3DXMatrixStack_MultMatrix.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: 8cdbeacd59b9534daeb615c8a5446bbcad2c0f79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cdbeacd59b9534daeb615c8a… Author: Jerome Gardou <jerome.gardou(a)gmail.com> Date: Wed Nov 12 08:45:19 2008 +0100 d3dx8: Implement D3DXMatrixStack_MultMatrix. --- dlls/d3dx8/math.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index f41c9f4..34c177a 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -686,8 +686,13 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_LoadMatrix(ID3DXMatrixStack *iface, C static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrix(ID3DXMatrixStack *iface, CONST D3DXMATRIX *pm) { ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; - FIXME("(%p) : stub\n",This); - return E_NOTIMPL; + + TRACE("iface %p\n", iface); + + if (!pm) return D3DERR_INVALIDCALL; + D3DXMatrixMultiply(&This->stack[This->current], &This->stack[This->current], pm); + + return D3D_OK; } static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrixLocal(ID3DXMatrixStack *iface, CONST D3DXMATRIX *pm)

1 0

Maarten Lankhorst : winmm: Some 64-bit pointer fixes.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: 2233f1eb507e70363cca76ecefa24836ea55fcba URL: http://source.winehq.org/git/wine.git/?a=commit;h=2233f1eb507e70363cca76ece… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Aug 10 07:51:14 2008 +0200 winmm: Some 64-bit pointer fixes. --- dlls/winmm/lolvldrv.c | 10 +++++----- dlls/winmm/time.c | 10 +++++----- dlls/winmm/winemm.h | 6 +++--- include/mmddk.h | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index d50f329..794c117 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -273,8 +273,8 @@ LPWINE_MLD MMDRV_Alloc(UINT size, UINT type, LPHANDLE hndl, DWORD* dwFlags, if (llTypes[type].Callback) { *dwFlags = LOWORD(*dwFlags) | CALLBACK_FUNCTION; - *dwCallback = (DWORD)llTypes[type].Callback; - *dwInstance = (DWORD)mld; /* FIXME: wouldn't some 16 bit drivers only use the loword ? */ + *dwCallback = (DWORD_PTR)llTypes[type].Callback; + *dwInstance = (DWORD_PTR)mld; /* FIXME: wouldn't some 16 bit drivers only use the loword ? */ } return mld; @@ -421,12 +421,12 @@ LPWINE_MLD MMDRV_GetRelated(HANDLE hndl, UINT srcType, /************************************************************************** * MMDRV_PhysicalFeatures [internal] */ -UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD dwParam1, - DWORD dwParam2) +UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) { WINE_MM_DRIVER* lpDrv = &MMDrvs[mld->mmdIndex]; - TRACE("(%p, %04x, %08x, %08x)\n", mld, uMsg, dwParam1, dwParam2); + TRACE("(%p, %04x, %08lx, %08lx)\n", mld, uMsg, dwParam1, dwParam2); /* all those function calls are undocumented */ switch (uMsg) { diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index 2092540..48ca3e8 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -55,7 +55,7 @@ typedef struct tagWINE_TIMERENTRY { UINT wDelay; UINT wResol; LPTIMECALLBACK lpFunc; /* can be lots of things */ - DWORD dwUser; + DWORD_PTR dwUser; UINT16 wFlags; UINT16 wTimerID; DWORD dwTriggerTime; @@ -170,7 +170,7 @@ static int TIME_MMSysTimeCallback(void) break; case TIME_CALLBACK_FUNCTION: { - DWORD user = timer->dwUser; + DWORD_PTR user = timer->dwUser; UINT16 id = timer->wTimerID; UINT16 flags = timer->wFlags; LPTIMECALLBACK func = timer->lpFunc; @@ -179,7 +179,7 @@ static int TIME_MMSysTimeCallback(void) LeaveCriticalSection(&WINMM_cs); if (flags & WINE_TIMER_IS32) func(id, 0, user, 0, 0); - else if (pFnCallMMDrvFunc16) pFnCallMMDrvFunc16((DWORD)func, id, 0, user, 0, 0); + else if (pFnCallMMDrvFunc16) pFnCallMMDrvFunc16((DWORD_PTR)func, id, 0, user, 0, 0); EnterCriticalSection(&WINMM_cs); if (flags & TIME_KILL_SYNCHRONOUS) LeaveCriticalSection(&TIME_cbcrst); @@ -294,14 +294,14 @@ MMRESULT WINAPI timeGetSystemTime(LPMMTIME lpTime, UINT wSize) * TIME_SetEventInternal [internal] */ WORD TIME_SetEventInternal(UINT wDelay, UINT wResol, - LPTIMECALLBACK lpFunc, DWORD dwUser, UINT wFlags) + LPTIMECALLBACK lpFunc, DWORD_PTR dwUser, UINT wFlags) { WORD wNewID = 0; LPWINE_TIMERENTRY lpNewTimer; LPWINE_TIMERENTRY lpTimer; const char c = 'c'; - TRACE("(%u, %u, %p, %08X, %04X);\n", wDelay, wResol, lpFunc, dwUser, wFlags); + TRACE("(%u, %u, %p, %08lX, %04X);\n", wDelay, wResol, lpFunc, dwUser, wFlags); if (wDelay < MMSYSTIME_MININTERVAL || wDelay > MMSYSTIME_MAXINTERVAL) return 0; diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 805ad83..dcd2290 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -59,7 +59,7 @@ typedef struct tagWINE_DRIVER } WINE_DRIVER, *LPWINE_DRIVER; typedef DWORD (CALLBACK *WINEMM_msgFunc16)(UINT16, WORD, DWORD, DWORD, DWORD); -typedef DWORD (CALLBACK *WINEMM_msgFunc32)(UINT , UINT, DWORD, DWORD, DWORD); +typedef DWORD (CALLBACK *WINEMM_msgFunc32)(UINT , UINT, DWORD_PTR, DWORD_PTR, DWORD_PTR); /* for each loaded driver and each known type of driver, this structure contains * the information needed to access it @@ -196,7 +196,7 @@ DWORD MMDRV_Close(LPWINE_MLD mld, UINT wMsg); LPWINE_MLD MMDRV_Get(HANDLE hndl, UINT type, BOOL bCanBeID); LPWINE_MLD MMDRV_GetRelated(HANDLE hndl, UINT srcType, BOOL bSrcCanBeID, UINT dstTyped); DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2, BOOL bFrom32); -UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD dwParam1, DWORD dwParam2); +UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2); BOOL MMDRV_Is32(unsigned int); void MMDRV_InstallMap(unsigned int, MMDRV_MAPFUNC, MMDRV_UNMAPFUNC, MMDRV_MAPFUNC, MMDRV_UNMAPFUNC, LPDRVCALLBACK); @@ -240,7 +240,7 @@ LRESULT MMIO_SendMessage(HMMIO hmmio, UINT uMessage, LPARAM lParam1, LPWINE_MMIO MMIO_Get(HMMIO h); WORD TIME_SetEventInternal(UINT wDelay, UINT wResol, LPTIMECALLBACK lpFunc, - DWORD dwUser, UINT wFlags); + DWORD_PTR dwUser, UINT wFlags); void TIME_MMTimeStop(void); /* Global variables */ diff --git a/include/mmddk.h b/include/mmddk.h index 57d3e4b..c2ed4fc 100644 --- a/include/mmddk.h +++ b/include/mmddk.h @@ -413,8 +413,8 @@ typedef struct tMIXEROPENDESC { HMIXEROBJ hmx; LPVOID pReserved0; - DWORD dwCallback; - DWORD dwInstance; + DWORD_PTR dwCallback; + DWORD_PTR dwInstance; } MIXEROPENDESC, *LPMIXEROPENDESC; typedef struct {

1 0

Kirill K. Smirnov : winecfg/audio: Simplify removeDriver() function.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: 1482006fb565b76910d1acb6b0677f1fbf347883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1482006fb565b76910d1acb6b… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Wed Nov 26 01:24:53 2008 +0300 winecfg/audio: Simplify removeDriver() function. --- programs/winecfg/audio.c | 59 +++++++++++++++------------------------------ 1 files changed, 20 insertions(+), 39 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 7f6cff8..78f9f57 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -173,45 +173,26 @@ static void addDriver(const char * driver) /* remove driver from local copy of driver registry string */ static void removeDriver(const char * driver) { - char before[32], after[32], * start; - - strcpy(before, ","); - strcat(before, driver); - strcpy(after, driver); - strcat(after, ","); - - if ((start = strstr(curAudioDriver, after))) - { - int len = strlen(after); - char * end = curAudioDriver + strlen(curAudioDriver); - int i, count = end - start + len; - for (i = 0; i < count; i++) - { - if (start + len >= end) - *start = 0; - else - *start = start[len]; - start++; - } - } - else if ((start = strstr(curAudioDriver, before))) - { - int len = strlen(before); - char * end = curAudioDriver + strlen(curAudioDriver); - int i, count = end - start + len; - for (i = 0; i < count; i++) - { - if (start + len >= end) - *start = 0; - else - *start = start[len]; - start++; - } - } - else if (strcmp(curAudioDriver, driver) == 0) - { - strcpy(curAudioDriver, ""); - } + char pattern[32], *p; + int drvlen, listlen; + + strcpy(pattern, ","); + strcat(pattern, driver); + strcat(pattern, ","); + drvlen = strlen(driver); + listlen = strlen(curAudioDriver); + + p = strstr(curAudioDriver, pattern); + if (p) /* somewhere in the middle */ + memmove(p, p+drvlen+1, strlen(p+drvlen+1)+1); + else if (!strncmp(curAudioDriver, pattern+1, drvlen+1)) /* the head */ + memmove(curAudioDriver, curAudioDriver+drvlen+1, listlen-drvlen); + else if (!strncmp(curAudioDriver+listlen-drvlen-1, pattern, drvlen+1)) /* the tail */ + curAudioDriver[listlen-drvlen-1] = 0; + else if (!strcmp(curAudioDriver, driver)) /* only one entry (head&tail) */ + curAudioDriver[0] = 0; + else + WINE_FIXME("driver '%s' is not in the list, please report!\n", driver); } static void initAudioDeviceTree(HWND hDlg)

1 0

Maarten Lankhorst : ole32: Add Co*InitializeSpy functions.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: 92dca953d933365d0f2643d6b4de5b922e866536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92dca953d933365d0f2643d6b… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Wed Nov 26 10:28:43 2008 +0100 ole32: Add Co*InitializeSpy functions. --- dlls/ole32/compobj.c | 77 ++++++++++++++++++++++++++++++++++++++++- dlls/ole32/compobj_private.h | 1 + dlls/ole32/ole32.spec | 2 + 3 files changed, 78 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index bc03914..d97279a 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1014,6 +1014,64 @@ DWORD WINAPI CoBuildVersion(void) } /****************************************************************************** + * CoRegisterInitializeSpy [OLE32.@] + * + * Add a Spy that watches CoInitializeEx calls + * + * PARAMS + * spy [I] Pointer to IUnknown interface that will be QueryInterface'd. + * cookie [II] cookie receiver + * + * RETURNS + * Success: S_OK if not already initialized, S_FALSE otherwise. + * Failure: HRESULT code. + * + * SEE ALSO + * CoInitializeEx + */ +HRESULT WINAPI CoRegisterInitializeSpy(IInitializeSpy *spy, ULARGE_INTEGER *cookie) +{ + struct oletls *info = COM_CurrentInfo(); + HRESULT hr; + + TRACE("(%p, %p)\n", spy, cookie); + + if (!spy || !cookie || !info) + { + if (!info) + WARN("Could not allocate tls\n"); + return E_INVALIDARG; + } + + if (info->spy) + { + FIXME("Already registered?\n"); + return E_UNEXPECTED; + } + + hr = IUnknown_QueryInterface(spy, &IID_IInitializeSpy, (void **) &info->spy); + if (SUCCEEDED(hr)) + { + cookie->QuadPart = (DWORD_PTR)spy; + return S_OK; + } + return hr; +} + +HRESULT WINAPI CoRevokeInitializeSpy(ULARGE_INTEGER cookie) +{ + struct oletls *info = COM_CurrentInfo(); + TRACE("(%s)\n", wine_dbgstr_longlong(cookie.QuadPart)); + + if (!info || !info->spy || cookie.QuadPart != (DWORD_PTR)info->spy) + return E_INVALIDARG; + + IUnknown_Release(info->spy); + return S_OK; +} + + +/****************************************************************************** * CoInitialize [OLE32.@] * * Initializes the COM libraries by calling CoInitializeEx with @@ -1069,6 +1127,7 @@ HRESULT WINAPI CoInitialize(LPVOID lpReserved) */ HRESULT WINAPI CoInitializeEx(LPVOID lpReserved, DWORD dwCoInit) { + struct oletls *info = COM_CurrentInfo(); HRESULT hr = S_OK; APARTMENT *apt; @@ -1096,7 +1155,10 @@ HRESULT WINAPI CoInitializeEx(LPVOID lpReserved, DWORD dwCoInit) RunningObjectTableImpl_Initialize(); } - if (!(apt = COM_CurrentInfo()->apt)) + if (info->spy) + IInitializeSpy_PreInitialize(info->spy, dwCoInit, info->inits); + + if (!(apt = info->apt)) { apt = apartment_get_or_create(dwCoInit); if (!apt) return E_OUTOFMEMORY; @@ -1113,7 +1175,10 @@ HRESULT WINAPI CoInitializeEx(LPVOID lpReserved, DWORD dwCoInit) else hr = S_FALSE; - COM_CurrentInfo()->inits++; + info->inits++; + + if (info->spy) + IInitializeSpy_PostInitialize(info->spy, hr, dwCoInit, info->inits); return hr; } @@ -1144,10 +1209,16 @@ void WINAPI CoUninitialize(void) /* will only happen on OOM */ if (!info) return; + if (info->spy) + IInitializeSpy_PreUninitialize(info->spy, info->inits); + /* sanity check */ if (!info->inits) { ERR("Mismatched CoUninitialize\n"); + + if (info->spy) + IInitializeSpy_PostUninitialize(info->spy, info->inits); return; } @@ -1173,6 +1244,8 @@ void WINAPI CoUninitialize(void) ERR( "CoUninitialize() - not CoInitialized.\n" ); InterlockedExchangeAdd(&s_COMLockCount,1); /* restore the lock count. */ } + if (info->spy) + IInitializeSpy_PostUninitialize(info->spy, info->inits); } /****************************************************************************** diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 81d591e..4b88ad2 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -175,6 +175,7 @@ struct oletls struct apartment *apt; IErrorInfo *errorinfo; /* see errorinfo.c */ IUnknown *state; /* see CoSetState */ + IInitializeSpy *spy; /* The "SPY" from CoInitializeSpy */ DWORD inits; /* number of times CoInitializeEx called */ DWORD ole_inits; /* number of times OleInitialize called */ GUID causality_id; /* unique identifier for each COM call */ diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index e5e90b3..79376ac 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -57,6 +57,7 @@ @ stub CoQueryReleaseObject @ stdcall CoRegisterChannelHook(ptr ptr) @ stdcall CoRegisterClassObject(ptr ptr long long ptr) +@ stdcall CoRegisterInitializeSpy(ptr ptr) @ stdcall CoRegisterMallocSpy (ptr) @ stdcall CoRegisterMessageFilter(ptr ptr) @ stdcall CoRegisterPSClsid(ptr ptr) @@ -67,6 +68,7 @@ @ stdcall CoResumeClassObjects() @ stdcall CoRevertToSelf() @ stdcall CoRevokeClassObject(long) +@ stdcall CoRevokeInitializeSpy(double) @ stdcall CoRevokeMallocSpy() @ stdcall CoSetProxyBlanket(ptr long long wstr long long ptr long) @ stdcall CoSetState(ptr)

1 0