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

ole32: Rename PROPERTY_NAME_*_LEN to DIRENTRY_NAME_*_LEN.

This commit is contained in:
Vincent Povirk 2009-11-11 10:31:55 -06:00 committed by Alexandre Julliard
parent 86759988f1
commit 74d0503026
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/ole32/storage32.c
View File

@ -853,7 +853,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream(
newStreamProperty.sizeOfNameString =
( lstrlenW(pwcsName)+1 ) * sizeof(WCHAR);
if (newStreamProperty.sizeOfNameString > PROPERTY_NAME_BUFFER_LEN)
if (newStreamProperty.sizeOfNameString > DIRENTRY_NAME_BUFFER_LEN)
return STG_E_INVALIDNAME;
strcpyW(newStreamProperty.name, pwcsName);
@ -1033,7 +1033,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage(
newProperty.sizeOfNameString = (lstrlenW(pwcsName)+1)*sizeof(WCHAR);
if (newProperty.sizeOfNameString > PROPERTY_NAME_BUFFER_LEN)
if (newProperty.sizeOfNameString > DIRENTRY_NAME_BUFFER_LEN)
{
FIXME("name too long\n");
return STG_E_INVALIDNAME;
@ -3052,7 +3052,7 @@ void UpdateRawDirEntry(BYTE *buffer, const DirEntry *newData)
memcpy(
buffer + OFFSET_PS_NAME,
newData->name,
PROPERTY_NAME_BUFFER_LEN );
DIRENTRY_NAME_BUFFER_LEN );
memcpy(buffer + OFFSET_PS_STGTYPE, &newData->propertyType, 1);
@ -3137,7 +3137,7 @@ BOOL StorageImpl_ReadDirEntry(
memcpy(
buffer->name,
propName,
PROPERTY_NAME_BUFFER_LEN );
DIRENTRY_NAME_BUFFER_LEN );
TRACE("storage name: %s\n", debugstr_w(buffer->name));
memcpy(&buffer->propertyType, currentProperty + OFFSET_PS_STGTYPE, 1);
@ -5840,8 +5840,8 @@ HRESULT WINAPI StgOpenStorage(
/* prepare the file name string given in lieu of the root property name */
GetFullPathNameW(pwcsName, MAX_PATH, fullname, NULL);
memcpy(newStorage->filename, fullname, PROPERTY_NAME_BUFFER_LEN);
newStorage->filename[PROPERTY_NAME_BUFFER_LEN-1] = '\0';
memcpy(newStorage->filename, fullname, DIRENTRY_NAME_BUFFER_LEN);
newStorage->filename[DIRENTRY_NAME_BUFFER_LEN-1] = '\0';
/*
* Get an "out" pointer for the caller.

8
dlls/ole32/storage32.h
View File

@ -74,8 +74,8 @@ static const ULONG BLOCK_END_OF_CHAIN = 0xFFFFFFFE;
static const ULONG BLOCK_UNUSED = 0xFFFFFFFF;
static const ULONG DIRENTRY_NULL = 0xFFFFFFFF;
#define PROPERTY_NAME_MAX_LEN 0x20
#define PROPERTY_NAME_BUFFER_LEN 0x40
#define DIRENTRY_NAME_MAX_LEN 0x20
#define DIRENTRY_NAME_BUFFER_LEN 0x40
#define PROPSET_BLOCK_SIZE 0x00000080
@ -127,7 +127,7 @@ typedef struct StgStreamImpl StgStreamImpl;
*/
struct DirEntry
{
WCHAR name[PROPERTY_NAME_MAX_LEN];
WCHAR name[DIRENTRY_NAME_MAX_LEN];
WORD sizeOfNameString;
BYTE propertyType;
ULONG leftChild;
@ -255,7 +255,7 @@ struct StorageImpl
The behaviour of STGM_SIMPLE depends on this */
/* FIXME: should this be in Storage32BaseImpl ? */
WCHAR filename[PROPERTY_NAME_BUFFER_LEN];
WCHAR filename[DIRENTRY_NAME_BUFFER_LEN];
/*
* File header