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
0be56d27
Commit
0be56d27
authored
Sep 25, 2013
by
Jacek Caban
Committed by
Alexandre Julliard
Sep 25, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Wine Gecko 2.24 release.
parent
a449b2d5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
17 deletions
+22
-17
addons.c
dlls/appwiz.cpl/addons.c
+3
-3
htmlelem.c
dlls/mshtml/htmlelem.c
+12
-12
htmlwindow.c
dlls/mshtml/htmlwindow.c
+6
-1
nsembed.c
dlls/mshtml/nsembed.c
+1
-1
nsiface.idl
dlls/mshtml/nsiface.idl
+0
-0
No files found.
dlls/appwiz.cpl/addons.c
View file @
0be56d27
...
...
@@ -52,14 +52,14 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
appwizcpl
);
#define GECKO_VERSION "2.2
1
"
#define GECKO_VERSION "2.2
4
"
#ifdef __i386__
#define ARCH_STRING "x86"
#define GECKO_SHA "
a514fc4d53783a586c7880a676c415695fe934a3
"
#define GECKO_SHA "
b4923c0565e6cbd20075a0d4119ce3b48424f962
"
#elif defined(__x86_64__)
#define ARCH_STRING "x86_64"
#define GECKO_SHA "
c6f249ff2c6eb7dfe423ef246aba54e1a3b26934
"
#define GECKO_SHA "
da65fb99a53d87c831030ec8787e31d797f60e60
"
#else
#define ARCH_STRING ""
#define GECKO_SHA "???"
...
...
dlls/mshtml/htmlelem.c
View file @
0be56d27
...
...
@@ -1728,8 +1728,8 @@ static HRESULT HTMLElement_invoke(DispatchEx *dispex, DISPID id, LCID lcid,
static
HRESULT
HTMLElement_populate_props
(
DispatchEx
*
dispex
)
{
HTMLElement
*
This
=
impl_from_DispatchEx
(
dispex
);
nsIDOM
NamedNode
Map
*
attrs
;
nsIDOM
Node
*
node
;
nsIDOM
MozNamedAttr
Map
*
attrs
;
nsIDOM
Attr
*
attr
;
nsAString
nsstr
;
const
PRUnichar
*
str
;
BSTR
name
;
...
...
@@ -1747,40 +1747,40 @@ static HRESULT HTMLElement_populate_props(DispatchEx *dispex)
if
(
NS_FAILED
(
nsres
))
return
E_FAIL
;
nsres
=
nsIDOM
NamedNode
Map_GetLength
(
attrs
,
&
len
);
nsres
=
nsIDOM
MozNamedAttr
Map_GetLength
(
attrs
,
&
len
);
if
(
NS_FAILED
(
nsres
))
{
nsIDOM
NamedNode
Map_Release
(
attrs
);
nsIDOM
MozNamedAttr
Map_Release
(
attrs
);
return
E_FAIL
;
}
nsAString_Init
(
&
nsstr
,
NULL
);
for
(
i
=
0
;
i
<
len
;
i
++
)
{
nsres
=
nsIDOM
NamedNodeMap_Item
(
attrs
,
i
,
&
node
);
nsres
=
nsIDOM
MozNamedAttrMap_Item
(
attrs
,
i
,
&
attr
);
if
(
NS_FAILED
(
nsres
))
continue
;
nsres
=
nsIDOM
Node_GetNodeName
(
node
,
&
nsstr
);
nsres
=
nsIDOM
Attr_GetNodeName
(
attr
,
&
nsstr
);
if
(
NS_FAILED
(
nsres
))
{
nsIDOM
Node_Release
(
node
);
nsIDOM
Attr_Release
(
attr
);
continue
;
}
nsAString_GetData
(
&
nsstr
,
&
str
);
name
=
SysAllocString
(
str
);
if
(
!
name
)
{
nsIDOM
Node_Release
(
node
);
nsIDOM
Attr_Release
(
attr
);
continue
;
}
hres
=
IDispatchEx_GetDispID
(
&
dispex
->
IDispatchEx_iface
,
name
,
fdexNameCaseInsensitive
,
&
id
);
if
(
hres
!=
DISP_E_UNKNOWNNAME
)
{
nsIDOM
Node_Release
(
node
);
nsIDOM
Attr_Release
(
attr
);
SysFreeString
(
name
);
continue
;
}
nsres
=
nsIDOM
Node_GetNodeValue
(
node
,
&
nsstr
);
nsIDOM
Node_Release
(
node
);
nsres
=
nsIDOM
Attr_GetNodeValue
(
attr
,
&
nsstr
);
nsIDOM
Attr_Release
(
attr
);
if
(
NS_FAILED
(
nsres
))
{
SysFreeString
(
name
);
continue
;
...
...
@@ -1803,7 +1803,7 @@ static HRESULT HTMLElement_populate_props(DispatchEx *dispex)
}
nsAString_Finish
(
&
nsstr
);
nsIDOM
NamedNode
Map_Release
(
attrs
);
nsIDOM
MozNamedAttr
Map_Release
(
attrs
);
return
S_OK
;
}
...
...
dlls/mshtml/htmlwindow.c
View file @
0be56d27
...
...
@@ -38,6 +38,7 @@
#include "mshtml_private.h"
#include "htmlevent.h"
#include "htmlscript.h"
#include "pluginhost.h"
#include "binding.h"
#include "resource.h"
...
...
@@ -114,8 +115,12 @@ static void detach_inner_window(HTMLInnerWindow *window)
if
(
outer_window
&&
outer_window
->
doc_obj
&&
outer_window
==
outer_window
->
doc_obj
->
basedoc
.
window
)
window
->
doc
->
basedoc
.
cp_container
.
forward_container
=
NULL
;
if
(
window
->
doc
)
if
(
window
->
doc
)
{
detach_events
(
window
->
doc
);
while
(
!
list_empty
(
&
window
->
doc
->
plugin_hosts
))
detach_plugin_host
(
LIST_ENTRY
(
list_head
(
&
window
->
doc
->
plugin_hosts
),
PluginHost
,
entry
));
}
abort_window_bindings
(
window
);
remove_target_tasks
(
window
->
task_magic
);
release_script_hosts
(
window
);
...
...
dlls/mshtml/nsembed.c
View file @
0be56d27
...
...
@@ -488,7 +488,7 @@ static BOOL load_xul(const PRUnichar *gre_path)
}
#define NS_DLSYM(func) \
func = (void *)GetProcAddress(xul_handle, #func
"_P"
); \
func = (void *)GetProcAddress(xul_handle, #func); \
if(!func) \
ERR("Could not GetProcAddress(" #func ") failed\n")
...
...
dlls/mshtml/nsiface.idl
View file @
0be56d27
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