September 2013 - Wine-commits

Michael Stefaniuc : dplayx: Finish the COM cleanup for IDPLobbySP.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: 56e1e6aa7f546ac7010589d31a7ecbc786a0df45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e1e6aa7f546ac7010589d31… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 3 23:23:19 2013 +0200 dplayx: Finish the COM cleanup for IDPLobbySP. --- dlls/dplayx/lobbysp.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c index 6e7fdd6..8b0c24c 100644 --- a/dlls/dplayx/lobbysp.c +++ b/dlls/dplayx/lobbysp.c @@ -28,14 +28,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); typedef struct IDPLobbySPImpl { - const IDPLobbySPVtbl *lpVtbl; + IDPLobbySP IDPLobbySP_iface; LONG ref; IDirectPlayImpl *dplay; } IDPLobbySPImpl; static inline IDPLobbySPImpl *impl_from_IDPLobbySP(IDPLobbySP *iface) { - return CONTAINING_RECORD( iface, IDPLobbySPImpl, lpVtbl ); + return CONTAINING_RECORD(iface, IDPLobbySPImpl, IDPLobbySP_iface); } /* Forward declaration of virtual tables */ @@ -56,7 +56,7 @@ HRESULT DPLSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) if( IsEqualGUID( &IID_IDPLobbySP, riid ) ) { IDPLobbySPImpl *This = *ppvObj; - This->lpVtbl = &dpLobbySPVT; + This->IDPLobbySP_iface.lpVtbl = &dpLobbySPVT; This->dplay = dp; } else

1 0

Michael Stefaniuc : dplayx: Simplify the creation of a IDPLobbySPImpl COM object.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: 30c55f35472b8ea828da884a235794ae27b09df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30c55f35472b8ea828da884a2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 3 23:24:58 2013 +0200 dplayx: Simplify the creation of a IDPLobbySPImpl COM object. --- dlls/dplayx/dplay.c | 3 +- dlls/dplayx/dplay_global.h | 2 +- dlls/dplayx/lobbysp.c | 56 +++++++++++++++++-------------------------- 3 files changed, 24 insertions(+), 37 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 4529c5e..94ba844 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -187,8 +187,7 @@ static BOOL DP_CreateDirectPlay2( LPVOID lpDP ) sizeof( *This->dp2->dplspData.lpCB ) ); This->dp2->dplspData.lpCB->dwSize = sizeof( *This->dp2->dplspData.lpCB ); - if( FAILED( DPLSP_CreateInterface( &IID_IDPLobbySP, - (LPVOID*)&This->dp2->dplspData.lpISP, This ) ) + if( FAILED( dplobbysp_create( &IID_IDPLobbySP, (void**)&This->dp2->dplspData.lpISP, This ) ) ) { /* FIXME: Memory leak */ diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h index 7fde277..dca6396 100644 --- a/dlls/dplayx/dplay_global.h +++ b/dlls/dplayx/dplay_global.h @@ -209,6 +209,6 @@ extern LPVOID DPSP_CreateSPPlayerData(void) DECLSPEC_HIDDEN; extern HRESULT dplay_create( REFIID riid, void **ppv ) DECLSPEC_HIDDEN; extern HRESULT dplobby_create( REFIID riid, void **ppv ) DECLSPEC_HIDDEN; extern HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) DECLSPEC_HIDDEN; -extern HRESULT DPLSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) DECLSPEC_HIDDEN; +extern HRESULT dplobbysp_create( REFIID riid, void **ppv, IDirectPlayImpl *dp ) DECLSPEC_HIDDEN; #endif /* __WINE_DPLAY_GLOBAL_INCLUDED */ diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c index 8b0c24c..72198da 100644 --- a/dlls/dplayx/lobbysp.c +++ b/dlls/dplayx/lobbysp.c @@ -38,40 +38,6 @@ static inline IDPLobbySPImpl *impl_from_IDPLobbySP(IDPLobbySP *iface) return CONTAINING_RECORD(iface, IDPLobbySPImpl, IDPLobbySP_iface); } -/* Forward declaration of virtual tables */ -static const IDPLobbySPVtbl dpLobbySPVT; - -HRESULT DPLSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) -{ - TRACE( " for %s\n", debugstr_guid( riid ) ); - - *ppvObj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof( IDPLobbySPImpl ) ); - - if( *ppvObj == NULL ) - { - return DPERR_OUTOFMEMORY; - } - - if( IsEqualGUID( &IID_IDPLobbySP, riid ) ) - { - IDPLobbySPImpl *This = *ppvObj; - This->IDPLobbySP_iface.lpVtbl = &dpLobbySPVT; - This->dplay = dp; - } - else - { - /* Unsupported interface */ - HeapFree( GetProcessHeap(), 0, *ppvObj ); - *ppvObj = NULL; - - return E_NOINTERFACE; - } - - IDPLobbySP_AddRef( (LPDPLOBBYSP)*ppvObj ); - return S_OK; -} - static HRESULT WINAPI IDPLobbySPImpl_QueryInterface( IDPLobbySP *iface, REFIID riid, void **ppv ) { @@ -260,3 +226,25 @@ static const IDPLobbySPVtbl dpLobbySPVT = IDPLobbySPImpl_SetSPDataPointer, IDPLobbySPImpl_StartSession }; + +HRESULT dplobbysp_create( REFIID riid, void **ppv, IDirectPlayImpl *dp ) +{ + IDPLobbySPImpl *obj; + HRESULT hr; + + TRACE( "(%s, %p)\n", debugstr_guid( riid ), ppv ); + + *ppv = NULL; + obj = HeapAlloc( GetProcessHeap(), 0, sizeof( *obj ) ); + if ( !obj ) + return DPERR_OUTOFMEMORY; + + obj->IDPLobbySP_iface.lpVtbl = &dpLobbySPVT; + obj->ref = 0; + obj->dplay = dp; + + hr = IDPLobbySP_QueryInterface( &obj->IDPLobbySP_iface, riid, ppv ); + IDPLobbySP_Release( &obj->IDPLobbySP_iface ); + + return hr; +}

1 0

Frédéric Delanoy : winelib: Use appropriate values for 'filename' tag attributes.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: docs Branch: master Commit: da64ad430089a0138a1bedaf1060335eb3b684b0 URL: http://source.winehq.org/git/docs.git/?a=commit;h=da64ad430089a0138a1bedaf1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 3 21:28:48 2013 +0200 winelib: Use appropriate values for 'filename' tag attributes. --- en/winelib-bindlls.sgml | 10 +++++----- en/winelib-intro.sgml | 13 +++++++------ en/winelib-mfc.sgml | 2 +- en/winelib-porting.sgml | 10 +++++----- en/winelib-toolkit.sgml | 34 ++++++++++++++++++---------------- 5 files changed, 36 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=da64ad430089a0138a1be…

1 0

Frédéric Delanoy : winedev: Use appropriate values for 'filename' tag attributes.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: docs Branch: master Commit: cc2040462f980edd190ead333da17aad8fc532f0 URL: http://source.winehq.org/git/docs.git/?a=commit;h=cc2040462f980edd190ead333… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 3 21:28:49 2013 +0200 winedev: Use appropriate values for 'filename' tag attributes. --- en/winedev-architecture.sgml | 61 +++++----- en/winedev-coding.sgml | 29 +++-- en/winedev-debugger.sgml | 24 ++-- en/winedev-debugging.sgml | 2 +- en/winedev-documentation.sgml | 14 +- en/winedev-kernel.sgml | 264 +++++++++++++++++++++-------------------- en/winedev-multimedia.sgml | 110 ++++++++++-------- en/winedev-ole.sgml | 8 +- en/winedev-opengl.sgml | 24 ++-- en/winedev-otherdebug.sgml | 6 +- en/winedev-testing.sgml | 28 ++-- en/winedev-windowing.sgml | 2 +- 12 files changed, 300 insertions(+), 272 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=cc2040462f980edd190ea…

1 0

Frédéric Delanoy : wineusr: Use appropriate values for 'filename' tag attributes.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: docs Branch: master Commit: a903ec6838ae5f4d5724568eba2183ee2ee23726 URL: http://source.winehq.org/git/docs.git/?a=commit;h=a903ec6838ae5f4d5724568eb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 3 21:28:47 2013 +0200 wineusr: Use appropriate values for 'filename' tag attributes. --- en/wineusr-bugs.sgml | 4 +- en/wineusr-configuring.sgml | 50 +++++++++++++++++++++++------------------- en/wineusr-getting.sgml | 2 +- en/wineusr-running.sgml | 31 ++++++++++++++------------ 4 files changed, 47 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=a903ec6838ae5f4d57245…

1 0

Henri Verbeet : wined3d: Get rid of some leftover references to IWineD3D.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 36dcb77f6ed6c204305bdee8dd7c0b6299cfc8e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36dcb77f6ed6c204305bdee8d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 3 09:47:21 2013 +0200 wined3d: Get rid of some leftover references to IWineD3D. --- dlls/wined3d/surface.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 12 ++++-------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2bf5521..e36f61d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4163,7 +4163,7 @@ void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[25 /* When index_in_alpha is set the palette index is stored in the * alpha component. In case of a readback we can then read - * GL_ALPHA. Color keying is handled in BltOverride using a + * GL_ALPHA. Color keying is handled in surface_blt_special() using a * GL_ALPHA_TEST using GL_NOT_EQUAL. In case of index_in_alpha the * color key itself is passed to glAlphaFunc in other cases the * alpha component of pixels that should be masked away is set to 0. */ @@ -4916,7 +4916,7 @@ HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const st return blitter->color_fill(device, s, rect, color); } -static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surface, const RECT *dst_rect, +static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const WINEDDBLTFX *DDBltFx, enum wined3d_texture_filter_type filter) { @@ -6864,7 +6864,7 @@ fallback: if ((dst_surface->resource.usage & WINED3DUSAGE_RENDERTARGET) || (src_surface && (src_surface->resource.usage & WINED3DUSAGE_RENDERTARGET))) { - if (SUCCEEDED(IWineD3DSurfaceImpl_BltOverride(dst_surface, &dst_rect, + if (SUCCEEDED(surface_blt_special(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter))) return WINED3D_OK; } @@ -6872,8 +6872,8 @@ fallback: cpu: /* For the rest call the X11 surface implementation. For render targets - * this should be implemented OpenGL accelerated in BltOverride, other - * blits are rather rare. */ + * this should be implemented OpenGL accelerated in surface_blt_special(), + * other blits are rather rare. */ return surface_cpu_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 688671d..1a341b7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1836,12 +1836,10 @@ struct wined3d_state DWORD render_states[WINEHIGHEST_RENDER_STATE + 1]; }; -/***************************************************************************** - * IWineD3DDevice implementation structure - */ #define WINED3D_UNMAPPED_STAGE ~0U -/* Multithreaded flag. Removed from the public header to signal that IWineD3D::CreateDevice ignores it */ +/* Multithreaded flag. Removed from the public header to signal that + * wined3d_device_create() ignores it. */ #define WINED3DCREATE_MULTITHREADED 0x00000004 struct wined3d_device @@ -2969,10 +2967,8 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_surface *surface, static inline BOOL use_vs(const struct wined3d_state *state) { - /* Check stateblock->vertexDecl to allow this to be used from - * IWineD3DDeviceImpl_FindTexUnitMap(). This is safe because - * stateblock->vertexShader implies a vertex declaration instead of ddraw - * style strided data. */ + /* Check state->vertex_declaration to allow this to be used before the + * stream info is validated, for example in device_update_tex_unit_map(). */ return state->vertex_shader && !state->vertex_declaration->position_transformed; }

1 0

Henri Verbeet : wined3d: Rename wined3d_fake_gl_ctx to wined3d_caps_gl_ctx.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 50e2ee73a42b035b89cf057f577baf94ee465a29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50e2ee73a42b035b89cf057f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 3 09:47:22 2013 +0200 wined3d: Rename wined3d_fake_gl_ctx to wined3d_caps_gl_ctx. There's nothing particularly fake about the GL context. --- dlls/wined3d/directx.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4545ed0..653d123 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -255,7 +255,7 @@ const GLenum magLookup_noFilter[] = GL_NEAREST, GL_NEAREST, GL_NEAREST, }; -struct wined3d_fake_gl_ctx +struct wined3d_caps_gl_ctx { HDC dc; HWND wnd; @@ -264,12 +264,12 @@ struct wined3d_fake_gl_ctx HGLRC restore_gl_ctx; }; -static void WineD3D_ReleaseFakeGLContext(const struct wined3d_fake_gl_ctx *ctx) +static void wined3d_caps_gl_ctx_destroy(const struct wined3d_caps_gl_ctx *ctx) { - TRACE("Destroying fake GL context.\n"); + TRACE("Destroying caps GL context.\n"); if (!wglMakeCurrent(NULL, NULL)) - ERR("Failed to disable fake GL context.\n"); + ERR("Failed to disable caps GL context.\n"); if (!wglDeleteContext(ctx->gl_ctx)) { @@ -284,7 +284,7 @@ static void WineD3D_ReleaseFakeGLContext(const struct wined3d_fake_gl_ctx *ctx) ERR("Failed to restore previous GL context.\n"); } -static void wined3d_create_fake_gl_context_attribs(struct wined3d_fake_gl_ctx *fake_gl_ctx, +static void wined3d_caps_gl_ctx_create_attribs(struct wined3d_caps_gl_ctx *caps_gl_ctx, struct wined3d_gl_info *gl_info, const GLint *ctx_attribs) { HGLRC new_ctx; @@ -292,14 +292,14 @@ static void wined3d_create_fake_gl_context_attribs(struct wined3d_fake_gl_ctx *f if (!(gl_info->p_wglCreateContextAttribsARB = (void *)wglGetProcAddress("wglCreateContextAttribsARB"))) return; - if (!(new_ctx = gl_info->p_wglCreateContextAttribsARB(fake_gl_ctx->dc, NULL, ctx_attribs))) + if (!(new_ctx = gl_info->p_wglCreateContextAttribsARB(caps_gl_ctx->dc, NULL, ctx_attribs))) { ERR("Failed to create a context using wglCreateContextAttribsARB(), last error %#x.\n", GetLastError()); gl_info->p_wglCreateContextAttribsARB = NULL; return; } - if (!wglMakeCurrent(fake_gl_ctx->dc, new_ctx)) + if (!wglMakeCurrent(caps_gl_ctx->dc, new_ctx)) { ERR("Failed to make new context current, last error %#x.\n", GetLastError()); if (!wglDeleteContext(new_ctx)) @@ -308,12 +308,12 @@ static void wined3d_create_fake_gl_context_attribs(struct wined3d_fake_gl_ctx *f return; } - if (!wglDeleteContext(fake_gl_ctx->gl_ctx)) + if (!wglDeleteContext(caps_gl_ctx->gl_ctx)) ERR("Failed to delete old context, last error %#x.\n", GetLastError()); - fake_gl_ctx->gl_ctx = new_ctx; + caps_gl_ctx->gl_ctx = new_ctx; } -static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) +static BOOL wined3d_caps_gl_ctx_create(struct wined3d_caps_gl_ctx *ctx) { PIXELFORMATDESCRIPTOR pfd; int iPixelFormat; @@ -367,7 +367,7 @@ static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) /* Make it the current GL context. */ if (!wglMakeCurrent(ctx->dc, ctx->gl_ctx)) { - ERR("Failed to make fake GL context current.\n"); + ERR("Failed to make caps GL context current.\n"); goto fail; } @@ -5033,7 +5033,7 @@ static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter *adapter, HDC dc static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) { struct wined3d_gl_info *gl_info = &adapter->gl_info; - struct wined3d_fake_gl_ctx fake_gl_ctx = {0}; + struct wined3d_caps_gl_ctx caps_gl_ctx = {0}; unsigned int ctx_attrib_idx = 0; DISPLAY_DEVICEW display_device; GLint ctx_attribs[3]; @@ -5076,7 +5076,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) TRACE("Allocated LUID %08x:%08x for adapter %p.\n", adapter->luid.HighPart, adapter->luid.LowPart, adapter); - if (!WineD3D_CreateFakeGLContext(&fake_gl_ctx)) + if (!wined3d_caps_gl_ctx_create(&caps_gl_ctx)) { ERR("Failed to get a GL context for adapter %p.\n", adapter); return FALSE; @@ -5088,22 +5088,22 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) ctx_attribs[ctx_attrib_idx++] = WGL_CONTEXT_DEBUG_BIT_ARB; } ctx_attribs[ctx_attrib_idx] = 0; - wined3d_create_fake_gl_context_attribs(&fake_gl_ctx, gl_info, ctx_attribs); + wined3d_caps_gl_ctx_create_attribs(&caps_gl_ctx, gl_info, ctx_attribs); if (!wined3d_adapter_init_gl_caps(adapter)) { ERR("Failed to initialize GL caps for adapter %p.\n", adapter); - WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); + wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); return FALSE; } - wined3d_adapter_init_fb_cfgs(adapter, fake_gl_ctx.dc); + wined3d_adapter_init_fb_cfgs(adapter, caps_gl_ctx.dc); /* We haven't found any suitable formats. This should only happen in * case of GDI software rendering, which is pretty useless anyway. */ if (!adapter->cfg_count) { WARN("No suitable pixel formats found.\n"); - WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); + wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); HeapFree(GetProcessHeap(), 0, adapter->cfgs); return FALSE; } @@ -5111,7 +5111,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) if (!wined3d_adapter_init_format_info(adapter)) { ERR("Failed to initialize GL format info.\n"); - WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); + wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); HeapFree(GetProcessHeap(), 0, adapter->cfgs); return FALSE; } @@ -5125,7 +5125,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) TRACE("DeviceName: %s\n", debugstr_w(display_device.DeviceName)); strcpyW(adapter->DeviceName, display_device.DeviceName); - WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); + wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); wined3d_adapter_init_ffp_attrib_ops(adapter);

1 0

Henri Verbeet : wined3d: Don' t clamp texture lookups in the GLSL fixed function fragment pipe.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 0d2d84791481247a4b9231df6841d7c170202e09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d2d84791481247a4b9231df6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 3 09:47:23 2013 +0200 wined3d: Don't clamp texture lookups in the GLSL fixed function fragment pipe. --- dlls/wined3d/glsl_shader.c | 32 +++++++------------------------- 1 files changed, 7 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7e0971b..740e100 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5507,7 +5507,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct wined3d_shader_buf { const char *texture_function, *coord_mask; char tex_reg_name[8]; - BOOL proj, clamp; + BOOL proj; if (!(tex_map & (1 << stage))) continue; @@ -5527,12 +5527,6 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct wined3d_shader_buf proj = TRUE; } - if (settings->op[stage].cop == WINED3D_TOP_BUMPENVMAP - || settings->op[stage].cop == WINED3D_TOP_BUMPENVMAP_LUMINANCE) - clamp = FALSE; - else - clamp = TRUE; - switch (settings->op[stage].tex_type) { case tex_1d: @@ -5624,12 +5618,8 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct wined3d_shader_buf shader_addline(buffer, "ret = gl_TexCoord[%u] + ret.xyxy;\n", stage); } - if (clamp) - shader_addline(buffer, "tex%u = clamp(%s(ps_sampler%u, ret.%s), 0.0, 1.0);\n", - stage, texture_function, stage, coord_mask); - else - shader_addline(buffer, "tex%u = %s(ps_sampler%u, ret.%s);\n", - stage, texture_function, stage, coord_mask); + shader_addline(buffer, "tex%u = %s(ps_sampler%u, ret.%s);\n", + stage, texture_function, stage, coord_mask); if (settings->op[stage - 1].cop == WINED3D_TOP_BUMPENVMAP_LUMINANCE) shader_addline(buffer, "tex%u *= clamp(tex%u.z * bumpenv_lum_scale%u + bumpenv_lum_offset%u, 0.0, 1.0);\n", @@ -5637,21 +5627,13 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct wined3d_shader_buf } else if (settings->op[stage].projected == proj_count3) { - if (clamp) - shader_addline(buffer, "tex%u = clamp(%s(ps_sampler%u, gl_TexCoord[%u].xyz), 0.0, 1.0);\n", - stage, texture_function, stage, stage); - else - shader_addline(buffer, "tex%u = %s(ps_sampler%u, gl_TexCoord[%u].xyz);\n", - stage, texture_function, stage, stage); + shader_addline(buffer, "tex%u = %s(ps_sampler%u, gl_TexCoord[%u].xyz);\n", + stage, texture_function, stage, stage); } else { - if (clamp) - shader_addline(buffer, "tex%u = clamp(%s(ps_sampler%u, gl_TexCoord[%u].%s), 0.0, 1.0);\n", - stage, texture_function, stage, stage, coord_mask); - else - shader_addline(buffer, "tex%u = %s(ps_sampler%u, gl_TexCoord[%u].%s);\n", - stage, texture_function, stage, stage, coord_mask); + shader_addline(buffer, "tex%u = %s(ps_sampler%u, gl_TexCoord[%u].%s);\n", + stage, texture_function, stage, stage, coord_mask); } sprintf(tex_reg_name, "tex%u", stage);

1 0

Henri Verbeet : d3dx9: Avoid LPSTR.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 77ee90b59fd790002086e9f259b671def6a74a42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77ee90b59fd790002086e9f25… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 3 09:47:24 2013 +0200 d3dx9: Avoid LPSTR. --- dlls/d3dx9_36/effect.c | 10 +++++----- dlls/d3dx9_36/mesh.c | 14 ++++++++------ dlls/d3dx9_36/tests/mesh.c | 2 +- include/d3dx9anim.h | 4 ++-- include/d3dx9mesh.h | 6 +++--- include/d3dx9xof.h | 4 ++-- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5b9b05f..776c7c6 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -604,7 +604,7 @@ static void free_parameter_state(struct d3dx_parameter *param, BOOL element, BOO switch (param->type) { case D3DXPT_STRING: - HeapFree(GetProcessHeap(), 0, *(LPSTR *)param->data); + HeapFree(GetProcessHeap(), 0, *(char **)param->data); if (!child) HeapFree(GetProcessHeap(), 0, param->data); break; @@ -621,7 +621,7 @@ static void free_parameter_state(struct d3dx_parameter *param, BOOL element, BOO } else { - HeapFree(GetProcessHeap(), 0, *(LPSTR *)param->data); + HeapFree(GetProcessHeap(), 0, *(char **)param->data); } if (!child) HeapFree(GetProcessHeap(), 0, param->data); break; @@ -637,7 +637,7 @@ static void free_parameter_state(struct d3dx_parameter *param, BOOL element, BOO } else { - HeapFree(GetProcessHeap(), 0, *(LPSTR *)param->data); + HeapFree(GetProcessHeap(), 0, *(char **)param->data); } /* samplers have always own data, so free that */ HeapFree(GetProcessHeap(), 0, param->data); @@ -654,7 +654,7 @@ static void free_parameter_state(struct d3dx_parameter *param, BOOL element, BOO { if (st != ST_CONSTANT) { - HeapFree(GetProcessHeap(), 0, *(LPSTR *)param->data); + HeapFree(GetProcessHeap(), 0, *(char **)param->data); } HeapFree(GetProcessHeap(), 0, param->data); } @@ -4417,7 +4417,7 @@ static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr, { case D3DXPT_STRING: /* re-read with size (sizeof(DWORD) = 4) */ - hr = d3dx9_parse_name((LPSTR *)param->data, *ptr - 4); + hr = d3dx9_parse_name((char **)param->data, *ptr - 4); if (hr != D3D_OK) { WARN("Failed to parse string data\n"); diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 19c92b9..a735a35 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2638,7 +2638,7 @@ struct mesh_data { DWORD nb_bones; }; -static HRESULT parse_texture_filename(ID3DXFileData *filedata, LPSTR *filename_out) +static HRESULT parse_texture_filename(ID3DXFileData *filedata, char **filename_out) { HRESULT hr; SIZE_T data_size; @@ -2658,12 +2658,13 @@ static HRESULT parse_texture_filename(ID3DXFileData *filedata, LPSTR *filename_o if (FAILED(hr)) return hr; /* FIXME: String must be retrieved directly instead of through a pointer once ID3DXFILE is fixed */ - if (data_size < sizeof(LPSTR)) { + if (data_size < sizeof(filename_in)) + { WARN("truncated data (%lu bytes)\n", data_size); filedata->lpVtbl->Unlock(filedata); return E_FAIL; } - filename_in = *(LPSTR*)data; + filename_in = *(char **)data; filename = HeapAlloc(GetProcessHeap(), 0, strlen(filename_in) + 1); if (!filename) { @@ -3398,7 +3399,7 @@ static HRESULT generate_effects(ID3DXBuffer *materials, DWORD num_materials, for (j = 0; j < ARRAY_SIZE(material_effects); j++) { - defaults->pParamName = (LPSTR)out_ptr; + defaults->pParamName = (char *)out_ptr; strcpy(defaults->pParamName, material_effects[j].param_name); defaults->pValue = defaults->pParamName + material_effects[j].name_size; defaults->Type = D3DXEDT_FLOATS; @@ -3408,8 +3409,9 @@ static HRESULT generate_effects(ID3DXBuffer *materials, DWORD num_materials, defaults++; } - if (material_ptr->pTextureFilename) { - defaults->pParamName = (LPSTR)out_ptr; + if (material_ptr->pTextureFilename) + { + defaults->pParamName = (char *)out_ptr; strcpy(defaults->pParamName, texture_paramname); defaults->pValue = defaults->pParamName + sizeof(texture_paramname); defaults->Type = D3DXEDT_STRING; diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index a2c3709..911fe63 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1781,7 +1781,7 @@ static void check_generated_effects_(int line, const D3DXMATERIAL *materials, DW static char *strdupA(const char *p) { - LPSTR ret; + char *ret; if (!p) return NULL; ret = HeapAlloc(GetProcessHeap(), 0, strlen(p) + 1); if (ret) strcpy(ret, p); diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 578d56d..e340328 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -92,7 +92,7 @@ typedef struct _D3DXMESHDATA typedef struct _D3DXMESHCONTAINER { - LPSTR Name; + char *Name; D3DXMESHDATA MeshData; LPD3DXMATERIAL pMaterials; LPD3DXEFFECTINSTANCE pEffects; @@ -104,7 +104,7 @@ typedef struct _D3DXMESHCONTAINER typedef struct _D3DXFRAME { - LPSTR Name; + char *Name; D3DXMATRIX TransformationMatrix; LPD3DXMESHCONTAINER pMeshContainer; struct _D3DXFRAME *pFrameSibling; diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 864be69..b71fc33 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -193,12 +193,12 @@ typedef D3DXATTRIBUTERANGE* LPD3DXATTRIBUTERANGE; typedef struct _D3DXMATERIAL { D3DMATERIAL9 MatD3D; - LPSTR pTextureFilename; + char *pTextureFilename; } D3DXMATERIAL, *LPD3DXMATERIAL; typedef struct _D3DXEFFECTDEFAULT { - LPSTR pParamName; + char *pParamName; D3DXEFFECTDEFAULTTYPE Type; DWORD NumBytes; LPVOID pValue; @@ -206,7 +206,7 @@ typedef struct _D3DXEFFECTDEFAULT typedef struct _D3DXEFFECTINSTANCE { - LPSTR pEffectFilename; + char *pEffectFilename; DWORD NumDefaults; LPD3DXEFFECTDEFAULT pDefaults; } D3DXEFFECTINSTANCE, *LPD3DXEFFECTINSTANCE; diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h index ff0fc3b..b15d9da 100644 --- a/include/d3dx9xof.h +++ b/include/d3dx9xof.h @@ -110,7 +110,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileSaveData,IUnknown,"cef08cfb-7b4f-4429-9624-2a690 STDMETHOD_(ULONG,Release)(THIS) PURE; /*** ID3DXFileSaveObject methods ***/ STDMETHOD(GetSave)(THIS_ ID3DXFileSaveObject **save_obj) PURE; - STDMETHOD(GetName)(THIS_ LPSTR, SIZE_T*) PURE; + STDMETHOD(GetName)(THIS_ char *name, SIZE_T *size) PURE; STDMETHOD(GetId)(THIS_ LPGUID) PURE; STDMETHOD(GetType)(THIS_ GUID*) PURE; STDMETHOD(AddDataObject)(THIS_ REFGUID template_guid, const char *name, const GUID *guid, @@ -145,7 +145,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileData,IUnknown,"cef08cfd-7b4f-4429-9624-2a690a933 STDMETHOD_(ULONG,Release)(THIS) PURE; /*** ID3DXFileData methods ***/ STDMETHOD(GetEnum)(THIS_ ID3DXFileEnumObject **enum_obj) PURE; - STDMETHOD(GetName)(THIS_ LPSTR, SIZE_T*) PURE; + STDMETHOD(GetName)(THIS_ char *name, SIZE_T *size) PURE; STDMETHOD(GetId)(THIS_ LPGUID) PURE; STDMETHOD(Lock)(THIS_ SIZE_T*, LPCVOID*) PURE; STDMETHOD(Unlock)(THIS) PURE;

1 0

Henri Verbeet : d3dx9: Avoid LPCVOID.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 76e35a293957bdeafff54436f3b82ffb8f784d39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76e35a293957bdeafff54436f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 3 09:47:25 2013 +0200 d3dx9: Avoid LPCVOID. --- dlls/d3dx9_36/d3dx9_36_private.h | 3 ++- dlls/d3dx9_36/effect.c | 8 ++++---- dlls/d3dx9_36/mesh.c | 13 +++++-------- dlls/d3dx9_36/shader.c | 7 ++++--- dlls/d3dx9_36/skin.c | 9 ++++----- dlls/d3dx9_36/tests/asm.c | 5 +++-- dlls/d3dx9_36/tests/effect.c | 12 ++++++------ dlls/d3dx9_36/tests/shader.c | 6 +++--- dlls/d3dx9_36/util.c | 8 ++++---- include/d3dx9effect.h | 8 ++++---- include/d3dx9mesh.h | 10 ++++++---- include/d3dx9shader.h | 2 +- include/d3dx9tex.h | 2 +- include/d3dx9xof.h | 4 ++-- 14 files changed, 49 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=76e35a293957bdeafff54…

1 0