wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 705c52691a4e8c6224cda5080fb88f257de5fd77.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-12-06 21:52:20 +01:00
parent 5403b21e6a
commit 0d616d719e
18 changed files with 113 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
patches/msvfw32-ICGetDisplayFormat/0001-msvfw32-Try-different-formarts-in-ICGetDisplayFormat.patch
View File

@@ -1,4 +1,4 @@
From 595d96fdba45c66788ba83732fa7e5bfc8a5947b Mon Sep 17 00:00:00 2001
From 9ae94214e0afa58f6b518ec34fd325a1ae57230a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 31 Mar 2016 00:58:04 +0200
Subject: msvfw32: Try different formarts in ICGetDisplayFormat.
@@ -9,10 +9,10 @@ Subject: msvfw32: Try different formarts in ICGetDisplayFormat.
2 files changed, 308 insertions(+), 22 deletions(-)
diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c
index 0ae33ed..a76828a 100644
index cc5c85d..25b80ff 100644
--- a/dlls/msvfw32/msvideo_main.c
+++ b/dlls/msvfw32/msvideo_main.c
@@ -719,25 +719,80 @@ HIC VFWAPI ICGetDisplayFormat(
@@ -718,25 +718,80 @@ HIC VFWAPI ICGetDisplayFormat(
HIC hic,LPBITMAPINFOHEADER lpbiIn,LPBITMAPINFOHEADER lpbiOut,
INT depth,INT dx,INT dy)
{
@@ -104,7 +104,7 @@ index 0ae33ed..a76828a 100644
FIXME("Ooch, how come decompressor outputs compressed data (%d)??\n",
lpbiOut->biCompression);
}
@@ -746,20 +801,11 @@ HIC VFWAPI ICGetDisplayFormat(
@@ -745,20 +800,11 @@ HIC VFWAPI ICGetDisplayFormat(
lpbiOut->biSize);
lpbiOut->biSize = sizeof(*lpbiOut);
}
@@ -128,10 +128,10 @@ index 0ae33ed..a76828a 100644
if (hic!=tmphic)
ICClose(tmphic);
diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c
index 125cac5..7fd4c43 100644
index 3fe6702..22b32ee 100644
--- a/dlls/msvfw32/tests/msvfw.c
+++ b/dlls/msvfw32/tests/msvfw.c
@@ -285,9 +285,249 @@ static void test_ICSeqCompress(void)
@@ -285,6 +285,245 @@ static void test_ICSeqCompress(void)
ok(err == ICERR_BADHANDLE, "Expected -8, got %d\n", err);
}
@@ -374,12 +374,15 @@ index 125cac5..7fd4c43 100644
+ ICClose(ic);
+}
+
START_TEST(msvfw)
static void test_ICInfo(void)
{
ICINFO info, info2;
@@ -324,5 +563,6 @@ START_TEST(msvfw)
test_OpenCase();
test_Locate();
test_ICSeqCompress();
+ test_ICGetDisplayFormat();
test_ICInfo();
}
--
2.9.0