ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #480 from cxd4/so_i_herd_u_liek_warnings 

warning fixes
This commit is contained in:
zilmar 2015-05-25 10:43:24 +10:00
parent a86d3c2002 8f2e0e066d
commit f5c7fa3bf8
4 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/3rd Party/zlib/contrib/minizip/crypt.h
View File

@ -32,14 +32,14 @@
/*********************************************************************** /***********************************************************************
* Return the next byte in the pseudo-random sequence * Return the next byte in the pseudo-random sequence
*/ */
static int decrypt_byte(unsigned long* pkeys, const z_crc_t* pcrc_32_tab) static Byte decrypt_byte(unsigned long* pkeys)
{ {
unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an
* unpredictable manner on 16-bit systems; not a problem * unpredictable manner on 16-bit systems; not a problem
* with any known compiler so far, though */ * with any known compiler so far, though */
temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2; temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
return (int)(((temp * (temp ^ 1)) >> 8) & 0xff); return (Byte)(((temp * (temp ^ 1)) >> 8) & 0xFF);
} }
/*********************************************************************** /***********************************************************************
@ -77,7 +77,7 @@ static void init_keys(const char* passwd,unsigned long* pkeys,const z_crc_t* pcr
(update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab))) (update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab)))
#define zencode(pkeys,pcrc_32_tab,c,t) \ #define zencode(pkeys,pcrc_32_tab,c,t) \
(t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c)) (t=decrypt_byte(pkeys), update_keys(pkeys,pcrc_32_tab,c), t^(c))
#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED #ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED
@ -95,8 +95,8 @@ static int crypthead(const char* passwd, /* password string */
unsigned long crcForCrypting) unsigned long crcForCrypting)
{ {
int n; /* index in random header */ int n; /* index in random header */
int t; /* temporary */ Byte t; /* temporary */
int c; /* random byte */ Byte c; /* random byte */
unsigned char header[RAND_HEAD_LEN-2]; /* random header */ unsigned char header[RAND_HEAD_LEN-2]; /* random header */
static unsigned calls = 0; /* ensure different random header each time */ static unsigned calls = 0; /* ensure different random header each time */
@ -114,17 +114,17 @@ static int crypthead(const char* passwd, /* password string */
init_keys(passwd, pkeys, pcrc_32_tab); init_keys(passwd, pkeys, pcrc_32_tab);
for (n = 0; n < RAND_HEAD_LEN-2; n++) for (n = 0; n < RAND_HEAD_LEN-2; n++)
{ {
c = (rand() >> 7) & 0xff; c = (Byte)((rand() >> 7) & 0xFF);
header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t); header[n] = zencode(pkeys, pcrc_32_tab, c, t);
} }
/* Encrypt random header (last two bytes is high word of crc) */ /* Encrypt random header (last two bytes is high word of crc) */
init_keys(passwd, pkeys, pcrc_32_tab); init_keys(passwd, pkeys, pcrc_32_tab);
for (n = 0; n < RAND_HEAD_LEN-2; n++) for (n = 0; n < RAND_HEAD_LEN-2; n++)
{ {
buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t); buf[n] = zencode(pkeys, pcrc_32_tab, header[n], t);
} }
buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t); buf[n++] = zencode(pkeys, pcrc_32_tab, (crcForCrypting >> 16) & 0xFF, t);
buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t); buf[n++] = zencode(pkeys, pcrc_32_tab, (crcForCrypting >> 24) & 0xFF, t);
return n; return n;
} }

5
Source/3rd Party/zlib/contrib/minizip/zip.c
View File

@ -1368,8 +1368,9 @@ local int zip64FlushWriteBuffer(zip64_internal* zi)
{ {
#ifndef NOCRYPT #ifndef NOCRYPT
uInt i; uInt i;
int t; Byte t;
for (i=0;i<zi->ci.pos_in_buffered_data;i++)
for (i = 0; i < zi->ci.pos_in_buffered_data; i++)
zi->ci.buffered_data[i] = zencode(zi->ci.keys, zi->ci.pcrc_32_tab, zi->ci.buffered_data[i],t); zi->ci.buffered_data[i] = zencode(zi->ci.keys, zi->ci.pcrc_32_tab, zi->ci.buffered_data[i],t);
#endif #endif
} }

6
Source/Project64/User Interface/Settings Config.cpp
View File

@ -172,7 +172,7 @@ LRESULT CSettingConfig::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*
HTREEITEM hSectionItem = NULL; HTREEITEM hSectionItem = NULL;
for (int i = 0; i < Section->GetPageCount(); i++ ) for (size_t i = 0; i < Section->GetPageCount(); i++)
{ {
CSettingsPage * Page = Section->GetPage(i); CSettingsPage * Page = Section->GetPage(i);
if (HideAdvanced && Page == m_AdvancedPage) if (HideAdvanced && Page == m_AdvancedPage)
@ -227,7 +227,7 @@ LRESULT CSettingConfig::OnClicked (WORD /*wNotifyCode*/, WORD wID, HWND , BOOL&
{ {
CConfigSettingSection * Section = *iter; CConfigSettingSection * Section = *iter;
for (int i = 0; i < Section->GetPageCount(); i++ ) for (size_t i = 0; i < Section->GetPageCount(); i++ )
{ {
CSettingsPage * Page = Section->GetPage(i); CSettingsPage * Page = Section->GetPage(i);
if (Page->EnableReset()) if (Page->EnableReset())
@ -259,7 +259,7 @@ void CSettingConfig::ApplySettings( bool UpdateScreen )
{ {
CConfigSettingSection * Section = *iter; CConfigSettingSection * Section = *iter;
for (int i = 0; i < Section->GetPageCount(); i++ ) for (size_t i = 0; i < Section->GetPageCount(); i++ )
{ {
CSettingsPage * Page = Section->GetPage(i); CSettingsPage * Page = Section->GetPage(i);
Page->ApplySettings(UpdateScreen); Page->ApplySettings(UpdateScreen);

9
Source/Project64/User Interface/WTL Controls/numberctrl.h
View File

@ -187,7 +187,8 @@ protected:
if (uMsg == WM_CHAR) if (uMsg == WM_CHAR)
{ {
int MaxLen = 30; size_t MaxLen = 30;
if (m_DisplayType == DisplayHex) if (m_DisplayType == DisplayHex)
{ {
MaxLen = 8; MaxLen = 8;
@ -229,7 +230,7 @@ protected:
} }
return true; return true;
} }
else if ( c >= 48 && c<= 57 || c >= 'A' && c<= 'F') else if (c >= '0' && c <= '9' || c >= 'A' && c <= 'F')
{ {
if (Len >= MaxLen && start == end) if (Len >= MaxLen && start == end)
{ {
@ -296,9 +297,9 @@ public:
size_t Finish = strlen(text); size_t Finish = strlen(text);
char second = Finish > 1 ? text[1] : 0; char second = Finish > 1 ? text[1] : 0;
int Start = (second == 'x' || second == 'X') ? 2 : 0; size_t Start = (second == 'x' || second == 'X') ? 2 : 0;
if (Finish > (8 + Start)) { Finish = (8 + Start); } if (Finish > 8 + Start) { Finish = 8 + Start; }
DWORD Value = 0; DWORD Value = 0;
for (size_t i = Start; i < Finish; i++) for (size_t i = Start; i < Finish; i++)