From afb90f6d90fa1f35b5a795c44b0b5254ab180887 Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Mon, 20 Feb 2006 01:56:34 +0000
Subject: [PATCH] Check .xwd files coming back from OpenFile dlg, and reject
 with msg to user those that aren't valid.  This catches corrupt files and
 other app files ending with .xwd.

---
 xwords4/wince/cedict.c | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/xwords4/wince/cedict.c b/xwords4/wince/cedict.c
index 3510b093d..a74a594bf 100755
--- a/xwords4/wince/cedict.c
+++ b/xwords4/wince/cedict.c
@@ -45,6 +45,8 @@ static XP_U8* openMappedFile( MPFORMAL const wchar_t* name,
                               HANDLE* mappedFileP, HANDLE* hFileP, 
                               XP_U32* sizep );
 static void closeMappedFile( MPFORMAL XP_U8* base, HANDLE mappedFile );
+static XP_Bool checkIfDictAndLegal( MPFORMAL wchar_t* path, XP_U16 pathLen, 
+                                    wchar_t* name );
 
 #define ALIGN_COUNT 2
 
@@ -434,9 +436,21 @@ ce_pickDictFile( CEAppGlobals* globals, XP_UCHAR* buf, XP_U16 bufLen )
     openFileStruct.lpstrFile = nameBuf;
     openFileStruct.nMaxFile = sizeof(nameBuf)/sizeof(nameBuf[0]);
 
-    if ( GetOpenFileName( &openFileStruct ) ) {
+    while ( GetOpenFileName( &openFileStruct ) ) {
         XP_U16 len;
         XP_UCHAR multiBuf[256];
+
+        if ( !checkIfDictAndLegal( MPPARM(globals->mpool) nameBuf, 
+                                   openFileStruct.nFileOffset, 
+                                   nameBuf + openFileStruct.nFileOffset ) ) {
+            wchar_t errBuf[128];
+            (void)swprintf( errBuf,
+                            L"\"%s\" is not a valid Crosswords dictionary.",
+                            nameBuf + openFileStruct.nFileOffset );
+            MessageBox( globals->hWnd, errBuf, NULL, MB_OK );
+            continue;
+        }
+
         len = WideCharToMultiByte( CP_ACP, 0, nameBuf, wcslen(nameBuf),
                                    multiBuf,
                                    sizeof(multiBuf), NULL, NULL );
@@ -447,6 +461,7 @@ ce_pickDictFile( CEAppGlobals* globals, XP_UCHAR* buf, XP_U16 bufLen )
             XP_MEMCPY( buf, multiBuf, len );
             buf[len] = '\0';
             result = XP_TRUE;
+            break;
         }
     }
 
@@ -544,10 +559,9 @@ closeMappedFile( MPFORMAL XP_U8* base, HANDLE mappedFile )
 
 static XP_Bool
 checkIfDictAndLegal( MPFORMAL wchar_t* path, XP_U16 pathLen, 
-                     DH(WIN32_FIND_DATA)* data )
+                     wchar_t* name )
 {
     XP_Bool result = XP_FALSE;
-    wchar_t* name = data->cFileName;
     XP_U16 len;
 
     len = wcslen(name);
@@ -630,7 +644,7 @@ locateOneDir( MPFORMAL wchar_t* path, XP_U16* which )
                 path[startLen] = 0;
 #endif
             } else if ( checkIfDictAndLegal( MPPARM(mpool) path, startLen,
-                                             &data )
+                                             data.cFileName )
                         && (*which-- == 0)) {
                 /* we're done! */
                 DH(lstrcpy)( path+startLen, data.cFileName );