ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Move StgIsStorageFile16's implementation to StgIsStorageFile; port 

it to Win32.
- Move StgIsStorageFile from storage.c to storage32.c.
- StgIsStorageFile only returns S_OK, STG_E_FILENOTFOUND, and S_FALSE.
- StgIsStorageFile doesn't check if a file is large enough to be a
  storage file, it only checks for the presence of the 8-byte magic.
This commit is contained in:
Ryan Cumming 2002-11-18 19:43:58 +00:00 committed by Alexandre Julliard
parent 1e5d816a0d
commit 42867265ca
2 changed files with 48 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
dlls/ole32/storage.c
View File

@ -76,8 +76,6 @@ struct storage_pps_entry {
static const BYTE STORAGE_magic[8] ={0xd0,0xcf,0x11,0xe0,0xa1,0xb1,0x1a,0xe1};
static const BYTE STORAGE_notmagic[8]={0x0e,0x11,0xfc,0x0d,0xd0,0xcf,0x11,0xe0};
static const BYTE STORAGE_oldmagic[8]={0xd0,0xcf,0x11,0xe0,0x0e,0x11,0xfc,0x0d};
#define BIGSIZE 512
#define SMALLSIZE 64
@ -1638,56 +1636,16 @@ HRESULT WINAPI StgCreateDocFile16(
* StgIsStorageFile [STORAGE.5]
*/
HRESULT WINAPI StgIsStorageFile16(LPCOLESTR16 fn) {
HFILE hf;
OFSTRUCT ofs;
BYTE magic[24];
UNICODE_STRING strW;
HRESULT ret;
TRACE("(\'%s\')\n",fn);
hf = OpenFile(fn,&ofs,OF_SHARE_DENY_NONE);
if (hf==HFILE_ERROR)
return STG_E_FILENOTFOUND;
if (24!=_lread(hf,magic,24)) {
WARN(" too short\n");
_lclose(hf);
return S_FALSE;
}
if (!memcmp(magic,STORAGE_magic,8)) {
WARN(" -> YES\n");
_lclose(hf);
return S_OK;
}
if (!memcmp(magic,STORAGE_notmagic,8)) {
WARN(" -> NO\n");
_lclose(hf);
return S_FALSE;
}
if (!memcmp(magic,STORAGE_oldmagic,8)) {
WARN(" -> old format\n");
_lclose(hf);
return STG_E_OLDFORMAT;
}
WARN(" -> Invalid header.\n");
_lclose(hf);
return STG_E_INVALIDHEADER;
RtlCreateUnicodeStringFromAsciiz(&strW, fn);
ret = StgIsStorageFile( strW.Buffer );
RtlFreeUnicodeString( &strW );
return ret;
}
/******************************************************************************
* StgIsStorageFile [OLE32.146]
*/
HRESULT WINAPI
StgIsStorageFile(LPCOLESTR fn)
{
HRESULT ret;
DWORD len = WideCharToMultiByte( CP_ACP, 0, fn, -1, NULL, 0, NULL, NULL );
LPSTR strA = HeapAlloc( GetProcessHeap(), 0, len );
WideCharToMultiByte( CP_ACP, 0, fn, -1, strA, len, NULL, NULL );
ret = StgIsStorageFile16(strA);
HeapFree( GetProcessHeap(), 0, strA );
return ret;
}
/******************************************************************************
* StgOpenStorage [STORAGE.3]
*/

41
dlls/ole32/storage32.c
View File

@ -7155,3 +7155,44 @@ HRESULT WINAPI GetConvertStg(LPGUID guid) {
FIXME("(%s), unimplemented stub!\n",debugstr_guid(guid));
return E_FAIL;
}
/******************************************************************************
* StgIsStorageFile [OLE32.146]
*/
HRESULT WINAPI
StgIsStorageFile(LPCOLESTR fn)
{
HANDLE hf;
BYTE magic[8];
DWORD bytes_read;
TRACE("(\'%s\')\n", debugstr_w(fn));
hf = CreateFileW(fn, GENERIC_READ,
FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
if (hf == INVALID_HANDLE_VALUE)
return STG_E_FILENOTFOUND;
if (!ReadFile(hf, magic, 8, &bytes_read, NULL))
{
WARN(" unable to read file\n");
CloseHandle(hf);
return S_FALSE;
}
CloseHandle(hf);
if (bytes_read != 8) {
WARN(" too short\n");
return S_FALSE;
}
if (!memcmp(magic,STORAGE_magic,8)) {
WARN(" -> YES\n");
return S_OK;
}
WARN(" -> Invalid header.\n");
return S_FALSE;
}