Merge pull request #233 from fiendish/development

Development
fiendish · Dec 29, 2015 · a27dc2d · a27dc2d
2 parents e7a48ed + eaaecdf
commit a27dc2d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/MUSHclient/AardwolfPackageChanges.txt b/MUSHclient/AardwolfPackageChanges.txt
@@ -1,5 +1,9 @@
 Aardwolf Client Package Major Changes List
 
+r1851 snapshot:
+- bug fix: Windows XP returns error 1026 if an FO_DELETE operation is attempted for a file that doesn't exist (updater)
+- bug fix: string comparisons should be plain (updater)
+
 r1850 snapshot:
 - misc change: with GMCP mapper cexits it should now be possible to visually draw exits between rooms that are nomap but still actually unique. You have to manually flag the room to ignore exits mismatches and then create a single-letter direction cexit. This will probably fail in funny ways for non-unique rooms.
 - bug fix: ascii map plugin will no longer request map updates if a room description kinda sorta looks like a door opening or closing.

diff --git a/MUSHclient/lua/aard_lua_ffi.lua b/MUSHclient/lua/aard_lua_ffi.lua
@@ -163,7 +163,7 @@ local function CheckForWinError(err, acceptable_errors)
       local str = ffi_charstr(1024, 0)
       local errlen = ffi.C.FormatMessageA(ffi.C.FORMAT_MESSAGE_FROM_SYSTEM + ffi.C.FORMAT_MESSAGE_IGNORE_INSERTS, nil, err, 0, str, 1023, nil)
       if errlen == 0 then
-         ColourNote("yellow", "red", "Received Win32 error code: "..tostring(err).."but encountered another error calling FormatMessageA")
+         ColourNote("yellow", "red", "Received Win32 error code: "..tostring(err).." but encountered another error calling FormatMessageA")
          ColourNote("yellow", "red", "Try to see what this code means at:")
          ColourNote("yellow", "red", "    https://msdn.microsoft.com/en-us/library/windows/desktop/ms681381.aspx")
       else
@@ -206,7 +206,7 @@ local function RestrictPathScope(path)
    end
 
    canonical_path = ffi.string(canonical_path)
-   if canonical_path:find(ffi.string(mushclient_canonical_path)) ~= 1 then
+   if canonical_path:find(ffi.string(mushclient_canonical_path), nil, true) ~= 1 then
       ColourNote("yellow", "red", "ERROR: A script just tried to operate on a file outside of your MUSHclient directory.")
       ColourNote("yellow", "red", "The action has been prevented.")
       ColourNote("yellow", "red", "Details:")
@@ -240,7 +240,7 @@ local function DeleteFile(pathname, recursive, acceptable_errors)
       return false
    end
 
-   acceptable_errors = acceptable_errors or {2} -- already gone
+   acceptable_errors = acceptable_errors or {2, 1026} -- already gone
 
    local SHDeleteFlags = ffi.C.FOF_NOCONFIRMATION + ffi.C.FOF_NOERRORUI + ffi.C.FOF_SILENT
    if not recursive then