mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Added patch to update Wine-Gecko to 2.44-beta1.
This commit is contained in:
Sebastian Lackner
parent
2852387a0c
commit
86c9959f50
@ -34,10 +34,11 @@ Wine. All those differences are also documented on the
|
||||
Included bug fixes and improvements
|
||||
-----------------------------------
|
||||
|
||||
**Bug fixes and features included in the next upcoming release [2]:**
|
||||
**Bug fixes and features included in the next upcoming release [3]:**
|
||||
|
||||
* Do a device check before returning a default serial port name ([Wine Bug #39793](https://bugs.winehq.org/show_bug.cgi?id=39793))
|
||||
* Remove dead code from SCROLL_TrackScrollBar ([Wine Bug #39558](https://bugs.winehq.org/show_bug.cgi?id=39558))
|
||||
* Update Wine-Gecko to 2.44-beta1
|
||||
|
||||
|
||||
**Bug fixes and features in Wine Staging 1.9.0 [269]:**
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,79 @@
|
||||
From 1e0ee442ec83aa1876edf14279632d844c8b41b3 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Wed, 6 Jan 2016 18:51:06 +0100
|
||||
Subject: mshtml: Fix some prototypes.
|
||||
|
||||
---
|
||||
dlls/mshtml/mutation.c | 4 ++--
|
||||
dlls/mshtml/nsiface.idl | 14 +++++++-------
|
||||
2 files changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c
|
||||
index a07c52d..22a3e61 100644
|
||||
--- a/dlls/mshtml/mutation.c
|
||||
+++ b/dlls/mshtml/mutation.c
|
||||
@@ -526,12 +526,12 @@ static void NSAPI nsDocumentObserver_CharacterDataChanged(nsIDocumentObserver *i
|
||||
}
|
||||
|
||||
static void NSAPI nsDocumentObserver_AttributeWillChange(nsIDocumentObserver *iface, nsIDocument *aDocument,
|
||||
- nsIContent *aContent, LONG aNameSpaceID, nsIAtom *aAttribute, LONG aModType, const nsAttrValue *aNewValue)
|
||||
+ void *aElement, LONG aNameSpaceID, nsIAtom *aAttribute, LONG aModType, const nsAttrValue *aNewValue)
|
||||
{
|
||||
}
|
||||
|
||||
static void NSAPI nsDocumentObserver_AttributeChanged(nsIDocumentObserver *iface, nsIDocument *aDocument,
|
||||
- nsIContent *aContent, LONG aNameSpaceID, nsIAtom *aAttribute, LONG aModType, const nsAttrValue *aNewValue)
|
||||
+ void *aElement, LONG aNameSpaceID, nsIAtom *aAttribute, LONG aModType, const nsAttrValue *aOldValue)
|
||||
{
|
||||
}
|
||||
|
||||
diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl
|
||||
index 962bb6f..52ca1d84 100644
|
||||
--- a/dlls/mshtml/nsiface.idl
|
||||
+++ b/dlls/mshtml/nsiface.idl
|
||||
@@ -2916,7 +2916,7 @@ interface nsIDOMWindowUtils : nsISupports
|
||||
nsresult SetDisplayPortForElement(float aXPx, float aYPx, float aWidthPx, float aHeightPx,
|
||||
nsIDOMElement *aElement, uint32_t aPriority);
|
||||
nsresult SetDisplayPortMarginsForElement(float aLeftMargin, float aTopMargin, float aRightMargin, float aBottomMargin,
|
||||
- uint32_t aAlignmentX, uint32_t aAlignmentY, nsIDOMElement *aElement, uint32_t aPriority);
|
||||
+ nsIDOMElement *aElement, uint32_t aPriority);
|
||||
nsresult SetDisplayPortBaseForElement(int32_t aX, int32_t aY, int32_t aWidth, int32_t aHeight, nsIDOMElement *aElement);
|
||||
nsresult SetResolution(float aResolution);
|
||||
nsresult GetResolution(float *aResolution);
|
||||
@@ -3862,8 +3862,8 @@ interface nsIDocShell : nsIDocShellTreeItem
|
||||
nsresult GatherCharsetMenuTelemetry();
|
||||
nsresult GetForcedCharset(nsIAtom **aForcedCharset);
|
||||
nsresult SetForcedCharset(nsIAtom *aForcedCharset);
|
||||
- void SetParentCharset(const nsACString *parentCharset, int32_t parentCharsetSource, nsIPrincipal *parentCharsetPrincipal);
|
||||
- void GetParentCharset(nsACString *parentCharset, int32_t *parentCharsetSource, nsIPrincipal **parentCharsetPrincipal);
|
||||
+ void /* thiscall */ SetParentCharset(const nsACString *parentCharset, int32_t parentCharsetSource, nsIPrincipal *parentCharsetPrincipal);
|
||||
+ void /* thiscall */ GetParentCharset(nsACString *parentCharset, int32_t *parentCharsetSource, nsIPrincipal **parentCharsetPrincipal);
|
||||
nsresult GetRecordProfileTimelineMarkers(bool *aRecordProfileTimelineMarkers);
|
||||
nsresult SetRecordProfileTimelineMarkers(bool aRecordProfileTimelineMarkers);
|
||||
nsresult Now(int /* DOMHighResTimeStamp */ *_retval);
|
||||
@@ -3891,7 +3891,7 @@ interface nsIDocShell : nsIDocShellTreeItem
|
||||
nsresult SetSandboxFlags(uint32_t aSandboxFlags);
|
||||
nsresult GetOnePermittedSandboxedNavigator(nsIDocShell **aOnePermittedSandboxedNavigator);
|
||||
nsresult SetOnePermittedSandboxedNavigator(nsIDocShell *aOnePermittedSandboxedNavigator);
|
||||
- bool IsSandboxedFrom(nsIDocShell *aTargetDocShell);
|
||||
+ bool /* thiscall */ IsSandboxedFrom(nsIDocShell *aTargetDocShell);
|
||||
nsresult GetMixedContentChannel(nsIChannel **aMixedContentChannel);
|
||||
nsresult SetMixedContentChannel(nsIChannel *aMixedContentChannel);
|
||||
nsresult GetAllowMixedContentAndConnectionData(bool *rootHasSecureConnection, bool *allowMixedContent, bool *isRootDocShell);
|
||||
@@ -3948,10 +3948,10 @@ interface nsIMutationObserver : nsISupports
|
||||
void /*CharacterDataChangeInfo*/ *aInfo);
|
||||
void CharacterDataChanged(nsIDocument *aDocument, nsIContent *aContent,
|
||||
void /*CharacterDataChangeInfo*/ *aInfo);
|
||||
- void AttributeWillChange(nsIDocument *aDocument, nsIContent *aContent, int32_t aNameSpaceID,
|
||||
+ void AttributeWillChange(nsIDocument *aDocument, /*mozilla::dom::Element*/ void *aElement, int32_t aNameSpaceID,
|
||||
nsIAtom *aAttribute, int32_t aModType, const nsAttrValue *aNewValue);
|
||||
- void AttributeChanged(nsIDocument *aDocument, nsIContent *aContent, int32_t aNameSpaceID,
|
||||
- nsIAtom *aAttribute, int32_t aModType, const nsAttrValue *aNewValue);
|
||||
+ void AttributeChanged(nsIDocument *aDocument, /*mozilla::dom::Element*/ void *aElement, int32_t aNameSpaceID,
|
||||
+ nsIAtom *aAttribute, int32_t aModType, const nsAttrValue *aOldValue);
|
||||
void NativeAnonymousChildListChange(nsIDocument *aDocument, nsIContent *aContent, bool aIsRemove);
|
||||
void AttributeSetToCurrentValue(nsIDocument *aDocument, /*mozilla::dom::Element*/ void *aElement,
|
||||
int32_t aNameSpaceID, nsIAtom *aAttribute);
|
||||
--
|
||||
2.6.4
|
||||
|
||||
1
patches/mshtml-Wine_Gecko_2.44/definition
Normal file
1
patches/mshtml-Wine_Gecko_2.44/definition
Normal file
@ -0,0 +1 @@
|
||||
Fixes: Update Wine-Gecko to 2.44-beta1
|
||||
@ -175,6 +175,7 @@ patch_enable_all ()
|
||||
enable_mpr_WNetGetUniversalNameW="$1"
|
||||
enable_mscoree_CorValidateImage="$1"
|
||||
enable_mshtml_HTMLLocation_put_hash="$1"
|
||||
enable_mshtml_Wine_Gecko_2_44="$1"
|
||||
enable_msidb_Implementation="$1"
|
||||
enable_msvcrt_Math_Precision="$1"
|
||||
enable_msvcrt_StdHandle_RefCount="$1"
|
||||
@ -640,6 +641,9 @@ patch_enable ()
|
||||
mshtml-HTMLLocation_put_hash)
|
||||
enable_mshtml_HTMLLocation_put_hash="$2"
|
||||
;;
|
||||
mshtml-Wine_Gecko_2.44)
|
||||
enable_mshtml_Wine_Gecko_2_44="$2"
|
||||
;;
|
||||
msidb-Implementation)
|
||||
enable_msidb_Implementation="$2"
|
||||
;;
|
||||
@ -3869,6 +3873,21 @@ if test "$enable_mshtml_HTMLLocation_put_hash" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset mshtml-Wine_Gecko_2.44
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/appwiz.cpl/addons.c, dlls/mshtml/mshtml_private.h, dlls/mshtml/mutation.c, dlls/mshtml/nsembed.c,
|
||||
# | dlls/mshtml/nsiface.idl, dlls/mshtml/nsio.c
|
||||
# |
|
||||
if test "$enable_mshtml_Wine_Gecko_2_44" -eq 1; then
|
||||
patch_apply mshtml-Wine_Gecko_2.44/0001-mshtml-Wine-Gecko-2.44-release.patch
|
||||
patch_apply mshtml-Wine_Gecko_2.44/0002-mshtml-Fix-some-prototypes.patch
|
||||
(
|
||||
echo '+ { "Jacek Caban", "mshtml: Wine Gecko 2.44 release.", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "mshtml: Fix some prototypes.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset msidb-Implementation
|
||||
# |
|
||||
# | Modified files:
|
||||
|
||||
@ -10,6 +10,7 @@ wine-staging (1.9.1) UNRELEASED; urgency=low
|
||||
* Added patch to do a device check before returning a default serial port
|
||||
name.
|
||||
* Added patch to return STATUS_SUCCESS from NtQuerySystemInformationEx.
|
||||
* Added patch to update Wine-Gecko to 2.44-beta1.
|
||||
-- Sebastian Lackner <sebastian@fds-team.de> Wed, 30 Dec 2015 01:03:12 +0100
|
||||
|
||||
wine-staging (1.9.0) unstable; urgency=low
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user