1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
--- xorg-server-1.20.1.orig/hw/xwin/winwindow.c 2018-08-07 18:31:04.000000000 +0200
+++ xorg-server-1.20.1/hw/xwin/winwindow.c 2018-08-22 19:39:37.078925268 +0200
@@ -269,14 +269,14 @@
if (pWinPriv->hRgn) {
if (CombineRgn(hRgnWin, hRgnWin, pWinPriv->hRgn, RGN_AND)
- == ERROR) {
+ == 0) {
ErrorF("winAddRgn - CombineRgn () failed\n");
}
}
OffsetRgn(hRgnWin, iX, iY);
- if (CombineRgn(hRgn, hRgn, hRgnWin, RGN_OR) == ERROR) {
+ if (CombineRgn(hRgn, hRgn, hRgnWin, RGN_OR) == 0) {
ErrorF("winAddRgn - CombineRgn () failed\n");
}
@@ -363,7 +363,7 @@
}
/* Merge the Windows region with the accumulated region */
- if (CombineRgn(hRgn, hRgn, hRgnRect, RGN_OR) == ERROR) {
+ if (CombineRgn(hRgn, hRgn, hRgnRect, RGN_OR) == 0) {
ErrorF("winReshapeRootless - CombineRgn() failed\n");
}
--- xorg-server-1.20.1.orig/hw/xwin/winmultiwindowshape.c 2018-08-07 18:31:04.000000000 +0200
+++ xorg-server-1.20.1/hw/xwin/winmultiwindowshape.c 2018-08-25 17:23:10.018564229 +0200
@@ -180,7 +180,7 @@
}
/* Merge the Windows region with the accumulated region */
- if (CombineRgn(hRgn, hRgn, hRgnRect, RGN_OR) == ERROR) {
+ if (CombineRgn(hRgn, hRgn, hRgnRect, RGN_OR) == 0) {
ErrorF("winReshape - CombineRgn () failed: %d\n",
(int) GetLastError());
}
|
