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

Fix compiler warnings in multiple patches.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-07-31 03:02:56 +02:00
parent 9f334d5964
commit 3ddc7bcaff
7 changed files with 95 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,18 +1,18 @@
From 396e4a11fbc0773d9519e84ff0d77c3ff3ec6efc Mon Sep 17 00:00:00 2001
From 595d96fdba45c66788ba83732fa7e5bfc8a5947b 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.
---
dlls/msvfw32/msvideo_main.c | 88 ++++++++++++----
dlls/msvfw32/msvideo_main.c | 90 +++++++++++++----
dlls/msvfw32/tests/msvfw.c | 240 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 307 insertions(+), 21 deletions(-)
2 files changed, 308 insertions(+), 22 deletions(-)
diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c
index 4f1a2bf..28f405e 100644
index 0ae33ed..a76828a 100644
--- a/dlls/msvfw32/msvideo_main.c
+++ b/dlls/msvfw32/msvideo_main.c
@@ -719,24 +719,79 @@ HIC VFWAPI ICGetDisplayFormat(
@@ -719,25 +719,80 @@ HIC VFWAPI ICGetDisplayFormat(
HIC hic,LPBITMAPINFOHEADER lpbiIn,LPBITMAPINFOHEADER lpbiOut,
INT depth,INT dx,INT dy)
{
@@ -64,6 +64,7 @@ index 4f1a2bf..28f405e 100644
ICSendMessage(tmphic, ICM_DECOMPRESS_GET_FORMAT, (DWORD_PTR)lpbiIn, (DWORD_PTR)lpbiOut);
- if (lpbiOut->biCompression != 0) {
+ lpbiOut->biSize = sizeof(BITMAPINFOHEADER);
+ lpbiOut->biWidth = dx;
+ lpbiOut->biHeight = dy;
@@ -99,9 +100,10 @@ index 4f1a2bf..28f405e 100644
+ if (ICSendMessage(tmphic, ICM_DECOMPRESS_GET_FORMAT, (DWORD_PTR)lpbiIn, (DWORD_PTR)lpbiOut))
+ goto errout;
+
if (lpbiOut->biCompression != 0) {
+ if (lpbiOut->biCompression != 0) {
FIXME("Ooch, how come decompressor outputs compressed data (%d)??\n",
lpbiOut->biCompression);
}
@@ -746,20 +801,11 @@ HIC VFWAPI ICGetDisplayFormat(
lpbiOut->biSize);
lpbiOut->biSize = sizeof(*lpbiOut);
@@ -380,5 +382,5 @@ index 125cac5..7fd4c43 100644
+ test_ICGetDisplayFormat();
}
--
2.7.1
2.9.0