[matroska] r804 - in trunk/DvdMenuXtractor: . libdvdread/win32

Author: robux4
Date: 2004-09-14 17:21:57 +0400 (Tue, 14 Sep 2004)
New Revision: 804

Modified:
   trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
   trunk/DvdMenuXtractor/libdvdread/win32/inttypes.h
Log:
fix bugs when using a directory

Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2004-09-14 12:31:09 UTC (rev 803)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2004-09-14 13:21:57 UTC (rev 804)
@@ -239,8 +239,9 @@
         }
 
         try
-        {
-            IfoFile = new IFOFile(m_edInDir->GetValue());
+        {
+			wxFileName _FileName(m_edInDir->GetValue());
+            IfoFile = new IFOFile(_FileName.GetPath());
         }
         catch(IFOException&)
         {

Modified: trunk/DvdMenuXtractor/libdvdread/win32/inttypes.h
===================================================================
--- trunk/DvdMenuXtractor/libdvdread/win32/inttypes.h	2004-09-14 12:31:09 UTC (rev 803)
+++ trunk/DvdMenuXtractor/libdvdread/win32/inttypes.h	2004-09-14 13:21:57 UTC (rev 804)
@@ -19,13 +19,13 @@
 #define strncasecmp(x,y,z) strnicmp(x,y,z)
 
 #ifndef S_ISREG
-#define S_ISREG(mode) ((mode)&_S_IFREG)
+#define S_ISREG(mode) (0)
 #endif
 #ifndef S_ISDIR
 #define S_ISDIR(mode) ((mode)&_S_IFDIR)
 #endif
 #ifndef S_ISCHR
-#define S_ISCHR(mode) ((mode)&_S_IFMT)
+#define S_ISCHR(mode) (0)
 #endif
 #ifndef S_ISSOCK
 #define S_ISSOCK(x) (0)