wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

ole32-HGLOBALStream: Properly rebase.

Browse Source
This commit is contained in:
Zebediah Figura 2020-08-15 19:32:53 -05:00
parent c811ed7bd9
commit 03290f8a41
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
patches/ole32-HGLOBALStream/0002-ole32-Add-a-check-for-hglobal-pointer-to-GetHGlobalF.patch
View File

@ -1,7 +1,8 @@
From a26bfabac3940176f412896241ffab5c7f92baaa Mon Sep 17 00:00:00 2001
From bb72b7bf3df86b284c169125e52d6e385ff46cbc Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Tue, 2 Feb 2016 12:53:47 +0800
Subject: ole32: Add a check for hglobal pointer to GetHGlobalFromStream.
Subject: [PATCH] ole32: Add a check for hglobal pointer to
GetHGlobalFromStream.
---
dlls/ole32/hglobalstream.c | 4 ++--
@ -9,10 +10,10 @@ Subject: ole32: Add a check for hglobal pointer to GetHGlobalFromStream.
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c
index 655e380..b86de56 100644
index 4590bb9c431..4cfedd66a1b 100644
--- a/dlls/ole32/hglobalstream.c
+++ b/dlls/ole32/hglobalstream.c
@@ -621,10 +621,10 @@ HRESULT WINAPI GetHGlobalFromStream(IStream* pstm, HGLOBAL* phglobal)
@@ -664,10 +664,10 @@ HRESULT WINAPI GetHGlobalFromStream(IStream* pstm, HGLOBAL* phglobal)
{
HGLOBALStreamImpl* pStream;
@ -26,10 +27,10 @@ index 655e380..b86de56 100644
/*
* Verify that the stream object was created with CreateStreamOnHGlobal.
diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c
index 0dc3c52..0453e54 100644
index 2f386914afc..5bcf9abfbda 100644
--- a/dlls/ole32/tests/hglobalstream.c
+++ b/dlls/ole32/tests/hglobalstream.c
@@ -555,6 +555,12 @@ static void test_IStream_Clone(void)
@@ -561,6 +561,12 @@ static void test_IStream_Clone(void)
hr = CreateStreamOnHGlobal(orig_hmem, TRUE, &stream);
ok(hr == S_OK, "unexpected %#x\n", hr);
@ -41,7 +42,7 @@ index 0dc3c52..0453e54 100644
+
stream_info(stream, &hmem, &size, &pos);
ok(hmem == orig_hmem, "handles should match\n");
ok(size == 0, "unexpected %d\n", size);
ok(size == 0, "unexpected %d\n", size);
--
2.7.0
2.27.0