Hi all,
you knew that I had to do this ;-)
- fix more evil bracket stuff in some other files
(I know, it's not really problematic, just makes a lot more sense)
--
Andreas Mohr Stauferstr. 6, D-71272 Renningen, Germany
Determining best CVS host...
Using CVSROOT :pserver:cvs@rhlx01.fht-esslingen.de:/home/wine
Index: dlls/comctl32/comctl32undoc.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/comctl32undoc.c,v
retrieving revision 1.59
diff -u -r1.59 comctl32undoc.c
--- dlls/comctl32/comctl32undoc.c 31 Jan 2002 20:37:49 -0000 1.59
+++ dlls/comctl32/comctl32undoc.c 1 Feb 2002 15:56:07 -0000
@@ -264,7 +264,7 @@
}
else if (nResult < 0)
{
- if (!dwFlags & 8)
+ if (!(dwFlags & 8))
{
PVOID ptr;
@@ -277,7 +277,7 @@
}
else
{
- if (!dwFlags & 4)
+ if (!(dwFlags & 4))
{
PVOID ptr;
Index: dlls/comctl32/header.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/header.c,v
retrieving revision 1.42
diff -u -r1.42 header.c
--- dlls/comctl32/header.c 17 Sep 2001 20:25:52 -0000 1.42
+++ dlls/comctl32/header.c 1 Feb 2002 15:56:08 -0000
@@ -883,7 +883,7 @@
if (lpItem->fmt == 0)
lpItem->fmt = HDF_LEFT;
- if (!(lpItem->fmt &HDF_STRING) && (phdi->mask & HDI_TEXT))
+ if (!(lpItem->fmt & HDF_STRING) && (phdi->mask & HDI_TEXT))
{
lpItem->fmt |= HDF_STRING;
}
Index: dlls/comctl32/rebar.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/rebar.c,v
retrieving revision 1.52
diff -u -r1.52 rebar.c
--- dlls/comctl32/rebar.c 29 Jan 2002 16:52:24 -0000 1.52
+++ dlls/comctl32/rebar.c 1 Feb 2002 15:56:10 -0000
@@ -1727,7 +1727,7 @@
iband = infoPtr->rows[i-1].istartband;
lpBand = &infoPtr->bands[iband];
if(HIDDENBAND(lpBand)) continue;
- if (!lpBand->fMask & RBBS_VARIABLEHEIGHT) continue;
+ if (!(lpBand->fMask & RBBS_VARIABLEHEIGHT)) continue;
if (((INT)lpBand->cyMaxChild < 1) ||
((INT)lpBand->cyIntegral < 1)) {
if (lpBand->cyMaxChild + lpBand->cyIntegral == 0) continue;
Index: dlls/commdlg/fontdlg.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/fontdlg.c,v
retrieving revision 1.35
diff -u -r1.35 fontdlg.c
--- dlls/commdlg/fontdlg.c 12 Nov 2001 15:48:20 -0000 1.35
+++ dlls/commdlg/fontdlg.c 1 Feb 2002 15:56:10 -0000
@@ -636,9 +636,9 @@
if (!SendMessageA(hcmb2, CB_GETCOUNT, 0, 0))
{
- HDC hdc= (lpcf->Flags & CF_PRINTERFONTS && lpcf->hDC) ? lpcf->hDC : GetDC(hDlg);
+ HDC hdc= ((lpcf->Flags & CF_PRINTERFONTS) && lpcf->hDC) ? lpcf->hDC : GetDC(hDlg);
i=SetFontStylesToCombo2(hcmb2,hdc,lplf);
- if (!(lpcf->Flags & CF_PRINTERFONTS && lpcf->hDC))
+ if (!((lpcf->Flags & CF_PRINTERFONTS) && lpcf->hDC))
ReleaseDC(hDlg,hdc);
if (i)
return 0;
@@ -733,7 +733,7 @@
ShowWindow(GetDlgItem(hDlg,grp1),SW_HIDE);
ShowWindow(GetDlgItem(hDlg,stc4),SW_HIDE);
}
- hdc= (lpcf->Flags & CF_PRINTERFONTS && lpcf->hDC) ? lpcf->hDC : GetDC(hDlg);
+ hdc= ((lpcf->Flags & CF_PRINTERFONTS) && lpcf->hDC) ? lpcf->hDC : GetDC(hDlg);
if (hdc)
{
CFn_ENUMSTRUCT s;
@@ -811,7 +811,7 @@
return FALSE;
}
- if (!(lpcf->Flags & CF_PRINTERFONTS && lpcf->hDC))
+ if (!((lpcf->Flags & CF_PRINTERFONTS) && lpcf->hDC))
ReleaseDC(hDlg,hdc);
SetCursor(hcursor);
return TRUE;
@@ -968,7 +968,7 @@
{
case cmb1:if (HIWORD(wParam)==CBN_SELCHANGE)
{
- hdc=(lpcf->Flags & CF_PRINTERFONTS && lpcf->hDC) ? lpcf->hDC : GetDC(hDlg);
+ hdc=((lpcf->Flags & CF_PRINTERFONTS) && lpcf->hDC) ? lpcf->hDC : GetDC(hDlg);
if (hdc)
{
SendDlgItemMessageA(hDlg, cmb2, CB_RESETCONTENT16, 0, 0);
@@ -990,7 +990,7 @@
SendDlgItemMessageA(hDlg,cmb3, CB_SETCURSEL, 0, 0);
SetCursor(hcursor);
}
- if (!(lpcf->Flags & CF_PRINTERFONTS && lpcf->hDC))
+ if (!((lpcf->Flags & CF_PRINTERFONTS) && lpcf->hDC))
ReleaseDC(hDlg,hdc);
}
else
Index: dlls/shell32/iconcache.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/iconcache.c,v
retrieving revision 1.51
diff -u -r1.51 iconcache.c
--- dlls/shell32/iconcache.c 6 Nov 2001 22:31:20 -0000 1.51
+++ dlls/shell32/iconcache.c 1 Feb 2002 15:56:11 -0000
@@ -405,7 +405,7 @@
}
/* if no pointers given and one icon expected, return the handle directly*/
- if (!phiconLarge && ! phiconSmall && nIcons==1 )
+ if (!phiconLarge && !phiconSmall && nIcons==1 )
phiconSmall = &ret;
if (phiconSmall)
Index: dlls/user/dde/client.c
===================================================================
RCS file: /home/wine/wine/dlls/user/dde/client.c,v
retrieving revision 1.5
diff -u -r1.5 client.c
--- dlls/user/dde/client.c 18 Jan 2002 19:30:15 -0000 1.5
+++ dlls/user/dde/client.c 1 Feb 2002 15:56:11 -0000
@@ -1225,7 +1225,7 @@
{
for (pConv = pInstance->convs[WDML_CLIENT_SIDE]; pConv; pConv = pConv->next)
{
- if (!pConv->wStatus & ST_CONNECTED) continue;
+ if (!(pConv->wStatus & ST_CONNECTED)) continue;
for (pXAct = pConv->transactions; pXAct; pXAct = pXAct->next)
{
if (pXAct->dwTimeout == TIMEOUT_ASYNC)
Index: tools/winedump/msmangle.c
===================================================================
RCS file: /home/wine/wine/tools/winedump/msmangle.c,v
retrieving revision 1.4
diff -u -r1.4 msmangle.c
--- tools/winedump/msmangle.c 5 Nov 2001 23:54:11 -0000 1.4
+++ tools/winedump/msmangle.c 1 Feb 2002 15:56:12 -0000
@@ -453,7 +453,7 @@
fatal ("Out of Memory");
/* If we're a reference, re-use the pointer already in the type */
- if (!ct->flags & CT_BY_REFERENCE)
+ if (!(ct->flags & CT_BY_REFERENCE))
stripped[ strlen (stripped) - 2] = '\0'; /* otherwise, strip it */
ct->expression = str_create (2, ct->flags & CT_CONST ? "const " :
