# HG changeset patch
# User ib
# Date 1304674546 0
# Node ID f0733d37f56b237882475d505abf4f1dd914a069
# Parent  9a7b0dab3d959e31549dd7a2cc9adb97355391d2
Fix bug with gfree() definition in Win32 GUI.

gfree (taking pointer of pointer) was erroneously defined
free (taking pointer).  Get rid of gfree() by using suitable
free() statements.

Patch by Stephen Sheldon, sfsheldo gmail com.

diff -r 9a7b0dab3d95 -r f0733d37f56b gui/win32/dialogs.h
--- a/gui/win32/dialogs.h	Fri May 06 08:47:18 2011 +0000
+++ b/gui/win32/dialogs.h	Fri May 06 09:35:46 2011 +0000
@@ -34,7 +34,6 @@
 #define SOLID_GREY (HBRUSH) CreateSolidBrush(RGB(232, 232, 232))
 #define SOLID_GREY2 (HBRUSH) CreateSolidBrush(RGB(175, 175, 175))
 
-#define gfree free
 
 #define MAXFILE 1024
 
diff -r 9a7b0dab3d95 -r f0733d37f56b gui/win32/interface.c
--- a/gui/win32/interface.c	Fri May 06 08:47:18 2011 +0000
+++ b/gui/win32/interface.c	Fri May 06 09:35:46 2011 +0000
@@ -433,8 +433,10 @@
         guiSetDF(guiIntfStruct.Filename, dir, name);
 
     guiIntfStruct.StreamType = type;
-    free((void **) &guiIntfStruct.AudioFile);
-    free((void **) &guiIntfStruct.Subtitlename);
+    free(guiIntfStruct.AudioFile);
+    guiIntfStruct.AudioFile = NULL;
+    free(guiIntfStruct.Subtitlename);
+    guiIntfStruct.Subtitlename = NULL;
 }
 
 void mplFullScreen( void )
diff -r 9a7b0dab3d95 -r f0733d37f56b gui/win32/preferences.c
--- a/gui/win32/preferences.c	Fri May 06 08:47:18 2011 +0000
+++ b/gui/win32/preferences.c	Fri May 06 09:35:46 2011 +0000
@@ -561,14 +561,14 @@
                     if(guiIntfStruct.Playing) guiGetEvent(guiCEvent, (void *)guiSetStop);
 
                     /* Set the video driver */
-                    gfree(video_driver_list[0]);
+                    free(video_driver_list[0]);
                     strl = SendMessage(vo_driver, CB_GETCURSEL, 0, 0);
                     video_driver_list[0] = malloc(strl);
                     SendMessage(vo_driver, CB_GETLBTEXT, (WPARAM)strl,
                                 (LPARAM)video_driver_list[0]);
 
                     /* Set the audio driver */
-                    gfree(audio_driver_list[0]);
+                    free(audio_driver_list[0]);
                     strl = SendMessage(ao_driver, CB_GETCURSEL, 0, 0);
                     audio_driver_list[0] = malloc(strl);
                     SendMessage(ao_driver, CB_GETLBTEXT, (WPARAM)strl,