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
66b05dde
Commit
66b05dde
authored
Jun 28, 2007
by
Andrew Talbot
Committed by
Alexandre Julliard
Jun 29, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole32: Constify some variables.
parent
d89f2b48
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
12 deletions
+10
-12
compobj.c
dlls/ole32/compobj.c
+8
-10
compobj_private.h
dlls/ole32/compobj_private.h
+2
-2
No files found.
dlls/ole32/compobj.c
View file @
66b05dde
...
@@ -76,8 +76,9 @@ HINSTANCE OLE32_hInstance = 0; /* FIXME: make static ... */
...
@@ -76,8 +76,9 @@ HINSTANCE OLE32_hInstance = 0; /* FIXME: make static ... */
* TODO: Most of these things will have to be made thread-safe.
* TODO: Most of these things will have to be made thread-safe.
*/
*/
static
HRESULT
COM_GetRegisteredClassObject
(
struct
apartment
*
apt
,
REFCLSID
rclsid
,
DWORD
dwClsContext
,
LPUNKNOWN
*
ppUnk
);
static
HRESULT
COM_GetRegisteredClassObject
(
const
struct
apartment
*
apt
,
REFCLSID
rclsid
,
static
void
COM_RevokeAllClasses
(
struct
apartment
*
apt
);
DWORD
dwClsContext
,
LPUNKNOWN
*
ppUnk
);
static
void
COM_RevokeAllClasses
(
const
struct
apartment
*
apt
);
static
HRESULT
get_inproc_class_object
(
APARTMENT
*
apt
,
HKEY
hkeydll
,
REFCLSID
rclsid
,
REFIID
riid
,
void
**
ppv
);
static
HRESULT
get_inproc_class_object
(
APARTMENT
*
apt
,
HKEY
hkeydll
,
REFCLSID
rclsid
,
REFIID
riid
,
void
**
ppv
);
static
APARTMENT
*
MTA
;
/* protected by csApartment */
static
APARTMENT
*
MTA
;
/* protected by csApartment */
...
@@ -327,7 +328,7 @@ static APARTMENT *apartment_get_or_create(DWORD model)
...
@@ -327,7 +328,7 @@ static APARTMENT *apartment_get_or_create(DWORD model)
return
apt
;
return
apt
;
}
}
static
inline
BOOL
apartment_is_model
(
APARTMENT
*
apt
,
DWORD
model
)
static
inline
BOOL
apartment_is_model
(
const
APARTMENT
*
apt
,
DWORD
model
)
{
{
return
(
apt
->
multi_threaded
==
!
(
model
&
COINIT_APARTMENTTHREADED
));
return
(
apt
->
multi_threaded
==
!
(
model
&
COINIT_APARTMENTTHREADED
));
}
}
...
@@ -728,7 +729,7 @@ HRESULT apartment_createwindowifneeded(struct apartment *apt)
...
@@ -728,7 +729,7 @@ HRESULT apartment_createwindowifneeded(struct apartment *apt)
return
S_OK
;
return
S_OK
;
}
}
HWND
apartment_getwindow
(
struct
apartment
*
apt
)
HWND
apartment_getwindow
(
const
struct
apartment
*
apt
)
{
{
assert
(
!
apt
->
multi_threaded
);
assert
(
!
apt
->
multi_threaded
);
return
apt
->
win
;
return
apt
->
win
;
...
@@ -1754,11 +1755,8 @@ HRESULT WINAPI CoRegisterPSClsid(REFIID riid, REFCLSID rclsid)
...
@@ -1754,11 +1755,8 @@ HRESULT WINAPI CoRegisterPSClsid(REFIID riid, REFCLSID rclsid)
* to normal COM usage, this method will increase the
* to normal COM usage, this method will increase the
* reference count on this object.
* reference count on this object.
*/
*/
static
HRESULT
COM_GetRegisteredClassObject
(
static
HRESULT
COM_GetRegisteredClassObject
(
const
struct
apartment
*
apt
,
REFCLSID
rclsid
,
struct
apartment
*
apt
,
DWORD
dwClsContext
,
LPUNKNOWN
*
ppUnk
)
REFCLSID
rclsid
,
DWORD
dwClsContext
,
LPUNKNOWN
*
ppUnk
)
{
{
HRESULT
hr
=
S_FALSE
;
HRESULT
hr
=
S_FALSE
;
RegisteredClass
*
curClass
;
RegisteredClass
*
curClass
;
...
@@ -1951,7 +1949,7 @@ static void COM_RevokeRegisteredClassObject(RegisteredClass *curClass)
...
@@ -1951,7 +1949,7 @@ static void COM_RevokeRegisteredClassObject(RegisteredClass *curClass)
HeapFree
(
GetProcessHeap
(),
0
,
curClass
);
HeapFree
(
GetProcessHeap
(),
0
,
curClass
);
}
}
static
void
COM_RevokeAllClasses
(
struct
apartment
*
apt
)
static
void
COM_RevokeAllClasses
(
const
struct
apartment
*
apt
)
{
{
RegisteredClass
*
curClass
,
*
cursor
;
RegisteredClass
*
curClass
,
*
cursor
;
...
...
dlls/ole32/compobj_private.h
View file @
66b05dde
...
@@ -255,13 +255,13 @@ DWORD apartment_addref(struct apartment *apt);
...
@@ -255,13 +255,13 @@ DWORD apartment_addref(struct apartment *apt);
DWORD
apartment_release
(
struct
apartment
*
apt
);
DWORD
apartment_release
(
struct
apartment
*
apt
);
HRESULT
apartment_disconnectproxies
(
struct
apartment
*
apt
);
HRESULT
apartment_disconnectproxies
(
struct
apartment
*
apt
);
void
apartment_disconnectobject
(
struct
apartment
*
apt
,
void
*
object
);
void
apartment_disconnectobject
(
struct
apartment
*
apt
,
void
*
object
);
static
inline
HRESULT
apartment_getoxid
(
struct
apartment
*
apt
,
OXID
*
oxid
)
static
inline
HRESULT
apartment_getoxid
(
const
struct
apartment
*
apt
,
OXID
*
oxid
)
{
{
*
oxid
=
apt
->
oxid
;
*
oxid
=
apt
->
oxid
;
return
S_OK
;
return
S_OK
;
}
}
HRESULT
apartment_createwindowifneeded
(
struct
apartment
*
apt
);
HRESULT
apartment_createwindowifneeded
(
struct
apartment
*
apt
);
HWND
apartment_getwindow
(
struct
apartment
*
apt
);
HWND
apartment_getwindow
(
const
struct
apartment
*
apt
);
void
apartment_joinmta
(
void
);
void
apartment_joinmta
(
void
);
...
...
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