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
04a8cff1
Commit
04a8cff1
authored
Jul 14, 2005
by
Jacek Caban
Committed by
Alexandre Julliard
Jul 14, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Better handling of UI and InPlace active state.
- Implemented InPlaceDeactivate. - THIS macros cleanup.
parent
13766712
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
72 additions
and
42 deletions
+72
-42
htmldoc.c
dlls/mshtml/htmldoc.c
+6
-6
mshtml_private.h
dlls/mshtml/mshtml_private.h
+3
-0
olewnd.c
dlls/mshtml/olewnd.c
+22
-2
view.c
dlls/mshtml/view.c
+41
-34
No files found.
dlls/mshtml/htmldoc.c
View file @
04a8cff1
...
...
@@ -128,13 +128,13 @@ static ULONG WINAPI HTMLDocument_Release(IHTMLDocument2 *iface)
if
(
!
ref
)
{
if
(
This
->
client
)
IOle
ClientSite_Release
(
This
->
client
);
if
(
This
->
hostui
)
I
DocHostUIHandler_Release
(
This
->
hostui
);
IOle
Object_SetClientSite
(
OLEOBJ
(
This
),
NULL
);
if
(
This
->
in_place_active
)
I
OleInPlaceObjectWindowless_InPlaceDeactivate
(
INPLACEWIN
(
This
)
);
if
(
This
->
ipsite
)
IOle
InPlaceSite_Release
(
This
->
ipsite
);
if
(
This
->
frame
)
IOleInPlaceFrame_Release
(
This
->
frame
);
IOle
DocumentView_SetInPlaceSite
(
DOCVIEW
(
This
),
NULL
);
if
(
This
->
hwnd
)
DestroyWindow
(
This
->
hwnd
);
HeapFree
(
GetProcessHeap
(),
0
,
This
);
}
...
...
dlls/mshtml/mshtml_private.h
View file @
04a8cff1
...
...
@@ -38,6 +38,9 @@ typedef struct {
IOleInPlaceFrame
*
frame
;
HWND
hwnd
;
BOOL
in_place_active
;
BOOL
ui_active
;
}
HTMLDocument
;
#define HTMLDOC(x) ((IHTMLDocument2*) &(x)->lpHTMLDocument2Vtbl)
...
...
dlls/mshtml/olewnd.c
View file @
04a8cff1
...
...
@@ -71,6 +71,9 @@ static HRESULT WINAPI OleInPlaceActiveObject_GetWindow(IOleInPlaceActiveObject *
if
(
!
phwnd
)
return
E_INVALIDARG
;
if
(
!
This
->
in_place_active
)
return
E_FAIL
;
*
phwnd
=
This
->
hwnd
;
return
S_OK
;
}
...
...
@@ -175,8 +178,25 @@ static HRESULT WINAPI OleInPlaceObjectWindowless_ContextSensitiveHelp(IOleInPlac
static
HRESULT
WINAPI
OleInPlaceObjectWindowless_InPlaceDeactivate
(
IOleInPlaceObjectWindowless
*
iface
)
{
HTMLDocument
*
This
=
OLEINPLACEWND_THIS
(
iface
);
FIXME
(
"(%p)
\n
"
,
This
);
return
E_NOTIMPL
;
TRACE
(
"(%p)
\n
"
,
This
);
if
(
!
This
->
in_place_active
)
return
S_OK
;
if
(
This
->
frame
)
IOleInPlaceFrame_Release
(
This
->
frame
);
if
(
This
->
hwnd
)
{
ShowWindow
(
This
->
hwnd
,
SW_HIDE
);
SetWindowPos
(
This
->
hwnd
,
HWND_TOPMOST
,
0
,
0
,
0
,
0
,
SWP_NOSIZE
|
SWP_NOMOVE
|
SWP_NOACTIVATE
);
}
This
->
in_place_active
=
FALSE
;
if
(
This
->
ipsite
)
IOleInPlaceSite_OnInPlaceDeactivate
(
This
->
ipsite
);
return
S_OK
;
}
static
HRESULT
WINAPI
OleInPlaceObjectWindowless_UIDeactivate
(
IOleInPlaceObjectWindowless
*
iface
)
...
...
dlls/mshtml/view.c
View file @
04a8cff1
This diff is collapsed.
Click to expand it.
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