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 7aadb08212a5269ebefcb100cf567f7cf7aa0a7c.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-08-02 03:35:23 +02:00
parent 0b0ad0faa4
commit b5a323aaa3
14 changed files with 587 additions and 756 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/Compiler_Warnings/0003-gdi32-Remove-unnecessary-debug-channel.patch
View File

@@ -1,26 +0,0 @@
From 450d33400036663b5a0e21fce38a7c449409b4d3 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 30 Jul 2016 23:55:09 +0200
Subject: gdi32: Remove unnecessary debug channel.
---
dlls/gdi32/enhmfdrv/dc.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c
index 64c6136..91fde55 100644
--- a/dlls/gdi32/enhmfdrv/dc.c
+++ b/dlls/gdi32/enhmfdrv/dc.c
@@ -21,9 +21,6 @@
#include <assert.h>
#include "enhmfdrv/enhmetafiledrv.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile);
/* get the emf physdev from the path physdev */
static inline PHYSDEV get_emfdev( PHYSDEV path )
--
2.9.0

26
patches/Compiler_Warnings/0016-winetest-Remove-duplicate-if-check.patch
View File

@@ -1,26 +0,0 @@
From ced83fdea5e467009d8a4220fab97fb2e7e4e008 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 31 Jul 2016 00:02:13 +0200
Subject: winetest: Remove duplicate if check.
---
programs/winetest/gui.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/programs/winetest/gui.c b/programs/winetest/gui.c
index a8bcf05..2948d7e 100644
--- a/programs/winetest/gui.c
+++ b/programs/winetest/gui.c
@@ -547,8 +547,7 @@ report (enum report_type t, ...)
}
va_start (ap, t);
- if (t < sizeof text_funcs / sizeof text_funcs[0] &&
- t < sizeof GUI_funcs / sizeof GUI_funcs[0]) ret = funcs[t](ap);
+ if (t < sizeof text_funcs / sizeof text_funcs[0]) ret = funcs[t](ap);
else report (R_WARNING, "unimplemented report type: %d", t);
va_end (ap);
return ret;
--
2.9.0