Skip to content

W
wine-winehq
Commit 224ddb50 authored by Vincent Povirk's avatar Vincent Povirk Committed by Alexandre Julliard
Browse files
Options

ole32: Clarify the timestamp fields in StgProperty.

According to the MS spec, these are FILETIME structures containing creation and modification times.
parent 70d43eb0
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 36 deletions
dlls/ole32/storage32.c
View file @ 224ddb50
...@@ -773,10 +773,8 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( ...@@ -773,10 +773,8 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement(
renamedProperty.dirProperty = currentProperty.dirProperty; renamedProperty.dirProperty = currentProperty.dirProperty;
/* call CoFileTime to get the current time /* call CoFileTime to get the current time
renamedProperty.timeStampS1 renamedProperty.ctime
renamedProperty.timeStampD1 renamedProperty.mtime
renamedProperty.timeStampS2
renamedProperty.timeStampD2
renamedProperty.propertyUniqueID renamedProperty.propertyUniqueID
*/ */
...@@ -967,10 +965,8 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( ...@@ -967,10 +965,8 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream(
newStreamProperty.dirProperty = PROPERTY_NULL; newStreamProperty.dirProperty = PROPERTY_NULL;
/* call CoFileTime to get the current time /* call CoFileTime to get the current time
newStreamProperty.timeStampS1 newStreamProperty.ctime
newStreamProperty.timeStampD1 newStreamProperty.mtime
newStreamProperty.timeStampS2
newStreamProperty.timeStampD2
*/ */
/* newStreamProperty.propertyUniqueID */ /* newStreamProperty.propertyUniqueID */
...@@ -1167,10 +1163,8 @@ static HRESULT WINAPI StorageImpl_CreateStorage( ...@@ -1167,10 +1163,8 @@ static HRESULT WINAPI StorageImpl_CreateStorage(
newProperty.dirProperty = PROPERTY_NULL; newProperty.dirProperty = PROPERTY_NULL;
/* call CoFileTime to get the current time /* call CoFileTime to get the current time
newProperty.timeStampS1 newProperty.ctime
newProperty.timeStampD1 newProperty.mtime
newProperty.timeStampS2
newProperty.timeStampD2
*/ */
/* newStorageProperty.propertyUniqueID */ /* newStorageProperty.propertyUniqueID */
...@@ -3234,23 +3228,23 @@ BOOL StorageImpl_ReadProperty( ...@@ -3234,23 +3228,23 @@ BOOL StorageImpl_ReadProperty(
StorageUtl_ReadDWord( StorageUtl_ReadDWord(
currentProperty, currentProperty,
OFFSET_PS_TSS1, OFFSET_PS_CTIMELOW,
&buffer->timeStampS1); &buffer->ctime.dwLowDateTime);
StorageUtl_ReadDWord( StorageUtl_ReadDWord(
currentProperty, currentProperty,
OFFSET_PS_TSD1, OFFSET_PS_CTIMEHIGH,
&buffer->timeStampD1); &buffer->ctime.dwHighDateTime);
StorageUtl_ReadDWord( StorageUtl_ReadDWord(
currentProperty, currentProperty,
OFFSET_PS_TSS2, OFFSET_PS_MTIMELOW,
&buffer->timeStampS2); &buffer->mtime.dwLowDateTime);
StorageUtl_ReadDWord( StorageUtl_ReadDWord(
currentProperty, currentProperty,
OFFSET_PS_TSD2, OFFSET_PS_MTIMEHIGH,
&buffer->timeStampD2); &buffer->mtime.dwHighDateTime);
StorageUtl_ReadDWord( StorageUtl_ReadDWord(
currentProperty, currentProperty,
...@@ -3320,23 +3314,23 @@ BOOL StorageImpl_WriteProperty( ...@@ -3320,23 +3314,23 @@ BOOL StorageImpl_WriteProperty(
StorageUtl_WriteDWord( StorageUtl_WriteDWord(
currentProperty, currentProperty,
OFFSET_PS_TSS1, OFFSET_PS_CTIMELOW,
buffer->timeStampS1); buffer->ctime.dwLowDateTime);
StorageUtl_WriteDWord( StorageUtl_WriteDWord(
currentProperty, currentProperty,
OFFSET_PS_TSD1, OFFSET_PS_CTIMEHIGH,
buffer->timeStampD1); buffer->ctime.dwHighDateTime);
StorageUtl_WriteDWord( StorageUtl_WriteDWord(
currentProperty, currentProperty,
OFFSET_PS_TSS2, OFFSET_PS_MTIMELOW,
buffer->timeStampS2); buffer->mtime.dwLowDateTime);
StorageUtl_WriteDWord( StorageUtl_WriteDWord(
currentProperty, currentProperty,
OFFSET_PS_TSD2, OFFSET_PS_MTIMEHIGH,
buffer->timeStampD2); buffer->ctime.dwHighDateTime);
StorageUtl_WriteDWord( StorageUtl_WriteDWord(
currentProperty, currentProperty,
......
dlls/ole32/storage32.h
View file @ 224ddb50
...@@ -58,10 +58,10 @@ static const ULONG OFFSET_PS_PREVIOUSPROP = 0x00000044; ...@@ -58,10 +58,10 @@ static const ULONG OFFSET_PS_PREVIOUSPROP = 0x00000044;
static const ULONG OFFSET_PS_NEXTPROP = 0x00000048; static const ULONG OFFSET_PS_NEXTPROP = 0x00000048;
static const ULONG OFFSET_PS_DIRPROP = 0x0000004C; static const ULONG OFFSET_PS_DIRPROP = 0x0000004C;
static const ULONG OFFSET_PS_GUID = 0x00000050; static const ULONG OFFSET_PS_GUID = 0x00000050;
static const ULONG OFFSET_PS_TSS1 = 0x00000064; static const ULONG OFFSET_PS_CTIMELOW = 0x00000064;
static const ULONG OFFSET_PS_TSD1 = 0x00000068; static const ULONG OFFSET_PS_CTIMEHIGH = 0x00000068;
static const ULONG OFFSET_PS_TSS2 = 0x0000006C; static const ULONG OFFSET_PS_MTIMELOW = 0x0000006C;
static const ULONG OFFSET_PS_TSD2 = 0x00000070; static const ULONG OFFSET_PS_MTIMEHIGH = 0x00000070;
static const ULONG OFFSET_PS_STARTBLOCK = 0x00000074; static const ULONG OFFSET_PS_STARTBLOCK = 0x00000074;
static const ULONG OFFSET_PS_SIZE = 0x00000078; static const ULONG OFFSET_PS_SIZE = 0x00000078;
static const WORD DEF_BIG_BLOCK_SIZE_BITS = 0x0009; static const WORD DEF_BIG_BLOCK_SIZE_BITS = 0x0009;
...@@ -136,10 +136,8 @@ struct StgProperty ...@@ -136,10 +136,8 @@ struct StgProperty
ULONG nextProperty; ULONG nextProperty;
ULONG dirProperty; ULONG dirProperty;
GUID propertyUniqueID; GUID propertyUniqueID;
ULONG timeStampS1; FILETIME ctime;
ULONG timeStampD1; FILETIME mtime;
ULONG timeStampS2;
ULONG timeStampD2;
ULONG startingBlock; ULONG startingBlock;
ULARGE_INTEGER size; ULARGE_INTEGER size;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment