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
e1a63fd5
Commit
e1a63fd5
authored
May 31, 2010
by
Hans Leidekker
Committed by
Alexandre Julliard
May 31, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Pass the control name to ControlEvent_SubscribeToEvent instead of uninitialized memory.
parent
35a0461b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
dialog.c
dlls/msi/dialog.c
+6
-4
No files found.
dlls/msi/dialog.c
View file @
e1a63fd5
...
@@ -774,7 +774,7 @@ static UINT msi_dialog_text_control( msi_dialog *dialog, MSIRECORD *rec )
...
@@ -774,7 +774,7 @@ static UINT msi_dialog_text_control( msi_dialog *dialog, MSIRECORD *rec )
{
{
msi_control
*
control
;
msi_control
*
control
;
struct
msi_text_info
*
info
;
struct
msi_text_info
*
info
;
LPCWSTR
text
,
ptr
,
prop
;
LPCWSTR
text
,
ptr
,
prop
,
control_name
;
LPWSTR
font_name
;
LPWSTR
font_name
;
TRACE
(
"%p %p
\n
"
,
dialog
,
rec
);
TRACE
(
"%p %p
\n
"
,
dialog
,
rec
);
...
@@ -787,6 +787,7 @@ static UINT msi_dialog_text_control( msi_dialog *dialog, MSIRECORD *rec )
...
@@ -787,6 +787,7 @@ static UINT msi_dialog_text_control( msi_dialog *dialog, MSIRECORD *rec )
if
(
!
info
)
if
(
!
info
)
return
ERROR_SUCCESS
;
return
ERROR_SUCCESS
;
control_name
=
MSI_RecordGetString
(
rec
,
2
);
control
->
attributes
=
MSI_RecordGetInteger
(
rec
,
8
);
control
->
attributes
=
MSI_RecordGetInteger
(
rec
,
8
);
prop
=
MSI_RecordGetString
(
rec
,
9
);
prop
=
MSI_RecordGetString
(
rec
,
9
);
control
->
property
=
msi_dialog_dup_property
(
dialog
,
prop
,
FALSE
);
control
->
property
=
msi_dialog_dup_property
(
dialog
,
prop
,
FALSE
);
...
@@ -805,7 +806,7 @@ static UINT msi_dialog_text_control( msi_dialog *dialog, MSIRECORD *rec )
...
@@ -805,7 +806,7 @@ static UINT msi_dialog_text_control( msi_dialog *dialog, MSIRECORD *rec )
SetPropW
(
control
->
hwnd
,
szButtonData
,
info
);
SetPropW
(
control
->
hwnd
,
szButtonData
,
info
);
ControlEvent_SubscribeToEvent
(
dialog
->
package
,
dialog
,
ControlEvent_SubscribeToEvent
(
dialog
->
package
,
dialog
,
szSelectionPath
,
control
->
name
,
szSelectionPath
);
szSelectionPath
,
control
_
name
,
szSelectionPath
);
return
ERROR_SUCCESS
;
return
ERROR_SUCCESS
;
}
}
...
@@ -2390,7 +2391,7 @@ done:
...
@@ -2390,7 +2391,7 @@ done:
static
UINT
msi_dialog_selection_tree
(
msi_dialog
*
dialog
,
MSIRECORD
*
rec
)
static
UINT
msi_dialog_selection_tree
(
msi_dialog
*
dialog
,
MSIRECORD
*
rec
)
{
{
msi_control
*
control
;
msi_control
*
control
;
LPCWSTR
prop
;
LPCWSTR
prop
,
control_name
;
MSIPACKAGE
*
package
=
dialog
->
package
;
MSIPACKAGE
*
package
=
dialog
->
package
;
DWORD
style
;
DWORD
style
;
struct
msi_selection_tree_info
*
info
;
struct
msi_selection_tree_info
*
info
;
...
@@ -2410,6 +2411,7 @@ static UINT msi_dialog_selection_tree( msi_dialog *dialog, MSIRECORD *rec )
...
@@ -2410,6 +2411,7 @@ static UINT msi_dialog_selection_tree( msi_dialog *dialog, MSIRECORD *rec )
}
}
control
->
handler
=
msi_dialog_seltree_handler
;
control
->
handler
=
msi_dialog_seltree_handler
;
control_name
=
MSI_RecordGetString
(
rec
,
2
);
control
->
attributes
=
MSI_RecordGetInteger
(
rec
,
8
);
control
->
attributes
=
MSI_RecordGetInteger
(
rec
,
8
);
prop
=
MSI_RecordGetString
(
rec
,
9
);
prop
=
MSI_RecordGetString
(
rec
,
9
);
control
->
property
=
msi_dialog_dup_property
(
dialog
,
prop
,
FALSE
);
control
->
property
=
msi_dialog_dup_property
(
dialog
,
prop
,
FALSE
);
...
@@ -2422,7 +2424,7 @@ static UINT msi_dialog_selection_tree( msi_dialog *dialog, MSIRECORD *rec )
...
@@ -2422,7 +2424,7 @@ static UINT msi_dialog_selection_tree( msi_dialog *dialog, MSIRECORD *rec )
SetPropW
(
control
->
hwnd
,
szButtonData
,
info
);
SetPropW
(
control
->
hwnd
,
szButtonData
,
info
);
ControlEvent_SubscribeToEvent
(
dialog
->
package
,
dialog
,
ControlEvent_SubscribeToEvent
(
dialog
->
package
,
dialog
,
szSelectionPath
,
control
->
name
,
szProperty
);
szSelectionPath
,
control
_
name
,
szProperty
);
/* initialize it */
/* initialize it */
msi_seltree_create_imagelist
(
control
->
hwnd
);
msi_seltree_create_imagelist
(
control
->
hwnd
);
...
...
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