Skip to content

Intrusiveness minimizing changes to suppress warnings for build inside NuttX tree #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ghaerr merged 1 commit into from
Sep 3, 2026
Merged

Intrusiveness minimizing changes to suppress warnings for build inside NuttX tree #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/images/tools/convbmp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,16 +376,16 @@ UCHAR *p = (UCHAR *)&l;

for(i = cy-1; i>= 0; i--) {
/* turn image rightside up*/
unsigned char *p = imagebits + i*pitch;
unsigned char *p1 = imagebits + i*pitch;

if(compression == BI_RLE8) {
if(!DecodeRLE8(p, fp))
if(!DecodeRLE8(p1, fp))
break;
} else if(compression == BI_RLE4) {
if(!DecodeRLE4(p, fp))
if(!DecodeRLE4(p1, fp))
break;
} else {
if(fread(p, 1, pitch, fp) != (size_t)pitch) {
if(fread(p1, 1, pitch, fp) != (size_t)pitch) {
free(imagebits);
fprintf(stderr, "Error fread\n");
return -1;
Expand All @@ -401,9 +401,9 @@ UCHAR *p = (UCHAR *)&l;

/* then output each line in order*/
for (i=0; i<cy; i++) {
unsigned char *p = imagebits + i*pitch;
unsigned char *p1 = imagebits + i*pitch;

outline(p, bitdepth, pitch);
outline(p1, bitdepth, pitch);
}

if(!s_flag) {
Expand Down Expand Up @@ -570,6 +570,7 @@ int c, n, c1, c2;
continue;
default: /* 0 3..255 xx nn uncompressed data*/
c2 = (n+3) & ~3;
c1 = 0; /* initialize to suppress false warning */
for(c=0; c<c2; c++) {
if((c & 1) == 0)
c1 = fgetc(fp);
Expand Down
2 changes: 2 additions & 0 deletions src/include/mwconfig.nuttx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
* Included by mwconfig.h via -DMWCONFIG_FILE='"mwconfig.nuttx"'
*/

#pragma GCC diagnostic ignored "-Wundef"

#undef NUTTX
#define NUTTX 1
#ifndef NANOWM
Expand Down
4 changes: 4 additions & 0 deletions src/include/nano-X.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,13 +962,17 @@ GR_CURSOR_ID GrSetCursor(GR_WINDOW_ID wid, GR_SIZE width, GR_SIZE height,
GR_COORD hotx, GR_COORD hoty, GR_COLOR foreground,
GR_COLOR background, GR_BITMAP *fbbitmap, GR_BITMAP *bgbitmap);
/*#define GrSetBorderColor GrSetWindowBorderColor*/
#undef GrCreateFont
#define GrCreateFont(name,height,plogfont) GrCreateFontEx(name,height,height,plogfont)
#undef GrSetFontSize
#define GrSetFontSize(fontid,height) GrSetFontSizeEx(fontid,height,height)
#undef GrNewPixmap
#define GrNewPixmap(width,height,pixels) GrNewPixmapEx(width,height,0,pixels)

/* useful function macros*/
#define GrClearWindow(wid,exposeflag) GrClearArea(wid,0,0,0,0,exposeflag)
#define GrFlushWindow(wid) GrClearWindow(wid,2)
#undef GrDrawImageToFit
#define GrDrawImageToFit(id,gc,x,y,width,height,imageid) \
GrDrawImagePartToFit(id,gc,x,y,width,height,0,0,0,0,imageid)
#define GrSetWindowBackgroundColor(wid,color) \
Expand Down
5 changes: 3 additions & 2 deletions src/mwin/wingdi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ static MWBITMAPOBJ default_bitmap = {
};

static MWPALOBJ default_palette = {
{OBJ_PAL, TRUE}, 0, 0
{OBJ_PAL, TRUE}, {0, 0}
};

static BOOL MwExtTextOut(HDC hdc, int x, int y, UINT fuOptions,
Expand Down Expand Up @@ -784,7 +784,8 @@ FillRect(HDC hdc, CONST RECT *lprc, HBRUSH hbr)

/* handle COLOR_xxx + 1 passed as HBRUSH*/
if((UINT_PTR)obr <= MAXSYSCOLORS) { // Convert pointer to long without truncation to check if small int passed
crFill = GetSysColor((int)obr-1); // OK: Not pointer. Convert to int then decrement.
// OK: Not pointer. Convert to int then decrement.
crFill = GetSysColor((int)(UINT_PTR)obr-1);
} else {
/* get color from passed HBRUSH*/
if(obr->style == BS_NULL)
Expand Down
2 changes: 1 addition & 1 deletion src/mwin/winlib/combobox.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ DefComboboxProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
lp->bExtended = TRUE;
lp->hFont = 0;
lp->hWndParent = lpcs->hwndParent;
lp->nID = (UINT) lpcs->hMenu; //OK: Not pointer, control id always passed as UINT.
lp->nID = (UINT)(UINT_PTR) lpcs->hMenu; //OK: Not pointer, control id always passed as UINT.

dwStyle = GetWindowLong(hWnd, GWL_STYLE);
dwStyle &= ~(WS_VSCROLL | WS_HSCROLL | WS_BORDER | WS_DLGFRAME | WS_THICKFRAME);
Expand Down
11 changes: 6 additions & 5 deletions src/mwin/winres.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ mwAddResource(HRSRC hRes)
static int
mwResCompare(LPCTSTR res1, LPCTSTR res2)
{
if ((HIWORD(res1) == 0xFFFF) || (HIWORD(res2) == 0xFFFF)) // OK: Not pointer. Checks high word of resource DWORD.
// OK: Not pointer. Checks high word of resource DWORD.
if ((HIWORD((UINT_PTR)res1) == 0xFFFF) || (HIWORD((UINT_PTR)res2) == 0xFFFF))
return (res1 != res2);

// FIXME: resource string names not handled properly here
Expand Down Expand Up @@ -258,14 +259,14 @@ mwIsSameType(FILE * f, LPCTSTR id, BOOL * pEof)
return !(*pEof);
}
// Resource may be specified in text or integer
if (HIWORD(id) == 0xFFFF) {
if (HIWORD((UINT_PTR)id) == 0xFFFF) {
w = resReadWord(f, pEof);
if (w != 0xFFFF)
return FALSE;
w = resReadWord(f, pEof);
if (*pEof)
return FALSE;
if (w == LOWORD((DWORD) id))
if (w == LOWORD((UINT_PTR) id))
return TRUE;
} else {
LPCTSTR p = id;
Expand Down Expand Up @@ -538,8 +539,8 @@ resDialogTemplate(BYTE *dest, LPCSTR caption, DWORD style, DWORD dwExtendedStyle
dialog->cdit = (WORD)cdit;

extra = (WORD *)(((BYTE *)dialog) + FIXSZ_MWDLGTEMPLATE);
*extra++ = (WORD)menu; // OK: No string menus yet, menu id always passed as WORD.
*extra++ = (WORD)classname; // OK: No string classes yet, class id always passed as WORD.
*extra++ = (WORD)(UINT_PTR)menu; // OK: No string menus yet, menu id always passed as WORD.
*extra++ = (WORD)(UINT_PTR)classname; // OK: No string classes yet, class id always passed as WORD.
if (caption)
while (*caption)
*extra++ = (WORD)*caption++;
Expand Down
6 changes: 3 additions & 3 deletions src/mwin/winsbar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,14 +797,14 @@ ShowScrollBar (HWND hWnd, int iSBar, BOOL bShow)

{
RECT rcWin, rcClient;

memcpy (&rcWin, &pWin->winrect.left, sizeof (RECT));
rcClient.left = 0;
rcClient.top = 0;
rcClient.right = pWin->clirect.right - pWin->clirect.left;
rcClient.bottom = pWin->clirect.bottom - pWin->clirect.top;

/* fix: no WM_SIZECHANGED */
(void)rcClient;
/* fix: no WM_SIZECHANGED */

@ghaerr ghaerr Sep 3, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is line 806 required? rcClient is used directly above and below, so not sure why this is needed. What was the warning given by the compiler?

@ppisa ppisa Sep 3, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The structure fields are setup

rcClient.left = 0;
...

but it is not used in the latter code for now. So warning is correct.

The code documents intention but then ends with commented call because WM_SIZECHANGED, seems to be unimplemented for now or it is implemented but already but change did not propagate back into winsbar.c

//SendMessage(hWnd, WM_SIZECHANGED, (WPARAM)&rcWin, (LPARAM)&rcClient);

@ppisa ppisa Sep 3, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am aware of 64-bit widows (WIN64_PORT) use of non-standard LLP64 breaking Unix prerequisite that long can hold pointer. But my change only convert the pointer to marching size unsigned integer and then it is truncated implicitly or by (int) or (DWORD) casts. The conversion of pointer to UINT_PTR has no real effect but it removes warning because latter implicit typecast to narrower integer is considered as intentional.

I am in some doubts, if some conversions to int should not be to DWORD in the fact. It depend on how the field, parameter of pointer type is reused and filled. I have not checked when the code calls functions affected. But there should not be any real operation change by casts I have added.

As for unit_ptr_t, I would preffer that and it would be ideal if UINT_PTR is set to this type everywhere but I expect that there can be some old compilers and environments where it can be a problem. So I hav stuck with type, which is guaranteed to be available in WinAPI world.

//SendMessage(hWnd, WM_SIZECHANGED, (WPARAM)&rcWin, (LPARAM)&rcClient);
}

Expand Down
20 changes: 10 additions & 10 deletions src/mwin/winuser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ CreateWindowEx(DWORD dwExStyle, LPCSTR lpClassName, LPCSTR lpWindowName,
wp->cursor = pwp->cursor;
wp->cursor->usecount++;
wp->unmapcount = pwp->unmapcount + 1;
wp->id = (int)hMenu; // OK: Not pointer. Menu id always passed as int.
wp->id = (int)(UINT_PTR)hMenu; // OK: Not pointer. Menu id always passed as int.
wp->gotPaintMsg = PAINT_PAINTED;

titLen = 0;
Expand Down Expand Up @@ -1300,8 +1300,8 @@ GetClassLong(HWND hwnd, int nIndex)
case GCL_CBWNDEXTRA:
return (DWORD)hwnd->pClass->cbWndExtra;
case GCL_HBRBACKGROUND:
assert(sizeof(LONG_PTR) <= 32); // 64bit must use GetClassLongPtr
return (DWORD)hwnd->pClass->hbrBackground; // OK: Pointer size checked above and is 32 bit.
assert(sizeof(LONG_PTR) <= sizeof(DWORD)); // 64bit must use GetClassLongPtr
return (DWORD)(LONG_PTR)hwnd->pClass->hbrBackground; // OK: Pointer size checked above and is 32 bit.
case GCL_HCURSOR:
case GCL_HICON:
case GCL_HMODULE:
Expand Down Expand Up @@ -1391,7 +1391,7 @@ SetWindowLongPtr(HWND hwnd, int nIndex, LONG_PTR lNewLong)
hwnd->lpfnWndProc = (WNDPROC)lNewLong;
break;
case GWL_WNDPROCBRIDGE:
hwnd->lpfnWndProcBridge = (WNDPROC)lNewLong;
hwnd->lpfnWndProcBridge = (WNDPROC)(UINT_PTR)lNewLong;
break;
case GWL_HINSTANCE:
hwnd->hInstance = (HINSTANCE)lNewLong;
Expand Down Expand Up @@ -1514,7 +1514,7 @@ SetProp(HWND hWnd, LPCSTR lpString, HANDLE hData)
return FALSE;
/* check if 16 bit atom passed instead of pointer*/
if (PTR_IS_ATOM(lpString))
pProp->Atom = LOWORD((DWORD)lpString); // OK: Not pointer. Atom passed in low 16 bits.
pProp->Atom = LOWORD((DWORD)(UINT_PTR)lpString); // OK: Not pointer. Atom passed in low 16 bits.
else
pProp->Atom = GlobalAddAtom(lpString);
pProp->hData = hData;
Expand All @@ -1532,7 +1532,7 @@ GetProp(HWND hWnd, LPCSTR lpString)

/* check if 16 bit atom passed instead of pointer*/
if (PTR_IS_ATOM(lpString))
Atom = LOWORD((DWORD)lpString); // OK: Not pointer. Atom passed in low 16 bits.
Atom = LOWORD((DWORD)(UINT_PTR)lpString); // OK: Not pointer. Atom passed in low 16 bits.
else
Atom = GlobalFindAtom(lpString);

Expand All @@ -1554,7 +1554,7 @@ RemoveProp(HWND hWnd, LPCSTR lpString)

/* check if 16 bit atom passed instead of pointer*/
if (PTR_IS_ATOM(lpString))
Atom = LOWORD((DWORD)lpString); // OK: Not pointer. Atom passed in low 16 bits.
Atom = LOWORD((DWORD)(UINT_PTR)lpString); // OK: Not pointer. Atom passed in low 16 bits.
else
Atom = GlobalFindAtom(lpString);

Expand Down Expand Up @@ -1656,11 +1656,11 @@ SetWindowPos(HWND hwnd, HWND hwndInsertAfter, int x, int y, int cx, int cy, UINT
hidden = hwnd->unmapcount || (fuFlags & SWP_NOREDRAW);

if(bZorder) {
switch((int)hwndInsertAfter) { // OK: intentional HWND to int cast
case (int)(HWND)HWND_TOP: // OK: intentional HWND to int cast
switch((int)(UINT_PTR)hwndInsertAfter) { // OK: intentional HWND to int cast
case (int)(UINT_PTR)(HWND)HWND_TOP: // OK: intentional HWND to int cast
MwRaiseWindow(hwnd);
break;
case (int)(HWND)HWND_BOTTOM: // OK: intentional HWND to int cast
case (int)(UINT_PTR)(HWND)HWND_BOTTOM: // OK: intentional HWND to int cast
MwLowerWindow(hwnd);
break;
default:
Expand Down
1 change: 1 addition & 0 deletions src/nanox/client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4498,6 +4498,7 @@ GrQueryPointer(GR_WINDOW_ID *mwin, GR_COORD *x, GR_COORD *y, GR_BUTTON *bmask)

LOCK(&nxGlobalLock);
req = AllocReq(QueryPointer);
(void)req;
TypedReadBlock(mwin, sizeof(*mwin), GrNumQueryPointer);
ReadBlock(x, sizeof(*x));
ReadBlock(y, sizeof(*y));
Expand Down
4 changes: 4 additions & 0 deletions src/nanox/serv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#define GrCloseWindow SVR_GrCloseWindow
#define GrCopyArea SVR_GrCopyArea
#define GrCopyGC SVR_GrCopyGC
#undef GrCreateFont
#define GrCreateFont SVR_GrCreateFont
#define GrCreateFontEx SVR_GrCreateFontEx
#define GrCreateTimer SVR_GrCreateTimer
Expand All @@ -47,6 +48,7 @@
#define GrDrawImageFromBuffer SVR_GrDrawImageFromBuffer
#define GrDrawImageFromFile SVR_GrDrawImageFromFile
#define GrDrawImagePartToFit SVR_GrDrawImagePartToFit
#undef GrDrawImageToFit
#define GrDrawImageToFit SVR_GrDrawImageToFit
#define GrEllipse SVR_GrEllipse
#define GrEmptyRegion SVR_GrEmptyRegion
Expand Down Expand Up @@ -86,6 +88,7 @@
#define GrNewCursor SVR_GrNewCursor
#define GrNewGC SVR_GrNewGC
#define GrNewInputWindow SVR_GrNewInputWindow
#undef GrNewPixmap
#define GrNewPixmap SVR_GrNewPixmap
#define GrNewPixmapEx SVR_GrNewPixmapEx
#define GrNewPolygonRegion SVR_GrNewPolygonRegion
Expand Down Expand Up @@ -114,6 +117,7 @@
#define GrSetFocus SVR_GrSetFocus
#define GrSetFontAttr SVR_GrSetFontAttr
#define GrSetFontRotation SVR_GrSetFontRotation
#undef GrSetFontSize
#define GrSetFontSize SVR_GrSetFontSize
#define GrSetFontSizeEx SVR_GrSetFontSizeEx
#define GrSetGCBackground SVR_GrSetGCBackground
Expand Down