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
1529f082
Commit
1529f082
authored
Jan 12, 2016
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jan 12, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole2disp: Implement SafeArrayDestroyDescriptor().
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
6cecd59f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
1 deletion
+26
-1
ole2disp.c
dlls/ole2disp.dll16/ole2disp.c
+25
-0
ole2disp.dll16.spec
dlls/ole2disp.dll16/ole2disp.dll16.spec
+1
-1
No files found.
dlls/ole2disp.dll16/ole2disp.c
View file @
1529f082
...
@@ -67,6 +67,11 @@ static SEGPTR safearray_alloc(ULONG size)
...
@@ -67,6 +67,11 @@ static SEGPTR safearray_alloc(ULONG size)
return
WOWGlobalAllocLock16
(
GPTR
,
size
,
&
h
);
return
WOWGlobalAllocLock16
(
GPTR
,
size
,
&
h
);
}
}
static
void
safearray_free
(
SEGPTR
ptr
)
{
WOWGlobalUnlockFree16
(
ptr
);
}
/******************************************************************************
/******************************************************************************
* SafeArrayAllocDescriptor [OLE2DISP.38]
* SafeArrayAllocDescriptor [OLE2DISP.38]
*/
*/
...
@@ -90,6 +95,26 @@ HRESULT WINAPI SafeArrayAllocDescriptor16(UINT16 dims, SEGPTR *ret)
...
@@ -90,6 +95,26 @@ HRESULT WINAPI SafeArrayAllocDescriptor16(UINT16 dims, SEGPTR *ret)
return
S_OK
;
return
S_OK
;
}
}
/******************************************************************************
* SafeArrayDestroyDescriptor [OLE2DISP.40]
*/
HRESULT
WINAPI
SafeArrayDestroyDescriptor16
(
SEGPTR
s
)
{
TRACE
(
"0x%08x
\n
"
,
s
);
if
(
s
)
{
SAFEARRAY16
*
sa
=
MapSL
(
s
);
if
(
sa
->
cLocks
)
return
DISP_E_ARRAYISLOCKED
;
safearray_free
(
s
);
}
return
S_OK
;
}
/* This implementation of the BSTR API is 16-bit only. It
/* This implementation of the BSTR API is 16-bit only. It
represents BSTR as a 16:16 far pointer, and the strings
represents BSTR as a 16:16 far pointer, and the strings
as ISO-8859 */
as ISO-8859 */
...
...
dlls/ole2disp.dll16/ole2disp.dll16.spec
View file @
1529f082
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
37 stub GETACTIVEOBJECT
37 stub GETACTIVEOBJECT
38 pascal SafeArrayAllocDescriptor(word ptr) SafeArrayAllocDescriptor16
38 pascal SafeArrayAllocDescriptor(word ptr) SafeArrayAllocDescriptor16
39 stub SAFEARRAYALLOCDATA
39 stub SAFEARRAYALLOCDATA
40
stub SAFEARRAYDESTROYDESCRIPTOR
40
pascal SafeArrayDestroyDescriptor(segptr) SafeArrayDestroyDescriptor16
41 stub SAFEARRAYDESTROYDATA
41 stub SAFEARRAYDESTROYDATA
42 stub SAFEARRAYREDIM
42 stub SAFEARRAYREDIM
43 stub VARI2FROMI4
43 stub VARI2FROMI4
...
...
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