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
7f602db5
Commit
7f602db5
authored
Feb 25, 2011
by
Marcus Meissner
Committed by
Alexandre Julliard
Feb 28, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
server: Avoid shadowing a global variable.
parent
0d92426d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
11 deletions
+11
-11
atom.c
server/atom.c
+11
-11
No files found.
server/atom.c
View file @
7f602db5
...
@@ -334,19 +334,19 @@ static struct atom_table *get_table( obj_handle_t h, int create )
...
@@ -334,19 +334,19 @@ static struct atom_table *get_table( obj_handle_t h, int create )
/* add an atom in the global table; used for window properties */
/* add an atom in the global table; used for window properties */
atom_t
add_global_atom
(
struct
winstation
*
winstation
,
const
struct
unicode_str
*
str
)
atom_t
add_global_atom
(
struct
winstation
*
winstation
,
const
struct
unicode_str
*
str
)
{
{
struct
atom_table
*
global_
table
=
get_global_table
(
winstation
,
1
);
struct
atom_table
*
table
=
get_global_table
(
winstation
,
1
);
if
(
!
global_
table
)
return
0
;
if
(
!
table
)
return
0
;
return
add_atom
(
global_
table
,
str
);
return
add_atom
(
table
,
str
);
}
}
/* find an atom in the global table; used for window properties */
/* find an atom in the global table; used for window properties */
atom_t
find_global_atom
(
struct
winstation
*
winstation
,
const
struct
unicode_str
*
str
)
atom_t
find_global_atom
(
struct
winstation
*
winstation
,
const
struct
unicode_str
*
str
)
{
{
struct
atom_table
*
global_
table
=
get_global_table
(
winstation
,
0
);
struct
atom_table
*
table
=
get_global_table
(
winstation
,
0
);
struct
atom_entry
*
entry
;
struct
atom_entry
*
entry
;
if
(
!
str
->
len
||
str
->
len
>
MAX_ATOM_LEN
||
!
global_
table
)
return
0
;
if
(
!
str
->
len
||
str
->
len
>
MAX_ATOM_LEN
||
!
table
)
return
0
;
if
((
entry
=
find_atom_entry
(
global_table
,
str
,
atom_hash
(
global_
table
,
str
)
)))
if
((
entry
=
find_atom_entry
(
table
,
str
,
atom_hash
(
table
,
str
)
)))
return
entry
->
atom
;
return
entry
->
atom
;
return
0
;
return
0
;
}
}
...
@@ -356,10 +356,10 @@ int grab_global_atom( struct winstation *winstation, atom_t atom )
...
@@ -356,10 +356,10 @@ int grab_global_atom( struct winstation *winstation, atom_t atom )
{
{
if
(
atom
>=
MIN_STR_ATOM
)
if
(
atom
>=
MIN_STR_ATOM
)
{
{
struct
atom_table
*
global_
table
=
get_global_table
(
winstation
,
0
);
struct
atom_table
*
table
=
get_global_table
(
winstation
,
0
);
if
(
global_
table
)
if
(
table
)
{
{
struct
atom_entry
*
entry
=
get_atom_entry
(
global_
table
,
atom
);
struct
atom_entry
*
entry
=
get_atom_entry
(
table
,
atom
);
if
(
entry
)
entry
->
count
++
;
if
(
entry
)
entry
->
count
++
;
return
(
entry
!=
NULL
);
return
(
entry
!=
NULL
);
}
}
...
@@ -373,8 +373,8 @@ void release_global_atom( struct winstation *winstation, atom_t atom )
...
@@ -373,8 +373,8 @@ void release_global_atom( struct winstation *winstation, atom_t atom )
{
{
if
(
atom
>=
MIN_STR_ATOM
)
if
(
atom
>=
MIN_STR_ATOM
)
{
{
struct
atom_table
*
global_
table
=
get_global_table
(
winstation
,
0
);
struct
atom_table
*
table
=
get_global_table
(
winstation
,
0
);
if
(
global_table
)
delete_atom
(
global_
table
,
atom
,
1
);
if
(
table
)
delete_atom
(
table
,
atom
,
1
);
}
}
}
}
...
...
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