Skip to content
This repository has been archived by the owner on Oct 1, 2020. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Rebase against 7756d6ba9b0213d5533eb5248e62716e7e8409b8.
[dmusic-SynthPort_IKsControl]
Removed patch to add IKsControl stub subinterface for SynthPort (accepted upstream).
  • Loading branch information
slackner committed Oct 9, 2016
1 parent 2d5e42b commit 8bfc3ca
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 154 deletions.

This file was deleted.

6 changes: 2 additions & 4 deletions patches/patchinstall.sh
Expand Up @@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "5d96ef42a58e09a2d6cf47a685abb3f42b513ceb"
echo "7756d6ba9b0213d5533eb5248e62716e7e8409b8"
}

# Show version information
Expand Down Expand Up @@ -3522,14 +3522,12 @@ fi
# | * [#30105] Implement IKsControl stub subinterface for SynthPort
# |
# | Modified files:
# | * dlls/dmusic/buffer.c, dlls/dmusic/dmusic_private.h, dlls/dmusic/port.c
# | * dlls/dmusic/buffer.c
# |
if test "$enable_dmusic_SynthPort_IKsControl" -eq 1; then
patch_apply dmusic-SynthPort_IKsControl/0001-dmusic-Implement-IDirectMusicBuffer-PackStructured.patch
patch_apply dmusic-SynthPort_IKsControl/0002-dmusic-Add-IKsControl-stub-subinterface-for-SynthPor.patch
(
echo '+ { "Michael Müller", "dmusic: Implement IDirectMusicBuffer::PackStructured.", 1 },';
echo '+ { "Michael Müller", "dmusic: Add IKsControl stub subinterface for SynthPort.", 1 },';
) >> "$patchlist"
fi

Expand Down
@@ -1,4 +1,4 @@
From 83e88ace41be8d8971bc7efbdb8e9969257729e6 Mon Sep 17 00:00:00 2001
From c36ca805fa81799134509231bdbc028dcd1c994e Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Fri, 13 May 2016 16:05:13 +0800
Subject: riched20/tests: Add a test to see what richedit class flavours should
Expand All @@ -9,11 +9,11 @@ Subject: riched20/tests: Add a test to see what richedit class flavours should
1 file changed, 33 insertions(+)

diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c
index 31d5128..cdde40e 100644
index 351695a..1dfcce2 100644
--- a/dlls/riched20/tests/editor.c
+++ b/dlls/riched20/tests/editor.c
@@ -8349,6 +8349,38 @@ static void test_background(void)
DestroyWindow(hwndRichEdit);
@@ -8408,6 +8408,38 @@ static void test_eop_char_fmt(void)
DestroyWindow( edit );
}

+static void test_window_classes(void)
Expand Down Expand Up @@ -51,7 +51,7 @@ index 31d5128..cdde40e 100644
START_TEST( editor )
{
BOOL ret;
@@ -8358,6 +8390,7 @@ START_TEST( editor )
@@ -8417,6 +8449,7 @@ START_TEST( editor )
ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError());
is_lang_japanese = (PRIMARYLANGID(GetUserDefaultLangID()) == LANG_JAPANESE);

Expand All @@ -60,5 +60,5 @@ index 31d5128..cdde40e 100644
test_EM_FINDTEXT(FALSE);
test_EM_FINDTEXT(TRUE);
--
2.8.0
2.9.0

0 comments on commit 8bfc3ca

Please sign in to comment.