1 files changed, 35 insertions, 4 deletions
diff --git a/src/Format/FormatCom.cpp b/src/Format/FormatCom.cpp
index 18653761..90333f23 100644
--- a/src/Format/FormatCom.cpp
+++ b/src/Format/FormatCom.cpp
@@ -160,60 +160,65 @@ public:
 	virtual DWORD STDMETHODCALLTYPE RestoreEfiSystemLoader ()
 	{
 		return BaseCom::RestoreEfiSystemLoader ();
 	}
 
 	virtual DWORD STDMETHODCALLTYPE GetEfiBootDeviceNumber (BSTR* pSdn)
 	{
 		return BaseCom::GetEfiBootDeviceNumber (pSdn);
 	}
 
 	virtual DWORD STDMETHODCALLTYPE GetSecureBootConfig (BOOL* pSecureBootEnabled, BOOL *pVeraCryptKeysLoaded)
 	{
 		return BaseCom::GetSecureBootConfig (pSecureBootEnabled, pVeraCryptKeysLoaded);
 	}
 
 	virtual DWORD STDMETHODCALLTYPE WriteEfiBootSectorUserConfig (DWORD userConfig, BSTR customUserMessage, int pim, int hashAlg)
 	{
 		return BaseCom::WriteEfiBootSectorUserConfig (userConfig, customUserMessage,pim, hashAlg);
 	}
 
 	virtual DWORD STDMETHODCALLTYPE UpdateSetupConfigFile (BOOL bForInstall)
 	{
 		return BaseCom::UpdateSetupConfigFile (bForInstall);
 	}
 
 	virtual DWORD STDMETHODCALLTYPE NotifyService (DWORD dwNotifyCode)
 	{
 		return BaseCom::NotifyService (dwNotifyCode);
 	}
 
+	virtual DWORD STDMETHODCALLTYPE FastFileResize (BSTR filePath, __int64 fileSize)
+	{
+		return BaseCom::FastFileResize (filePath, fileSize);
+	}
+
 protected:
 	DWORD MessageThreadId;
 	LONG RefCount;
 	ITrueCryptFormatCom *CallBack;
 };
 
 
 extern "C" BOOL ComServerFormat ()
 {
 	SetProcessShutdownParameters (0x100, 0);
 
 	TrueCryptFactory<TrueCryptFormatCom> factory (GetCurrentThreadId ());
 	DWORD cookie;
 
 	if (IsUacSupported ())
 		UacElevated = TRUE;
 
 	if (CoRegisterClassObject (CLSID_TrueCryptFormatCom, (LPUNKNOWN) &factory,
 		CLSCTX_LOCAL_SERVER, REGCLS_SINGLEUSE, &cookie) != S_OK)
 		return FALSE;
 
 	MSG msg;
 	while (int r = GetMessageW (&msg, NULL, 0, 0))
 	{
 		if (r == -1)
 			return FALSE;
 
 		TranslateMessage (&msg);
 		DispatchMessageW (&msg);
 
@@ -223,115 +228,141 @@ extern "C" BOOL ComServerFormat ()
 			break;
 	}
 	CoRevokeClassObject (cookie);
 
 	return TRUE;
 }
 
 
 static BOOL ComGetInstance (HWND hWnd, ITrueCryptFormatCom **tcServer)
 {
 	return ComGetInstanceBase (hWnd, CLSID_TrueCryptFormatCom, IID_ITrueCryptFormatCom, (void **) tcServer);
 }
 
 
 ITrueCryptFormatCom *GetElevatedInstance (HWND parent)
 {
 	ITrueCryptFormatCom *instance;
 
 	if (!ComGetInstance (parent, &instance))
 		throw UserAbort (SRC_POS);
 
 	return instance;
 }
 
 
 extern "C" int UacFormatNtfs (HWND hWnd, int driveNo, int clusterSize)
 {
 	CComPtr<ITrueCryptFormatCom> tc;
 	int r;
 
-	CoInitialize (NULL);
+	CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
 
 	if (ComGetInstance (hWnd, &tc))
 		r = tc->FormatNtfs (driveNo, clusterSize);
 	else
 		r = (int) GetLastError();
 
 	CoUninitialize ();
 
 	return r;
 }
 
 extern "C" int UacFormatFs (HWND hWnd, int driveNo, int clusterSize, int fsType)
 {
 	CComPtr<ITrueCryptFormatCom> tc;
 	int r;
 
-	CoInitialize (NULL);
+	CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
 
 	if (ComGetInstance (hWnd, &tc))
 		r = tc->FormatFs (driveNo, clusterSize, fsType);
 	else
 		r = (int) GetLastError();
 
 	CoUninitialize ();
 
 	return r;
 }
 
 
 extern "C" int UacAnalyzeHiddenVolumeHost (HWND hwndDlg, int *driveNo, __int64 hiddenVolHostSize, int *realClusterSize, __int64 *nbrFreeClusters)
 {
 	CComPtr<ITrueCryptFormatCom> tc;
 	int r;
 
-	CoInitialize (NULL);
+	CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
 
 	if (ComGetInstance (hwndDlg, &tc))
 		r = tc->AnalyzeHiddenVolumeHost ((__int64) hwndDlg, driveNo, hiddenVolHostSize, realClusterSize, nbrFreeClusters);
 	else
 		r = 0;
 
 	CoUninitialize ();
 
 	return r;
 }
 
 extern "C" BOOL UacWriteLocalMachineRegistryDword (HWND hwndDlg, wchar_t *keyPath, wchar_t *valueName, DWORD value)
 {
 	CComPtr<ITrueCryptFormatCom> tc;
 	int r = 0;
 
-	CoInitialize (NULL);
+	CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
 
 	if (ComGetInstance (hwndDlg, &tc))
 	{
 		CComBSTR keyPathBstr, valueNameBstr;
 		BSTR bstr = W2BSTR(keyPath);
 		if (bstr)
 		{
 			keyPathBstr.Attach (bstr);
 			bstr = W2BSTR(valueName);
 			if (bstr)
 			{
 				valueNameBstr.Attach (bstr);
 				r = tc->WriteLocalMachineRegistryDwordValue (keyPathBstr, valueNameBstr, value);
 			}
 			else
 				r = ERROR_OUTOFMEMORY;
 		}
 		else
 			r = ERROR_OUTOFMEMORY;
 	}
 
 	CoUninitialize ();
 
 	if (r == ERROR_SUCCESS)
 		return TRUE;
 	else
 	{
 		SetLastError (r);
 		return FALSE;
 	}
 }
 
+extern "C" DWORD UacFastFileCreation (HWND hWnd, wchar_t* filePath, __int64 fileSize)
+{
+	CComPtr<ITrueCryptFormatCom> tc;
+	DWORD r;
+
+	CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
+
+	if (ComGetInstance (hWnd, &tc))
+	{
+		CComBSTR filePathBstr;
+		BSTR bstr = W2BSTR(filePath);
+		if (bstr)
+		{
+			filePathBstr.Attach (bstr);
+			r = tc->FastFileResize (filePathBstr, fileSize);
+		}
+		else
+			r = ERROR_OUTOFMEMORY;
+	}
+	else
+		r = GetLastError();
+
+	CoUninitialize ();
+
+	return r;
+}