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
9251b2c6
Commit
9251b2c6
authored
Jun 20, 2005
by
Mike McCormack
Committed by
Alexandre Julliard
Jun 20, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make tabs work in msi dialogs.
parent
32984a64
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
10 deletions
+17
-10
dialog.c
dlls/msi/dialog.c
+17
-10
No files found.
dlls/msi/dialog.c
View file @
9251b2c6
...
@@ -402,7 +402,7 @@ static UINT msi_dialog_button_control( msi_dialog *dialog, MSIRECORD *rec )
...
@@ -402,7 +402,7 @@ static UINT msi_dialog_button_control( msi_dialog *dialog, MSIRECORD *rec )
TRACE
(
"%p %p
\n
"
,
dialog
,
rec
);
TRACE
(
"%p %p
\n
"
,
dialog
,
rec
);
control
=
msi_dialog_add_control
(
dialog
,
rec
,
szButton
,
0
);
control
=
msi_dialog_add_control
(
dialog
,
rec
,
szButton
,
WS_TABSTOP
);
control
->
handler
=
msi_dialog_button_handler
;
control
->
handler
=
msi_dialog_button_handler
;
return
ERROR_SUCCESS
;
return
ERROR_SUCCESS
;
...
@@ -458,7 +458,7 @@ static UINT msi_dialog_checkbox_control( msi_dialog *dialog, MSIRECORD *rec )
...
@@ -458,7 +458,7 @@ static UINT msi_dialog_checkbox_control( msi_dialog *dialog, MSIRECORD *rec )
TRACE
(
"%p %p
\n
"
,
dialog
,
rec
);
TRACE
(
"%p %p
\n
"
,
dialog
,
rec
);
control
=
msi_dialog_add_control
(
dialog
,
rec
,
szButton
,
control
=
msi_dialog_add_control
(
dialog
,
rec
,
szButton
,
BS_CHECKBOX
|
BS_MULTILINE
);
BS_CHECKBOX
|
BS_MULTILINE
|
WS_TABSTOP
);
control
->
handler
=
msi_dialog_checkbox_handler
;
control
->
handler
=
msi_dialog_checkbox_handler
;
prop
=
MSI_RecordGetString
(
rec
,
9
);
prop
=
MSI_RecordGetString
(
rec
,
9
);
if
(
prop
)
if
(
prop
)
...
@@ -515,7 +515,8 @@ static UINT msi_dialog_scrolltext_control( msi_dialog *dialog, MSIRECORD *rec )
...
@@ -515,7 +515,8 @@ static UINT msi_dialog_scrolltext_control( msi_dialog *dialog, MSIRECORD *rec )
EDITSTREAM
es
;
EDITSTREAM
es
;
DWORD
style
;
DWORD
style
;
style
=
WS_BORDER
|
ES_MULTILINE
|
WS_VSCROLL
|
ES_READONLY
|
ES_AUTOVSCROLL
;
style
=
WS_BORDER
|
ES_MULTILINE
|
WS_VSCROLL
|
ES_READONLY
|
ES_AUTOVSCROLL
|
WS_TABSTOP
;
control
=
msi_dialog_add_control
(
dialog
,
rec
,
szRichEdit20W
,
style
);
control
=
msi_dialog_add_control
(
dialog
,
rec
,
szRichEdit20W
,
style
);
text
=
MSI_RecordGetString
(
rec
,
10
);
text
=
MSI_RecordGetString
(
rec
,
10
);
...
@@ -601,7 +602,8 @@ static UINT msi_dialog_edit_control( msi_dialog *dialog, MSIRECORD *rec )
...
@@ -601,7 +602,8 @@ static UINT msi_dialog_edit_control( msi_dialog *dialog, MSIRECORD *rec )
LPCWSTR
prop
;
LPCWSTR
prop
;
LPWSTR
val
;
LPWSTR
val
;
control
=
msi_dialog_add_control
(
dialog
,
rec
,
szEdit
,
WS_BORDER
);
control
=
msi_dialog_add_control
(
dialog
,
rec
,
szEdit
,
WS_BORDER
|
WS_TABSTOP
);
control
->
handler
=
msi_dialog_edit_handler
;
control
->
handler
=
msi_dialog_edit_handler
;
prop
=
MSI_RecordGetString
(
rec
,
9
);
prop
=
MSI_RecordGetString
(
rec
,
9
);
if
(
prop
)
if
(
prop
)
...
@@ -838,13 +840,15 @@ static UINT msi_dialog_maskedit_control( msi_dialog *dialog, MSIRECORD *rec )
...
@@ -838,13 +840,15 @@ static UINT msi_dialog_maskedit_control( msi_dialog *dialog, MSIRECORD *rec )
info
->
dialog
=
dialog
;
info
->
dialog
=
dialog
;
control
=
msi_dialog_add_control
(
dialog
,
rec
,
szStatic
,
SS_OWNERDRAW
|
WS_GROUP
);
control
=
msi_dialog_add_control
(
dialog
,
rec
,
szStatic
,
SS_OWNERDRAW
|
WS_GROUP
|
WS_VISIBLE
);
if
(
!
control
)
if
(
!
control
)
{
{
ERR
(
"Failed to create maskedit container
\n
"
);
ERR
(
"Failed to create maskedit container
\n
"
);
ret
=
ERROR_FUNCTION_FAILED
;
ret
=
ERROR_FUNCTION_FAILED
;
goto
end
;
goto
end
;
}
}
SetWindowLongPtrW
(
control
->
hwnd
,
GWL_EXSTYLE
,
WS_EX_CONTROLPARENT
);
info
->
hwnd
=
control
->
hwnd
;
info
->
hwnd
=
control
->
hwnd
;
...
@@ -895,7 +899,7 @@ static UINT msi_dialog_create_radiobutton( MSIRECORD *rec, LPVOID param )
...
@@ -895,7 +899,7 @@ static UINT msi_dialog_create_radiobutton( MSIRECORD *rec, LPVOID param )
DWORD
style
;
DWORD
style
;
DWORD
attributes
=
group
->
attributes
;
DWORD
attributes
=
group
->
attributes
;
style
=
WS_CHILD
|
BS_AUTORADIOBUTTON
|
BS_MULTILINE
;
style
=
WS_CHILD
|
BS_AUTORADIOBUTTON
|
BS_MULTILINE
|
WS_TABSTOP
;
name
=
MSI_RecordGetString
(
rec
,
3
);
name
=
MSI_RecordGetString
(
rec
,
3
);
text
=
MSI_RecordGetString
(
rec
,
8
);
text
=
MSI_RecordGetString
(
rec
,
8
);
if
(
attributes
&
1
)
if
(
attributes
&
1
)
...
@@ -941,6 +945,7 @@ static UINT msi_dialog_radiogroup_control( msi_dialog *dialog, MSIRECORD *rec )
...
@@ -941,6 +945,7 @@ static UINT msi_dialog_radiogroup_control( msi_dialog *dialog, MSIRECORD *rec )
oldproc
=
(
WNDPROC
)
SetWindowLongPtrW
(
control
->
hwnd
,
GWLP_WNDPROC
,
oldproc
=
(
WNDPROC
)
SetWindowLongPtrW
(
control
->
hwnd
,
GWLP_WNDPROC
,
(
LONG_PTR
)
MSIRadioGroup_WndProc
);
(
LONG_PTR
)
MSIRadioGroup_WndProc
);
SetPropW
(
control
->
hwnd
,
szButtonData
,
oldproc
);
SetPropW
(
control
->
hwnd
,
szButtonData
,
oldproc
);
SetWindowLongPtrW
(
control
->
hwnd
,
GWL_EXSTYLE
,
WS_EX_CONTROLPARENT
);
if
(
prop
)
if
(
prop
)
control
->
property
=
strdupW
(
prop
);
control
->
property
=
strdupW
(
prop
);
...
@@ -1048,7 +1053,7 @@ static UINT msi_dialog_set_control_condition( MSIRECORD *rec, LPVOID param )
...
@@ -1048,7 +1053,7 @@ static UINT msi_dialog_set_control_condition( MSIRECORD *rec, LPVOID param )
TRACE
(
"%s control %s
\n
"
,
debugstr_w
(
action
),
debugstr_w
(
name
));
TRACE
(
"%s control %s
\n
"
,
debugstr_w
(
action
),
debugstr_w
(
name
));
/* FIXME: case sensitive? */
/* FIXME: case sensitive? */
if
(
!
strcmpW
(
action
,
szHide
))
if
(
!
l
strcmpW
(
action
,
szHide
))
ShowWindow
(
control
->
hwnd
,
SW_HIDE
);
ShowWindow
(
control
->
hwnd
,
SW_HIDE
);
else
if
(
!
strcmpW
(
action
,
szShow
))
else
if
(
!
strcmpW
(
action
,
szShow
))
ShowWindow
(
control
->
hwnd
,
SW_SHOW
);
ShowWindow
(
control
->
hwnd
,
SW_SHOW
);
...
@@ -1513,12 +1518,14 @@ msi_dialog *msi_dialog_create( MSIPACKAGE* package, LPCWSTR szDialogName,
...
@@ -1513,12 +1518,14 @@ msi_dialog *msi_dialog_create( MSIPACKAGE* package, LPCWSTR szDialogName,
return
dialog
;
return
dialog
;
}
}
static
void
msi_process_pending_messages
(
void
)
static
void
msi_process_pending_messages
(
HWND
hdlg
)
{
{
MSG
msg
;
MSG
msg
;
while
(
PeekMessageW
(
&
msg
,
0
,
0
,
0
,
PM_REMOVE
)
)
while
(
PeekMessageW
(
&
msg
,
0
,
0
,
0
,
PM_REMOVE
)
)
{
{
if
(
hdlg
&&
IsDialogMessageW
(
hdlg
,
&
msg
))
continue
;
TranslateMessage
(
&
msg
);
TranslateMessage
(
&
msg
);
DispatchMessageW
(
&
msg
);
DispatchMessageW
(
&
msg
);
}
}
...
@@ -1546,7 +1553,7 @@ void msi_dialog_check_messages( HANDLE handle )
...
@@ -1546,7 +1553,7 @@ void msi_dialog_check_messages( HANDLE handle )
/* there's two choices for the UI thread */
/* there's two choices for the UI thread */
while
(
1
)
while
(
1
)
{
{
msi_process_pending_messages
();
msi_process_pending_messages
(
NULL
);
if
(
!
handle
)
if
(
!
handle
)
break
;
break
;
...
@@ -1589,7 +1596,7 @@ UINT msi_dialog_run_message_loop( msi_dialog *dialog )
...
@@ -1589,7 +1596,7 @@ UINT msi_dialog_run_message_loop( msi_dialog *dialog )
while
(
!
dialog
->
finished
)
while
(
!
dialog
->
finished
)
{
{
MsgWaitForMultipleObjects
(
0
,
NULL
,
0
,
INFINITE
,
QS_ALLEVENTS
);
MsgWaitForMultipleObjects
(
0
,
NULL
,
0
,
INFINITE
,
QS_ALLEVENTS
);
msi_process_pending_messages
();
msi_process_pending_messages
(
dialog
->
hwnd
);
}
}
}
}
else
else
...
...
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