diff --git a/include/exstubs.h b/include/exstubs.h index 60fd6eee..f78295e2 100644 --- a/include/exstubs.h +++ b/include/exstubs.h @@ -130,22 +130,22 @@ typedef struct _DrmSurfaceBuffer { * The color logic operations. */ enum DrmColorLogicOp { - COLOR_LOGICOP_CLEAR = 0, - COLOR_LOGICOP_NOR = 1, - COLOR_LOGICOP_AND_INVERTED = 2, - COLOR_LOGICOP_COPY_INVERTED = 3, - COLOR_LOGICOP_AND_REVERSE = 4, - COLOR_LOGICOP_INVERT = 5, - COLOR_LOGICOP_XOR = 6, - COLOR_LOGICOP_NAND = 7, - COLOR_LOGICOP_AND = 8, - COLOR_LOGICOP_EQUIV = 9, - COLOR_LOGICOP_NOOP = 10, - COLOR_LOGICOP_OR_INVERTED = 11, - COLOR_LOGICOP_COPY = 12, - COLOR_LOGICOP_OR_REVERSE = 13, - COLOR_LOGICOP_OR = 14, - COLOR_LOGICOP_SET = 15 + COLOR_LOGICOP_COPY = 0, + COLOR_LOGICOP_COPY_INVERTED, + COLOR_LOGICOP_CLEAR, + COLOR_LOGICOP_SET, + COLOR_LOGICOP_NOR, + COLOR_LOGICOP_NAND, + COLOR_LOGICOP_EQUIV, + COLOR_LOGICOP_INVERT, + COLOR_LOGICOP_XOR, + COLOR_LOGICOP_AND, + COLOR_LOGICOP_AND_INVERTED, + COLOR_LOGICOP_AND_REVERSE, + COLOR_LOGICOP_OR, + COLOR_LOGICOP_OR_INVERTED, + COLOR_LOGICOP_OR_REVERSE, + COLOR_LOGICOP_NOOP, }; /** diff --git a/include/window.h b/include/window.h index 96949a42..871c059e 100644 --- a/include/window.h +++ b/include/window.h @@ -6143,8 +6143,8 @@ MG_EXPORT BOOL GUIAPI SetMainWindowAlwaysTop (HWND hWnd, BOOL fSet); * Do the given color logical operation. You should specify the color * logical operation along with the pararmeter \a arg. See \a BitBlt. * - CT_ALPHAPIXEL\n - * The alpha component value of the source or the destination pixel goes - * into effect. You can specify the color compositing operation along + * The alpha component value of the source and/or the destination pixel go + * into effect. You can specify the color blend method along * with the pararmeter \a arg. See \a BitBlt. * - CT_BLURRED\n * Apply a Gaussian blur to the background of the main window. You should diff --git a/src/kernel/desktop-procs.c b/src/kernel/desktop-procs.c index aabf3f58..e67d0aef 100644 --- a/src/kernel/desktop-procs.c +++ b/src/kernel/desktop-procs.c @@ -1276,7 +1276,7 @@ static inline int srvSetZNodeCompositing (int cli, int idx_znode, int ret; ret = dskSetZNodeCompositing (cli, idx_znode, type, arg); - if (ret == 0 && OnZNodeOperation) + if (ret == 0 && OnZNodeOperation) { OnZNodeOperation (ZNOP_COMPOSITINGCHANGED, cli, idx_znode); }