mirror of
https://github.com/reactos/reactos.git
synced 2026-07-05 07:44:33 +08:00
- Patch by hto: Fix bugs in Gdi32.dll and User32.dll, see bug 3847.
svn path=/trunk/; revision=37193
This commit is contained in:
@@ -31,7 +31,8 @@ typedef INT
|
||||
#define METAFILE_DISK 2
|
||||
|
||||
/* MACRO ********************************************************************/
|
||||
#define ROP_USES_SOURCE(Rop) ((Rop << 2) ^ Rop) & 0xCC0000
|
||||
|
||||
#define ROP_USES_SOURCE(Rop) (((Rop) << 2 ^ Rop) & 0xCC0000)
|
||||
|
||||
/* TYPES *********************************************************************/
|
||||
|
||||
|
||||
@@ -783,7 +783,7 @@ static void CBPaintText(
|
||||
clipRegion=NULL;
|
||||
}
|
||||
|
||||
if (!IsWindowEnabled(lphc->self) & WS_DISABLED) itemState |= ODS_DISABLED;
|
||||
if (!(IsWindowEnabled(lphc->self) & WS_DISABLED)) itemState |= ODS_DISABLED;
|
||||
|
||||
dis.CtlType = ODT_COMBOBOX;
|
||||
dis.CtlID = ctlid;
|
||||
|
||||
@@ -811,7 +811,7 @@ static WDML_QUEUE_STATE WDML_HandleTerminateReply(WDML_CONV* pConv, MSG* msg, WD
|
||||
FIXME("hmmm shouldn't happen\n");
|
||||
return WDML_QS_PASS;
|
||||
}
|
||||
if (!pConv->instance->CBFflags & CBF_SKIP_DISCONNECTS)
|
||||
if (!(pConv->instance->CBFflags & CBF_SKIP_DISCONNECTS))
|
||||
{
|
||||
WDML_InvokeCallback(pConv->instance, XTYP_DISCONNECT, 0, (HCONV)pConv,
|
||||
0, 0, 0, 0, (pConv->wStatus & ST_ISSELF) ? 1 : 0);
|
||||
@@ -894,7 +894,7 @@ static WDML_QUEUE_STATE WDML_HandleIncomingTerminate(WDML_CONV* pConv, MSG* msg,
|
||||
return WDML_QS_PASS;
|
||||
|
||||
pConv->wStatus |= ST_TERMINATED;
|
||||
if (!pConv->instance->CBFflags & CBF_SKIP_DISCONNECTS)
|
||||
if (!(pConv->instance->CBFflags & CBF_SKIP_DISCONNECTS))
|
||||
{
|
||||
WDML_InvokeCallback(pConv->instance, XTYP_DISCONNECT, 0, (HCONV)pConv,
|
||||
0, 0, 0, 0, (pConv->wStatus & ST_ISSELF) ? 1 : 0);
|
||||
|
||||
Reference in New Issue
Block a user