shithub: choc

Download patch

ref: fdd021c5650584421751a91b81a98ed6dbc9ef2f
parent: 3ac144025a055a3b85c1f4b2ef05b6f2892788f5
author: Simon Howard <[email protected]>
date: Sun Mar 31 15:09:45 EDT 2013 

Fix file selector issues with Windows build.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2571


--- a/textscreen/txt_fileselect.c
+++ b/textscreen/txt_fileselect.c
@@ -149,8 +149,8 @@
 #include <shlobj.h>
 
 static BOOL WINAPI (*MyGetOpenFileName)(LPOPENFILENAME) = NULL;
-static PIDLIST_ABSOLUTE (*MySHBrowseForFolder)(LPBROWSEINFO) = NULL;
-static BOOL (*MySHGetPathFromIDList)(PCIDLIST_ABSOLUTE, LPTSTR) = NULL;
+static LPITEMIDLIST (*MySHBrowseForFolder)(LPBROWSEINFO) = NULL;
+static BOOL (*MySHGetPathFromIDList)(LPITEMIDLIST, LPTSTR) = NULL;
 
 // Load library functions from DLL files.
 
@@ -176,7 +176,7 @@
         && MySHGetPathFromIDList != NULL;
 }
 
-static InitLibraries(void)
+static int InitLibraries(void)
 {
     static int initted = 0, success = 0;
 
@@ -233,7 +233,6 @@
 {
     LPITEMIDLIST pidl;
     BROWSEINFO bi;
-    LPMALLOC allocator;
     char selected[MAX_PATH] = "";
     char *result;