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
87ede894
Commit
87ede894
authored
Dec 17, 2009
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Get rid of the EDIT_winproc_handle variable.
parent
6400dabf
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
9 deletions
+4
-9
class.c
dlls/user32/class.c
+3
-4
controls.h
dlls/user32/controls.h
+0
-2
win.c
dlls/user32/win.c
+1
-1
winproc.c
dlls/user32/winproc.c
+0
-2
No files found.
dlls/user32/class.c
View file @
87ede894
...
...
@@ -391,18 +391,17 @@ static CLASS *CLASS_RegisterClass( LPCWSTR name, HINSTANCE hInstance, BOOL local
* Register a builtin control class.
* This allows having both ASCII and Unicode winprocs for the same class.
*/
static
WNDPROC
register_builtin
(
const
struct
builtin_class_descr
*
descr
)
static
void
register_builtin
(
const
struct
builtin_class_descr
*
descr
)
{
CLASS
*
classPtr
;
if
(
!
(
classPtr
=
CLASS_RegisterClass
(
descr
->
name
,
user32_module
,
FALSE
,
descr
->
style
,
0
,
descr
->
extra
)))
return
0
;
descr
->
style
,
0
,
descr
->
extra
)))
return
;
classPtr
->
hCursor
=
LoadCursorA
(
0
,
(
LPSTR
)
descr
->
cursor
);
classPtr
->
hbrBackground
=
descr
->
brush
;
classPtr
->
winproc
=
WINPROC_AllocProc
(
descr
->
procA
,
descr
->
procW
);
release_class_ptr
(
classPtr
);
return
classPtr
->
winproc
;
}
...
...
@@ -416,7 +415,7 @@ void CLASS_RegisterBuiltinClasses(void)
register_builtin
(
&
COMBO_builtin_class
);
register_builtin
(
&
COMBOLBOX_builtin_class
);
register_builtin
(
&
DIALOG_builtin_class
);
EDIT_winproc_handle
=
register_builtin
(
&
EDIT_builtin_class
);
register_builtin
(
&
EDIT_builtin_class
);
register_builtin
(
&
ICONTITLE_builtin_class
);
register_builtin
(
&
LISTBOX_builtin_class
);
register_builtin
(
&
MDICLIENT_builtin_class
);
...
...
dlls/user32/controls.h
View file @
87ede894
...
...
@@ -109,8 +109,6 @@ extern void register_wow_handlers(void) DECLSPEC_HIDDEN;
extern
void
WINAPI
UserRegisterWowHandlers
(
const
struct
wow_handlers16
*
new
,
struct
wow_handlers32
*
orig
);
extern
WNDPROC
EDIT_winproc_handle
DECLSPEC_HIDDEN
;
/* Class functions */
struct
tagCLASS
;
/* opaque structure */
struct
tagWND
;
...
...
dlls/user32/win.c
View file @
87ede894
...
...
@@ -2081,7 +2081,7 @@ static LONG_PTR WIN_GetWindowLong( HWND hwnd, INT offset, UINT size, BOOL unicod
* more tolerant to A/W mismatches. The lack of W->A->W conversion for such a mismatch suggests
* that the hack is in GetWindowLongPtr[AW], not in winprocs.
*/
if
(
wndPtr
->
winproc
==
EDIT_winproc_handle
&&
(
!
unicode
!=
!
(
wndPtr
->
flags
&
WIN_ISUNICODE
)))
if
(
wndPtr
->
winproc
==
BUILTIN_WINPROC
(
WINPROC_EDIT
)
&&
(
!
unicode
!=
!
(
wndPtr
->
flags
&
WIN_ISUNICODE
)))
retvalue
=
(
ULONG_PTR
)
wndPtr
->
winproc
;
else
retvalue
=
(
ULONG_PTR
)
WINPROC_GetProc
(
wndPtr
->
winproc
,
unicode
);
...
...
dlls/user32/winproc.c
View file @
87ede894
...
...
@@ -49,8 +49,6 @@ typedef struct tagWINDOWPROC
#define MAX_WINPROC_RECURSION 64
#define WINPROC_PROC16 ((WINDOWPROC *)1)
/* placeholder for 16-bit window procs */
WNDPROC
EDIT_winproc_handle
=
0
;
static
LRESULT
WINAPI
ButtonWndProcA
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wParam
,
LPARAM
lParam
);
static
LRESULT
WINAPI
ButtonWndProcW
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wParam
,
LPARAM
lParam
);
static
LRESULT
WINAPI
ComboWndProcA
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wParam
,
LPARAM
lParam
);
...
...
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