[PATCH] opengl32: Avoid double initialization of variables in WGL functions.
Alex Henrie
alexhenrie24 at gmail.com
Tue Nov 3 23:06:13 CST 2015
Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
dlls/opengl32/wgl.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index 963fbd8..42bf920 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -1047,31 +1047,31 @@ BOOL WINAPI wglGetPixelFormatAttribfvARB( HDC hdc, int format, int layer, UINT c
FLOAT *values )
{
const struct opengl_funcs *funcs = get_dc_funcs( hdc );
if (!funcs || !funcs->ext.p_wglGetPixelFormatAttribfvARB) return FALSE;
return funcs->ext.p_wglGetPixelFormatAttribfvARB( hdc, format, layer, count, attribs, values );
}
/***********************************************************************
* wglCreatePbufferARB
*
* Provided by the WGL_ARB_pbuffer extension.
*/
HPBUFFERARB WINAPI wglCreatePbufferARB( HDC hdc, int format, int width, int height, const int *attribs )
{
- HPBUFFERARB ret = 0;
+ HPBUFFERARB ret;
struct wgl_pbuffer *pbuffer;
struct opengl_funcs *funcs = get_dc_funcs( hdc );
if (!funcs || !funcs->ext.p_wglCreatePbufferARB) return 0;
if (!(pbuffer = funcs->ext.p_wglCreatePbufferARB( hdc, format, width, height, attribs ))) return 0;
ret = alloc_handle( HANDLE_PBUFFER, funcs, pbuffer );
if (!ret) funcs->ext.p_wglDestroyPbufferARB( pbuffer );
return ret;
}
/***********************************************************************
* wglGetPbufferDCARB
*
* Provided by the WGL_ARB_pbuffer extension.
*/
@@ -1737,31 +1737,31 @@ BOOL WINAPI wglUseFontOutlinesW(HDC hdc,
LPGLYPHMETRICSFLOAT lpgmf)
{
return wglUseFontOutlines_common(hdc, first, count, listBase, deviation, extrusion, format, lpgmf, TRUE);
}
/***********************************************************************
* glDebugEntry (OPENGL32.@)
*/
GLint WINAPI glDebugEntry( GLint unknown1, GLint unknown2 )
{
return 0;
}
static GLubyte *filter_extensions_list(const char *extensions, const char *disabled)
{
- char *p, *str = NULL;
+ char *p, *str;
const char *end;
p = str = HeapAlloc(GetProcessHeap(), 0, strlen(extensions) + 2);
if (!str)
return NULL;
for (;;)
{
while (*extensions == ' ')
extensions++;
if (!*extensions)
break;
if (!(end = strchr(extensions, ' ')))
end = extensions + strlen(extensions);
memcpy(p, extensions, end - extensions);
p[end - extensions] = 0;
@@ -1773,31 +1773,31 @@ static GLubyte *filter_extensions_list(const char *extensions, const char *disab
}
else
{
TRACE("-- %s (disabled by config)\n", p);
}
extensions = end;
}
*p = 0;
return (GLubyte *)str;
}
static GLuint *filter_extensions_index(const char *disabled)
{
const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;
const char *ext, *end, *gl_ext;
- GLuint *disabled_exts = NULL, *new_disabled_exts;
+ GLuint *disabled_exts, *new_disabled_exts;
unsigned int i = 0, j, disabled_size;
GLint extensions_count;
if (!funcs->ext.p_glGetStringi)
{
void **func_ptr = (void **)&funcs->ext.p_glGetStringi;
*func_ptr = funcs->wgl.p_wglGetProcAddress("glGetStringi");
if (!funcs->ext.p_glGetStringi)
return NULL;
}
funcs->gl.p_glGetIntegerv(GL_NUM_EXTENSIONS, &extensions_count);
disabled_size = 2;
disabled_exts = HeapAlloc(GetProcessHeap(), 0, disabled_size * sizeof(*disabled_exts));
--
2.6.2
More information about the wine-patches
mailing list