Refactor the parenthesis from the TRACE/FIXME/ERR macros

Trac #11526
Signed-off-by: Shannon Woods
Signed-off-by: Nicolas Capens

git-svn-id: http://angleproject.googlecode.com/svn/trunk@60 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/include/debug.h b/src/include/debug.h
index 7885675..3690754 100644
--- a/src/include/debug.h
+++ b/src/include/debug.h
@@ -24,16 +24,16 @@
 
 // A macro to output a trace of a function call and its arguments to the debugging log
 #ifndef NDEBUG
-    #define TRACE(arguments, ...) gl::trace("trace: %s("arguments")\n", __FUNCTION__, __VA_ARGS__)
+    #define TRACE(arguments, ...) gl::trace("trace: %s"arguments"\n", __FUNCTION__, __VA_ARGS__)
 #else
     #define TRACE(...) ((void)0)
 #endif
 
 // A macro to output a function call and its arguments to the debugging log, to denote an item in need of fixing. Will occur even in release mode.
-#define FIXME(arguments, ...) gl::trace("fixme: %s("arguments")\n", __FUNCTION__, __VA_ARGS__)
+#define FIXME(arguments, ...) gl::trace("fixme: %s"arguments"\n", __FUNCTION__, __VA_ARGS__)
 
 // A macro to output a function call and its arguments to the debugging log, in case of error. Will occur even in release mode.
-#define ERR(arguments, ...) gl::trace("err: %s("arguments")\n", __FUNCTION__, __VA_ARGS__)
+#define ERR(arguments, ...) gl::trace("err: %s"arguments"\n", __FUNCTION__, __VA_ARGS__)
 
 // A macro asserting a condition and outputting failures to the debug log
 #define ASSERT(expression) do { \
diff --git a/src/libEGL/libEGL.cpp b/src/libEGL/libEGL.cpp
index c807c1d..a319cf0 100644
--- a/src/libEGL/libEGL.cpp
+++ b/src/libEGL/libEGL.cpp
@@ -77,7 +77,7 @@
 {
 EGLint __stdcall eglGetError(void)
 {
-    TRACE("");
+    TRACE("()");
 
     EGLint error = egl::getCurrentError();
 
@@ -91,7 +91,7 @@
 
 EGLDisplay __stdcall eglGetDisplay(EGLNativeDisplayType display_id)
 {
-    TRACE("EGLNativeDisplayType display_id = 0x%0.8p", display_id);
+    TRACE("(EGLNativeDisplayType display_id = 0x%0.8p)", display_id);
 
     try
     {
@@ -118,7 +118,8 @@
 
 EGLBoolean __stdcall eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor)
 {
-    TRACE("EGLDisplay dpy = 0x%0.8p, EGLint *major = 0x%0.8p, EGLint *minor = 0x%0.8p", dpy, major, minor);
+    TRACE("(EGLDisplay dpy = 0x%0.8p, EGLint *major = 0x%0.8p, EGLint *minor = 0x%0.8p)",
+          dpy, major, minor);
 
     try
     {
@@ -149,7 +150,7 @@
 
 EGLBoolean __stdcall eglTerminate(EGLDisplay dpy)
 {
-    TRACE("EGLDisplay dpy = 0x%0.8p", dpy);
+    TRACE("(EGLDisplay dpy = 0x%0.8p)", dpy);
 
     try
     {
@@ -174,7 +175,7 @@
 
 const char *__stdcall eglQueryString(EGLDisplay dpy, EGLint name)
 {
-    TRACE("EGLDisplay dpy = 0x%0.8p, EGLint name = %d", dpy, name);
+    TRACE("(EGLDisplay dpy = 0x%0.8p, EGLint name = %d)", dpy, name);
 
     try
     {
@@ -209,7 +210,9 @@
 
 EGLBoolean __stdcall eglGetConfigs(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config)
 {
-    TRACE("EGLDisplay dpy = 0x%0.8p, EGLConfig *configs = 0x%0.8p, EGLint config_size = %d, EGLint *num_config = 0x%0.8p", dpy, configs, config_size, num_config);
+    TRACE("(EGLDisplay dpy = 0x%0.8p, EGLConfig *configs = 0x%0.8p, "
+          "EGLint config_size = %d, EGLint *num_config = 0x%0.8p)",
+          dpy, configs, config_size, num_config);
 
     try
     {
@@ -244,7 +247,9 @@
 
 EGLBoolean __stdcall eglChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config)
 {
-    TRACE("EGLDisplay dpy = 0x%0.8p, const EGLint *attrib_list = 0x%0.8p, EGLConfig *configs = 0x%0.8p, EGLint config_size = %d, EGLint *num_config = 0x%0.8p", dpy, attrib_list, configs, config_size, num_config);
+    TRACE("(EGLDisplay dpy = 0x%0.8p, const EGLint *attrib_list = 0x%0.8p, "
+          "EGLConfig *configs = 0x%0.8p, EGLint config_size = %d, EGLint *num_config = 0x%0.8p)",
+          dpy, attrib_list, configs, config_size, num_config);
 
     try
     {
@@ -281,7 +286,8 @@
 
 EGLBoolean __stdcall eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value)
 {
-    TRACE("EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, EGLint attribute = %d, EGLint *value = 0x%0.8p", dpy, config, attribute, value);
+    TRACE("(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, EGLint attribute = %d, EGLint *value = 0x%0.8p)",
+          dpy, config, attribute, value);
 
     try
     {
@@ -309,7 +315,8 @@
 
 EGLSurface __stdcall eglCreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint *attrib_list)
 {
-    TRACE("EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, EGLNativeWindowType win = 0x%0.8p, const EGLint *attrib_list = 0x%0.8p", dpy, config, win, attrib_list);
+    TRACE("(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, EGLNativeWindowType win = 0x%0.8p, "
+          "const EGLint *attrib_list = 0x%0.8p)", dpy, config, win, attrib_list);
 
     try
     {
@@ -373,7 +380,8 @@
 
 EGLSurface __stdcall eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list)
 {
-    TRACE("EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, const EGLint *attrib_list = 0x%0.8p", dpy, config, attrib_list);
+    TRACE("(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, const EGLint *attrib_list = 0x%0.8p)",
+          dpy, config, attrib_list);
 
     try
     {
@@ -398,7 +406,8 @@
 
 EGLSurface __stdcall eglCreatePixmapSurface(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list)
 {
-    TRACE("EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, EGLNativePixmapType pixmap = 0x%0.8p, const EGLint *attrib_list = 0x%0.8p", dpy, config, pixmap, attrib_list);
+    TRACE("(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, EGLNativePixmapType pixmap = 0x%0.8p, "
+          "const EGLint *attrib_list = 0x%0.8p)", dpy, config, pixmap, attrib_list);
 
     try
     {
@@ -423,7 +432,7 @@
 
 EGLBoolean __stdcall eglDestroySurface(EGLDisplay dpy, EGLSurface surface)
 {
-    TRACE("EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p", dpy, surface);
+    TRACE("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p)", dpy, surface);
 
     try
     {
@@ -453,7 +462,8 @@
 
 EGLBoolean __stdcall eglQuerySurface(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value)
 {
-    TRACE("EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint attribute = %d, EGLint *value = 0x%0.8p", dpy, surface, attribute, value);
+    TRACE("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint attribute = %d, EGLint *value = 0x%0.8p)",
+          dpy, surface, attribute, value);
 
     try
     {
@@ -537,7 +547,7 @@
 
 EGLBoolean __stdcall eglBindAPI(EGLenum api)
 {
-    TRACE("EGLenum api = 0x%X", api);
+    TRACE("(EGLenum api = 0x%X)", api);
 
     try
     {
@@ -566,7 +576,7 @@
 
 EGLenum __stdcall eglQueryAPI(void)
 {
-    TRACE("");
+    TRACE("()");
 
     try
     {
@@ -584,7 +594,7 @@
 
 EGLBoolean __stdcall eglWaitClient(void)
 {
-    TRACE("");
+    TRACE("()");
 
     try
     {
@@ -602,7 +612,7 @@
 
 EGLBoolean __stdcall eglReleaseThread(void)
 {
-    TRACE("");
+    TRACE("()");
 
     try
     {
@@ -620,7 +630,9 @@
 
 EGLSurface __stdcall eglCreatePbufferFromClientBuffer(EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list)
 {
-    TRACE("EGLDisplay dpy = 0x%0.8p, EGLenum buftype = 0x%X, EGLClientBuffer buffer = 0x%0.8p, EGLConfig config = 0x%0.8p, const EGLint *attrib_list = 0x%0.8p", dpy, buftype, buffer, config, attrib_list);
+    TRACE("(EGLDisplay dpy = 0x%0.8p, EGLenum buftype = 0x%X, EGLClientBuffer buffer = 0x%0.8p, "
+          "EGLConfig config = 0x%0.8p, const EGLint *attrib_list = 0x%0.8p)",
+          dpy, buftype, buffer, config, attrib_list);
 
     try
     {
@@ -645,7 +657,8 @@
 
 EGLBoolean __stdcall eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value)
 {
-    TRACE("EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint attribute = %d, EGLint value = %d", dpy, surface, attribute, value);
+    TRACE("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint attribute = %d, EGLint value = %d)",
+          dpy, surface, attribute, value);
 
     try
     {
@@ -670,7 +683,7 @@
 
 EGLBoolean __stdcall eglBindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
 {
-    TRACE("EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint buffer = %d", dpy, surface, buffer);
+    TRACE("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint buffer = %d)", dpy, surface, buffer);
 
     try
     {
@@ -695,7 +708,7 @@
 
 EGLBoolean __stdcall eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
 {
-    TRACE("EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint buffer = %d", dpy, surface, buffer);
+    TRACE("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint buffer = %d)", dpy, surface, buffer);
 
     try
     {
@@ -720,7 +733,7 @@
 
 EGLBoolean __stdcall eglSwapInterval(EGLDisplay dpy, EGLint interval)
 {
-    TRACE("EGLDisplay dpy = 0x%0.8p, EGLint interval = %d", dpy, interval);
+    TRACE("(EGLDisplay dpy = 0x%0.8p, EGLint interval = %d)", dpy, interval);
 
     try
     {
@@ -745,7 +758,8 @@
 
 EGLContext __stdcall eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list)
 {
-    TRACE("EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, EGLContext share_context = 0x%0.8p, const EGLint *attrib_list = 0x%0.8p", dpy, config, share_context, attrib_list);
+    TRACE("(EGLDisplay dpy = 0x%0.8p, EGLConfig config = 0x%0.8p, EGLContext share_context = 0x%0.8p, "
+          "const EGLint *attrib_list = 0x%0.8p)", dpy, config, share_context, attrib_list);
 
     try
     {
@@ -770,7 +784,7 @@
 
 EGLBoolean __stdcall eglDestroyContext(EGLDisplay dpy, EGLContext ctx)
 {
-    TRACE("EGLDisplay dpy = 0x%0.8p, EGLContext ctx = 0x%0.8p", dpy, ctx);
+    TRACE("(EGLDisplay dpy = 0x%0.8p, EGLContext ctx = 0x%0.8p)", dpy, ctx);
 
     try
     {
@@ -800,7 +814,8 @@
 
 EGLBoolean __stdcall eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx)
 {
-    TRACE("EGLDisplay dpy = 0x%0.8p, EGLSurface draw = 0x%0.8p, EGLSurface read = 0x%0.8p, EGLContext ctx = 0x%0.8p", dpy, draw, read, ctx);
+    TRACE("(EGLDisplay dpy = 0x%0.8p, EGLSurface draw = 0x%0.8p, EGLSurface read = 0x%0.8p, EGLContext ctx = 0x%0.8p)",
+          dpy, draw, read, ctx);
 
     try
     {
@@ -837,7 +852,7 @@
 
 EGLContext __stdcall eglGetCurrentContext(void)
 {
-    TRACE("");
+    TRACE("()");
 
     try
     {
@@ -855,7 +870,7 @@
 
 EGLSurface __stdcall eglGetCurrentSurface(EGLint readdraw)
 {
-    TRACE("EGLint readdraw = %d", readdraw);
+    TRACE("(EGLint readdraw = %d)", readdraw);
 
     try
     {
@@ -873,7 +888,7 @@
 
 EGLDisplay __stdcall eglGetCurrentDisplay(void)
 {
-    TRACE("");
+    TRACE("()");
 
     try
     {
@@ -891,7 +906,8 @@
 
 EGLBoolean __stdcall eglQueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value)
 {
-    TRACE("EGLDisplay dpy = 0x%0.8p, EGLContext ctx = 0x%0.8p, EGLint attribute = %d, EGLint *value = 0x%0.8p", dpy, ctx, attribute, value);
+    TRACE("(EGLDisplay dpy = 0x%0.8p, EGLContext ctx = 0x%0.8p, EGLint attribute = %d, EGLint *value = 0x%0.8p)",
+          dpy, ctx, attribute, value);
 
     try
     {
@@ -916,7 +932,7 @@
 
 EGLBoolean __stdcall eglWaitGL(void)
 {
-    TRACE("");
+    TRACE("()");
 
     try
     {
@@ -934,7 +950,7 @@
 
 EGLBoolean __stdcall eglWaitNative(EGLint engine)
 {
-    TRACE("EGLint engine = %d", engine);
+    TRACE("(EGLint engine = %d)", engine);
 
     try
     {
@@ -952,7 +968,7 @@
 
 EGLBoolean __stdcall eglSwapBuffers(EGLDisplay dpy, EGLSurface surface)
 {
-    TRACE("EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p", dpy, surface);
+    TRACE("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p)", dpy, surface);
 
     try
     {
@@ -983,7 +999,7 @@
 
 EGLBoolean __stdcall eglCopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target)
 {
-    TRACE("EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLNativePixmapType target = 0x%0.8p", dpy, surface, target);
+    TRACE("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLNativePixmapType target = 0x%0.8p)", dpy, surface, target);
 
     try
     {
@@ -1008,7 +1024,7 @@
 
 __eglMustCastToProperFunctionPointerType __stdcall eglGetProcAddress(const char *procname)
 {
-    TRACE("const char *procname = \"%s\"", procname);
+    TRACE("(const char *procname = \"%s\")", procname);
 
     try
     {
diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index cb38dc3..1526aaa 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -30,7 +30,7 @@
 
 void __stdcall glActiveTexture(GLenum texture)
 {
-    TRACE("GLenum texture = 0x%X", texture);
+    TRACE("(GLenum texture = 0x%X)", texture);
 
     try
     {
@@ -54,7 +54,7 @@
 
 void __stdcall glAttachShader(GLuint program, GLuint shader)
 {
-    TRACE("GLuint program = %d, GLuint shader = %d", program, shader);
+    TRACE("(GLuint program = %d, GLuint shader = %d)", program, shader);
 
     try
     {
@@ -84,7 +84,7 @@
 
 void __stdcall glBindAttribLocation(GLuint program, GLuint index, const char* name)
 {
-    TRACE("GLuint program = %d, GLuint index = %d, const char* name = 0x%0.8p", program, index, name);
+    TRACE("(GLuint program = %d, GLuint index = %d, const char* name = 0x%0.8p)", program, index, name);
 
     try
     {
@@ -115,7 +115,7 @@
 
 void __stdcall glBindBuffer(GLenum target, GLuint buffer)
 {
-    TRACE("GLenum target = 0x%X, GLuint buffer = %d", target, buffer);
+    TRACE("(GLenum target = 0x%X, GLuint buffer = %d)", target, buffer);
 
     try
     {
@@ -144,7 +144,7 @@
 
 void __stdcall glBindFramebuffer(GLenum target, GLuint framebuffer)
 {
-    TRACE("GLenum target = 0x%X, GLuint framebuffer = %d", target, framebuffer);
+    TRACE("(GLenum target = 0x%X, GLuint framebuffer = %d)", target, framebuffer);
 
     try
     {
@@ -168,7 +168,7 @@
 
 void __stdcall glBindRenderbuffer(GLenum target, GLuint renderbuffer)
 {
-    TRACE("GLenum target = 0x%X, GLuint renderbuffer = %d", target, renderbuffer);
+    TRACE("(GLenum target = 0x%X, GLuint renderbuffer = %d)", target, renderbuffer);
 
     try
     {
@@ -192,7 +192,7 @@
 
 void __stdcall glBindTexture(GLenum target, GLuint texture)
 {
-    TRACE("GLenum target = 0x%X, GLuint texture = %d", target, texture);
+    TRACE("(GLenum target = 0x%X, GLuint texture = %d)", target, texture);
 
     try
     {
@@ -228,7 +228,8 @@
 
 void __stdcall glBlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
 {
-    TRACE("GLclampf red = %f, GLclampf green = %f, GLclampf blue = %f, GLclampf alpha = %f", red, green, blue, alpha);
+    TRACE("(GLclampf red = %f, GLclampf green = %f, GLclampf blue = %f, GLclampf alpha = %f)",
+          red, green, blue, alpha);
 
     try
     {
@@ -255,7 +256,7 @@
 
 void __stdcall glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
 {
-    TRACE("GLenum modeRGB = 0x%X, GLenum modeAlpha = 0x%X", modeRGB, modeAlpha);
+    TRACE("(GLenum modeRGB = 0x%X, GLenum modeAlpha = 0x%X)", modeRGB, modeAlpha);
 
     try
     {
@@ -300,7 +301,8 @@
 
 void __stdcall glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
 {
-    TRACE("GLenum srcRGB = 0x%X, GLenum dstRGB = 0x%X, GLenum srcAlpha = 0x%X, GLenum dstAlpha = 0x%X", srcRGB, dstRGB, srcAlpha, dstAlpha);
+    TRACE("(GLenum srcRGB = 0x%X, GLenum dstRGB = 0x%X, GLenum srcAlpha = 0x%X, GLenum dstAlpha = 0x%X)",
+          srcRGB, dstRGB, srcAlpha, dstAlpha);
 
     try
     {
@@ -420,7 +422,8 @@
 
 void __stdcall glBufferData(GLenum target, GLsizeiptr size, const void* data, GLenum usage)
 {
-    TRACE("GLenum target = 0x%X, GLsizeiptr size = %d, const void* data = 0x%0.8p, GLenum usage = %d", target, size, data, usage);
+    TRACE("(GLenum target = 0x%X, GLsizeiptr size = %d, const void* data = 0x%0.8p, GLenum usage = %d)",
+          target, size, data, usage);
 
     try
     {
@@ -473,7 +476,8 @@
 
 void __stdcall glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const void* data)
 {
-    TRACE("GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr size = %d, const void* data = 0x%0.8p", target, offset, size, data);
+    TRACE("(GLenum target = 0x%X, GLintptr offset = %d, GLsizeiptr size = %d, const void* data = 0x%0.8p)",
+          target, offset, size, data);
 
     try
     {
@@ -526,7 +530,7 @@
 
 GLenum __stdcall glCheckFramebufferStatus(GLenum target)
 {
-    TRACE("GLenum target = 0x%X", target);
+    TRACE("(GLenum target = 0x%X)", target);
 
     try
     {
@@ -554,7 +558,7 @@
 
 void __stdcall glClear(GLbitfield mask)
 {
-    TRACE("GLbitfield mask = %X", mask);
+    TRACE("(GLbitfield mask = %X)", mask);
 
     try
     {
@@ -573,7 +577,8 @@
 
 void __stdcall glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
 {
-    TRACE("GLclampf red = %f, GLclampf green = %f, GLclampf blue = %f, GLclampf alpha = %f", red, green, blue, alpha);
+    TRACE("(GLclampf red = %f, GLclampf green = %f, GLclampf blue = %f, GLclampf alpha = %f)",
+          red, green, blue, alpha);
 
     try
     {
@@ -592,7 +597,7 @@
 
 void __stdcall glClearDepthf(GLclampf depth)
 {
-    TRACE("GLclampf depth = %f", depth);
+    TRACE("(GLclampf depth = %f)", depth);
 
     try
     {
@@ -611,7 +616,7 @@
 
 void __stdcall glClearStencil(GLint s)
 {
-    TRACE("GLint s = %d", s);
+    TRACE("(GLint s = %d)", s);
 
     try
     {
@@ -630,7 +635,8 @@
 
 void __stdcall glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    TRACE("GLboolean red = %d, GLboolean green = %d, GLboolean blue = %d, GLboolean alpha = %d", red, green, blue, alpha);
+    TRACE("(GLboolean red = %d, GLboolean green = %d, GLboolean blue = %d, GLboolean alpha = %d)",
+          red, green, blue, alpha);
 
     try
     {
@@ -652,7 +658,7 @@
 
 void __stdcall glCompileShader(GLuint shader)
 {
-    TRACE("GLuint shader = %d", shader);
+    TRACE("(GLuint shader = %d)", shader);
 
     try
     {
@@ -678,7 +684,8 @@
 
 void __stdcall glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data)
 {
-    TRACE("GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = %d, GLsizei height = %d, GLint border = %d, GLsizei imageSize = %d, const void* data = 0x%0.8p",
+    TRACE("(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = %d, " 
+          "GLsizei height = %d, GLint border = %d, GLsizei imageSize = %d, const void* data = 0x%0.8p)",
           target, level, internalformat, width, height, border, imageSize, data);
 
     try
@@ -708,7 +715,9 @@
 
 void __stdcall glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data)
 {
-    TRACE("GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLsizei width = %d, GLsizei height = %d, GLenum format = 0x%X, GLsizei imageSize = %d, const void* data = 0x%0.8p",
+    TRACE("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "
+          "GLsizei width = %d, GLsizei height = %d, GLenum format = 0x%X, "
+          "GLsizei imageSize = %d, const void* data = 0x%0.8p)",
           target, level, xoffset, yoffset, width, height, format, imageSize, data);
 
     try
@@ -743,7 +752,8 @@
 
 void __stdcall glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    TRACE("GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLint border = %d",
+    TRACE("(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, "
+          "GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLint border = %d)",
           target, level, internalformat, x, y, width, height, border);
 
     try
@@ -763,7 +773,8 @@
 
 void __stdcall glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    TRACE("GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d",
+    TRACE("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "
+          "GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",
           target, level, xoffset, yoffset, x, y, width, height);
 
     try
@@ -783,7 +794,7 @@
 
 GLuint __stdcall glCreateProgram(void)
 {
-    TRACE("");
+    TRACE("()");
 
     try
     {
@@ -804,7 +815,7 @@
 
 GLuint __stdcall glCreateShader(GLenum type)
 {
-    TRACE("GLenum type = 0x%X", type);
+    TRACE("(GLenum type = 0x%X)", type);
 
     try
     {
@@ -832,7 +843,7 @@
 
 void __stdcall glCullFace(GLenum mode)
 {
-    TRACE("GLenum mode = 0x%X", mode);
+    TRACE("(GLenum mode = 0x%X)", mode);
 
     try
     {
@@ -862,7 +873,7 @@
 
 void __stdcall glDeleteBuffers(GLsizei n, const GLuint* buffers)
 {
-    TRACE("GLsizei n = %d, const GLuint* buffers = 0x%0.8p", n, buffers);
+    TRACE("(GLsizei n = %d, const GLuint* buffers = 0x%0.8p)", n, buffers);
 
     try
     {
@@ -889,7 +900,7 @@
 
 void __stdcall glDeleteFramebuffers(GLsizei n, const GLuint* framebuffers)
 {
-    TRACE("GLsizei n = %d, const GLuint* framebuffers = 0x%0.8p", n, framebuffers);
+    TRACE("(GLsizei n = %d, const GLuint* framebuffers = 0x%0.8p)", n, framebuffers);
 
     try
     {
@@ -919,7 +930,7 @@
 
 void __stdcall glDeleteProgram(GLuint program)
 {
-    TRACE("GLuint program = %d", program);
+    TRACE("(GLuint program = %d)", program);
 
     try
     {
@@ -938,7 +949,7 @@
 
 void __stdcall glDeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers)
 {
-    TRACE("GLsizei n = %d, const GLuint* renderbuffers = 0x%0.8p", n, renderbuffers);
+    TRACE("(GLsizei n = %d, const GLuint* renderbuffers = 0x%0.8p)", n, renderbuffers);
 
     try
     {
@@ -965,7 +976,7 @@
 
 void __stdcall glDeleteShader(GLuint shader)
 {
-    TRACE("GLuint shader = %d", shader);
+    TRACE("(GLuint shader = %d)", shader);
 
     try
     {
@@ -984,7 +995,7 @@
 
 void __stdcall glDeleteTextures(GLsizei n, const GLuint* textures)
 {
-    TRACE("GLsizei n = %d, const GLuint* textures = 0x%0.8p", n, textures);
+    TRACE("(GLsizei n = %d, const GLuint* textures = 0x%0.8p)", n, textures);
 
     try
     {
@@ -1014,7 +1025,7 @@
 
 void __stdcall glDepthFunc(GLenum func)
 {
-    TRACE("GLenum func = 0x%X", func);
+    TRACE("(GLenum func = 0x%X)", func);
 
     try
     {
@@ -1048,7 +1059,7 @@
 
 void __stdcall glDepthMask(GLboolean flag)
 {
-    TRACE("GLboolean flag = %d", flag);
+    TRACE("(GLboolean flag = %d)", flag);
 
     try
     {
@@ -1067,7 +1078,7 @@
 
 void __stdcall glDepthRangef(GLclampf zNear, GLclampf zFar)
 {
-    TRACE("GLclampf zNear = %f, GLclampf zFar = %f", zNear, zFar);
+    TRACE("(GLclampf zNear = %f, GLclampf zFar = %f)", zNear, zFar);
 
     try
     {
@@ -1087,7 +1098,7 @@
 
 void __stdcall glDetachShader(GLuint program, GLuint shader)
 {
-    TRACE("GLuint program = %d, GLuint shader = %d", program, shader);
+    TRACE("(GLuint program = %d, GLuint shader = %d)", program, shader);
 
     try
     {
@@ -1122,7 +1133,7 @@
 
 void __stdcall glDisable(GLenum cap)
 {
-    TRACE("GLenum cap = 0x%X", cap);
+    TRACE("(GLenum cap = 0x%X)", cap);
 
     try
     {
@@ -1154,7 +1165,7 @@
 
 void __stdcall glDisableVertexAttribArray(GLuint index)
 {
-    TRACE("GLuint index = %d", index);
+    TRACE("(GLuint index = %d)", index);
 
     try
     {
@@ -1178,7 +1189,7 @@
 
 void __stdcall glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    TRACE("GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d", mode, first, count);
+    TRACE("(GLenum mode = 0x%X, GLint first = %d, GLsizei count = %d)", mode, first, count);
 
     try
     {
@@ -1202,7 +1213,8 @@
 
 void __stdcall glDrawElements(GLenum mode, GLsizei count, GLenum type, const void* indices)
 {
-    TRACE("GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void* indices = 0x%0.8p", mode, count, type, indices);
+    TRACE("(GLenum mode = 0x%X, GLsizei count = %d, GLenum type = 0x%X, const void* indices = 0x%0.8p)",
+          mode, count, type, indices);
 
     try
     {
@@ -1236,7 +1248,7 @@
 
 void __stdcall glEnable(GLenum cap)
 {
-    TRACE("GLenum cap = 0x%X", cap);
+    TRACE("(GLenum cap = 0x%X)", cap);
 
     try
     {
@@ -1268,7 +1280,7 @@
 
 void __stdcall glEnableVertexAttribArray(GLuint index)
 {
-    TRACE("GLuint index = %d", index);
+    TRACE("(GLuint index = %d)", index);
 
     try
     {
@@ -1292,7 +1304,7 @@
 
 void __stdcall glFinish(void)
 {
-    TRACE("");
+    TRACE("()");
 
     try
     {
@@ -1311,7 +1323,7 @@
 
 void __stdcall glFlush(void)
 {
-    TRACE("");
+    TRACE("()");
 
     try
     {
@@ -1330,7 +1342,8 @@
 
 void __stdcall glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
-    TRACE("GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum renderbuffertarget = 0x%X, GLuint renderbuffer = %d", target, attachment, renderbuffertarget, renderbuffer);
+    TRACE("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum renderbuffertarget = 0x%X, "
+          "GLuint renderbuffer = %d)", target, attachment, renderbuffertarget, renderbuffer);
 
     try
     {
@@ -1374,7 +1387,8 @@
 
 void __stdcall glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    TRACE("GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum textarget = 0x%X, GLuint texture = %d, GLint level = %d", target, attachment, textarget, texture, level);
+    TRACE("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum textarget = 0x%X, "
+          "GLuint texture = %d, GLint level = %d)", target, attachment, textarget, texture, level);
 
     try
     {
@@ -1451,7 +1465,7 @@
 
 void __stdcall glFrontFace(GLenum mode)
 {
-    TRACE("GLenum mode = 0x%X", mode);
+    TRACE("(GLenum mode = 0x%X)", mode);
 
     try
     {
@@ -1480,7 +1494,7 @@
 
 void __stdcall glGenBuffers(GLsizei n, GLuint* buffers)
 {
-    TRACE("GLsizei n = %d, GLuint* buffers = 0x%0.8p", n, buffers);
+    TRACE("(GLsizei n = %d, GLuint* buffers = 0x%0.8p)", n, buffers);
 
     try
     {
@@ -1507,7 +1521,7 @@
 
 void __stdcall glGenerateMipmap(GLenum target)
 {
-    TRACE("GLenum target = 0x%X", target);
+    TRACE("(GLenum target = 0x%X)", target);
 
     try
     {
@@ -1521,7 +1535,7 @@
 
 void __stdcall glGenFramebuffers(GLsizei n, GLuint* framebuffers)
 {
-    TRACE("GLsizei n = %d, GLuint* framebuffers = 0x%0.8p", n, framebuffers);
+    TRACE("(GLsizei n = %d, GLuint* framebuffers = 0x%0.8p)", n, framebuffers);
 
     try
     {
@@ -1548,7 +1562,7 @@
 
 void __stdcall glGenRenderbuffers(GLsizei n, GLuint* renderbuffers)
 {
-    TRACE("GLsizei n = %d, GLuint* renderbuffers = 0x%0.8p", n, renderbuffers);
+    TRACE("(GLsizei n = %d, GLuint* renderbuffers = 0x%0.8p)", n, renderbuffers);
 
     try
     {
@@ -1575,7 +1589,7 @@
 
 void __stdcall glGenTextures(GLsizei n, GLuint* textures)
 {
-    TRACE("GLsizei n = %d, GLuint* textures =  0x%0.8p", n, textures);
+    TRACE("(GLsizei n = %d, GLuint* textures =  0x%0.8p)", n, textures);
 
     try
     {
@@ -1602,7 +1616,8 @@
 
 void __stdcall glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name)
 {
-    TRACE("GLuint program = %d, GLuint index = %d, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, GLint* size = 0x%0.8p, GLenum* type = %0.8p, char* name = %0.8p",
+    TRACE("(GLuint program = %d, GLuint index = %d, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, "
+          "GLint* size = 0x%0.8p, GLenum* type = %0.8p, char* name = %0.8p)",
           program, index, bufsize, length, size, type, name);
 
     try
@@ -1622,7 +1637,8 @@
 
 void __stdcall glGetActiveUniform(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name)
 {
-    TRACE("GLuint program = %d, GLuint index = %d, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, GLint* size = 0x%0.8p, GLenum* type = 0x%0.8p, char* name = 0x%0.8p",
+    TRACE("(GLuint program = %d, GLuint index = %d, GLsizei bufsize = %d, "
+          "GLsizei* length = 0x%0.8p, GLint* size = 0x%0.8p, GLenum* type = 0x%0.8p, char* name = 0x%0.8p)",
           program, index, bufsize, length, size, type, name);
 
     try
@@ -1642,7 +1658,8 @@
 
 void __stdcall glGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders)
 {
-    TRACE("GLuint program = %d, GLsizei maxcount = %d, GLsizei* count = 0x%0.8p, GLuint* shaders = 0x%0.8p", program, maxcount, count, shaders);
+    TRACE("(GLuint program = %d, GLsizei maxcount = %d, GLsizei* count = 0x%0.8p, GLuint* shaders = 0x%0.8p)",
+          program, maxcount, count, shaders);
 
     try
     {
@@ -1661,7 +1678,7 @@
 
 int __stdcall glGetAttribLocation(GLuint program, const char* name)
 {
-    TRACE("GLuint program = %d, const char* name = %s", program, name);
+    TRACE("(GLuint program = %d, const char* name = %s)", program, name);
 
     try
     {
@@ -1689,7 +1706,7 @@
 
 void __stdcall glGetBooleanv(GLenum pname, GLboolean* params)
 {
-    TRACE("GLenum pname = 0x%X, GLboolean* params = 0x%0.8p",  pname, params);
+    TRACE("(GLenum pname = 0x%X, GLboolean* params = 0x%0.8p)",  pname, params);
 
     try
     {
@@ -1709,7 +1726,7 @@
 
 void __stdcall glGetBufferParameteriv(GLenum target, GLenum pname, GLint* params)
 {
-    TRACE("GLenum target = 0x%X, GLenum pname = 0x%X, GLint* params = 0x%0.8p", target, pname, params);
+    TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint* params = 0x%0.8p)", target, pname, params);
 
     try
     {
@@ -1723,7 +1740,7 @@
 
 GLenum __stdcall glGetError(void)
 {
-    TRACE("");
+    TRACE("()");
 
     gl::Context *context = gl::getContext();
 
@@ -1737,7 +1754,7 @@
 
 void __stdcall glGetFloatv(GLenum pname, GLfloat* params)
 {
-    TRACE("GLenum pname = 0x%X, GLfloat* params = 0x%0.8p", pname, params);
+    TRACE("(GLenum pname = 0x%X, GLfloat* params = 0x%0.8p)", pname, params);
 
     try
     {
@@ -1751,7 +1768,8 @@
 
 void __stdcall glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint* params)
 {
-    TRACE("GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum pname = 0x%X, GLint* params = 0x%0.8p", target, attachment, pname, params);
+    TRACE("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum pname = 0x%X, GLint* params = 0x%0.8p)",
+          target, attachment, pname, params);
 
     try
     {
@@ -1775,7 +1793,7 @@
 
 void __stdcall glGetIntegerv(GLenum pname, GLint* params)
 {
-    TRACE("GLenum pname = 0x%X, GLint* params = 0x%0.8p", pname, params);
+    TRACE("(GLenum pname = 0x%X, GLint* params = 0x%0.8p)", pname, params);
 
     try
     {
@@ -1871,7 +1889,7 @@
 
 void __stdcall glGetProgramiv(GLuint program, GLenum pname, GLint* params)
 {
-    TRACE("GLuint program = %d, GLenum pname = %d, GLint* params = 0x%0.8p", program, pname, params);
+    TRACE("(GLuint program = %d, GLenum pname = %d, GLint* params = 0x%0.8p)", program, pname, params);
 
     try
     {
@@ -1936,7 +1954,8 @@
 
 void __stdcall glGetProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei* length, char* infolog)
 {
-    TRACE("GLuint program = %d, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, char* infolog = 0x%0.8p", program, bufsize, length, infolog);
+    TRACE("(GLuint program = %d, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, char* infolog = 0x%0.8p)",
+          program, bufsize, length, infolog);
 
     try
     {
@@ -1955,7 +1974,7 @@
 
 void __stdcall glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* params)
 {
-    TRACE("GLenum target = 0x%X, GLenum pname = 0x%X, GLint* params = 0x%0.8p", target, pname, params);
+    TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint* params = 0x%0.8p)", target, pname, params);
 
     try
     {
@@ -1969,7 +1988,7 @@
 
 void __stdcall glGetShaderiv(GLuint shader, GLenum pname, GLint* params)
 {
-    TRACE("GLuint shader = %d, GLenum pname = %d, GLint* params = 0x%0.8p", shader, pname, params);
+    TRACE("(GLuint shader = %d, GLenum pname = %d, GLint* params = 0x%0.8p)", shader, pname, params);
 
     try
     {
@@ -2017,7 +2036,8 @@
 
 void __stdcall glGetShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog)
 {
-    TRACE("GLuint shader = %d, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, char* infolog = 0x%0.8p", shader, bufsize, length, infolog);
+    TRACE("(GLuint shader = %d, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, char* infolog = 0x%0.8p)",
+          shader, bufsize, length, infolog);
 
     try
     {
@@ -2036,7 +2056,8 @@
 
 void __stdcall glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision)
 {
-    TRACE("GLenum shadertype = 0x%X, GLenum precisiontype = 0x%X, GLint* range = 0x%0.8p, GLint* precision = 0x%0.8p", shadertype, precisiontype, range, precision);
+    TRACE("(GLenum shadertype = 0x%X, GLenum precisiontype = 0x%X, GLint* range = 0x%0.8p, GLint* precision = 0x%0.8p)",
+          shadertype, precisiontype, range, precision);
 
     try
     {
@@ -2050,7 +2071,8 @@
 
 void __stdcall glGetShaderSource(GLuint shader, GLsizei bufsize, GLsizei* length, char* source)
 {
-    TRACE("GLuint shader = %d, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, char* source = 0x%0.8p", shader, bufsize, length, source);
+    TRACE("(GLuint shader = %d, GLsizei bufsize = %d, GLsizei* length = 0x%0.8p, char* source = 0x%0.8p)",
+          shader, bufsize, length, source);
 
     try
     {
@@ -2069,7 +2091,7 @@
 
 const GLubyte* __stdcall glGetString(GLenum name)
 {
-    TRACE("GLenum name = 0x%X", name);
+    TRACE("(GLenum name = 0x%X)", name);
 
     try
     {
@@ -2099,7 +2121,7 @@
 
 void __stdcall glGetTexParameterfv(GLenum target, GLenum pname, GLfloat* params)
 {
-    TRACE("GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat* params = 0x%0.8p", target, pname, params);
+    TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat* params = 0x%0.8p)", target, pname, params);
 
     try
     {
@@ -2113,7 +2135,7 @@
 
 void __stdcall glGetTexParameteriv(GLenum target, GLenum pname, GLint* params)
 {
-    TRACE("GLenum target = 0x%X, GLenum pname = 0x%X, GLint* params = 0x%0.8p", target, pname, params);
+    TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint* params = 0x%0.8p)", target, pname, params);
 
     try
     {
@@ -2127,7 +2149,7 @@
 
 void __stdcall glGetUniformfv(GLuint program, GLint location, GLfloat* params)
 {
-    TRACE("GLuint program = %d, GLint location = %d, GLfloat* params = 0x%0.8p", program, location, params);
+    TRACE("(GLuint program = %d, GLint location = %d, GLfloat* params = 0x%0.8p)", program, location, params);
 
     try
     {
@@ -2141,7 +2163,7 @@
 
 void __stdcall glGetUniformiv(GLuint program, GLint location, GLint* params)
 {
-    TRACE("GLuint program = %d, GLint location = %d, GLint* params = 0x%0.8p", program, location, params);
+    TRACE("(GLuint program = %d, GLint location = %d, GLint* params = 0x%0.8p)", program, location, params);
 
     try
     {
@@ -2155,7 +2177,7 @@
 
 int __stdcall glGetUniformLocation(GLuint program, const char* name)
 {
-    TRACE("GLuint program = %d, const char* name = 0x%0.8p", program, name);
+    TRACE("(GLuint program = %d, const char* name = 0x%0.8p)", program, name);
 
     try
     {
@@ -2193,7 +2215,7 @@
 
 void __stdcall glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params)
 {
-    TRACE("GLuint index = %d, GLenum pname = 0x%X, GLfloat* params = 0x%0.8p", index, pname, params);
+    TRACE("(GLuint index = %d, GLenum pname = 0x%X, GLfloat* params = 0x%0.8p)", index, pname, params);
 
     try
     {
@@ -2212,7 +2234,7 @@
 
 void __stdcall glGetVertexAttribiv(GLuint index, GLenum pname, GLint* params)
 {
-    TRACE("GLuint index = %d, GLenum pname = 0x%X, GLint* params = 0x%0.8p", index, pname, params);
+    TRACE("(GLuint index = %d, GLenum pname = 0x%X, GLint* params = 0x%0.8p)", index, pname, params);
 
     try
     {
@@ -2231,7 +2253,7 @@
 
 void __stdcall glGetVertexAttribPointerv(GLuint index, GLenum pname, void** pointer)
 {
-    TRACE("GLuint index = %d, GLenum pname = 0x%X, void** pointer = 0x%0.8p", index, pname, pointer);
+    TRACE("(GLuint index = %d, GLenum pname = 0x%X, void** pointer = 0x%0.8p)", index, pname, pointer);
 
     try
     {
@@ -2250,7 +2272,7 @@
 
 void __stdcall glHint(GLenum target, GLenum mode)
 {
-    TRACE("GLenum target = 0x%X, GLenum mode = 0x%X", target, mode);
+    TRACE("(GLenum target = 0x%X, GLenum mode = 0x%X)", target, mode);
 
     try
     {
@@ -2286,7 +2308,7 @@
 
 GLboolean __stdcall glIsBuffer(GLuint buffer)
 {
-    TRACE("GLuint buffer = %d", buffer);
+    TRACE("(GLuint buffer = %d)", buffer);
 
     try
     {
@@ -2312,7 +2334,7 @@
 
 GLboolean __stdcall glIsEnabled(GLenum cap)
 {
-    TRACE("GLenum cap = 0x%X", cap);
+    TRACE("(GLenum cap = 0x%X)", cap);
 
     try
     {
@@ -2346,7 +2368,7 @@
 
 GLboolean __stdcall glIsFramebuffer(GLuint framebuffer)
 {
-    TRACE("GLuint framebuffer = %d", framebuffer);
+    TRACE("(GLuint framebuffer = %d)", framebuffer);
 
     try
     {
@@ -2372,7 +2394,7 @@
 
 GLboolean __stdcall glIsProgram(GLuint program)
 {
-    TRACE("GLuint program = %d", program);
+    TRACE("(GLuint program = %d)", program);
 
     try
     {
@@ -2398,7 +2420,7 @@
 
 GLboolean __stdcall glIsRenderbuffer(GLuint renderbuffer)
 {
-    TRACE("GLuint renderbuffer = %d", renderbuffer);
+    TRACE("(GLuint renderbuffer = %d)", renderbuffer);
 
     try
     {
@@ -2424,7 +2446,7 @@
 
 GLboolean __stdcall glIsShader(GLuint shader)
 {
-    TRACE("GLuint shader = %d", shader);
+    TRACE("(GLuint shader = %d)", shader);
 
     try
     {
@@ -2450,7 +2472,7 @@
 
 GLboolean __stdcall glIsTexture(GLuint texture)
 {
-    TRACE("GLuint texture = %d", texture);
+    TRACE("(GLuint texture = %d)", texture);
 
     try
     {
@@ -2476,7 +2498,7 @@
 
 void __stdcall glLineWidth(GLfloat width)
 {
-    TRACE("GLfloat width = %f", width);
+    TRACE("(GLfloat width = %f)", width);
 
     try
     {
@@ -2498,7 +2520,7 @@
 
 void __stdcall glLinkProgram(GLuint program)
 {
-    TRACE("GLuint program = %d", program);
+    TRACE("(GLuint program = %d)", program);
 
     try
     {
@@ -2524,7 +2546,7 @@
 
 void __stdcall glPixelStorei(GLenum pname, GLint param)
 {
-    TRACE("GLenum pname = 0x%X, GLint param = %d", pname, param);
+    TRACE("(GLenum pname = 0x%X, GLint param = %d)", pname, param);
 
     try
     {
@@ -2565,7 +2587,7 @@
 
 void __stdcall glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    TRACE("GLfloat factor = %f, GLfloat units = %f", factor, units);
+    TRACE("(GLfloat factor = %f, GLfloat units = %f)", factor, units);
 
     try
     {
@@ -2582,7 +2604,9 @@
 
 void __stdcall glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void* pixels)
 {
-    TRACE("GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, GLenum format = 0x%X, GLenum type = 0x%X, void* pixels = 0x%0.8p", x, y, width, height, format, type,  pixels);
+    TRACE("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d, "
+          "GLenum format = 0x%X, GLenum type = 0x%X, void* pixels = 0x%0.8p)",
+          x, y, width, height, format, type,  pixels);
 
     try
     {
@@ -2630,7 +2654,7 @@
 
 void __stdcall glReleaseShaderCompiler(void)
 {
-    TRACE("");
+    TRACE("()");
 
     try
     {
@@ -2644,7 +2668,8 @@
 
 void __stdcall glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    TRACE("GLenum target = 0x%X, GLenum internalformat = 0x%X, GLsizei width = %d, GLsizei height = %d", target, internalformat, width, height);
+    TRACE("(GLenum target = 0x%X, GLenum internalformat = 0x%X, GLsizei width = %d, GLsizei height = %d)",
+          target, internalformat, width, height);
 
     try
     {
@@ -2709,7 +2734,7 @@
 
 void __stdcall glSampleCoverage(GLclampf value, GLboolean invert)
 {
-    TRACE("GLclampf value = %f, GLboolean invert = %d", value, invert);
+    TRACE("(GLclampf value = %f, GLboolean invert = %d)", value, invert);
 
     try
     {
@@ -2729,7 +2754,7 @@
 
 void __stdcall glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    TRACE("GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d", x, y, width, height);
+    TRACE("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", x, y, width, height);
 
     try
     {
@@ -2756,8 +2781,9 @@
 
 void __stdcall glShaderBinary(GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizei length)
 {
-    TRACE("GLsizei n = %d, const GLuint* shaders = 0x%0.8p, GLenum binaryformat = 0x%X, const void* binary = 0x%0.8p, GLsizei length = %d",
-           n, shaders, binaryformat, binary, length);
+    TRACE("(GLsizei n = %d, const GLuint* shaders = 0x%0.8p, GLenum binaryformat = 0x%X, "
+          "const void* binary = 0x%0.8p, GLsizei length = %d)",
+          n, shaders, binaryformat, binary, length);
 
     try
     {
@@ -2776,7 +2802,8 @@
 
 void __stdcall glShaderSource(GLuint shader, GLsizei count, const char** string, const GLint* length)
 {
-    TRACE("GLuint shader = %d, GLsizei count = %d, const char** string = 0x%0.8p, const GLint* length = 0x%0.8p", shader, count, string, length);
+    TRACE("(GLuint shader = %d, GLsizei count = %d, const char** string = 0x%0.8p, const GLint* length = 0x%0.8p)",
+          shader, count, string, length);
 
     try
     {
@@ -2812,7 +2839,7 @@
 
 void __stdcall glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
 {
-    TRACE("GLenum face = 0x%X, GLenum func = 0x%X, GLint ref = %d, GLuint mask = %d", face, func, ref, mask);
+    TRACE("(GLenum face = 0x%X, GLenum func = 0x%X, GLint ref = %d, GLuint mask = %d)", face, func, ref, mask);
 
     try
     {
@@ -2873,7 +2900,7 @@
 
 void __stdcall glStencilMaskSeparate(GLenum face, GLuint mask)
 {
-    TRACE("GLenum face = 0x%X, GLuint mask = %d", face, mask);
+    TRACE("(GLenum face = 0x%X, GLuint mask = %d)", face, mask);
 
     try
     {
@@ -2915,7 +2942,8 @@
 
 void __stdcall glStencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass)
 {
-    TRACE("GLenum face = 0x%X, GLenum fail = 0x%X, GLenum zfail = 0x%X, GLenum zpas = 0x%Xs", face, fail, zfail, zpass);
+    TRACE("(GLenum face = 0x%X, GLenum fail = 0x%X, GLenum zfail = 0x%X, GLenum zpas = 0x%Xs)",
+          face, fail, zfail, zpass);
 
     try
     {
@@ -3001,7 +3029,9 @@
 
 void __stdcall glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void* pixels)
 {
-    TRACE("GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, GLsizei height = %d, GLint border = %d, GLenum format = 0x%X, GLenum type = 0x%X, const void* pixels =  0x%0.8p", target, level, internalformat, width, height, border, format, type, pixels);
+    TRACE("(GLenum target = 0x%X, GLint level = %d, GLint internalformat = %d, GLsizei width = %d, GLsizei height = %d, "
+          "GLint border = %d, GLenum format = 0x%X, GLenum type = 0x%X, const void* pixels =  0x%0.8p)",
+          target, level, internalformat, width, height, border, format, type, pixels);
 
     try
     {
@@ -3158,7 +3188,7 @@
 
 void __stdcall glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    TRACE("GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat param = %f", target, pname, param);
+    TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLfloat param = %f)", target, pname, param);
 
     try
     {
@@ -3224,7 +3254,9 @@
 
 void __stdcall glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void* pixels)
 {
-    TRACE("GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, GLsizei width = %d, GLsizei height = %d, GLenum format = 0x%X, GLenum type = 0x%X, const void* pixels = 0x%0.8p",
+    TRACE("(GLenum target = 0x%X, GLint level = %d, GLint xoffset = %d, GLint yoffset = %d, "
+          "GLsizei width = %d, GLsizei height = %d, GLenum format = 0x%X, GLenum type = 0x%X, "
+          "const void* pixels = 0x%0.8p)",
            target, level, xoffset, yoffset, width, height, format, type, pixels);
 
     try
@@ -3299,7 +3331,7 @@
 
 void __stdcall glUniform1fv(GLint location, GLsizei count, const GLfloat* v)
 {
-    TRACE("GLint location = %d, GLsizei count = %d, const GLfloat* v = 0x%0.8p", location, count, v);
+    TRACE("(GLint location = %d, GLsizei count = %d, const GLfloat* v = 0x%0.8p)", location, count, v);
 
     try
     {
@@ -3343,7 +3375,7 @@
 
 void __stdcall glUniform1iv(GLint location, GLsizei count, const GLint* v)
 {
-    TRACE("GLint location = %d, GLsizei count = %d, const GLint* v = 0x%0.8p", location, count, v);
+    TRACE("(GLint location = %d, GLsizei count = %d, const GLint* v = 0x%0.8p)", location, count, v);
 
     try
     {
@@ -3384,7 +3416,7 @@
 
 void __stdcall glUniform2fv(GLint location, GLsizei count, const GLfloat* v)
 {
-    TRACE("GLint location = %d, GLsizei count = %d, const GLfloat* v = 0x%0.8p", location, count, v);
+    TRACE("(GLint location = %d, GLsizei count = %d, const GLfloat* v = 0x%0.8p)", location, count, v);
 
     try
     {
@@ -3430,7 +3462,7 @@
 
 void __stdcall glUniform2iv(GLint location, GLsizei count, const GLint* v)
 {
-    TRACE("GLint location = %d, GLsizei count = %d, const GLint* v = 0x%0.8p", location, count, v);
+    TRACE("(GLint location = %d, GLsizei count = %d, const GLint* v = 0x%0.8p)", location, count, v);
 
     try
     {
@@ -3456,7 +3488,7 @@
 
 void __stdcall glUniform3fv(GLint location, GLsizei count, const GLfloat* v)
 {
-    TRACE("GLint location = %d, GLsizei count = %d, const GLfloat* v = 0x%0.8p", location, count, v);
+    TRACE("(GLint location = %d, GLsizei count = %d, const GLfloat* v = 0x%0.8p)", location, count, v);
 
     try
     {
@@ -3502,7 +3534,7 @@
 
 void __stdcall glUniform3iv(GLint location, GLsizei count, const GLint* v)
 {
-    TRACE("GLint location = %d, GLsizei count = %d, const GLint* v = 0x%0.8p", location, count, v);
+    TRACE("(GLint location = %d, GLsizei count = %d, const GLint* v = 0x%0.8p)", location, count, v);
 
     try
     {
@@ -3528,7 +3560,7 @@
 
 void __stdcall glUniform4fv(GLint location, GLsizei count, const GLfloat* v)
 {
-    TRACE("GLint location = %d, GLsizei count = %d, const GLfloat* v = 0x%0.8p", location, count, v);
+    TRACE("(GLint location = %d, GLsizei count = %d, const GLfloat* v = 0x%0.8p)", location, count, v);
 
     try
     {
@@ -3574,7 +3606,7 @@
 
 void __stdcall glUniform4iv(GLint location, GLsizei count, const GLint* v)
 {
-    TRACE("GLint location = %d, GLsizei count = %d, const GLint* v = 0x%0.8p", location, count, v);
+    TRACE("(GLint location = %d, GLsizei count = %d, const GLint* v = 0x%0.8p)", location, count, v);
 
     try
     {
@@ -3593,7 +3625,8 @@
 
 void __stdcall glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
 {
-    TRACE("GLint location = %d, GLsizei count = %d, GLboolean transpose = %d, const GLfloat* value = 0x%0.8p", location, count, transpose, value);
+    TRACE("(GLint location = %d, GLsizei count = %d, GLboolean transpose = %d, const GLfloat* value = 0x%0.8p)",
+          location, count, transpose, value);
 
     try
     {
@@ -3632,7 +3665,8 @@
 
 void __stdcall glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
 {
-    TRACE("GLint location = %d, GLsizei count = %d, GLboolean transpose = %d, const GLfloat* value = 0x%0.8p", location, count, transpose, value);
+    TRACE("(GLint location = %d, GLsizei count = %d, GLboolean transpose = %d, const GLfloat* value = 0x%0.8p)",
+          location, count, transpose, value);
 
     try
     {
@@ -3671,7 +3705,8 @@
 
 void __stdcall glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
 {
-    TRACE("GLint location = %d, GLsizei count = %d, GLboolean transpose = %d, const GLfloat* value = 0x%0.8p", location, count, transpose, value);
+    TRACE("(GLint location = %d, GLsizei count = %d, GLboolean transpose = %d, const GLfloat* value = 0x%0.8p)",
+          location, count, transpose, value);
 
     try
     {
@@ -3710,7 +3745,7 @@
 
 void __stdcall glUseProgram(GLuint program)
 {
-    TRACE("GLuint program = %d", program);
+    TRACE("(GLuint program = %d)", program);
 
     try
     {
@@ -3736,7 +3771,7 @@
 
 void __stdcall glValidateProgram(GLuint program)
 {
-    TRACE("GLuint program = %d", program);
+    TRACE("(GLuint program = %d)", program);
 
     try
     {
@@ -3750,7 +3785,7 @@
 
 void __stdcall glVertexAttrib1f(GLuint index, GLfloat x)
 {
-    TRACE("GLuint index = %d, GLfloat x = %f", index, x);
+    TRACE("(GLuint index = %d, GLfloat x = %f)", index, x);
 
     try
     {
@@ -3769,7 +3804,7 @@
 
 void __stdcall glVertexAttrib1fv(GLuint index, const GLfloat* values)
 {
-    TRACE("GLuint index = %d, const GLfloat* values = 0x%0.8p", index, values);
+    TRACE("(GLuint index = %d, const GLfloat* values = 0x%0.8p)", index, values);
 
     try
     {
@@ -3788,7 +3823,7 @@
 
 void __stdcall glVertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
 {
-    TRACE("GLuint index = %d, GLfloat x = %f, GLfloat y = %f", index, x, y);
+    TRACE("(GLuint index = %d, GLfloat x = %f, GLfloat y = %f)", index, x, y);
 
     try
     {
@@ -3807,7 +3842,7 @@
 
 void __stdcall glVertexAttrib2fv(GLuint index, const GLfloat* values)
 {
-    TRACE("GLuint index = %d, const GLfloat* values = 0x%0.8p", index, values);
+    TRACE("(GLuint index = %d, const GLfloat* values = 0x%0.8p)", index, values);
 
     try
     {
@@ -3826,7 +3861,7 @@
 
 void __stdcall glVertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
-    TRACE("GLuint index = %d, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f", index, x, y, z);
+    TRACE("(GLuint index = %d, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f)", index, x, y, z);
 
     try
     {
@@ -3845,7 +3880,7 @@
 
 void __stdcall glVertexAttrib3fv(GLuint index, const GLfloat* values)
 {
-    TRACE("GLuint index = %d, const GLfloat* values = 0x%0.8p", index, values);
+    TRACE("(GLuint index = %d, const GLfloat* values = 0x%0.8p)", index, values);
 
     try
     {
@@ -3864,7 +3899,7 @@
 
 void __stdcall glVertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    TRACE("GLuint index = %d, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f, GLfloat w = %f", index, x, y, z, w);
+    TRACE("(GLuint index = %d, GLfloat x = %f, GLfloat y = %f, GLfloat z = %f, GLfloat w = %f)", index, x, y, z, w);
 
     try
     {
@@ -3883,7 +3918,7 @@
 
 void __stdcall glVertexAttrib4fv(GLuint index, const GLfloat* values)
 {
-    TRACE("GLuint index = %d, const GLfloat* values = 0x%0.8p", index, values);
+    TRACE("(GLuint index = %d, const GLfloat* values = 0x%0.8p)", index, values);
 
     try
     {
@@ -3902,7 +3937,9 @@
 
 void __stdcall glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr)
 {
-    TRACE("GLuint index = %d, GLint size = %d, GLenum type = 0x%X, GLboolean normalized = %d, GLsizei stride = %d, const void* ptr = 0x%0.8p", index, size, type, normalized, stride, ptr);
+    TRACE("(GLuint index = %d, GLint size = %d, GLenum type = 0x%X, "
+          "GLboolean normalized = %d, GLsizei stride = %d, const void* ptr = 0x%0.8p)",
+          index, size, type, normalized, stride, ptr);
 
     try
     {
@@ -3954,7 +3991,7 @@
 
 void __stdcall glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    TRACE("GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d", x, y, width, height);
+    TRACE("(GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)", x, y, width, height);
 
     try
     {
@@ -3981,7 +4018,9 @@
 
 void __stdcall glTexImage3DOES(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void* pixels)
 {
-    TRACE("GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLint border = %d, GLenum format = 0x%X, GLenum type = 0x%x, const void* pixels = 0x%0.8p",
+    TRACE("(GLenum target = 0x%X, GLint level = %d, GLenum internalformat = 0x%X, "
+          "GLsizei width = %d, GLsizei height = %d, GLsizei depth = %d, GLint border = %d, "
+          "GLenum format = 0x%X, GLenum type = 0x%x, const void* pixels = 0x%0.8p)",
           target, level, internalformat, width, height, depth, border, format, type, pixels);
 
     try