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
8e999df0
Commit
8e999df0
authored
Dec 31, 2010
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Dec 31, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
comdlg32: Pass an object instead of an iface to a helper function.
parent
cc43c46f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
35 deletions
+27
-35
filedlgbrowser.c
dlls/comdlg32/filedlgbrowser.c
+27
-35
No files found.
dlls/comdlg32/filedlgbrowser.c
View file @
8e999df0
...
...
@@ -72,12 +72,6 @@ static const IShellBrowserVtbl IShellBrowserImpl_Vtbl;
static
const
ICommDlgBrowserVtbl
IShellBrowserImpl_ICommDlgBrowser_Vtbl
;
static
const
IServiceProviderVtbl
IShellBrowserImpl_IServiceProvider_Vtbl
;
/**************************************************************************
* Local Prototypes
*/
static
HRESULT
IShellBrowserImpl_ICommDlgBrowser_OnSelChange
(
ICommDlgBrowser
*
iface
,
const
IShellView
*
ppshv
);
/*
* Helper functions
*/
...
...
@@ -805,6 +799,32 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnDefaultCommand(ICommDl
}
/**************************************************************************
* IShellBrowserImpl_OnSelChange
*/
static
HRESULT
IShellBrowserImpl_OnSelChange
(
IShellBrowserImpl
*
This
,
const
IShellView
*
ppshv
)
{
FileOpenDlgInfos
*
fodInfos
;
fodInfos
=
GetPropA
(
This
->
hwndOwner
,
FileOpenDlgInfosStr
);
TRACE
(
"(%p do=%p view=%p)
\n
"
,
This
,
fodInfos
->
Shell
.
FOIDataObject
,
fodInfos
->
Shell
.
FOIShellView
);
/* release old selections */
if
(
fodInfos
->
Shell
.
FOIDataObject
)
IDataObject_Release
(
fodInfos
->
Shell
.
FOIDataObject
);
/* get a new DataObject from the ShellView */
if
(
FAILED
(
IShellView_GetItemObject
(
fodInfos
->
Shell
.
FOIShellView
,
SVGIO_SELECTION
,
&
IID_IDataObject
,
(
void
**
)
&
fodInfos
->
Shell
.
FOIDataObject
)))
return
E_FAIL
;
FILEDLG95_FILENAME_FillFromSelection
(
This
->
hwndOwner
);
if
(
fodInfos
->
ofnInfos
->
Flags
&
OFN_EXPLORER
)
SendCustomDlgNotificationMessage
(
This
->
hwndOwner
,
CDN_SELCHANGE
);
return
S_OK
;
}
/**************************************************************************
* IShellBrowserImpl_ICommDlgBrowser_OnStateChange
*/
static
HRESULT
WINAPI
IShellBrowserImpl_ICommDlgBrowser_OnStateChange
(
ICommDlgBrowser
*
iface
,
...
...
@@ -838,7 +858,7 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnStateChange(ICommDlgBr
}
break
;
case
CDBOSC_SELCHANGE
:
return
IShellBrowserImpl_
ICommDlgBrowser_OnSelChange
(
iface
,
ppshv
);
return
IShellBrowserImpl_
OnSelChange
(
This
,
ppshv
);
case
CDBOSC_RENAME
:
/* nothing to do */
break
;
...
...
@@ -938,34 +958,6 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBr
}
/**************************************************************************
* IShellBrowserImpl_ICommDlgBrowser_OnSelChange
*/
static
HRESULT
IShellBrowserImpl_ICommDlgBrowser_OnSelChange
(
ICommDlgBrowser
*
iface
,
const
IShellView
*
ppshv
)
{
FileOpenDlgInfos
*
fodInfos
;
IShellBrowserImpl
*
This
=
impl_from_ICommDlgBrowser
(
iface
);
fodInfos
=
GetPropA
(
This
->
hwndOwner
,
FileOpenDlgInfosStr
);
TRACE
(
"(%p do=%p view=%p)
\n
"
,
This
,
fodInfos
->
Shell
.
FOIDataObject
,
fodInfos
->
Shell
.
FOIShellView
);
/* release old selections */
if
(
fodInfos
->
Shell
.
FOIDataObject
)
IDataObject_Release
(
fodInfos
->
Shell
.
FOIDataObject
);
/* get a new DataObject from the ShellView */
if
(
FAILED
(
IShellView_GetItemObject
(
fodInfos
->
Shell
.
FOIShellView
,
SVGIO_SELECTION
,
&
IID_IDataObject
,
(
LPVOID
*
)
&
fodInfos
->
Shell
.
FOIDataObject
)))
return
E_FAIL
;
FILEDLG95_FILENAME_FillFromSelection
(
This
->
hwndOwner
);
if
(
fodInfos
->
ofnInfos
->
Flags
&
OFN_EXPLORER
)
SendCustomDlgNotificationMessage
(
This
->
hwndOwner
,
CDN_SELCHANGE
);
return
S_OK
;
}
static
const
ICommDlgBrowserVtbl
IShellBrowserImpl_ICommDlgBrowser_Vtbl
=
{
/* IUnknown */
...
...
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