mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-06 18:37:19 +00:00
Fixed some more missing parenthesis issues.
This commit is contained in:
parent
b6e841873d
commit
2295e87be8
|
@ -51,7 +51,7 @@ typedef struct _LOADDATA
|
||||||
PVOID ptr;
|
PVOID ptr;
|
||||||
} LOADDATA, *LPLOADDATA;
|
} LOADDATA, *LPLOADDATA;
|
||||||
|
|
||||||
typedef HRESULT CALLBACK (*DPALOADPROC)(LPLOADDATA,IStream*,LPARAM);
|
typedef HRESULT (CALLBACK *DPALOADPROC)(LPLOADDATA,IStream*,LPARAM);
|
||||||
|
|
||||||
INT __cdecl _wtoi(LPWSTR string);
|
INT __cdecl _wtoi(LPWSTR string);
|
||||||
|
|
||||||
|
@ -264,7 +264,7 @@ DPA_Merge (const HDPA hdpa1, const HDPA hdpa2, DWORD dwFlags,
|
||||||
}
|
}
|
||||||
else if (nResult < 0)
|
else if (nResult < 0)
|
||||||
{
|
{
|
||||||
if (!dwFlags & 8)
|
if (!(dwFlags & 8))
|
||||||
{
|
{
|
||||||
PVOID ptr;
|
PVOID ptr;
|
||||||
|
|
||||||
|
@ -277,7 +277,7 @@ DPA_Merge (const HDPA hdpa1, const HDPA hdpa2, DWORD dwFlags,
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!dwFlags & 4)
|
if (!(dwFlags & 4))
|
||||||
{
|
{
|
||||||
PVOID ptr;
|
PVOID ptr;
|
||||||
|
|
||||||
|
|
|
@ -883,7 +883,7 @@ HEADER_InsertItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
|
||||||
if (lpItem->fmt == 0)
|
if (lpItem->fmt == 0)
|
||||||
lpItem->fmt = HDF_LEFT;
|
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;
|
lpItem->fmt |= HDF_STRING;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1727,7 +1727,7 @@ REBAR_Layout (REBAR_INFO *infoPtr, LPRECT lpRect, BOOL notify, BOOL resetclient)
|
||||||
iband = infoPtr->rows[i-1].istartband;
|
iband = infoPtr->rows[i-1].istartband;
|
||||||
lpBand = &infoPtr->bands[iband];
|
lpBand = &infoPtr->bands[iband];
|
||||||
if(HIDDENBAND(lpBand)) continue;
|
if(HIDDENBAND(lpBand)) continue;
|
||||||
if (!lpBand->fMask & RBBS_VARIABLEHEIGHT) continue;
|
if (!(lpBand->fMask & RBBS_VARIABLEHEIGHT)) continue;
|
||||||
if (((INT)lpBand->cyMaxChild < 1) ||
|
if (((INT)lpBand->cyMaxChild < 1) ||
|
||||||
((INT)lpBand->cyIntegral < 1)) {
|
((INT)lpBand->cyIntegral < 1)) {
|
||||||
if (lpBand->cyMaxChild + lpBand->cyIntegral == 0) continue;
|
if (lpBand->cyMaxChild + lpBand->cyIntegral == 0) continue;
|
||||||
|
|
|
@ -636,9 +636,9 @@ static INT AddFontStyle(const LOGFONTA *lplf, UINT nFontType,
|
||||||
|
|
||||||
if (!SendMessageA(hcmb2, CB_GETCOUNT, 0, 0))
|
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);
|
i=SetFontStylesToCombo2(hcmb2,hdc,lplf);
|
||||||
if (!(lpcf->Flags & CF_PRINTERFONTS && lpcf->hDC))
|
if (!((lpcf->Flags & CF_PRINTERFONTS) && lpcf->hDC))
|
||||||
ReleaseDC(hDlg,hdc);
|
ReleaseDC(hDlg,hdc);
|
||||||
if (i)
|
if (i)
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -733,7 +733,7 @@ static LRESULT CFn_WMInitDialog(HWND hDlg, WPARAM wParam, LPARAM lParam,
|
||||||
ShowWindow(GetDlgItem(hDlg,grp1),SW_HIDE);
|
ShowWindow(GetDlgItem(hDlg,grp1),SW_HIDE);
|
||||||
ShowWindow(GetDlgItem(hDlg,stc4),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)
|
if (hdc)
|
||||||
{
|
{
|
||||||
CFn_ENUMSTRUCT s;
|
CFn_ENUMSTRUCT s;
|
||||||
|
@ -811,7 +811,7 @@ static LRESULT CFn_WMInitDialog(HWND hDlg, WPARAM wParam, LPARAM lParam,
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(lpcf->Flags & CF_PRINTERFONTS && lpcf->hDC))
|
if (!((lpcf->Flags & CF_PRINTERFONTS) && lpcf->hDC))
|
||||||
ReleaseDC(hDlg,hdc);
|
ReleaseDC(hDlg,hdc);
|
||||||
SetCursor(hcursor);
|
SetCursor(hcursor);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
@ -968,7 +968,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam,
|
||||||
{
|
{
|
||||||
case cmb1:if (HIWORD(wParam)==CBN_SELCHANGE)
|
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)
|
if (hdc)
|
||||||
{
|
{
|
||||||
SendDlgItemMessageA(hDlg, cmb2, CB_RESETCONTENT16, 0, 0);
|
SendDlgItemMessageA(hDlg, cmb2, CB_RESETCONTENT16, 0, 0);
|
||||||
|
@ -990,7 +990,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam,
|
||||||
SendDlgItemMessageA(hDlg,cmb3, CB_SETCURSEL, 0, 0);
|
SendDlgItemMessageA(hDlg,cmb3, CB_SETCURSEL, 0, 0);
|
||||||
SetCursor(hcursor);
|
SetCursor(hcursor);
|
||||||
}
|
}
|
||||||
if (!(lpcf->Flags & CF_PRINTERFONTS && lpcf->hDC))
|
if (!((lpcf->Flags & CF_PRINTERFONTS) && lpcf->hDC))
|
||||||
ReleaseDC(hDlg,hdc);
|
ReleaseDC(hDlg,hdc);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -405,7 +405,7 @@ HICON WINAPI ExtractIconExA ( LPCSTR lpszFile, INT nIconIndex, HICON * phiconLar
|
||||||
}
|
}
|
||||||
|
|
||||||
/* if no pointers given and one icon expected, return the handle directly*/
|
/* if no pointers given and one icon expected, return the handle directly*/
|
||||||
if (!phiconLarge && ! phiconSmall && nIcons==1 )
|
if (!phiconLarge && !phiconSmall && nIcons==1 )
|
||||||
phiconSmall = &ret;
|
phiconSmall = &ret;
|
||||||
|
|
||||||
if (phiconSmall)
|
if (phiconSmall)
|
||||||
|
|
|
@ -1225,7 +1225,7 @@ BOOL WINAPI DdeAbandonTransaction(DWORD idInst, HCONV hConv, DWORD idTransaction
|
||||||
{
|
{
|
||||||
for (pConv = pInstance->convs[WDML_CLIENT_SIDE]; pConv; pConv = pConv->next)
|
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)
|
for (pXAct = pConv->transactions; pXAct; pXAct = pXAct->next)
|
||||||
{
|
{
|
||||||
if (pXAct->dwTimeout == TIMEOUT_ASYNC)
|
if (pXAct->dwTimeout == TIMEOUT_ASYNC)
|
||||||
|
|
|
@ -453,7 +453,7 @@ static char *demangle_datatype (char **str, compound_type *ct,
|
||||||
fatal ("Out of Memory");
|
fatal ("Out of Memory");
|
||||||
|
|
||||||
/* If we're a reference, re-use the pointer already in the type */
|
/* 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 */
|
stripped[ strlen (stripped) - 2] = '\0'; /* otherwise, strip it */
|
||||||
|
|
||||||
ct->expression = str_create (2, ct->flags & CT_CONST ? "const " :
|
ct->expression = str_create (2, ct->flags & CT_CONST ? "const " :
|
||||||
|
|
Loading…
Reference in a new issue