Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
26acdb3e
Commit
26acdb3e
authored
Nov 12, 2009
by
Vincent Povirk
Committed by
Alexandre Julliard
Nov 17, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole32: Rename property variables in StorageImpl_Construct.
parent
f1861166
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
27 deletions
+27
-27
storage32.c
dlls/ole32/storage32.c
+27
-27
No files found.
dlls/ole32/storage32.c
View file @
26acdb3e
...
...
@@ -2128,9 +2128,9 @@ static HRESULT StorageImpl_Construct(
BOOL
create
)
{
HRESULT
hr
=
S_OK
;
DirEntry
current
Propert
y
;
DirEntry
current
Entr
y
;
BOOL
readSuccessful
;
ULONG
current
PropertyIndex
;
ULONG
current
EntryRef
;
if
(
FAILED
(
validateSTGM
(
openFlags
)
))
return
STG_E_INVALIDFLAG
;
...
...
@@ -2183,7 +2183,7 @@ static HRESULT StorageImpl_Construct(
/*
* Initialize all header variables:
* - The big block depot consists of one block and it is at block 0
* - The
properties start
at block 1
* - The
directory table starts
at block 1
* - There is no small block depot
*/
memset
(
This
->
bigBlockDepotStart
,
...
...
@@ -2202,7 +2202,7 @@ static HRESULT StorageImpl_Construct(
StorageImpl_SaveFileHeader
(
This
);
/*
* Add one block for the big block depot and one block for the
properties
* Add one block for the big block depot and one block for the
directory table
*/
size
.
u
.
HighPart
=
0
;
size
.
u
.
LowPart
=
This
->
bigBlockSize
*
3
;
...
...
@@ -2254,51 +2254,51 @@ static HRESULT StorageImpl_Construct(
return
STG_E_READFAULT
;
/*
* Write the root
propert
y (memory only)
* Write the root
storage entr
y (memory only)
*/
if
(
create
)
{
DirEntry
root
Prop
;
DirEntry
root
Entry
;
/*
* Initialize the
property chain
* Initialize the
directory table
*/
memset
(
&
root
Prop
,
0
,
sizeof
(
rootProp
));
MultiByteToWideChar
(
CP_ACP
,
0
,
rootEntryName
,
-
1
,
root
Prop
.
name
,
sizeof
(
root
Prop
.
name
)
/
sizeof
(
WCHAR
)
);
root
Prop
.
sizeOfNameString
=
(
strlenW
(
rootProp
.
name
)
+
1
)
*
sizeof
(
WCHAR
);
root
Prop
.
stgType
=
STGTY_ROOT
;
root
Prop
.
leftChild
=
DIRENTRY_NULL
;
root
Prop
.
rightChild
=
DIRENTRY_NULL
;
root
Prop
.
dirRootEntry
=
DIRENTRY_NULL
;
root
Prop
.
startingBlock
=
BLOCK_END_OF_CHAIN
;
root
Prop
.
size
.
u
.
HighPart
=
0
;
root
Prop
.
size
.
u
.
LowPart
=
0
;
memset
(
&
root
Entry
,
0
,
sizeof
(
rootEntry
));
MultiByteToWideChar
(
CP_ACP
,
0
,
rootEntryName
,
-
1
,
root
Entry
.
name
,
sizeof
(
root
Entry
.
name
)
/
sizeof
(
WCHAR
)
);
root
Entry
.
sizeOfNameString
=
(
strlenW
(
rootEntry
.
name
)
+
1
)
*
sizeof
(
WCHAR
);
root
Entry
.
stgType
=
STGTY_ROOT
;
root
Entry
.
leftChild
=
DIRENTRY_NULL
;
root
Entry
.
rightChild
=
DIRENTRY_NULL
;
root
Entry
.
dirRootEntry
=
DIRENTRY_NULL
;
root
Entry
.
startingBlock
=
BLOCK_END_OF_CHAIN
;
root
Entry
.
size
.
u
.
HighPart
=
0
;
root
Entry
.
size
.
u
.
LowPart
=
0
;
StorageImpl_WriteDirEntry
(
This
,
0
,
&
root
Prop
);
StorageImpl_WriteDirEntry
(
This
,
0
,
&
root
Entry
);
}
/*
* Find the ID of the root
in the property sets
.
* Find the ID of the root
storage
.
*/
current
PropertyIndex
=
0
;
current
EntryRef
=
0
;
do
{
readSuccessful
=
StorageImpl_ReadDirEntry
(
This
,
current
PropertyIndex
,
&
current
Propert
y
);
current
EntryRef
,
&
current
Entr
y
);
if
(
readSuccessful
)
{
if
(
(
current
Propert
y
.
sizeOfNameString
!=
0
)
&&
(
current
Propert
y
.
stgType
==
STGTY_ROOT
)
)
if
(
(
current
Entr
y
.
sizeOfNameString
!=
0
)
&&
(
current
Entr
y
.
stgType
==
STGTY_ROOT
)
)
{
This
->
base
.
storageDirEntry
=
current
PropertyIndex
;
This
->
base
.
storageDirEntry
=
current
EntryRef
;
}
}
current
PropertyIndex
++
;
current
EntryRef
++
;
}
while
(
readSuccessful
&&
(
This
->
base
.
storageDirEntry
==
DIRENTRY_NULL
)
);
...
...
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