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
f930c87f
Commit
f930c87f
authored
Mar 26, 2010
by
Mikhail Maroukhine
Committed by
Alexandre Julliard
Mar 29, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
objbase.h: CLSIDFromString: Add constness to the parameters declaration in accordance with MSDN.
parent
503563c9
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
14 additions
and
14 deletions
+14
-14
atl_ax.c
dlls/atl/atl_ax.c
+1
-1
action.c
dlls/msi/action.c
+2
-2
registry.c
dlls/msi/registry.c
+1
-1
msi.c
dlls/msi/tests/msi.c
+1
-1
package.c
dlls/msi/tests/package.c
+1
-1
source.c
dlls/msi/tests/source.c
+1
-1
compobj.c
dlls/ole32/compobj.c
+2
-2
shellole.c
dlls/shell32/shellole.c
+1
-1
ordinal.c
dlls/shlwapi/ordinal.c
+2
-2
url.c
dlls/urlmon/tests/url.c
+1
-1
objbase.h
include/objbase.h
+1
-1
No files found.
dlls/atl/atl_ax.c
View file @
f930c87f
...
...
@@ -950,7 +950,7 @@ HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR lpszName, HWND hWnd,
TRACE
(
"(%s %p %p %p %p %p %p)
\n
"
,
debugstr_w
(
lpszName
),
hWnd
,
pStream
,
ppUnkContainer
,
ppUnkControl
,
iidSink
,
punkSink
);
hRes
=
CLSIDFromString
(
(
LPOLESTR
)
lpszName
,
&
controlId
);
hRes
=
CLSIDFromString
(
lpszName
,
&
controlId
);
if
(
FAILED
(
hRes
)
)
hRes
=
CLSIDFromProgID
(
lpszName
,
&
controlId
);
if
(
SUCCEEDED
(
hRes
)
)
...
...
dlls/msi/action.c
View file @
f930c87f
...
...
@@ -3098,7 +3098,7 @@ static UINT ITERATE_RegisterTypeLibraries(MSIRECORD *row, LPVOID param)
{
LPCWSTR
guid
;
guid
=
MSI_RecordGetString
(
row
,
1
);
CLSIDFromString
((
LPWSTR
)
guid
,
&
tl_struct
.
clsid
);
CLSIDFromString
((
LP
C
WSTR
)
guid
,
&
tl_struct
.
clsid
);
tl_struct
.
source
=
strdupW
(
file
->
TargetPath
);
tl_struct
.
path
=
NULL
;
...
...
@@ -3199,7 +3199,7 @@ static UINT ITERATE_UnregisterTypeLibraries( MSIRECORD *row, LPVOID param )
ui_actiondata
(
package
,
szUnregisterTypeLibraries
,
row
);
guid
=
MSI_RecordGetString
(
row
,
1
);
CLSIDFromString
(
(
LPWSTR
)
guid
,
&
libid
);
CLSIDFromString
(
(
LP
C
WSTR
)
guid
,
&
libid
);
version
=
MSI_RecordGetInteger
(
row
,
4
);
language
=
MSI_RecordGetInteger
(
row
,
2
);
...
...
dlls/msi/registry.c
View file @
f930c87f
...
...
@@ -286,7 +286,7 @@ BOOL squash_guid(LPCWSTR in, LPWSTR out)
out
[
0
]
=
0
;
if
(
FAILED
(
CLSIDFromString
((
LPOLESTR
)
in
,
&
guid
)))
if
(
FAILED
(
CLSIDFromString
((
LP
C
OLESTR
)
in
,
&
guid
)))
return
FALSE
;
for
(
i
=
0
;
i
<
8
;
i
++
)
...
...
dlls/msi/tests/msi.c
View file @
f930c87f
...
...
@@ -467,7 +467,7 @@ static BOOL squash_guid(LPCWSTR in, LPWSTR out)
DWORD
i
,
n
=
1
;
GUID
guid
;
if
(
FAILED
(
CLSIDFromString
((
LPOLESTR
)
in
,
&
guid
)))
if
(
FAILED
(
CLSIDFromString
((
LP
C
OLESTR
)
in
,
&
guid
)))
return
FALSE
;
for
(
i
=
0
;
i
<
8
;
i
++
)
...
...
dlls/msi/tests/package.c
View file @
f930c87f
...
...
@@ -153,7 +153,7 @@ static BOOL squash_guid(LPCWSTR in, LPWSTR out)
DWORD
i
,
n
=
1
;
GUID
guid
;
if
(
FAILED
(
CLSIDFromString
((
LPOLESTR
)
in
,
&
guid
)))
if
(
FAILED
(
CLSIDFromString
((
LP
C
OLESTR
)
in
,
&
guid
)))
return
FALSE
;
for
(
i
=
0
;
i
<
8
;
i
++
)
...
...
dlls/msi/tests/source.c
View file @
f930c87f
...
...
@@ -81,7 +81,7 @@ static BOOL squash_guid(LPCWSTR in, LPWSTR out)
DWORD
i
,
n
=
1
;
GUID
guid
;
if
(
FAILED
(
CLSIDFromString
((
LPOLESTR
)
in
,
&
guid
)))
if
(
FAILED
(
CLSIDFromString
((
LP
C
OLESTR
)
in
,
&
guid
)))
return
FALSE
;
for
(
i
=
0
;
i
<
8
;
i
++
)
...
...
dlls/ole32/compobj.c
View file @
f930c87f
...
...
@@ -1506,7 +1506,7 @@ HRESULT WINAPI CoCreateGuid(GUID *pguid)
* SEE ALSO
* StringFromCLSID
*/
static
HRESULT
__CLSIDFromString
(
LPCWSTR
s
,
CLSID
*
id
)
static
HRESULT
__CLSIDFromString
(
LPCWSTR
s
,
LPCLSID
id
)
{
int
i
;
BYTE
table
[
256
];
...
...
@@ -1566,7 +1566,7 @@ static HRESULT __CLSIDFromString(LPCWSTR s, CLSID *id)
/*****************************************************************************/
HRESULT
WINAPI
CLSIDFromString
(
LP
OLESTR
idstr
,
CLSID
*
id
)
HRESULT
WINAPI
CLSIDFromString
(
LP
COLESTR
idstr
,
LPCLSID
id
)
{
HRESULT
ret
;
...
...
dlls/shell32/shellole.c
View file @
f930c87f
...
...
@@ -252,7 +252,7 @@ DWORD WINAPI SHCLSIDFromStringA (LPCSTR clsid, CLSID *id)
DWORD
WINAPI
SHCLSIDFromStringW
(
LPCWSTR
clsid
,
CLSID
*
id
)
{
TRACE
(
"(%p(%s) %p)
\n
"
,
clsid
,
debugstr_w
(
clsid
),
id
);
return
CLSIDFromString
(
(
LPWSTR
)
clsid
,
id
);
return
CLSIDFromString
(
clsid
,
id
);
}
DWORD
WINAPI
SHCLSIDFromStringAW
(
LPCVOID
clsid
,
CLSID
*
id
)
{
...
...
dlls/shlwapi/ordinal.c
View file @
f930c87f
...
...
@@ -2818,7 +2818,7 @@ BOOL WINAPI GUIDFromStringA(LPCSTR idstr, CLSID *id)
*/
BOOL
WINAPI
GUIDFromStringW
(
LPCWSTR
idstr
,
CLSID
*
id
)
{
return
SUCCEEDED
(
CLSIDFromString
((
LPOLESTR
)
idstr
,
id
));
return
SUCCEEDED
(
CLSIDFromString
((
LP
C
OLESTR
)
idstr
,
id
));
}
/*************************************************************************
...
...
@@ -3903,7 +3903,7 @@ DWORD WINAPI SHSendMessageBroadcastW(UINT uMsg, WPARAM wParam, LPARAM lParam)
*/
HRESULT
WINAPI
CLSIDFromStringWrap
(
LPCWSTR
idstr
,
CLSID
*
id
)
{
return
CLSIDFromString
((
LPOLESTR
)
idstr
,
id
);
return
CLSIDFromString
((
LP
C
OLESTR
)
idstr
,
id
);
}
/*************************************************************************
...
...
dlls/urlmon/tests/url.c
View file @
f930c87f
...
...
@@ -1388,7 +1388,7 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u
CHECK_EXPECT
(
Obj_OnProgress_CLASSIDAVAILABLE
);
else
todo_wine
CHECK_EXPECT
(
Obj_OnProgress_CLASSIDAVAILABLE
);
hr
=
CLSIDFromString
((
LPOLESTR
)
szStatusText
,
&
clsid
);
hr
=
CLSIDFromString
((
LP
C
OLESTR
)
szStatusText
,
&
clsid
);
ok
(
hr
==
S_OK
,
"CLSIDFromString failed with error 0x%08x
\n
"
,
hr
);
ok
(
IsEqualCLSID
(
&
clsid
,
&
CLSID_HTMLDocument
),
"Expected clsid to be CLSID_HTMLDocument instead of %s
\n
"
,
debugstr_guid
(
&
clsid
));
...
...
include/objbase.h
View file @
f930c87f
...
...
@@ -431,7 +431,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags,DWORD dwTimeout,ULONG cHan
* GUID API
*/
HRESULT
WINAPI
StringFromCLSID
(
REFCLSID
id
,
LPOLESTR
*
);
HRESULT
WINAPI
CLSIDFromString
(
LP
OLESTR
,
CLSID
*
);
HRESULT
WINAPI
CLSIDFromString
(
LP
COLESTR
,
LPCLSID
);
HRESULT
WINAPI
CLSIDFromProgID
(
LPCOLESTR
progid
,
LPCLSID
riid
);
HRESULT
WINAPI
ProgIDFromCLSID
(
REFCLSID
clsid
,
LPOLESTR
*
lplpszProgID
);
...
...
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