Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
5969bde0
Commit
5969bde0
authored
Nov 11, 2009
by
Vincent Povirk
Committed by
Alexandre Julliard
Nov 13, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole32: Rename dirProperty to dirRootEntry.
parent
8a8471a7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
17 deletions
+17
-17
storage32.c
dlls/ole32/storage32.c
+15
-15
storage32.h
dlls/ole32/storage32.h
+2
-2
No files found.
dlls/ole32/storage32.c
View file @
5969bde0
...
...
@@ -865,7 +865,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream(
newStreamProperty
.
leftChild
=
DIRENTRY_NULL
;
newStreamProperty
.
rightChild
=
DIRENTRY_NULL
;
newStreamProperty
.
dir
Property
=
DIRENTRY_NULL
;
newStreamProperty
.
dir
RootEntry
=
DIRENTRY_NULL
;
/* call CoFileTime to get the current time
newStreamProperty.ctime
...
...
@@ -1048,7 +1048,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage(
newProperty
.
leftChild
=
DIRENTRY_NULL
;
newProperty
.
rightChild
=
DIRENTRY_NULL
;
newProperty
.
dir
Property
=
DIRENTRY_NULL
;
newProperty
.
dir
RootEntry
=
DIRENTRY_NULL
;
/* call CoFileTime to get the current time
newProperty.ctime
...
...
@@ -1272,7 +1272,7 @@ static HRESULT insertIntoTree(
parentStorageIndex
,
&
currentProperty
);
if
(
currentProperty
.
dir
Propert
y
!=
DIRENTRY_NULL
)
if
(
currentProperty
.
dir
RootEntr
y
!=
DIRENTRY_NULL
)
{
/*
* The root storage contains some element, therefore, start the research
...
...
@@ -1284,13 +1284,13 @@ static HRESULT insertIntoTree(
/*
* Keep the DirEntry sequence number of the storage first property
*/
currentPropertyId
=
currentProperty
.
dir
Propert
y
;
currentPropertyId
=
currentProperty
.
dir
RootEntr
y
;
/*
* Read
*/
StorageImpl_ReadDirEntry
(
This
,
currentProperty
.
dir
Propert
y
,
currentProperty
.
dir
RootEntr
y
,
&
currentProperty
);
previous
=
currentProperty
.
leftChild
;
...
...
@@ -1355,7 +1355,7 @@ static HRESULT insertIntoTree(
/*
* The root storage is empty, link the new property to its dir property
*/
currentProperty
.
dir
Propert
y
=
newPropertyIndex
;
currentProperty
.
dir
RootEntr
y
=
newPropertyIndex
;
StorageImpl_WriteDirEntry
(
This
,
parentStorageIndex
,
&
currentProperty
);
...
...
@@ -1378,7 +1378,7 @@ static ULONG findElement(StorageImpl *storage, ULONG storageEntry,
/* Read the storage entry to find the root of the tree. */
StorageImpl_ReadDirEntry
(
storage
,
storageEntry
,
data
);
currentEntry
=
data
->
dir
Propert
y
;
currentEntry
=
data
->
dir
RootEntr
y
;
while
(
currentEntry
!=
DIRENTRY_NULL
)
{
...
...
@@ -1424,7 +1424,7 @@ static HRESULT findTreeParent(StorageImpl *storage, ULONG storageEntry,
*
parentEntry
=
storageEntry
;
*
relation
=
PROPERTY_RELATION_DIR
;
childEntry
=
parentData
->
dir
Propert
y
;
childEntry
=
parentData
->
dir
RootEntr
y
;
while
(
childEntry
!=
DIRENTRY_NULL
)
{
...
...
@@ -1958,7 +1958,7 @@ static void setPropertyLink(DirEntry *property, ULONG relation, ULONG new_target
property
->
rightChild
=
new_target
;
break
;
case
PROPERTY_RELATION_DIR
:
property
->
dir
Propert
y
=
new_target
;
property
->
dir
RootEntr
y
=
new_target
;
break
;
default:
assert
(
0
);
...
...
@@ -2272,7 +2272,7 @@ static HRESULT StorageImpl_Construct(
rootProp
.
propertyType
=
STGTY_ROOT
;
rootProp
.
leftChild
=
DIRENTRY_NULL
;
rootProp
.
rightChild
=
DIRENTRY_NULL
;
rootProp
.
dir
Property
=
DIRENTRY_NULL
;
rootProp
.
dir
RootEntry
=
DIRENTRY_NULL
;
rootProp
.
startingBlock
=
BLOCK_END_OF_CHAIN
;
rootProp
.
size
.
u
.
HighPart
=
0
;
rootProp
.
size
.
u
.
LowPart
=
0
;
...
...
@@ -3073,8 +3073,8 @@ void UpdateRawDirEntry(BYTE *buffer, const DirEntry *newData)
StorageUtl_WriteDWord
(
buffer
,
OFFSET_PS_DIR
PROP
,
newData
->
dir
Propert
y
);
OFFSET_PS_DIR
ROOT
,
newData
->
dir
RootEntr
y
);
StorageUtl_WriteGUID
(
buffer
,
...
...
@@ -3159,8 +3159,8 @@ BOOL StorageImpl_ReadDirEntry(
StorageUtl_ReadDWord
(
currentProperty
,
OFFSET_PS_DIR
PROP
,
&
buffer
->
dir
Propert
y
);
OFFSET_PS_DIR
ROOT
,
&
buffer
->
dir
RootEntr
y
);
StorageUtl_ReadGUID
(
currentProperty
,
...
...
@@ -3729,7 +3729,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Reset(
/*
* Push the search node in the search stack.
*/
IEnumSTATSTGImpl_PushSearchNode
(
This
,
rootProperty
.
dir
Propert
y
);
IEnumSTATSTGImpl_PushSearchNode
(
This
,
rootProperty
.
dir
RootEntr
y
);
}
return
S_OK
;
...
...
dlls/ole32/storage32.h
View file @
5969bde0
...
...
@@ -56,7 +56,7 @@ static const ULONG OFFSET_PS_NAMELENGTH = 0x00000040;
static
const
ULONG
OFFSET_PS_STGTYPE
=
0x00000042
;
static
const
ULONG
OFFSET_PS_LEFTCHILD
=
0x00000044
;
static
const
ULONG
OFFSET_PS_RIGHTCHILD
=
0x00000048
;
static
const
ULONG
OFFSET_PS_DIR
PROP
=
0x0000004C
;
static
const
ULONG
OFFSET_PS_DIR
ROOT
=
0x0000004C
;
static
const
ULONG
OFFSET_PS_GUID
=
0x00000050
;
static
const
ULONG
OFFSET_PS_CTIMELOW
=
0x00000064
;
static
const
ULONG
OFFSET_PS_CTIMEHIGH
=
0x00000068
;
...
...
@@ -132,7 +132,7 @@ struct DirEntry
BYTE
propertyType
;
ULONG
leftChild
;
ULONG
rightChild
;
ULONG
dir
Propert
y
;
ULONG
dir
RootEntr
y
;
GUID
propertyUniqueID
;
FILETIME
ctime
;
FILETIME
mtime
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment