Ticket #545: ja2-0.12.1-svn.patch

Build/Editor/Editor_Taskbar_Utils.cc

@@ -662 +662 @@
                 if (d.ubLockID != 255)
                         swprintf(str, lengthof(str), L"%hs", LockTable[d.ubLockID].ubEditorName);
                 else
-                        wcslcpy(str, L"No Lock ID", lengthof(str));
+                        wcsncpy(str, L"No Lock ID", lengthof(str));
                 DisplayWrappedString(x - 10, y - 40, 60, 2, FONT10ARIAL, FONT_LTKHAKI, str, FONT_BLACK, CENTER_JUSTIFIED | MARK_DIRTY);
 
                 wchar_t const* trap_type; // HACK000E

Build/Editor/EditorItems.cc

@@ -405 +405 @@
 
                                 if( eInfo.uiItemType != TBAR_MODE_ITEM_TRIGGERS )
                                 {
-                                        wcslcpy(pStr, ItemNames[usCounter], lengthof(pStr));
+                                        wcsncpy(pStr, ItemNames[usCounter], lengthof(pStr));
                                 }
                                 else
                                 {
                                         if( i == PRESSURE_ACTION_ID )
                                         {
-                                                wcslcpy(pStr, L"Pressure Action", lengthof(pStr));
+                                                wcsncpy(pStr, L"Pressure Action", lengthof(pStr));
                                         }
                                         else if( i < 2 )
                                         {
                                                 if( usCounter == SWITCH )
-                                                        wcslcpy(pStr, L"Panic Trigger1", lengthof(pStr));
+                                                        wcsncpy(pStr, L"Panic Trigger1", lengthof(pStr));
                                                 else
-                                                        wcslcpy(pStr, L"Panic Action1", lengthof(pStr));
+                                                        wcsncpy(pStr, L"Panic Action1", lengthof(pStr));
                                         }
                                         else if( i < 4 )
                                         {
                                                 if( usCounter == SWITCH )
-                                                        wcslcpy(pStr, L"Panic Trigger2", lengthof(pStr));
+                                                        wcsncpy(pStr, L"Panic Trigger2", lengthof(pStr));
                                                 else
-                                                        wcslcpy(pStr, L"Panic Action2", lengthof(pStr));
+                                                        wcsncpy(pStr, L"Panic Action2", lengthof(pStr));
                                         }
                                         else if( i < 6 )
                                         {
                                                 if( usCounter == SWITCH )
-                                                        wcslcpy(pStr, L"Panic Trigger3", lengthof(pStr));
+                                                        wcsncpy(pStr, L"Panic Trigger3", lengthof(pStr));
                                                 else
-                                                        wcslcpy(pStr, L"Panic Action3", lengthof(pStr));
+                                                        wcsncpy(pStr, L"Panic Action3", lengthof(pStr));
                                         }
                                         else
                                         {

Build/Editor/EditorMercs.cc

@@ -1965 +1965 @@
                                                 swprintf(str, lengthof(str), L"Click on the gridno where you wish to move after you %ls the door.", keyword);
                                                 break;
                                         case SCHEDULE_INSTRUCTIONS_GRIDNO:
-                                                wcslcpy(str, L"Click on the gridno where you wish to move to.", lengthof(str));
+                                                wcsncpy(str, L"Click on the gridno where you wish to move to.", lengthof(str));
                                                 break;
                                         case SCHEDULE_INSTRUCTIONS_SLEEP:
-                                                wcslcpy(str, L"Click on the gridno where you wish to sleep at.  Person will automatically return to original position after waking up.", lengthof(str));
+                                                wcsncpy(str, L"Click on the gridno where you wish to sleep at.  Person will automatically return to original position after waking up.", lengthof(str));
                                         default:
                                                 return;
                                 }

Build/Editor/LoadScreen.cc

@@ -1033 +1033 @@
 
 static BOOLEAN ExtractFilenameFromFields(void)
 {
-        wcslcpy(gzFilename, GetStringFromField(0), lengthof(gzFilename));
+        wcsncpy(gzFilename, GetStringFromField(0), lengthof(gzFilename));
         return ValidFilename();
 }
 

Build/Editor/Sector_Summary.cc

@@ -2347 +2347 @@
                 gfOverrideDirty = TRUE;
         }
         if( !wcslen( str ) )
-                wcslcpy(gszDisplayName, L"test.dat", lengthof(gszDisplayName));
+                wcsncpy(gszDisplayName, L"test.dat", lengthof(gszDisplayName));
 }
 
 void ApologizeOverrideAndForceUpdateEverything()

Build/Laptop/AIMMembers.cc

@@ -1291 +1291 @@
         //Title & Name
         if( gubVideoConferencingMode == AIM_VIDEO_INIT_MODE)
         {
-                wcslcpy(sMercName, VideoConfercingText[AIM_MEMBER_CONNECTING], lengthof(sMercName));
+                wcsncpy(sMercName, VideoConfercingText[AIM_MEMBER_CONNECTING], lengthof(sMercName));
                 DrawTextToScreen(sMercName, AIM_MEMBER_VIDEO_NAME_X, AIM_MEMBER_VIDEO_NAME_Y, 0, FONT12ARIAL, AIM_M_VIDEO_TITLE_COLOR, FONT_MCOLOR_BLACK, LEFT_JUSTIFIED);
         }
         else
@@ -1430 +1430 @@
         }
         else
         {
-                wcslcpy(wTemp, wDollarTemp, lengthof(wTemp));
+                wcsncpy(wTemp, wDollarTemp, lengthof(wTemp));
         }
         DrawTextToScreen(wTemp, AIM_CONTRACT_CHARGE_AMOUNNT_X + 1, AIM_CONTRACT_CHARGE_AMOUNNT_Y + 3, 0, AIM_M_VIDEO_CONTRACT_AMOUNT_FONT, AIM_M_VIDEO_CONTRACT_AMOUNT_COLOR, FONT_MCOLOR_BLACK, LEFT_JUSTIFIED);
 }

Build/Laptop/BobbyRGuns.cc

@@ -850 +850 @@
 
         // ammo or gun?
         AmmoKind const calibre = item->usItemClass == IC_AMMO ? Magazine[item->ubClassIndex].ubCalibre : Weapon[item->ubClassIndex].ubCalibre;
-        wcslcpy(zTemp, BobbyRayAmmoCaliber[calibre], lengthof(zTemp));
+        wcsncpy(zTemp, BobbyRayAmmoCaliber[calibre], lengthof(zTemp));
 
         ReduceStringLength(zTemp, lengthof(zTemp), BOBBYR_GRID_PIC_WIDTH, BOBBYR_ITEM_NAME_TEXT_FONT);
         DrawTextToScreen(zTemp, BOBBYR_ITEM_WEIGHT_NUM_X, usPosY, BOBBYR_ITEM_WEIGHT_NUM_WIDTH, BOBBYR_ITEM_DESC_TEXT_FONT, BOBBYR_ITEM_DESC_TEXT_COLOR, FONT_MCOLOR_BLACK, RIGHT_JUSTIFIED);

Build/Laptop/Finances.cc

@@ -828 +828 @@
                 case PAY_SPECK_FOR_MERC:
                 case PURCHASED_FLOWERS:
                 case TRANSACTION_FEE:
-                        wcslcpy(pString, pTransactionText[code], Length);
+                        wcsncpy(pString, pTransactionText[code], Length);
                         break;
 
                 case CANCELLED_INSURANCE:

Build/Laptop/Florist_Order_Form.cc

@@ -372 +372 @@
         RemoveButton( guiFlowerOrderGalleryButton );
 
         //Store the text fields
-        wcslcpy(gsSentimentTextField, GetStringFromField(1), lengthof(gsSentimentTextField));
-        wcslcpy(gsNameTextField,      GetStringFromField(2), lengthof(gsNameTextField));
+        wcsncpy(gsSentimentTextField, GetStringFromField(1), lengthof(gsSentimentTextField));
+        wcsncpy(gsNameTextField,      GetStringFromField(2), lengthof(gsNameTextField));
         gbCurrentlySelectedCard = -1;
 
 
@@ -743 +743 @@
         UINT8 const text_field_id = GetActiveFieldID();
         if (text_field_id == 1)
         { // The personel sentiment field
-                wcslcpy(gsSentimentTextField, GetStringFromField(text_field_id), lengthof(gsSentimentTextField));
+                wcsncpy(gsSentimentTextField, GetStringFromField(text_field_id), lengthof(gsSentimentTextField));
         }
         else if (text_field_id == 2)
         { // The name field
-                wcslcpy(gsNameTextField, GetStringFromField(text_field_id), lengthof(gsNameTextField));
+                wcsncpy(gsNameTextField, GetStringFromField(text_field_id), lengthof(gsNameTextField));
         }
 
         SetActiveField(0);
@@ -802 +802 @@
 
                         //disable the text entry fields
 //                      DisableAllTextFields();
-                                wcslcpy(gsSentimentTextField, GetStringFromField(1), lengthof(gsSentimentTextField));
+                                wcsncpy(gsSentimentTextField, GetStringFromField(1), lengthof(gsSentimentTextField));
                                 KillTextInputMode();
 
                         //disable the clear order and accept order buttons, (their rendering interferes with the drop down graphics)
@@ -947 +947 @@
                 wchar_t sText[FLOR_CARD_TEXT_TITLE_SIZE];
                 CleanOutControlCodesFromString(sTemp, sText);
 
-                wcslcpy(gsSentimentTextField, sText, lengthof(gsSentimentTextField));
+                wcsncpy(gsSentimentTextField, sText, lengthof(gsSentimentTextField));
 
                 gbCurrentlySelectedCard = -1;
 

Build/Laptop/Insurance_Contract.cc

@@ -490 +490 @@
 
         //display the amount of time the merc has left on their Regular contract
         if (is_dead)
-                wcslcpy(sText, pMessageStrings[MSG_LOWERCASE_NA], lengthof(sText));
+                wcsncpy(sText, pMessageStrings[MSG_LOWERCASE_NA], lengthof(sText));
         else
                 swprintf( sText, lengthof(sText), L"%d", GetTimeRemainingOnSoldiersContract( pSoldier ) );
 
@@ -515 +515 @@
 
         //if the soldier has insurance, disply the length of time the merc has left
         if (is_dead)
-                wcslcpy(sText, pMessageStrings[MSG_LOWERCASE_NA], lengthof(sText));
+                wcsncpy(sText, pMessageStrings[MSG_LOWERCASE_NA], lengthof(sText));
         else if( pSoldier->usLifeInsurance != 0 )
                 swprintf( sText, lengthof(sText), L"%d", GetTimeRemainingOnSoldiersInsuranceContract( pSoldier ) );
 
@@ -558 +558 @@
 
         if (is_dead)
         {
-                wcslcpy(sText, L"$0", lengthof(sText));
+                wcsncpy(sText, L"$0", lengthof(sText));
         }
         //display the amount owing
         DrawTextToScreen(sText, dx + 32, dy + 179, 72, INS_FONT_MED, INS_FONT_COLOR, FONT_MCOLOR_BLACK, RIGHT_JUSTIFIED);

Build/Laptop/Personnel.cc

@@ -655 +655 @@
         else
         {
                 //nick name
-                wcslcpy(sString, s.name, lengthof(sString));
+                wcsncpy(sString, s.name, lengthof(sString));
         }
         FindFontCenterCoordinates(CHAR_NAME_LOC_X, 0, CHAR_NAME_LOC_WIDTH, 0, sString, CHAR_NAME_FONT, &sX, &sY);
         MPrint(sX, CHAR_NAME_Y, sString);
@@ -737 +737 @@
         }
         else
         {
-                wcslcpy(sString, pPOWStrings[1], lengthof(sString));
+                wcsncpy(sString, pPOWStrings[1], lengthof(sString));
         }
         mprintf(pers_stat_x, pers_stat_y[0], L"%ls:", str_stat_health);
         FindFontRightCoordinates(pers_stat_x, 0, TEXT_BOX_WIDTH - 20, 0, sString, PERS_FONT, &sX, &sY);
@@ -1167 +1167 @@
 
                 SetFontDestBuffer(FRAME_BUFFER);
 
-                wcslcpy(sString, ItemNames[item_idx], lengthof(sString));
+                wcsncpy(sString, ItemNames[item_idx], lengthof(sString));
                 ReduceStringLength(sString, lengthof(sString), 171 - 75, FONT10ARIAL);
                 MPrint(PosX + 65, PosY + 3, sString);
 
@@ -1188 +1188 @@
 
                 if (item.usItemClass & IC_GUN)
                 {
-                        wcslcpy(sString, AmmoCaliber[Weapon[item.ubClassIndex].ubCalibre], lengthof(sString));
+                        wcsncpy(sString, AmmoCaliber[Weapon[item.ubClassIndex].ubCalibre], lengthof(sString));
                         ReduceStringLength(sString, lengthof(sString), 171 - 75, FONT10ARIAL);
                         MPrint(PosX + 65, PosY + 15, sString);
                 }

Build/SaveLoadGame.cc

@@ -272 +272 @@
                 else
                 {
                         if (GameDesc[0] == L'\0') GameDesc = pMessageStrings[MSG_NODESC];
-                        wcslcpy(desc, GameDesc, lengthof(desc));
+                        wcsncpy(desc, GameDesc, lengthof(desc));
                 }
 
                 MakeFileManDirectory(g_savegame_dir);

Build/SaveLoadScreen.cc

@@ -552 +552 @@
         INT8 const id = GetActiveFieldID();
         if (id == 0 || id == -1) return false;
 
-        wcslcpy(gzGameDescTextField, GetStringFromField(id), lengthof(gzGameDescTextField));
+        wcsncpy(gzGameDescTextField, GetStringFromField(id), lengthof(gzGameDescTextField));
         return true;
 }
 
@@ -873 +873 @@
                         }
                         else if (header.uiDay * NUM_SEC_IN_DAY + header.ubHour * NUM_SEC_IN_HOUR + header.ubMin * NUM_SEC_IN_MIN <= STARTING_TIME)
                         {
-                                wcslcpy(location, gpStrategicString[STR_PB_NOTAPPLICABLE_ABBREVIATION], lengthof(location));
+                                wcsncpy(location, gpStrategicString[STR_PB_NOTAPPLICABLE_ABBREVIATION], lengthof(location));
                         }
                         else
                         {
-                                wcslcpy(location, gzLateLocalizedString[STR_LATE_14], lengthof(location));
+                                wcsncpy(location, gzLateLocalizedString[STR_LATE_14], lengthof(location));
                         }
                         ReduceStringLength(location, lengthof(location), SLG_SECTOR_WIDTH, font);
                         DrawTextToScreen(location, x + SLG_SECTOR_OFFSET_X, y, 0, font, foreground, FONT_MCOLOR_BLACK, LEFT_JUSTIFIED);

Build/Strategic/Auto_Resolve.cc

@@ -1546 +1546 @@
                 cell->usIndex        = s->ubBodyType == REGFEMALE ? ELITEF_FACE : face;
                 s->sSectorX          = ar->ubSectorX;
                 s->sSectorY          = ar->ubSectorY;
-                wcslcpy(s->name, name, lengthof(s->name));
+                wcsncpy(s->name, name, lengthof(s->name));
         }
         return cell;
 }
@@ -1562 +1562 @@
                 cell->usIndex        = face;
                 s->sSectorX          = ar->ubSectorX;
                 s->sSectorY          = ar->ubSectorY;
-                wcslcpy(s->name, gpStrategicString[STR_AR_CREATURE_NAME], lengthof(s->name));
+                wcsncpy(s->name, gpStrategicString[STR_AR_CREATURE_NAME], lengthof(s->name));
         }
         return cell;
 }
@@ -1674 +1674 @@
                 AssertMsg(s, "Failed to create militia soldier for autoresolve.");
                 s->sSectorX = ar->ubSectorX;
                 s->sSectorY = ar->ubSectorY;
-                wcslcpy(s->name, gpStrategicString[STR_AR_MILITIA_NAME], lengthof(s->name));
+                wcsncpy(s->name, gpStrategicString[STR_AR_MILITIA_NAME], lengthof(s->name));
         }
 
         if (gubEnemyEncounterCode != CREATURE_ATTACK_CODE)

Build/Strategic/Map_Screen_Interface.cc

@@ -1717 +1717 @@
         fhr->iX = x;
         fhr->iY = y;
         fhr->iW = width;
-        wcslcpy(fhr->FastHelpText, text, lengthof(fhr->FastHelpText));
+        wcsncpy(fhr->FastHelpText, text, lengthof(fhr->FastHelpText));
         giSizeOfInterfaceFastHelpTextList = 1;
 }
 

Build/Strategic/Merc_Contract.cc

@@ -777 +777 @@
                 if (elsewhere == SECTOR(x, y) && z == 0) goto no_choice;
 
                 // Set strings for generic buttons
-                wcslcpy(gzUserDefinedButton1, town_sector, lengthof(gzUserDefinedButton1));
+                wcsncpy(gzUserDefinedButton1, town_sector, lengthof(gzUserDefinedButton1));
                 GetShortSectorString(SECTORX(elsewhere), SECTORY(elsewhere), gzUserDefinedButton2, lengthof(gzUserDefinedButton2));
 
                 wchar_t const* const town = g_towns_locative[GetTownIdForSector(elsewhere)];

Build/Strategic/Player_Command.cc

@@ -29 +29 @@
         UINT32 const facilities = SectorInfo[SECTOR(x, y)].uiFacilitiesFlags;
         if (facilities == 0)
         {
-          wcslcpy(buf, sFacilitiesStrings[0], length);
+          wcsncpy(buf, sFacilitiesStrings[0], length);
                 return;
         }
 

Build/Strategic/Quest_Debug_System.cc

@@ -3239 +3239 @@
         if (pSoldier != NULL && pSoldier->uiStatusFlags & SOLDIER_OFF_MAP)
         {
                 //the soldier is on schedule
-                wcslcpy(pzText, L"On Schdl.", Length);
+                wcsncpy(pzText, L"On Schdl.", Length);
         }
 
         //if the soldier is dead
         else if( gMercProfiles[ usProfileID ].bMercStatus == MERC_IS_DEAD )
         {
-                wcslcpy(pzText, L"Dead", Length);
+                wcsncpy(pzText, L"Dead", Length);
         }
 
         //the soldier is in this sector

Build/Strategic/StrategicMap.cc

@@ -1520 +1520 @@
 void GetSectorIDString(INT16 const x, INT16 const y, INT8 const z, wchar_t* const buf, size_t const length, BOOLEAN const detailed)
 {
 #ifdef JA2DEMO
-        wcslcpy(buf, L"Demoville", length);
+        wcsncpy(buf, L"Demoville", length);
 #else
         if (x <= 0 || y <= 0 || z < 0) /* Empty? */
         {

Build/Tactical/Enemy_Soldier_Save.cc

@@ -748 +748 @@
                         dp->sInsertionGridNo = curr->pBasicPlacement->usStartingGridNo;
                 }
 
-                wcslcpy(dp->name, s.name, lengthof(dp->name));
+                wcsncpy(dp->name, s.name, lengthof(dp->name));
 
                 // Copy patrol points
                 dp->bPatrolCnt = s.bPatrolCnt;

Build/Tactical/Interface_Dialogue.cc

@@ -2730 +2730 @@
                                 // NOW overwrite name with true name in profile
                                 // copy new nickname into soldier structure
                                 {
-                                        wcslcpy(gMercProfiles[ubTargetNPC].zNickname, gMercProfiles[ubTargetNPC].zName, lengthof(gMercProfiles[ubTargetNPC].zNickname));
+                                        wcsncpy(gMercProfiles[ubTargetNPC].zNickname, gMercProfiles[ubTargetNPC].zName, lengthof(gMercProfiles[ubTargetNPC].zNickname));
                                         SOLDIERTYPE* const pSoldier = FindSoldierByProfileID(ubTargetNPC);
                                         if ( pSoldier )
                                         {
-                                                wcslcpy(pSoldier->name, gMercProfiles[ubTargetNPC].zNickname, lengthof(pSoldier->name));
+                                                wcsncpy(pSoldier->name, gMercProfiles[ubTargetNPC].zNickname, lengthof(pSoldier->name));
                                         }
                                 }
                                 break;

Build/Tactical/Interface_Items.cc

@@ -4778 +4778 @@
                         }
                         else
                         {
-                                wcslcpy(pStr, ShortItemNames[o.usItem], lengthof(pStr));
+                                wcsncpy(pStr, ShortItemNames[o.usItem], lengthof(pStr));
                         }
                         INT16 sFontX;
                         INT16 sFontY;
@@ -5192 +5192 @@
         }
         else if (usItem == NOTHING)
         {
-                wcslcpy(dst, L"", length);
+                wcsncpy(dst, L"", length);
         }
         else
         {

Build/Tactical/Soldier_Create.cc

@@ -892 +892 @@
 
                 default: goto no_name; // XXX fishy
         }
-        wcslcpy(s.name, name, lengthof(s.name));
+        wcsncpy(s.name, name, lengthof(s.name));
 no_name:
 
         GeneratePaletteForSoldier(&s, c.ubSoldierClass);

Build/TileEngine/Render_Dirty.cc

@@ -502 +502 @@
                 v->uiFontID   = font;
                 v->ubFontFore = foreground;
                 v->ubFontBack = background;
-                wcslcpy(v->zText, text, lengthof(v->zText));
+                wcsncpy(v->zText, text, lengthof(v->zText));
         }
         return v;
 }

Build/Utils/Text_Input.cc

@@ -250 +250 @@
         {
                 n->ubStrLen = wcslen(szInitText);
                 Assert(n->ubStrLen <= ubMaxChars);
-                wcslcpy(n->szString, szInitText, ubMaxChars + 1);
+                wcsncpy(n->szString, szInitText, ubMaxChars + 1);
         }
         else
         {
@@ -345 +345 @@
         {
                 curr->ubStrLen = (UINT8)wcslen(szNewText);
                 Assert(curr->ubStrLen <= curr->ubMaxChars);
-                wcslcpy(curr->szString, szNewText, curr->ubMaxChars + 1);
+                wcsncpy(curr->szString, szNewText, curr->ubMaxChars + 1);
         }
         else if (!curr->fUserField)
         {

Build/Utils/WordWrap.cc

@@ -477 +477 @@
                 RestWidth -= CharWidth;
         }
 
-        wcslcpy(pString + i, Dots, Length - i);
+        wcsncpy(pString + i, Dots, Length - i);
 }

Makefile

@@ -111 +111 @@
 CXXFLAGS += $(CFLAGS)
 
 LDFLAGS += $(LDFLAGS_SDL)
-LDFLAGS += -lm
+LDFLAGS +=
 
 ifdef WITH_ZLIB
 LDFLAGS += -lz