Merge pull request #123 from gameblabla/diablofix_hack

[pcsx_rearmed.git] / plugins / cdrcimg / cdrcimg.c

diff --git a/plugins/cdrcimg/cdrcimg.c b/plugins/cdrcimg/cdrcimg.c
index dd1cf57..91cf1ca 100644 (file)
--- a/plugins/cdrcimg/cdrcimg.c
+++ b/plugins/cdrcimg/cdrcimg.c
@@ -12,8 +12,13 @@
 #include <string.h>
 #include <stdlib.h>
 #include <zlib.h>
-#include <bzlib.h>
+#ifndef _WIN32
+#define CALLBACK
 #include <dlfcn.h>
+#else
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
 
 #include "cdrcimg.h"
 
@@ -45,12 +50,12 @@ static struct {
 static int current_block, current_sect_in_blk;
 
 struct CdrStat;
-extern long CDR__getStatus(struct CdrStat *stat);
+extern long CALLBACK CDR__getStatus(struct CdrStat *stat);
 
 struct CdrStat
 {
-       unsigned long Type;
-       unsigned long Status;
+       unsigned int Type;
+       unsigned int Status;
        unsigned char Time[3]; // current playing time
 };
 
@@ -93,7 +98,7 @@ static long CDRgetTD(unsigned char track, unsigned char *buffer)
        return 0;
 }
 
-int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size)
+static int uncompress2_pcsx(void *out, unsigned long *out_size, void *in, unsigned long in_size)
 {
        static z_stream z;
        int ret = 0;
@@ -194,7 +199,7 @@ static long CDRreadTrack(unsigned char *time)
                ret = uncompress(cdbuffer->raw[0], &cdbuffer_size, cdbuffer->compressed, size);
                break;
        case CDRC_ZLIB2:
-               ret = uncompress2(cdbuffer->raw[0], &cdbuffer_size, cdbuffer->compressed, size);
+               ret = uncompress2_pcsx(cdbuffer->raw[0], &cdbuffer_size, cdbuffer->compressed, size);
                break;
        case CDRC_BZ:
                ret = pBZ2_bzBuffToBuffDecompress((char *)cdbuffer->raw, (unsigned int *)&cdbuffer_size,
@@ -212,7 +217,7 @@ static long CDRreadTrack(unsigned char *time)
        }
        if (cdbuffer_size != sizeof(cdbuffer->raw[0]) * cd_sectors_per_blk)
                err("cdbuffer_size: %lu != %d, sector %d\n", cdbuffer_size,
-                       sizeof(cdbuffer->raw[0]) * cd_sectors_per_blk, sector);
+                       (int)sizeof(cdbuffer->raw[0]) * cd_sectors_per_blk, sector);
 
        // done at last!
        current_block = block;
@@ -280,6 +285,7 @@ static long CDRinit(void)
                        return -1;
                }
        }
+#ifndef _WIN32
        if (pBZ2_bzBuffToBuffDecompress == NULL) {
                void *h = dlopen("/usr/lib/libbz2.so.1", RTLD_LAZY);
                if (h == NULL)
@@ -292,6 +298,7 @@ static long CDRinit(void)
                        }
                }
        }
+#endif
        return 0;
 }