diff --git a/game/Builder.cpp b/game/Builder.cpp index 93c7e3a..b4084c6 100644 --- a/game/Builder.cpp +++ b/game/Builder.cpp @@ -586,7 +586,7 @@ void MobileUnitBuildForm::SetOwner(BuilderGob *pbldr) void MobileUnitBuildForm::UpdateUnitInfo(ListItem *pli) { - MobileUnitConsts *pmuntc = (MobileUnitConsts *)gapuntc[(int)pli->pvData]; + MobileUnitConsts *pmuntc = (MobileUnitConsts *)gapuntc[(long)pli->pvData]; // Update Cost diff --git a/game/GameObjects.cpp b/game/GameObjects.cpp index 82ed63e..a87b6a2 100644 --- a/game/GameObjects.cpp +++ b/game/GameObjects.cpp @@ -1283,9 +1283,9 @@ Direction16 CalcDir16(int dx, int dy) #define PpgobFromGid(gid) ((Gob **)((byte *)m_apgobMaster + (gid))) #define GidFromPpgob(ppgob) ((byte *)(ppgob) - (byte *)m_apgobMaster) -#define MakeUsedEntry(dw) (Gob **)((dword)(dw) & ~1) -#define MakeFreeEntry(dw) (Gob *)((dword)(dw) | 1) -#define IsFreeEntry(dw) ((dword)(dw) & 1) +#define MakeUsedEntry(pw) (Gob **)((pword)(pw) & ~1) +#define MakeFreeEntry(pw) (Gob *)((pword)(pw) | 1) +#define IsFreeEntry(pw) ((pword)(pw) & 1) #define IgidFromWXY(wx, wy) (TcFromWc(wy) * m_ctx + TcFromWc(wx)) GobMgr::GobMgr() diff --git a/game/GameOptions.cpp b/game/GameOptions.cpp index e90841f..4147d23 100644 --- a/game/GameOptions.cpp +++ b/game/GameOptions.cpp @@ -783,7 +783,7 @@ void DisplayOptionsForm::OnControlSelected(word idc) { ListControl *plstc = (ListControl *)GetControlPtr(kidcModesList); if (plstc->GetFlags() & kfCtlVisible) { - int immNew = (int)plstc->GetSelectedItemData(); + int immNew = (int)(long)plstc->GetSelectedItemData(); ggame.RequestModeChange(immNew); } diff --git a/game/Headquarters.cpp b/game/Headquarters.cpp index c6e5b53..23e58c6 100644 --- a/game/Headquarters.cpp +++ b/game/Headquarters.cpp @@ -380,7 +380,7 @@ void StructureBuildForm::SetOwner(BuilderGob *pgobOwner) void StructureBuildForm::UpdateStructureInfo(ListItem *pli) { - StructConsts *pstruc = (StructConsts *)gapuntc[(int)pli->pvData]; + StructConsts *pstruc = (StructConsts *)gapuntc[(long)pli->pvData]; // Update Cost diff --git a/game/RawBitmap.cpp b/game/RawBitmap.cpp index f6f7073..060c87d 100644 --- a/game/RawBitmap.cpp +++ b/game/RawBitmap.cpp @@ -194,12 +194,12 @@ void RawBitmap::BltTo(DibBitmap *pbmDst, int xDst, int yDst, Rect *prcSrc) int cyLeft = prcSrc->Height(); byte *pbRec = NULL; word cbRec; - dword dwCookie; + void *pvCookie; while (cyLeft > 0) { // See how much we can blt from the current record if (pbRec == NULL) { - pbRec = m_pfil->prnfo->ppdbReader->MapRecord(nRecCurrent, &dwCookie, &cbRec); + pbRec = m_pfil->prnfo->ppdbReader->MapRecord(nRecCurrent, &pvCookie, &cbRec); if (pbRec == NULL) break; } @@ -224,10 +224,10 @@ void RawBitmap::BltTo(DibBitmap *pbmDst, int xDst, int yDst, Rect *prcSrc) int cbLeftHalf = (int)(offRecCurrent + cbRec - offBits); memcpy(pbDst, &pbRec[offBits - offRecCurrent], cbLeftHalf); - m_pfil->prnfo->ppdbReader->UnmapRecord(nRecCurrent, dwCookie); + m_pfil->prnfo->ppdbReader->UnmapRecord(nRecCurrent, pvCookie); offRecCurrent += cbRec; nRecCurrent++; - pbRec = m_pfil->prnfo->ppdbReader->MapRecord(nRecCurrent, &dwCookie, &cbRec); + pbRec = m_pfil->prnfo->ppdbReader->MapRecord(nRecCurrent, &pvCookie, &cbRec); if (pbRec == NULL) return; memcpy(pbDst + cbLeftHalf, pbRec, cxBlt - cbLeftHalf); @@ -240,7 +240,7 @@ void RawBitmap::BltTo(DibBitmap *pbmDst, int xDst, int yDst, Rect *prcSrc) // Next scan doesn't intersect a record boundary memcpy(pbDst, &pbRec[offBits - offRecCurrent], cxBlt); - m_pfil->prnfo->ppdbReader->UnmapRecord(nRecCurrent, dwCookie); + m_pfil->prnfo->ppdbReader->UnmapRecord(nRecCurrent, pvCookie); pbRec = NULL; offRecCurrent += cbRec; offBits += m_cx; @@ -250,7 +250,7 @@ void RawBitmap::BltTo(DibBitmap *pbmDst, int xDst, int yDst, Rect *prcSrc) } if (pbRec != NULL) - m_pfil->prnfo->ppdbReader->UnmapRecord(nRecCurrent, dwCookie); + m_pfil->prnfo->ppdbReader->UnmapRecord(nRecCurrent, pvCookie); } #endif diff --git a/game/Simulation.cpp b/game/Simulation.cpp index ef1321d..f586d9c 100644 --- a/game/Simulation.cpp +++ b/game/Simulation.cpp @@ -478,7 +478,6 @@ void Simulation::Update(CommandQueue *pcmdq) // to the insertion or deletion of elements on the Gob list during the // kmidReserveUpdate callbacks. - Assert(kcpgobMax * sizeof(Gid) <= 1536); Gid agid[kcpgobMax]; Gid *pgidT = agid; int cgid = 0; @@ -706,10 +705,7 @@ void Simulation::SelectSameUnitTypes(UnitGob *punt, TRect *ptrc) UnitType ut = punt->GetUnitType(); - // Store the gobs on the stack; we've tested this with 1K of stack; assert if it - // changes - - Assert(kcpgobMax / 2 * sizeof(Gob *) <= 1536); + // Store the gobs on the stack. Gob *apgob[kcpgobMax / 2]; int cpgob = ggobm.FindGobs(ptrc, apgob, ARRAYSIZE(apgob)); diff --git a/game/Unit.cpp b/game/Unit.cpp index 9051013..559b665 100644 --- a/game/Unit.cpp +++ b/game/Unit.cpp @@ -588,7 +588,7 @@ dword UnitGob::GetAnimationHash() { int nFrame = m_ani.GetFrame(); int nStrip = m_ani.GetStrip(); - return ((nFrame << 16) | nStrip) ^ (dword)this ^ (GetId() << 16); + return ((nFrame << 16) | nStrip) ^ (dword)(unsigned long)this ^ (GetId() << 16); } void UnitGob::GetAnimationBounds(Rect *prc, bool fBase) diff --git a/game/completemanager.cpp b/game/completemanager.cpp index 7e4dec5..da04397 100644 --- a/game/completemanager.cpp +++ b/game/completemanager.cpp @@ -9,6 +9,7 @@ namespace wi { void CompleteManager::Init() { + return; map_.clear(); DIR *pdir = opendir(completedir_.c_str()); dirent *pdent; diff --git a/game/creategameform.cpp b/game/creategameform.cpp index c48b9f5..533725d 100644 --- a/game/creategameform.cpp +++ b/game/creategameform.cpp @@ -306,7 +306,7 @@ void CreateGameForm::OnControlSelected(word idc) { // Fill in GameParams ListControl *plstc = m_aplstc[IndexFromMissionType(m_mt)]; - int nLevel = (int)plstc->GetSelectedItemData(); + int nLevel = (long)plstc->GetSelectedItemData(); MissionIdentifier miid; if (!m_pml->GetMissionIdentifier(nLevel, &miid)) { @@ -426,7 +426,7 @@ void CreateGameForm::UpdateLabels() { plbl->SetText(""); return; } - int i = (int)plstc->GetSelectedItemData(); + int i = (long)plstc->GetSelectedItemData(); MissionIdentifier miid; if (!m_pml->GetMissionIdentifier(i, &miid)) { plbl->SetText(""); diff --git a/game/iphone/iphonesounddev.cpp b/game/iphone/iphonesounddev.cpp index fed4efc..cefa323 100644 --- a/game/iphone/iphonesounddev.cpp +++ b/game/iphone/iphonesounddev.cpp @@ -36,7 +36,7 @@ public: private: void InitAudioBuffer(AudioQueueBuffer *paqb); - void InterruptionListener(UInt32 interruptionState); + void InterruptionListener(void *data, UInt32 interruptionState); bool m_fEnable; long m_tSilence; @@ -65,7 +65,7 @@ SoundDevice *CreateIPhoneSoundDevice() void InterruptionListener(void *data, UInt32 interruptionState) { IPhoneSoundDevice *psndd = (IPhoneSoundDevice *)data; - psndd->InterruptionListener(interruptionState); + psndd->InterruptionListener(data, interruptionState); } IPhoneSoundDevice::IPhoneSoundDevice() @@ -93,7 +93,7 @@ bool IPhoneSoundDevice::Init() // over audio. If the user then ignores the phone call, the // audio needs to be turned on again. - AudioSessionInitialize(NULL, NULL, wi::InterruptionListener, this); + AudioSessionInitialize(NULL, NULL, (AudioSessionInterruptionListener)wi::InterruptionListener, this); UInt32 category = kAudioSessionCategory_UserInterfaceSoundEffects; AudioSessionSetProperty(kAudioSessionProperty_AudioCategory, sizeof(category), &category); @@ -129,7 +129,7 @@ bool IPhoneSoundDevice::Init() return true; } -void IPhoneSoundDevice::InterruptionListener(UInt32 interruptionState) { +void IPhoneSoundDevice::InterruptionListener(void *inClientData, UInt32 interruptionState) { switch (interruptionState) { case kAudioSessionBeginInterruption: AudioSessionSetActive(false); diff --git a/game/iphone/savegame.cpp b/game/iphone/savegame.cpp index bb4e847..5ca01fb 100644 --- a/game/iphone/savegame.cpp +++ b/game/iphone/savegame.cpp @@ -196,7 +196,8 @@ bool HostGetSaveGameName(int nGame, char *psz, int cb, Date *pdate, int *pnHours if (stat(szPath, &st) > 0) { return false; } - struct tm *ptm = localtime(&st.st_mtime); + time_t tim = 0; + struct tm *ptm = localtime(&tim); *pnHours24 = ptm->tm_hour; *pnMinutes = ptm->tm_min; *pnSeconds = ptm->tm_sec; diff --git a/game/loadsave.cpp b/game/loadsave.cpp index 2ac1b6b..1b7eafc 100644 --- a/game/loadsave.cpp +++ b/game/loadsave.cpp @@ -167,7 +167,7 @@ bool LoadGameForm::Init(FormMgr *pfrmm, IniReader *pini, word idf) } else { strcpy(szT, szLevel); } - plstc->Add(szT, (void *)(nGame + 1)); + plstc->Add(szT, (void *)((long)nGame + 1)); } m_nGameLast = nGameLast; @@ -196,7 +196,7 @@ void LoadGameForm::OnControlSelected(word idc) case kidcOk: { ListControl *plstc = (ListControl *)GetControlPtr(kidcGameList); - int nGame = ((int)plstc->GetSelectedItemData()) - 1; + int nGame = ((int)(long)plstc->GetSelectedItemData()) - 1; EndForm(nGame); } return; diff --git a/game/lobbyform.cpp b/game/lobbyform.cpp index 466ea6b..7dae8e6 100644 --- a/game/lobbyform.cpp +++ b/game/lobbyform.cpp @@ -123,7 +123,7 @@ void LobbyForm::OnControlNotify(word idc, int nNotify) { void LobbyForm::OnJoinRoom() { ListControl *plstc = (ListControl *)GetControlPtr(kidcRoomList); - dword roomid = (dword)plstc->GetSelectedItemData(); + dword roomid = (dword)(pword)plstc->GetSelectedItemData(); RoomMap::iterator it = map_.find(roomid); if (it == map_.end()) { return; @@ -245,7 +245,7 @@ void LobbyForm::Refresh(int ct) { void LobbyForm::OnTimeout(int id) { refresh_ = false; ListControl *plstc = (ListControl *)GetControlPtr(kidcRoomList); - dword roomid = (dword)plstc->GetSelectedItemData(); + dword roomid = (dword)(pword)plstc->GetSelectedItemData(); if (!selected_main_) { roomid = kroomidMain; } @@ -357,7 +357,7 @@ bool LobbyForm::OnFilterEvent(Event *pevt) { HostGetAskString(s, sizeof(s)); ListControl *plstc = (ListControl *)GetControlPtr(kidcRoomList); - dword roomid = (dword)plstc->GetSelectedItemData(); + dword roomid = (dword)(pword)plstc->GetSelectedItemData(); RoomMap::iterator it = map_.find(roomid); if (it != map_.end()) { it->second.password = s; diff --git a/game/mempdbreader.cpp b/game/mempdbreader.cpp index 526aeb8..268ce69 100644 --- a/game/mempdbreader.cpp +++ b/game/mempdbreader.cpp @@ -171,7 +171,7 @@ bool MemPdbReader::ReadRecord(word nRec, word n, word cb, void *pv) return true; } -byte *MemPdbReader::MapRecord(word nRec, dword *pdwCookie, word *pcb) +byte *MemPdbReader::MapRecord(word nRec, void **ppvCookie, word *pcb) { // First see if the record is cached @@ -196,7 +196,7 @@ byte *MemPdbReader::MapRecord(word nRec, dword *pdwCookie, word *pcb) return NULL; memcpy(pbT, &m_pb[offBytes], cbT); m_cMapped++; - *pdwCookie = (dword)pbT; + *ppvCookie = pbT; *pcb = cbT; return pbT; } @@ -215,18 +215,18 @@ byte *MemPdbReader::MapRecord(word nRec, dword *pdwCookie, word *pcb) byte *pbUncompressed = (byte *)gcam.Lock(hc); if (pcb != NULL) *pcb = gcam.GetSize(hc); - *pdwCookie = 0; + *ppvCookie = 0; m_cMapped++; return pbUncompressed; } -void MemPdbReader::UnmapRecord(word nRec, dword dwCookie) +void MemPdbReader::UnmapRecord(word nRec, void *pvCookie) { Assert(m_pb != NULL); Assert(nRec < m_cRecs); Assert(m_cMapped > 0); m_cMapped--; - if (dwCookie == 0) { + if (pvCookie == NULL) { // Pointed to cache object; unlock it if (m_aphcRecordData[nRec] != 0) { @@ -237,7 +237,7 @@ void MemPdbReader::UnmapRecord(word nRec, dword dwCookie) } else { // Pointed to alloced object; unlock it - byte *pb = (byte *)dwCookie; + byte *pb = (byte *)pvCookie; delete pb; } } diff --git a/game/mempdbreader.h b/game/mempdbreader.h index 66308cf..0c6d7c4 100644 --- a/game/mempdbreader.h +++ b/game/mempdbreader.h @@ -20,8 +20,8 @@ public: virtual void Close() secPackFile; virtual bool GetRecordSize(word nRec, word *pcb) secPackFile; virtual bool ReadRecord(word nRec, word n, word cb, void *pv) secPackFile; - virtual byte *MapRecord(word nRec, dword *pdwCookie, word *pcb = NULL) secPackFile; - virtual void UnmapRecord(word nRec, dword dwCookie) secPackFile; + virtual byte *MapRecord(word nRec, void **ppvCookie, word *pcb = NULL) secPackFile; + virtual void UnmapRecord(word nRec, void *pvCookie) secPackFile; private: bool GetRecordEntry(word nRec, int cRec, RecordEntryType *prece, dword *pcb) secPackFile; diff --git a/game/misccontrols.cpp b/game/misccontrols.cpp index 3090178..1c3655e 100644 --- a/game/misccontrols.cpp +++ b/game/misccontrols.cpp @@ -1137,7 +1137,7 @@ void ListControl::DrawItem(DibBitmap *pbm, ListItem *pli, int x, int y, pszDraw = pszAfterTab; } else { strncpyz(szT, pszAfterTab, - _min((int)sizeof(szT), pszTabNext - pszAfterTab + 1)); + _min((int)sizeof(szT), (int)(pszTabNext - pszAfterTab + 1))); pszDraw = szT; } diff --git a/game/miscgraphics.cpp b/game/miscgraphics.cpp index b30ab5a..cfcf7e3 100644 --- a/game/miscgraphics.cpp +++ b/game/miscgraphics.cpp @@ -260,7 +260,7 @@ word Compile8(byte *pbCompileBuffer, ScanData *psd, bool fOdd) if (op == kopEnd) break; } - if (((byte)(dword)pbT) & 1) + if (((byte)(pword)pbT) & 1) pbT++; int cbOps = pbT - pb; diff --git a/game/roomform.cpp b/game/roomform.cpp index 8967d29..52b4653 100644 --- a/game/roomform.cpp +++ b/game/roomform.cpp @@ -160,7 +160,7 @@ void RoomForm::OnControlNotify(word idc, int nNotify) { void RoomForm::OnJoinGame() { ListControl *plstc = (ListControl *)GetControlPtr(kidcGameList); - dword gameid = (dword)plstc->GetSelectedItemData(); + dword gameid = (dword)(pword)plstc->GetSelectedItemData(); GameMap::iterator it = map_.find(gameid); if (it == map_.end()) { return; @@ -438,7 +438,7 @@ void RoomForm::Refresh(int ct) { void RoomForm::OnTimeout(int id) { refresh_ = false; ListControl *plstc = (ListControl *)GetControlPtr(kidcGameList); - dword gameid = (dword)plstc->GetSelectedItemData(); + dword gameid = (dword)(pword)plstc->GetSelectedItemData(); plstc->Clear(); GameMap::iterator it = map_.begin(); for (; it != map_.end(); it++) { @@ -470,7 +470,7 @@ void RoomForm::OnTimeout(int id) { void RoomForm::HideShowJoinGame() { ListControl *plstc = (ListControl *)GetControlPtr(kidcGameList); - dword gameid = (dword)plstc->GetSelectedItemData(); + dword gameid = (dword)(pword)plstc->GetSelectedItemData(); GameMap::iterator it = map_.find(gameid); bool show = true; if (it == map_.end()) { diff --git a/game/selectmission.cpp b/game/selectmission.cpp index 29040ef..1f600f9 100644 --- a/game/selectmission.cpp +++ b/game/selectmission.cpp @@ -363,13 +363,13 @@ void SelectMissionForm::OnControlNotify(word idc, int nNotify) { } int SelectMissionForm::GetSelectedMissionIndex(ListControl *plstc) { - dword dw = (dword)plstc->GetSelectedItemData(); - return (int)(dw & ~kfItemLocked); + pword pw = (pword)plstc->GetSelectedItemData(); + return (int)(pw & ~kfItemLocked); } bool SelectMissionForm::IsSelectedMissionLocked(ListControl *plstc) { - dword dw = (dword)plstc->GetSelectedItemData(); - return (dw & kfItemLocked) != 0; + pword pw = (pword)plstc->GetSelectedItemData(); + return (pw & kfItemLocked) != 0; } void SelectMissionForm::UpdateDescription() { diff --git a/game/tilemap.cpp b/game/tilemap.cpp index b73ba9e..b666f92 100644 --- a/game/tilemap.cpp +++ b/game/tilemap.cpp @@ -199,9 +199,9 @@ void TileMap::Draw(DibBitmap *pbm, int x, int y, int cx, int cy, int xMap, int y *ppbDrawMap = NULL; if (!IsFogOpaque(*pbFogT)) { if (*pfInvalid) { - word offset = BigWord(*pwMapT); - Assert(offset < 0xff00); - *ppbDrawMap = *(byte **)((long)m_apbTileData + offset); + word offset = BigWord(*pwMapT); + Assert(offset < 0xff00); + *ppbDrawMap = m_apbTileData[offset / 4]; } } diff --git a/game/wi.xcodeproj/project.pbxproj b/game/wi.xcodeproj/project.pbxproj index 1b542ca..0c10018 100755 --- a/game/wi.xcodeproj/project.pbxproj +++ b/game/wi.xcodeproj/project.pbxproj @@ -219,7 +219,7 @@ C11FDC661033682E0053CD83 /* eventer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = eventer.h; path = ../base/eventer.h; sourceTree = SOURCE_ROOT; }; C11FDC671033682E0053CD83 /* selectserver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = selectserver.cpp; path = ../base/selectserver.cpp; sourceTree = SOURCE_ROOT; }; C11FDC681033682E0053CD83 /* selectserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = selectserver.h; path = ../base/selectserver.h; sourceTree = SOURCE_ROOT; }; - C124299F0E553D9500DDDFD1 /* stylushandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stylushandler.cpp; sourceTree = SOURCE_ROOT; }; + C124299F0E553D9500DDDFD1 /* stylushandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stylushandler.cpp; sourceTree = SOURCE_ROOT; usesTabs = 0; }; C12429F00E5727BF00DDDFD1 /* fingerhandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fingerhandler.cpp; sourceTree = SOURCE_ROOT; }; C12D9D2C0ECA3F94006B5FD9 /* completemanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = completemanager.cpp; sourceTree = SOURCE_ROOT; }; C12D9D2D0ECA3F94006B5FD9 /* completemanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = completemanager.h; sourceTree = SOURCE_ROOT; }; @@ -717,6 +717,7 @@ ); name = CustomTemplate; sourceTree = ""; + usesTabs = 1; }; 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; @@ -976,10 +977,10 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0510; + LastUpgradeCheck = 0710; TargetAttributes = { 1D6058900D05DD3D006BFB54 = { - DevelopmentTeam = BTM58P9QZU; + DevelopmentTeam = 4KSYT9966B; }; }; }; @@ -1194,8 +1195,8 @@ buildSettings = { CLANG_LINK_OBJC_RUNTIME = NO; CODE_SIGN_ENTITLEMENTS = Entitlements.plist; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = ""; @@ -1206,7 +1207,7 @@ GCC_PREFIX_HEADER = ""; GCC_VERSION = ""; INFOPLIST_FILE = iphone/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 4.3; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-Wno-write-strings"; OTHER_CPLUSPLUSFLAGS = ( @@ -1219,11 +1220,12 @@ "-DTRACKSTATE", ); PREBINDING = NO; + PRODUCT_BUNDLE_IDENTIFIER = com.spiffcode.ht; PRODUCT_NAME = wi; - PROVISIONING_PROFILE = "E522801F-D4E0-499E-9568-7FF0F4B07D52"; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "E522801F-D4E0-499E-9568-7FF0F4B07D52"; + PROVISIONING_PROFILE = ""; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos; - VALID_ARCHS = armv7; + VALID_ARCHS = "armv7, arm64"; }; name = Debug; }; @@ -1232,8 +1234,8 @@ buildSettings = { CLANG_LINK_OBJC_RUNTIME = NO; CODE_SIGN_ENTITLEMENTS = Entitlements.plist; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = ""; @@ -1242,7 +1244,7 @@ GCC_PREFIX_HEADER = ""; GCC_WARN_UNUSED_VARIABLE = NO; INFOPLIST_FILE = iphone/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 4.3; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-Wno-write-strings"; OTHER_CPLUSPLUSFLAGS = ( @@ -1253,11 +1255,12 @@ "-DTRACKSTATE", ); PREBINDING = NO; + PRODUCT_BUNDLE_IDENTIFIER = com.spiffcode.ht; PRODUCT_NAME = wi; - PROVISIONING_PROFILE = "E522801F-D4E0-499E-9568-7FF0F4B07D52"; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "E522801F-D4E0-499E-9568-7FF0F4B07D52"; + PROVISIONING_PROFILE = ""; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos; - VALID_ARCHS = armv7; + VALID_ARCHS = "armv7, arm64"; }; name = Release; }; @@ -1265,8 +1268,10 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = c99; GCC_ENABLE_SYMBOL_SEPARATION = NO; GCC_VERSION = ""; @@ -1274,11 +1279,12 @@ GCC_WARN_UNUSED_VARIABLE = NO; INFOPLIST_EXPAND_BUILD_SETTINGS = YES; INFOPLIST_FILE = ""; - ONLY_ACTIVE_ARCH = YES; + ONLY_ACTIVE_ARCH = NO; PREBINDING = NO; PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; SDKROOT = iphoneos; USER_HEADER_SEARCH_PATHS = ".. ../inc iphone"; + VALID_ARCHS = "armv7, arm64"; }; name = Debug; }; @@ -1286,6 +1292,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; GCC_C_LANGUAGE_STANDARD = c99; GCC_ENABLE_SYMBOL_SEPARATION = NO; @@ -1297,6 +1304,7 @@ PREBINDING = NO; SDKROOT = iphoneos; USER_HEADER_SEARCH_PATHS = ".. ../inc iphone"; + VALID_ARCHS = "armv7, arm64"; }; name = Release; }; @@ -1304,6 +1312,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; CODE_SIGN_ENTITLEMENTS = dist.plist; GCC_C_LANGUAGE_STANDARD = c99; GCC_ENABLE_SYMBOL_SEPARATION = NO; @@ -1317,6 +1326,7 @@ PREBINDING = NO; SDKROOT = iphoneos; USER_HEADER_SEARCH_PATHS = ".. ../inc iphone"; + VALID_ARCHS = "armv7, arm64"; }; name = Distribution; }; @@ -1325,8 +1335,8 @@ buildSettings = { CLANG_LINK_OBJC_RUNTIME = NO; CODE_SIGN_ENTITLEMENTS = Entitlements.plist; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = ""; @@ -1337,7 +1347,7 @@ GCC_VERSION = ""; GCC_WARN_UNUSED_VARIABLE = NO; INFOPLIST_FILE = iphone/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 4.3; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-Wno-write-strings"; OTHER_CPLUSPLUSFLAGS = ( @@ -1347,11 +1357,12 @@ "-DTRACKSTATE", ); PREBINDING = NO; + PRODUCT_BUNDLE_IDENTIFIER = com.spiffcode.ht; PRODUCT_NAME = wi; - PROVISIONING_PROFILE = "E522801F-D4E0-499E-9568-7FF0F4B07D52"; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "E522801F-D4E0-499E-9568-7FF0F4B07D52"; + PROVISIONING_PROFILE = ""; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos; - VALID_ARCHS = armv7; + VALID_ARCHS = "armv7, arm64"; }; name = Distribution; }; @@ -1359,6 +1370,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; CODE_SIGN_ENTITLEMENTS = dist.plist; GCC_C_LANGUAGE_STANDARD = c99; GCC_ENABLE_SYMBOL_SEPARATION = NO; @@ -1370,6 +1382,7 @@ PREBINDING = NO; SDKROOT = iphoneos; USER_HEADER_SEARCH_PATHS = ".. ../inc iphone"; + VALID_ARCHS = "armv7, arm64"; }; name = "Distribution-store"; }; @@ -1378,8 +1391,8 @@ buildSettings = { CLANG_LINK_OBJC_RUNTIME = NO; CODE_SIGN_ENTITLEMENTS = Entitlements.plist; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = ""; @@ -1389,7 +1402,7 @@ GCC_VERSION = ""; GCC_WARN_UNUSED_VARIABLE = NO; INFOPLIST_FILE = iphone/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 4.3; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-Wno-write-strings"; OTHER_CPLUSPLUSFLAGS = ( @@ -1399,10 +1412,11 @@ "-DTRACKSTATE", ); PREBINDING = NO; + PRODUCT_BUNDLE_IDENTIFIER = com.spiffcode.ht; PRODUCT_NAME = wi; - PROVISIONING_PROFILE = "E522801F-D4E0-499E-9568-7FF0F4B07D52"; + PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; - VALID_ARCHS = armv7; + VALID_ARCHS = "armv7, arm64"; }; name = "Distribution-store"; }; @@ -1410,6 +1424,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; GCC_C_LANGUAGE_STANDARD = c99; GCC_ENABLE_SYMBOL_SEPARATION = NO; @@ -1421,6 +1436,7 @@ PREBINDING = NO; SDKROOT = iphoneos; USER_HEADER_SEARCH_PATHS = ".. ../inc iphone"; + VALID_ARCHS = "armv7, arm64"; }; name = AdHoc; }; @@ -1429,8 +1445,8 @@ buildSettings = { CLANG_LINK_OBJC_RUNTIME = NO; CODE_SIGN_ENTITLEMENTS = Entitlements.plist; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = ""; @@ -1439,7 +1455,7 @@ GCC_PREFIX_HEADER = ""; GCC_WARN_UNUSED_VARIABLE = NO; INFOPLIST_FILE = iphone/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 4.3; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; ONLY_ACTIVE_ARCH = NO; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", @@ -1447,11 +1463,12 @@ "-DDEV_BUILD", ); PREBINDING = NO; + PRODUCT_BUNDLE_IDENTIFIER = com.spiffcode.ht; PRODUCT_NAME = wi; - PROVISIONING_PROFILE = "E522801F-D4E0-499E-9568-7FF0F4B07D52"; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "E522801F-D4E0-499E-9568-7FF0F4B07D52"; + PROVISIONING_PROFILE = ""; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos; - VALID_ARCHS = armv7; + VALID_ARCHS = "armv7, arm64"; }; name = AdHoc; }; diff --git a/inc/basictypes.h b/inc/basictypes.h index f1bd73c..1906b31 100644 --- a/inc/basictypes.h +++ b/inc/basictypes.h @@ -3,15 +3,16 @@ typedef unsigned char byte; typedef unsigned short word; -typedef unsigned long dword; +typedef unsigned int dword; typedef unsigned long long ddword; typedef unsigned long long dword64; typedef long long long64; +typedef unsigned long pword; #undef NULL #define NULL 0 #define ELEMENTSIZE(a) (sizeof(a[0])) #define ARRAYSIZE(a) (sizeof(a) / sizeof(a[0])) -#define OFFSETOF(t, m) ((int)&(((t *)0)->m)) +#define OFFSETOF(t, m) ((long)&(((t *)0)->m)) #endif // __BASICTYPES_H__ diff --git a/mpshared/packfile.cpp b/mpshared/packfile.cpp index 4a1a89a..6634ca6 100644 --- a/mpshared/packfile.cpp +++ b/mpshared/packfile.cpp @@ -318,7 +318,7 @@ void *PackFileReader::MapFile(const char *pszFn, FileMap *pfmap, dword *pcb) return NULL; } pfmap->prnfo = prnfo; - pfmap->dwCookie = 0; + pfmap->pvCookie = 0; pfmap->nRec = 0; pfmap->pbAlloced = pb; if (pcb != NULL) { @@ -329,8 +329,8 @@ void *PackFileReader::MapFile(const char *pszFn, FileMap *pfmap, dword *pcb) // See if pdbReader will map this entry word cbRec; - dword dwCookie; - pb = prnfo->ppdbReader->MapRecord(nRecFirst, &dwCookie, &cbRec); + void *pvCookie; + pb = prnfo->ppdbReader->MapRecord(nRecFirst, &pvCookie, &cbRec); if (pb == NULL) return NULL; @@ -338,7 +338,7 @@ void *PackFileReader::MapFile(const char *pszFn, FileMap *pfmap, dword *pcb) pfmap->prnfo = prnfo; pfmap->nRec = nRecFirst; - pfmap->dwCookie = dwCookie; + pfmap->pvCookie = pvCookie; pfmap->pbAlloced = NULL; if (pcb != NULL) *pcb = (dword)cbRec; @@ -363,7 +363,7 @@ void PackFileReader::UnmapFile(FileMap *pfmap) if (pfmap->pbAlloced != NULL) { delete[] pfmap->pbAlloced; } else { - pfmap->prnfo->ppdbReader->UnmapRecord(pfmap->nRec, pfmap->dwCookie); + pfmap->prnfo->ppdbReader->UnmapRecord(pfmap->nRec, pfmap->pvCookie); } } @@ -472,8 +472,8 @@ bool PackFileReader::Push(const char *pszDir, const char *pszFn, // First try to map the directory record word cb; - dword dwCookie; - DirEntry *pdir = (DirEntry *)ppdbReader->MapRecord(0, &dwCookie, &cb); + void *pvCookie; + DirEntry *pdir = (DirEntry *)ppdbReader->MapRecord(0, &pvCookie, &cb); if (pdir == NULL) return false; @@ -483,7 +483,7 @@ bool PackFileReader::Push(const char *pszDir, const char *pszFn, ReaderInfo *prnfo = &m_arnfo[m_crnfo]; m_crnfo++; prnfo->ppdbReader = ppdbReader; - prnfo->dwCookie = dwCookie; + prnfo->pvCookie = pvCookie; prnfo->pdir = pdir; prnfo->cEntries = cb / sizeof(DirEntry); prnfo->cOpen = 0; @@ -532,7 +532,7 @@ void PackFileReader::RemoveReader(int rnfo) delete[] prnfo->pszDir; delete[] prnfo->pszFn; - prnfo->ppdbReader->UnmapRecord(0, prnfo->dwCookie); + prnfo->ppdbReader->UnmapRecord(0, prnfo->pvCookie); prnfo->ppdbReader->Close(); delete prnfo->ppdbReader; diff --git a/mpshared/packfile.h b/mpshared/packfile.h index 4e44907..20c4241 100644 --- a/mpshared/packfile.h +++ b/mpshared/packfile.h @@ -15,8 +15,8 @@ namespace wi { typedef unsigned char UInt8; typedef unsigned short UInt16; -typedef unsigned long UInt32; -typedef unsigned long LocalID; +typedef unsigned int UInt32; +typedef unsigned int LocalID; typedef char Char; struct RecordEntryType { @@ -82,7 +82,7 @@ struct ReaderInfo // rnfo DirEntry *pdir; char *pszDir; char *pszFn; - dword dwCookie; + void *pvCookie; int cEntries; int cOpen; }; @@ -106,8 +106,9 @@ struct File struct FileMap // fmap { ReaderInfo *prnfo; - dword dwCookie; + void *pvCookie; dword nRec; + dword dwPad; byte *pbAlloced; }; diff --git a/mpshared/pdbreader.h b/mpshared/pdbreader.h index fafc9ca..ad55dbb 100644 --- a/mpshared/pdbreader.h +++ b/mpshared/pdbreader.h @@ -17,8 +17,8 @@ public: virtual void Close() = 0; virtual bool GetRecordSize(word nRec, word *pcb) = 0; virtual bool ReadRecord(word nRec, word n, word cb, void *pv) = 0; - virtual byte *MapRecord(word nRec, dword *pdwCookie, word *pcb = NULL) = 0; - virtual void UnmapRecord(word nRec, dword dwCookie) = 0; + virtual byte *MapRecord(word nRec, void **ppvCookie, word *pcb = NULL) = 0; + virtual void UnmapRecord(word nRec, void *pvCookie) = 0; }; } // namespace wi diff --git a/mpshared/xpump.cpp b/mpshared/xpump.cpp index 0d39bd5..93f39a2 100644 --- a/mpshared/xpump.cpp +++ b/mpshared/xpump.cpp @@ -73,7 +73,7 @@ bool XPump::Send(base::ByteBuffer *pbb) { #endif if (log_ != NULL) { - log_->Log(*pbb, -1, logid_, (dword)notify_); + log_->Log(*pbb, -1, logid_, (dword)(long64)notify_); } base::ByteBuffer **ppbbSend = &pbbSendFirst_; @@ -144,7 +144,7 @@ bool XPump::Dispatch() { } if (log_ != NULL) { - log_->Log(bbRead_, (int)cbMsg, (dword)notify_, logid_); + log_->Log(bbRead_, (int)cbMsg, (dword)(long64)notify_, logid_); } // Instantiate and dispatch this message.