Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
6ac2ba3e
Commit
6ac2ba3e
authored
Feb 19, 2020
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Feb 27, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
server: Ignore low word of a class instance when looking up for a window class.
Signed-off-by:
Dmitry Timoshkov
<
dmitry@baikal.ru
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
e2c0f513
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
class.c
dlls/user32/tests/class.c
+0
-3
class.c
server/class.c
+4
-1
No files found.
dlls/user32/tests/class.c
View file @
6ac2ba3e
...
...
@@ -128,14 +128,11 @@ static void ClassTest(HINSTANCE hInstance, BOOL global)
WS_OVERLAPPEDWINDOW
+
WS_HSCROLL
+
WS_VSCROLL
,
CW_USEDEFAULT
,
0
,
CW_USEDEFAULT
,
0
,
0
,
0
,
hInstance2
,
0
);
todo_wine_if
(
!
global
)
ok
(
hTestWnd
!=
0
,
"Failed to create window for hInstance %p
\n
"
,
hInstance2
);
todo_wine_if
(
!
global
)
ok
((
HINSTANCE
)
GetClassLongPtrA
(
hTestWnd
,
GCLP_HMODULE
)
==
hInstance
,
"Wrong GCL instance %p != %p
\n
"
,
(
HINSTANCE
)
GetClassLongPtrA
(
hTestWnd
,
GCLP_HMODULE
),
hInstance
);
todo_wine_if
(
!
global
)
ok
((
HINSTANCE
)
GetWindowLongPtrA
(
hTestWnd
,
GWLP_HINSTANCE
)
==
hInstance2
,
"Wrong GWL instance %p != %p
\n
"
,
(
HINSTANCE
)
GetWindowLongPtrA
(
hTestWnd
,
GWLP_HINSTANCE
),
hInstance2
);
...
...
server/class.c
View file @
6ac2ba3e
...
...
@@ -100,9 +100,12 @@ static struct window_class *find_class( struct process *process, atom_t atom, mo
LIST_FOR_EACH
(
ptr
,
&
process
->
classes
)
{
int
is_win16
;
struct
window_class
*
class
=
LIST_ENTRY
(
ptr
,
struct
window_class
,
entry
);
if
(
class
->
atom
!=
atom
)
continue
;
if
(
!
instance
||
!
class
->
local
||
class
->
instance
==
instance
)
return
class
;
is_win16
=
!
(
class
->
instance
>>
16
);
if
(
!
instance
||
!
class
->
local
||
class
->
instance
==
instance
||
(
!
is_win16
&&
((
class
->
instance
&
~
0xffff
)
==
(
instance
&
~
0xffff
))))
return
class
;
}
return
NULL
;
}
...
...
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