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
b84e2974
Commit
b84e2974
authored
Sep 16, 2005
by
Mike McCormack
Committed by
Alexandre Julliard
Sep 16, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Convert the list of dialog controls to a standard list.
parent
8c6649e4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
10 deletions
+11
-10
dialog.c
dlls/msi/dialog.c
+11
-10
No files found.
dlls/msi/dialog.c
View file @
b84e2974
...
...
@@ -48,7 +48,7 @@ typedef UINT (*msi_handler)( msi_dialog *, msi_control *, WPARAM );
struct
msi_control_tag
{
struct
msi_control_tag
*
next
;
struct
list
entry
;
HWND
hwnd
;
msi_handler
handler
;
LPWSTR
property
;
...
...
@@ -77,7 +77,7 @@ struct msi_dialog_tag
HWND
hwnd
;
LPWSTR
default_font
;
msi_font
*
font_list
;
msi_control
*
control_list
;
struct
list
controls
;
HWND
hWndFocus
;
WCHAR
name
[
1
];
};
...
...
@@ -147,7 +147,7 @@ static msi_control *msi_dialog_find_control( msi_dialog *dialog, LPCWSTR name )
if
(
!
name
)
return
NULL
;
for
(
control
=
dialog
->
control_list
;
control
;
control
=
control
->
next
)
LIST_FOR_EACH_ENTRY
(
control
,
&
dialog
->
controls
,
msi_control
,
entry
)
if
(
!
strcmpW
(
control
->
name
,
name
)
)
/* FIXME: case sensitive? */
break
;
return
control
;
...
...
@@ -157,7 +157,7 @@ static msi_control *msi_dialog_find_control_by_hwnd( msi_dialog *dialog, HWND hw
{
msi_control
*
control
;
for
(
control
=
dialog
->
control_list
;
control
;
control
=
control
->
next
)
LIST_FOR_EACH_ENTRY
(
control
,
&
dialog
->
controls
,
msi_control
,
entry
)
if
(
hwnd
==
control
->
hwnd
)
break
;
return
control
;
...
...
@@ -306,8 +306,7 @@ static msi_control *msi_dialog_create_window( msi_dialog *dialog,
control
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sizeof
*
control
+
strlenW
(
name
)
*
sizeof
(
WCHAR
)
);
strcpyW
(
control
->
name
,
name
);
control
->
next
=
dialog
->
control_list
;
dialog
->
control_list
=
control
;
list_add_head
(
&
dialog
->
controls
,
&
control
->
entry
);
control
->
handler
=
NULL
;
control
->
property
=
NULL
;
control
->
value
=
NULL
;
...
...
@@ -1418,7 +1417,7 @@ static UINT msi_dialog_set_tab_order( msi_dialog *dialog )
{
msi_control
*
control
,
*
tab_next
;
for
(
control
=
dialog
->
control_list
;
control
;
control
=
control
->
next
)
LIST_FOR_EACH_ENTRY
(
control
,
&
dialog
->
controls
,
msi_control
,
entry
)
{
tab_next
=
msi_dialog_find_control
(
dialog
,
control
->
tabnext
);
if
(
!
tab_next
)
...
...
@@ -1804,6 +1803,7 @@ msi_dialog *msi_dialog_create( MSIPACKAGE* package, LPCWSTR szDialogName,
dialog
->
package
=
package
;
dialog
->
event_handler
=
event_handler
;
dialog
->
finished
=
0
;
list_init
(
&
dialog
->
controls
);
/* verify that the dialog exists */
rec
=
msi_get_dialog_record
(
dialog
);
...
...
@@ -1929,10 +1929,11 @@ void msi_dialog_destroy( msi_dialog *dialog )
DestroyWindow
(
dialog
->
hwnd
);
/* destroy the list of controls */
while
(
dialog
->
control_list
)
while
(
!
list_empty
(
&
dialog
->
controls
)
)
{
msi_control
*
t
=
dialog
->
control_list
;
dialog
->
control_list
=
t
->
next
;
msi_control
*
t
=
LIST_ENTRY
(
list_head
(
&
dialog
->
controls
),
msi_control
,
entry
);
list_remove
(
&
t
->
entry
);
/* leave dialog->hwnd - destroying parent destroys child windows */
HeapFree
(
GetProcessHeap
(),
0
,
t
->
property
);
HeapFree
(
GetProcessHeap
(),
0
,
t
->
value
);
...
...
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