[PATCH] progman: Explicitly use unsigned constants to fix shifting in PUT_SHORT (clang)

André Hentschel nerv at dawncrow.de
Tue Mar 27 11:42:07 CDT 2018


Signed-off-by: André Hentschel <nerv at dawncrow.de>
---
 programs/progman/grpfile.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/programs/progman/grpfile.c b/programs/progman/grpfile.c
index d49dde3..360a2f9 100644
--- a/programs/progman/grpfile.c
+++ b/programs/progman/grpfile.c
@@ -564,10 +564,10 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group)
   PUT_SHORT(buffer, 18, group->iconx);
   PUT_SHORT(buffer, 20, group->icony);
   PUT_SHORT(buffer, 22, Title);
-  PUT_SHORT(buffer, 24, 0x0020); /* unknown */
-  PUT_SHORT(buffer, 26, 0x0020); /* unknown */
-  PUT_SHORT(buffer, 28, 0x0108); /* unknown */
-  PUT_SHORT(buffer, 30, 0x0000); /* unknown */
+  PUT_SHORT(buffer, 24, 0x0020u); /* unknown */
+  PUT_SHORT(buffer, 26, 0x0020u); /* unknown */
+  PUT_SHORT(buffer, 28, 0x0108u); /* unknown */
+  PUT_SHORT(buffer, 30, 0x0000u); /* unknown */
   PUT_SHORT(buffer, 32, NumProg);
 
   if ((UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, buffer, 34)) return FALSE;
@@ -609,7 +609,7 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group)
       PUT_SHORT(buffer,  0, program->x);
       PUT_SHORT(buffer,  2, program->y);
       PUT_SHORT(buffer,  4, program->nIconIndex);
-      PUT_SHORT(buffer,  6, 0x048c);            /* unknown */
+      PUT_SHORT(buffer,  6, 0x048cu);   /* unknown */
       PUT_SHORT(buffer,  8, sizeXor);
       PUT_SHORT(buffer, 10, sizeAnd * 8);
       PUT_SHORT(buffer, 12, CurrIcon);
@@ -664,9 +664,9 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group)
   if (need_extension)
     {
       /* write `PMCC' extension */
-      PUT_SHORT(buffer, 0, 0x8000);
-      PUT_SHORT(buffer, 2, 0xffff);
-      PUT_SHORT(buffer, 4, 0x000a);
+      PUT_SHORT(buffer, 0, 0x8000u);
+      PUT_SHORT(buffer, 2, 0xffffu);
+      PUT_SHORT(buffer, 4, 0x000au);
       buffer[6] = 'P', buffer[7] = 'M';
       buffer[8] = 'C', buffer[9] = 'C';
       if ((UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, buffer, 10))
@@ -682,7 +682,7 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group)
 	  /* Working directory */
 	  if (lpszWorkDir[0])
 	    {
-	      PUT_SHORT(buffer, 0, 0x8101);
+	      PUT_SHORT(buffer, 0, 0x8101u);
 	      PUT_SHORT(buffer, 2, seqnum);
 	      PUT_SHORT(buffer, 4, 7 + strlen(lpszWorkDir));
 	      if ((UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, buffer, 6) ||
@@ -693,9 +693,9 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group)
 	  /* Hot key */
 	  if (program->nHotKey)
 	    {
-	      PUT_SHORT(buffer, 0, 0x8102);
+	      PUT_SHORT(buffer, 0, 0x8102u);
 	      PUT_SHORT(buffer, 2, seqnum);
-	      PUT_SHORT(buffer, 4, 8);
+	      PUT_SHORT(buffer, 4, 8u);
 	      PUT_SHORT(buffer, 6, program->nHotKey);
 	      if ((UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, buffer, 8)) return FALSE;
 	    }
@@ -703,9 +703,9 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group)
 	  /* Show command */
 	  if (program->nCmdShow)
 	    {
-	      PUT_SHORT(buffer, 0, 0x8103);
+	      PUT_SHORT(buffer, 0, 0x8103u);
 	      PUT_SHORT(buffer, 2, seqnum);
-	      PUT_SHORT(buffer, 4, 8);
+	      PUT_SHORT(buffer, 4, 8u);
 	      PUT_SHORT(buffer, 6, program->nCmdShow);
 	      if ((UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, buffer, 8)) return FALSE;
 	    }
@@ -715,9 +715,9 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group)
 	}
 
       /* Write `End' extension */
-      PUT_SHORT(buffer, 0, 0xffff);
-      PUT_SHORT(buffer, 2, 0xffff);
-      PUT_SHORT(buffer, 4, 0x0000);
+      PUT_SHORT(buffer, 0, 0xffffu);
+      PUT_SHORT(buffer, 2, 0xffffu);
+      PUT_SHORT(buffer, 4, 0x0000u);
       if ((UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, buffer, 6)) return FALSE;
     }
 
-- 
2.7.4





More information about the wine-devel mailing list