Merged cptspiff's code-reshuffle branch.

Squashed commit due to build breakage during code-reshuffle history.

Conflicts:
	xbmc/Util.cpp
	xbmc/cdrip/CDDARipper.cpp
	xbmc/filesystem/Directory.cpp
	xbmc/filesystem/File.cpp

1 files changed, 139 insertions, 0 deletions

diff --git a/lib/UnrarXLib/win32acl.cpp b/lib/UnrarXLib/win32acl.cpp
new file mode 100644
index 0000000000..5e228b89a7
--- /dev/null
+++ b/lib/UnrarXLib/win32acl.cpp
@@ -0,0 +1,139 @@
+static void SetPrivileges();
+
+static bool ReadSacl=false;
+
+
+
+#ifndef SFX_MODULE
+void ExtractACL(Archive &Arc,char *FileName,wchar *FileNameW)
+{
+#if defined(_XBOX) || defined (_LINUX)
+  return;
+#else
+  if (!WinNT())
+    return;
+
+  SetPrivileges();
+
+  if (Arc.HeaderCRC!=Arc.EAHead.HeadCRC)
+  {
+    Log(Arc.FileName,St(MACLBroken),FileName);
+    ErrHandler.SetErrorCode(CRC_ERROR);
+    return;
+  }
+
+  if (Arc.EAHead.Method<0x31 || Arc.EAHead.Method>0x35 || Arc.EAHead.UnpVer>PACK_VER)
+  {
+    Log(Arc.FileName,St(MACLUnknown),FileName);
+    ErrHandler.SetErrorCode(WARNING);
+    return;
+  }
+
+  ComprDataIO DataIO;
+  Unpack Unpack(&DataIO);
+  Unpack.Init();
+
+  Array<unsigned char> UnpData(Arc.EAHead.UnpSize);
+  DataIO.SetUnpackToMemory(&UnpData[0],Arc.EAHead.UnpSize);
+  DataIO.SetPackedSizeToRead(Arc.EAHead.DataSize);
+  DataIO.EnableShowProgress(false);
+  DataIO.SetFiles(&Arc,NULL);
+  Unpack.SetDestSize(Arc.EAHead.UnpSize);
+  Unpack.DoUnpack(Arc.EAHead.UnpVer,false);
+
+  if (Arc.EAHead.EACRC!=~DataIO.UnpFileCRC)
+  {
+    Log(Arc.FileName,St(MACLBroken),FileName);
+    ErrHandler.SetErrorCode(CRC_ERROR);
+    return;
+  }
+
+  SECURITY_INFORMATION  si=OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|
+                           DACL_SECURITY_INFORMATION;
+  if (ReadSacl)
+    si|=SACL_SECURITY_INFORMATION;
+  SECURITY_DESCRIPTOR *sd=(SECURITY_DESCRIPTOR *)&UnpData[0];
+
+  int SetCode;
+  if (FileNameW!=NULL)
+    SetCode=SetFileSecurityW(FileNameW,si,sd);
+  else
+    SetCode=SetFileSecurity(FileName,si,sd);
+
+  if (!SetCode)
+  {
+    Log(Arc.FileName,St(MACLSetError),FileName);
+    ErrHandler.SysErrMsg();
+    ErrHandler.SetErrorCode(WARNING);
+  }
+#endif
+}
+#endif
+
+
+void ExtractACLNew(Archive &Arc,char *FileName,wchar *FileNameW)
+{
+#if defined(_XBOX) || defined(_LINUX)
+  return;
+#else
+  if (!WinNT())
+    return;
+
+  Array<byte> SubData;
+  if (!Arc.ReadSubData(&SubData,NULL))
+    return;
+
+  SetPrivileges();
+
+  SECURITY_INFORMATION  si=OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|
+                           DACL_SECURITY_INFORMATION;
+  if (ReadSacl)
+    si|=SACL_SECURITY_INFORMATION;
+  SECURITY_DESCRIPTOR *sd=(SECURITY_DESCRIPTOR *)&SubData[0];
+
+  int SetCode;
+  if (FileNameW!=NULL)
+    SetCode=SetFileSecurityW(FileNameW,si,sd);
+  else
+    SetCode=SetFileSecurity(FileName,si,sd);
+
+  if (!SetCode)
+  {
+    Log(Arc.FileName,St(MACLSetError),FileName);
+    ErrHandler.SysErrMsg();
+    ErrHandler.SetErrorCode(WARNING);
+  }
+#endif
+}
+
+
+void SetPrivileges()
+{
+#if defined(_XBOX) || defined(_LINUX)
+  return;
+#else
+  static bool InitDone=false;
+  if (InitDone)
+    return;
+  InitDone=true;
+
+  HANDLE hToken;
+
+  if(!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken))
+    return;
+
+  TOKEN_PRIVILEGES tp;
+  tp.PrivilegeCount = 1;
+  tp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
+
+  if (LookupPrivilegeValue(NULL,SE_SECURITY_NAME,&tp.Privileges[0].Luid))
+    if (AdjustTokenPrivileges(hToken, FALSE, &tp, 0, NULL, NULL) &&
+        GetLastError() == ERROR_SUCCESS)
+      ReadSacl=true;
+
+  if (LookupPrivilegeValue(NULL,SE_RESTORE_NAME,&tp.Privileges[0].Luid))
+    AdjustTokenPrivileges(hToken, FALSE, &tp, 0, NULL, NULL);
+
+  CloseHandle(hToken);
+#endif
+}