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
2203264b
Commit
2203264b
authored
Nov 12, 2009
by
Vincent Povirk
Committed by
Alexandre Julliard
Nov 16, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole32: Rename propertyType to stgType.
parent
8a17a028
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
storage32.c
dlls/ole32/storage32.c
+11
-11
storage32.h
dlls/ole32/storage32.h
+1
-1
No files found.
dlls/ole32/storage32.c
View file @
2203264b
...
...
@@ -451,7 +451,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStream(
* If it was found, construct the stream object and return a pointer to it.
*/
if
(
(
foundPropertyIndex
!=
DIRENTRY_NULL
)
&&
(
currentProperty
.
property
Type
==
STGTY_STREAM
)
)
(
currentProperty
.
stg
Type
==
STGTY_STREAM
)
)
{
newStream
=
StgStreamImpl_Construct
(
This
,
grfMode
,
foundPropertyIndex
);
...
...
@@ -556,7 +556,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage(
&
currentProperty
);
if
(
(
foundPropertyIndex
!=
DIRENTRY_NULL
)
&&
(
currentProperty
.
property
Type
==
STGTY_STORAGE
)
)
(
currentProperty
.
stg
Type
==
STGTY_STORAGE
)
)
{
newStorage
=
StorageInternalImpl_Construct
(
This
->
ancestorStorage
,
...
...
@@ -858,7 +858,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream(
strcpyW
(
newStreamProperty
.
name
,
pwcsName
);
newStreamProperty
.
propertyType
=
STGTY_STREAM
;
newStreamProperty
.
stgType
=
STGTY_STREAM
;
newStreamProperty
.
startingBlock
=
BLOCK_END_OF_CHAIN
;
newStreamProperty
.
size
.
u
.
LowPart
=
0
;
newStreamProperty
.
size
.
u
.
HighPart
=
0
;
...
...
@@ -1041,7 +1041,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage(
strcpyW
(
newProperty
.
name
,
pwcsName
);
newProperty
.
propertyType
=
STGTY_STORAGE
;
newProperty
.
stgType
=
STGTY_STORAGE
;
newProperty
.
startingBlock
=
BLOCK_END_OF_CHAIN
;
newProperty
.
size
.
u
.
LowPart
=
0
;
newProperty
.
size
.
u
.
HighPart
=
0
;
...
...
@@ -1744,14 +1744,14 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement(
return
STG_E_FILENOTFOUND
;
}
if
(
propertyToDelete
.
property
Type
==
STGTY_STORAGE
)
if
(
propertyToDelete
.
stg
Type
==
STGTY_STORAGE
)
{
hr
=
deleteStorageProperty
(
This
,
foundPropertyIndexToDelete
,
propertyToDelete
);
}
else
if
(
propertyToDelete
.
property
Type
==
STGTY_STREAM
)
else
if
(
propertyToDelete
.
stg
Type
==
STGTY_STREAM
)
{
hr
=
deleteStreamProperty
(
This
,
...
...
@@ -2269,7 +2269,7 @@ static HRESULT StorageImpl_Construct(
MultiByteToWideChar
(
CP_ACP
,
0
,
rootPropertyName
,
-
1
,
rootProp
.
name
,
sizeof
(
rootProp
.
name
)
/
sizeof
(
WCHAR
)
);
rootProp
.
sizeOfNameString
=
(
strlenW
(
rootProp
.
name
)
+
1
)
*
sizeof
(
WCHAR
);
rootProp
.
propertyType
=
STGTY_ROOT
;
rootProp
.
stgType
=
STGTY_ROOT
;
rootProp
.
leftChild
=
DIRENTRY_NULL
;
rootProp
.
rightChild
=
DIRENTRY_NULL
;
rootProp
.
dirRootEntry
=
DIRENTRY_NULL
;
...
...
@@ -2295,7 +2295,7 @@ static HRESULT StorageImpl_Construct(
if
(
readSuccessful
)
{
if
(
(
currentProperty
.
sizeOfNameString
!=
0
)
&&
(
currentProperty
.
propertyType
==
STGTY_ROOT
)
)
(
currentProperty
.
stgType
==
STGTY_ROOT
)
)
{
This
->
base
.
rootPropertySetIndex
=
currentPropertyIndex
;
}
...
...
@@ -3054,7 +3054,7 @@ void UpdateRawDirEntry(BYTE *buffer, const DirEntry *newData)
newData
->
name
,
DIRENTRY_NAME_BUFFER_LEN
);
memcpy
(
buffer
+
OFFSET_PS_STGTYPE
,
&
newData
->
property
Type
,
1
);
memcpy
(
buffer
+
OFFSET_PS_STGTYPE
,
&
newData
->
stg
Type
,
1
);
StorageUtl_WriteWord
(
buffer
,
...
...
@@ -3140,7 +3140,7 @@ BOOL StorageImpl_ReadDirEntry(
DIRENTRY_NAME_BUFFER_LEN
);
TRACE
(
"storage name: %s
\n
"
,
debugstr_w
(
buffer
->
name
));
memcpy
(
&
buffer
->
property
Type
,
currentProperty
+
OFFSET_PS_STGTYPE
,
1
);
memcpy
(
&
buffer
->
stg
Type
,
currentProperty
+
OFFSET_PS_STGTYPE
,
1
);
StorageUtl_ReadWord
(
currentProperty
,
...
...
@@ -4072,7 +4072,7 @@ void StorageUtl_CopyDirEntryToSTATSTG(
strcpyW
(
destination
->
pwcsName
,
source
->
name
);
}
switch
(
source
->
property
Type
)
switch
(
source
->
stg
Type
)
{
case
STGTY_STORAGE
:
case
STGTY_ROOT
:
...
...
dlls/ole32/storage32.h
View file @
2203264b
...
...
@@ -129,7 +129,7 @@ struct DirEntry
{
WCHAR
name
[
DIRENTRY_NAME_MAX_LEN
];
WORD
sizeOfNameString
;
BYTE
property
Type
;
BYTE
stg
Type
;
ULONG
leftChild
;
ULONG
rightChild
;
ULONG
dirRootEntry
;
...
...
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