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
dfc0f5ec
Commit
dfc0f5ec
authored
Mar 13, 1999
by
Francois Gouget
Committed by
Alexandre Julliard
Mar 13, 1999
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes in the SysAllocString functions prototypes. It's mostly 'const'
problems that prevent regular code from compiling.
parent
cb327212
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
16 deletions
+16
-16
oleauto.h
include/oleauto.h
+8
-8
ole2disp.c
ole/ole2disp.c
+8
-8
No files found.
include/oleauto.h
View file @
dfc0f5ec
...
@@ -10,16 +10,16 @@ extern "C" {
...
@@ -10,16 +10,16 @@ extern "C" {
#include "wine/obj_oleaut.h"
#include "wine/obj_oleaut.h"
#include "oaidl.h"
#include "oaidl.h"
BSTR16
WINAPI
SysAllocString16
(
LPOLESTR16
);
BSTR16
WINAPI
SysAllocString16
(
LP
C
OLESTR16
);
BSTR
WINAPI
SysAllocString
(
LPOLESTR
);
BSTR
WINAPI
SysAllocString
(
const
OLECHAR
*
);
INT16
WINAPI
SysReAllocString16
(
LPBSTR16
,
LPOLESTR16
);
INT16
WINAPI
SysReAllocString16
(
LPBSTR16
,
LP
C
OLESTR16
);
INT
WINAPI
SysReAllocString
(
LPBSTR
,
LPOLESTR
);
INT
WINAPI
SysReAllocString
(
LPBSTR
,
const
OLECHAR
*
);
VOID
WINAPI
SysFreeString16
(
BSTR16
);
VOID
WINAPI
SysFreeString16
(
BSTR16
);
VOID
WINAPI
SysFreeString
(
BSTR
);
VOID
WINAPI
SysFreeString
(
BSTR
);
BSTR16
WINAPI
SysAllocStringLen16
(
char
*
,
int
);
BSTR16
WINAPI
SysAllocStringLen16
(
c
onst
c
har
*
,
int
);
BSTR
WINAPI
SysAllocStringLen
(
WCHAR
*
,
int
);
BSTR
WINAPI
SysAllocStringLen
(
const
OLECHAR
*
,
UINT
);
int
WINAPI
SysReAllocStringLen16
(
BSTR16
*
,
char
*
,
int
);
int
WINAPI
SysReAllocStringLen16
(
BSTR16
*
,
c
onst
c
har
*
,
int
);
int
WINAPI
SysReAllocStringLen
(
BSTR
*
,
WCHAR
*
,
int
);
int
WINAPI
SysReAllocStringLen
(
BSTR
*
,
const
OLECHAR
*
,
UINT
);
int
WINAPI
SysStringLen16
(
BSTR16
);
int
WINAPI
SysStringLen16
(
BSTR16
);
int
WINAPI
SysStringLen
(
BSTR
);
int
WINAPI
SysStringLen
(
BSTR
);
...
...
ole/ole2disp.c
View file @
dfc0f5ec
...
@@ -45,7 +45,7 @@ static void* BSTR_GetAddr(BSTR16 in)
...
@@ -45,7 +45,7 @@ static void* BSTR_GetAddr(BSTR16 in)
/******************************************************************************
/******************************************************************************
* SysAllocString16 [OLE2DISP.2]
* SysAllocString16 [OLE2DISP.2]
*/
*/
BSTR16
WINAPI
SysAllocString16
(
LPOLESTR16
in
)
BSTR16
WINAPI
SysAllocString16
(
LP
C
OLESTR16
in
)
{
{
BSTR16
out
=
BSTR_AllocBytes
(
strlen
(
in
)
+
1
);
BSTR16
out
=
BSTR_AllocBytes
(
strlen
(
in
)
+
1
);
if
(
!
out
)
return
0
;
if
(
!
out
)
return
0
;
...
@@ -56,7 +56,7 @@ BSTR16 WINAPI SysAllocString16(LPOLESTR16 in)
...
@@ -56,7 +56,7 @@ BSTR16 WINAPI SysAllocString16(LPOLESTR16 in)
/******************************************************************************
/******************************************************************************
* SysAllocString32 [OLEAUT32.2]
* SysAllocString32 [OLEAUT32.2]
*/
*/
BSTR
WINAPI
SysAllocString
(
LPOLESTR
in
)
BSTR
WINAPI
SysAllocString
(
LP
C
OLESTR
in
)
{
{
/* Delegate this to the SysAllocStringLen32 method. */
/* Delegate this to the SysAllocStringLen32 method. */
return
SysAllocStringLen
(
in
,
lstrlenW
(
in
));
return
SysAllocStringLen
(
in
,
lstrlenW
(
in
));
...
@@ -65,7 +65,7 @@ BSTR WINAPI SysAllocString(LPOLESTR in)
...
@@ -65,7 +65,7 @@ BSTR WINAPI SysAllocString(LPOLESTR in)
/******************************************************************************
/******************************************************************************
* SysReAllocString16 [OLE2DISP.3]
* SysReAllocString16 [OLE2DISP.3]
*/
*/
INT16
WINAPI
SysReAllocString16
(
LPBSTR16
old
,
LPOLESTR16
in
)
INT16
WINAPI
SysReAllocString16
(
LPBSTR16
old
,
LP
C
OLESTR16
in
)
{
{
BSTR16
new
=
SysAllocString16
(
in
);
BSTR16
new
=
SysAllocString16
(
in
);
BSTR_Free
(
*
old
);
BSTR_Free
(
*
old
);
...
@@ -76,7 +76,7 @@ INT16 WINAPI SysReAllocString16(LPBSTR16 old,LPOLESTR16 in)
...
@@ -76,7 +76,7 @@ INT16 WINAPI SysReAllocString16(LPBSTR16 old,LPOLESTR16 in)
/******************************************************************************
/******************************************************************************
* SysReAllocString32 [OLEAUT32.3]
* SysReAllocString32 [OLEAUT32.3]
*/
*/
INT
WINAPI
SysReAllocString
(
LPBSTR
old
,
LPOLESTR
in
)
INT
WINAPI
SysReAllocString
(
LPBSTR
old
,
LP
C
OLESTR
in
)
{
{
/*
/*
* Sanity check
* Sanity check
...
@@ -101,7 +101,7 @@ INT WINAPI SysReAllocString(LPBSTR old,LPOLESTR in)
...
@@ -101,7 +101,7 @@ INT WINAPI SysReAllocString(LPBSTR old,LPOLESTR in)
/******************************************************************************
/******************************************************************************
* SysAllocStringLen16 [OLE2DISP.4]
* SysAllocStringLen16 [OLE2DISP.4]
*/
*/
BSTR16
WINAPI
SysAllocStringLen16
(
char
*
in
,
int
len
)
BSTR16
WINAPI
SysAllocStringLen16
(
c
onst
c
har
*
in
,
int
len
)
{
{
BSTR16
out
=
BSTR_AllocBytes
(
len
+
1
);
BSTR16
out
=
BSTR_AllocBytes
(
len
+
1
);
if
(
!
out
)
return
0
;
if
(
!
out
)
return
0
;
...
@@ -119,7 +119,7 @@ BSTR16 WINAPI SysAllocStringLen16(char *in, int len)
...
@@ -119,7 +119,7 @@ BSTR16 WINAPI SysAllocStringLen16(char *in, int len)
* the string. Meaning that the count is double the number of wide
* the string. Meaning that the count is double the number of wide
* characters in the string.
* characters in the string.
*/
*/
BSTR
WINAPI
SysAllocStringLen
(
WCHAR
*
in
,
int
len
)
BSTR
WINAPI
SysAllocStringLen
(
const
OLECHAR
*
in
,
unsigned
int
len
)
{
{
DWORD
bufferSize
;
DWORD
bufferSize
;
DWORD
*
newBuffer
;
DWORD
*
newBuffer
;
...
@@ -179,7 +179,7 @@ BSTR WINAPI SysAllocStringLen(WCHAR *in, int len)
...
@@ -179,7 +179,7 @@ BSTR WINAPI SysAllocStringLen(WCHAR *in, int len)
/******************************************************************************
/******************************************************************************
* SysReAllocStringLen16 [OLE2DISP.5]
* SysReAllocStringLen16 [OLE2DISP.5]
*/
*/
int
WINAPI
SysReAllocStringLen16
(
BSTR16
*
old
,
char
*
in
,
int
len
)
int
WINAPI
SysReAllocStringLen16
(
BSTR16
*
old
,
c
onst
c
har
*
in
,
int
len
)
{
{
BSTR16
new
=
SysAllocStringLen16
(
in
,
len
);
BSTR16
new
=
SysAllocStringLen16
(
in
,
len
);
BSTR_Free
(
*
old
);
BSTR_Free
(
*
old
);
...
@@ -191,7 +191,7 @@ int WINAPI SysReAllocStringLen16(BSTR16 *old,char *in,int len)
...
@@ -191,7 +191,7 @@ int WINAPI SysReAllocStringLen16(BSTR16 *old,char *in,int len)
/******************************************************************************
/******************************************************************************
* SysReAllocStringLen32 [OLEAUT32.5]
* SysReAllocStringLen32 [OLEAUT32.5]
*/
*/
int
WINAPI
SysReAllocStringLen
(
BSTR
*
old
,
WCHAR
*
in
,
int
len
)
int
WINAPI
SysReAllocStringLen
(
BSTR
*
old
,
const
OLECHAR
*
in
,
unsigned
int
len
)
{
{
/*
/*
* Sanity check
* Sanity check
...
...
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