[PATCH v2 5/7] opengl32: Avoid unneeded wrapper return type casts.

[Jacek Caban]

From: Jacek Caban

---
 dlls/opengl32/make_opengl   | 2 +-
 dlls/opengl32/unix_thunks.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl
index 00de6094205..821875a1b8a 100755
--- a/dlls/opengl32/make_opengl
+++ b/dlls/opengl32/make_opengl
@@ -489,7 +489,6 @@ sub generate_unix_thunk($$$$)
         $ret .= "params->ret = ";
         $ret .= "(UINT_PTR)" if $is_wow64 && get_wow64_arg_type( $func->[0] ) =~ /PTR32/;
     }
-    $ret .= "($func_ret)" if defined $remap_types{$func_ret};
     $call_args =~ s/,$/ /;
     if ($need_wrap)
     {
@@ -497,6 +496,7 @@ sub generate_unix_thunk($$$$)
     }
     else
     {
+        $ret .= "($func_ret)" if defined $remap_types{$func_ret};
         $ret .= "funcs->p_$name($call_args);\n";
     }
     $ret .= "    pthread_mutex_unlock( &wgl_lock );\n" if $need_lock;
diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c
index 09be3ab465e..a3ab4c887e9 100644
--- a/dlls/opengl32/unix_thunks.c
+++ b/dlls/opengl32/unix_thunks.c
@@ -38,7 +38,7 @@ NTSTATUS wgl_wglCreateContext( void *args )
     const struct opengl_funcs *funcs = get_dc_funcs( params->hDc );
     if (!funcs || !funcs->p_wglCreateContext) return STATUS_NOT_IMPLEMENTED;
     pthread_mutex_lock( &wgl_lock );
-    params->ret = (HGLRC)wrap_wglCreateContext( params->teb, params->hDc );
+    params->ret = wrap_wglCreateContext( params->teb, params->hDc );
     pthread_mutex_unlock( &wgl_lock );
     return STATUS_SUCCESS;
 }
@@ -26664,7 +26664,7 @@ NTSTATUS ext_wglCreateContextAttribsARB( void *args )
     const struct opengl_funcs *funcs = get_dc_funcs( params->hDC );
     if (!funcs || !funcs->p_wglCreateContextAttribsARB) return STATUS_NOT_IMPLEMENTED;
     pthread_mutex_lock( &wgl_lock );
-    params->ret = (HGLRC)wrap_wglCreateContextAttribsARB( params->teb, params->hDC, params->hShareContext, params->attribList );
+    params->ret = wrap_wglCreateContextAttribsARB( params->teb, params->hDC, params->hShareContext, params->attribList );
     pthread_mutex_unlock( &wgl_lock );
     return STATUS_SUCCESS;
 }
@@ -26675,7 +26675,7 @@ NTSTATUS ext_wglCreatePbufferARB( void *args )
     const struct opengl_funcs *funcs = get_dc_funcs( params->hDC );
     if (!funcs || !funcs->p_wglCreatePbufferARB) return STATUS_NOT_IMPLEMENTED;
     pthread_mutex_lock( &wgl_lock );
-    params->ret = (HPBUFFERARB)wrap_wglCreatePbufferARB( params->teb, params->hDC, params->iPixelFormat, params->iWidth, params->iHeight, params->piAttribList );
+    params->ret = wrap_wglCreatePbufferARB( params->teb, params->hDC, params->iPixelFormat, params->iWidth, params->iHeight, params->piAttribList );
     pthread_mutex_unlock( &wgl_lock );
     return STATUS_SUCCESS;
 }