From ff132bb536aea7ad82dd7fa23e200c57aedc0545 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Wed, 4 Apr 2007 07:48:14 +0000 Subject: [PATCH] 64bit windows patch from phrosty --- include/QF/hash.h | 2 +- include/QF/link.h | 2 +- include/QF/sys.h | 2 +- libs/audio/cd/cd_win.c | 34 ++-- libs/audio/renderer/snd_dma.c | 2 +- libs/gamecode/engine/pr_builtins.c | 2 +- libs/gamecode/engine/pr_opcode.c | 2 +- libs/gib/gib_execute.c | 2 +- libs/gib/regex.c | 2 +- libs/ruamoko/rua_hash.c | 40 ++--- libs/ruamoko/rua_obj.c | 14 +- libs/ruamoko/rua_plist.c | 4 +- libs/util/hash.c | 12 +- libs/util/sys.c | 2 +- libs/util/wadfile.c | 2 +- qw/include/server.h | 2 +- qw/source/sv_recorder.c | 2 +- qw/source/sv_user.c | 6 +- tools/qfbsp/source/qfbsp.c | 13 +- tools/qfvis/source/qfvis.c | 8 +- vc2005/QuakeForge.sln | 86 ++++++++++ vc2005/builtins/builtins.vcproj | 143 ++++++++++++++++ vc2005/clean.ps1 | 2 +- vc2005/common/common.vcproj | 143 ++++++++++++++++ vc2005/console/console.vcproj | 143 ++++++++++++++++ vc2005/console_client/console_client.vcproj | 143 ++++++++++++++++ vc2005/console_server/console_server.vcproj | 143 ++++++++++++++++ vc2005/engine/engine.vcproj | 143 ++++++++++++++++ vc2005/gib/gib.vcproj | 143 ++++++++++++++++ vc2005/image/image.vcproj | 143 ++++++++++++++++ vc2005/include/config.h | 14 +- vc2005/models/models.vcproj | 143 ++++++++++++++++ vc2005/modelsgl/modelsgl.vcproj | 143 ++++++++++++++++ vc2005/net/net.vcproj | 143 ++++++++++++++++ vc2005/qfbsp/qfbsp.vcproj | 174 ++++++++++++++++++++ vc2005/qfclient/qfclient.vcproj | 174 ++++++++++++++++++++ vc2005/qflight/qflight.vcproj | 174 ++++++++++++++++++++ vc2005/qfserver/qfserver.vcproj | 174 ++++++++++++++++++++ vc2005/qfvis/qfvis.vcproj | 174 ++++++++++++++++++++ vc2005/qw/qw.vcproj | 143 ++++++++++++++++ vc2005/ruamoko/ruamoko.vcproj | 143 ++++++++++++++++ vc2005/sound/sound.vcproj | 143 ++++++++++++++++ vc2005/util/util.vcproj | 143 ++++++++++++++++ vc2005/video/video.vcproj | 143 ++++++++++++++++ 44 files changed, 3335 insertions(+), 80 deletions(-) diff --git a/include/QF/hash.h b/include/QF/hash.h index 6b94028f2..e03dff481 100644 --- a/include/QF/hash.h +++ b/include/QF/hash.h @@ -72,7 +72,7 @@ hashtab_t *Hash_NewTable (int tsize, const char *(*gk)(void*,void*), \param gh takes the same parameters as gk in Hash_NewTable \param cmp is element 1, element 2, userdata */ -void Hash_SetHashCompare (hashtab_t *tab, unsigned long (*gh)(void*,void*), +void Hash_SetHashCompare (hashtab_t *tab, uintptr_t (*gh)(void*,void*), int (*cmp)(void*,void*,void*)); diff --git a/include/QF/link.h b/include/QF/link.h index 4cc6d8a54..e64b2d844 100644 --- a/include/QF/link.h +++ b/include/QF/link.h @@ -32,7 +32,7 @@ // (type *)STRUCT_FROM_LINK(link_t *link, type, member) // ent = STRUCT_FROM_LINK(link,entity_t,order) // FIXME: remove this mess! -#define STRUCT_FROM_LINK(l,t,m) ((t *)((byte *)l - (int)&(((t *)0)->m))) +#define STRUCT_FROM_LINK(l,t,m) ((t *)((byte *)l - (intptr_t)&(((t *)0)->m))) typedef struct link_s { diff --git a/include/QF/sys.h b/include/QF/sys.h index 6514a038e..d748f1138 100644 --- a/include/QF/sys.h +++ b/include/QF/sys.h @@ -97,7 +97,7 @@ void Sys_Init_Cvars (void); // // memory protection // -void Sys_MakeCodeWriteable (unsigned long startaddr, unsigned long length); +void Sys_MakeCodeWriteable (uintptr_t startaddr, size_t length); void Sys_PageIn (void *ptr, int size); // diff --git a/libs/audio/cd/cd_win.c b/libs/audio/cd/cd_win.c index 79d8c3e61..017be873f 100644 --- a/libs/audio/cd/cd_win.c +++ b/libs/audio/cd/cd_win.c @@ -75,7 +75,7 @@ I_CDAudio_CloseDoor (void) DWORD dwReturn; dwReturn = - mciSendCommand (wDeviceID, MCI_SET, MCI_SET_DOOR_CLOSED, (DWORD) NULL); + mciSendCommand (wDeviceID, MCI_SET, MCI_SET_DOOR_CLOSED, (DWORD_PTR) NULL); if (dwReturn) { Sys_DPrintf ("MCI_SET_DOOR_CLOSED failed (%li)\n", dwReturn); } @@ -87,7 +87,7 @@ I_CDAudio_Eject (void) DWORD dwReturn; dwReturn = mciSendCommand (wDeviceID, MCI_SET, MCI_SET_DOOR_OPEN, - (DWORD) NULL); + (DWORD_PTR) NULL); if (dwReturn) { Sys_DPrintf ("MCI_SET_DOOR_OPEN failed (%li)\n", dwReturn); } @@ -104,7 +104,7 @@ I_CDAudio_GetAudioDiskInfo (void) mciStatusParms.dwItem = MCI_STATUS_READY; dwReturn = mciSendCommand (wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, - (DWORD) (LPVOID) & mciStatusParms); + (DWORD_PTR) (LPVOID) & mciStatusParms); if (dwReturn) { Sys_DPrintf ("CDAudio: drive ready test - get status failed\n"); return -1; @@ -117,7 +117,7 @@ I_CDAudio_GetAudioDiskInfo (void) mciStatusParms.dwItem = MCI_STATUS_NUMBER_OF_TRACKS; dwReturn = mciSendCommand (wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, - (DWORD) (LPVOID) & mciStatusParms); + (DWORD_PTR) (LPVOID) & mciStatusParms); if (dwReturn) { Sys_DPrintf ("CDAudio: get tracks - status failed\n"); return -1; @@ -179,10 +179,10 @@ I_CDAudio_Pause (void) if (!playing) return; - mciGenericParms.dwCallback = (DWORD) mainwindow; + mciGenericParms.dwCallback = (DWORD_PTR) mainwindow; dwReturn = mciSendCommand (wDeviceID, MCI_PAUSE, 0, - (DWORD) (LPVOID) & mciGenericParms); + (DWORD_PTR) (LPVOID) & mciGenericParms); if (dwReturn) { Sys_DPrintf ("MCI_PAUSE failed (%li)", dwReturn); } @@ -223,7 +223,7 @@ I_CDAudio_Play (int track, qboolean looping) dwReturn = mciSendCommand (wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_TRACK | MCI_WAIT, - (DWORD) (LPVOID) & mciStatusParms); + (DWORD_PTR) (LPVOID) & mciStatusParms); if (dwReturn) { Sys_DPrintf ("MCI_STATUS failed (%li)\n", dwReturn); return; @@ -238,7 +238,7 @@ I_CDAudio_Play (int track, qboolean looping) dwReturn = mciSendCommand (wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_TRACK | MCI_WAIT, - (DWORD) (LPVOID) & mciStatusParms); + (DWORD_PTR) (LPVOID) & mciStatusParms); if (dwReturn) { Sys_DPrintf ("MCI_STATUS failed (%li)\n", dwReturn); return; @@ -252,10 +252,10 @@ I_CDAudio_Play (int track, qboolean looping) mciPlayParms.dwFrom = MCI_MAKE_TMSF (track, 0, 0, 0); mciPlayParms.dwTo = (mciStatusParms.dwReturn << 8) | track; - mciPlayParms.dwCallback = (DWORD) mainwindow; + mciPlayParms.dwCallback = (DWORD_PTR) mainwindow; dwReturn = mciSendCommand (wDeviceID, MCI_PLAY, MCI_NOTIFY | MCI_FROM | MCI_TO, - (DWORD) (LPVOID) & mciPlayParms); + (DWORD_PTR) (LPVOID) & mciPlayParms); if (dwReturn) { Sys_DPrintf ("CDAudio: MCI_PLAY failed (%li)\n", dwReturn); return; @@ -284,10 +284,10 @@ I_CDAudio_Resume (void) mciPlayParms.dwFrom = MCI_MAKE_TMSF (playTrack, 0, 0, 0); mciPlayParms.dwTo = MCI_MAKE_TMSF (playTrack + 1, 0, 0, 0); - mciPlayParms.dwCallback = (DWORD) mainwindow; + mciPlayParms.dwCallback = (DWORD_PTR) mainwindow; dwReturn = mciSendCommand (wDeviceID, MCI_PLAY, MCI_TO | MCI_NOTIFY, - (DWORD) (LPVOID) & mciPlayParms); + (DWORD_PTR) (LPVOID) & mciPlayParms); if (dwReturn) { Sys_DPrintf ("CDAudio: MCI_PLAY failed (%li)\n", dwReturn); return; @@ -301,7 +301,7 @@ I_CDAudio_Shutdown (void) if (!initialized) return; I_CDAudio_Stop (); - if (mciSendCommand (wDeviceID, MCI_CLOSE, MCI_WAIT, (DWORD) NULL)) + if (mciSendCommand (wDeviceID, MCI_CLOSE, MCI_WAIT, (DWORD_PTR) NULL)) Sys_DPrintf ("CDAudio_Shutdown: MCI_CLOSE failed\n"); } @@ -315,7 +315,7 @@ I_CDAudio_Stop (void) if (!playing) return; - dwReturn = mciSendCommand (wDeviceID, MCI_STOP, 0, (DWORD) NULL); + dwReturn = mciSendCommand (wDeviceID, MCI_STOP, 0, (DWORD_PTR) NULL); if (dwReturn) { Sys_DPrintf ("MCI_STOP failed (%li)", dwReturn); } @@ -459,7 +459,7 @@ I_CDAudio_Init (void) mciOpenParms.lpstrDeviceType = "cdaudio"; dwReturn = mciSendCommand (0, MCI_OPEN, MCI_OPEN_TYPE | MCI_OPEN_SHAREABLE, - (DWORD) (LPVOID) & mciOpenParms); + (DWORD_PTR) (LPVOID) & mciOpenParms); if (dwReturn) { Sys_Printf ("CDAudio_Init: MCI_OPEN failed (%li)\n", dwReturn); return; // was -1 @@ -470,10 +470,10 @@ I_CDAudio_Init (void) mciSetParms.dwTimeFormat = MCI_FORMAT_TMSF; dwReturn = mciSendCommand (wDeviceID, MCI_SET, MCI_SET_TIME_FORMAT, - (DWORD) (LPVOID) & mciSetParms); + (DWORD_PTR) (LPVOID) & mciSetParms); if (dwReturn) { Sys_Printf ("MCI_SET_TIME_FORMAT failed (%li)\n", dwReturn); - mciSendCommand (wDeviceID, MCI_CLOSE, 0, (DWORD) NULL); + mciSendCommand (wDeviceID, MCI_CLOSE, 0, (DWORD_PTR) NULL); return; // was -1 } diff --git a/libs/audio/renderer/snd_dma.c b/libs/audio/renderer/snd_dma.c index f282f10bd..b915b2771 100644 --- a/libs/audio/renderer/snd_dma.c +++ b/libs/audio/renderer/snd_dma.c @@ -327,7 +327,7 @@ s_soundinfo_f (void) Sys_Printf ("%5d samplebits\n", snd_shm->samplebits); Sys_Printf ("%5d submission_chunk\n", snd_shm->submission_chunk); Sys_Printf ("%5d speed\n", snd_shm->speed); - Sys_Printf ("0x%lx dma buffer\n", (unsigned long) snd_shm->buffer); + Sys_Printf ("0x%p dma buffer\n", snd_shm->buffer); Sys_Printf ("%5d total_channels\n", snd_total_channels); } diff --git a/libs/gamecode/engine/pr_builtins.c b/libs/gamecode/engine/pr_builtins.c index 40c9ec939..dbc36c8e2 100644 --- a/libs/gamecode/engine/pr_builtins.c +++ b/libs/gamecode/engine/pr_builtins.c @@ -62,7 +62,7 @@ builtin_get_key (void *_bi, void *unused) return bi->name; } -static unsigned long +static uintptr_t builtin_get_hash (void *_bi, void *unused) { builtin_t *bi = (builtin_t *)_bi; diff --git a/libs/gamecode/engine/pr_opcode.c b/libs/gamecode/engine/pr_opcode.c index c863376b8..95d9684e9 100644 --- a/libs/gamecode/engine/pr_opcode.c +++ b/libs/gamecode/engine/pr_opcode.c @@ -1144,7 +1144,7 @@ VISIBLE opcode_t pr_opcodes[] = { }; -static unsigned long +static uintptr_t opcode_get_hash (void *op, void *unused) { return ((opcode_t *)op)->opcode; diff --git a/libs/gib/gib_execute.c b/libs/gib/gib_execute.c index 1b9bcbf44..ba71133b5 100644 --- a/libs/gib/gib_execute.c +++ b/libs/gib/gib_execute.c @@ -73,7 +73,7 @@ GIB_Execute_Generate_Composite (struct cbuf_s *cbuf) for (i = 0; i < args->argc; i++) // now that arg_composite is done we can add the pointer to the stored // offsets and get valid pointers. This *should* be portable. - args->args[i] += (unsigned long int) GIB_DATA (cbuf)->arg_composite->str; + args->args[i] += (intptr_t) GIB_DATA (cbuf)->arg_composite->str; } static void diff --git a/libs/gib/regex.c b/libs/gib/regex.c index 8e6e5bcb5..82617b888 100644 --- a/libs/gib/regex.c +++ b/libs/gib/regex.c @@ -3776,7 +3776,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) regstart[r] = old_regstart[r]; /* xx why this test? */ - if ((long) old_regend[r] >= (long) regstart[r]) + if (old_regend[r] >= regstart[r]) regend[r] = old_regend[r]; } } diff --git a/libs/ruamoko/rua_hash.c b/libs/ruamoko/rua_hash.c index eff18dd2f..b123a6da2 100644 --- a/libs/ruamoko/rua_hash.c +++ b/libs/ruamoko/rua_hash.c @@ -99,18 +99,18 @@ bi_get_key (void *key, void *_ht) { bi_hashtab_t *ht = (bi_hashtab_t *)_ht; PR_RESET_PARAMS (ht->pr); - P_INT (ht->pr, 0) = (long) (key); + P_INT (ht->pr, 0) = (intptr_t) (key); P_INT (ht->pr, 1) = ht->ud; PR_ExecuteProgram (ht->pr, ht->gk); return PR_GetString (ht->pr, R_STRING (ht->pr)); } -static unsigned long +static uintptr_t bi_get_hash (void *key, void *_ht) { bi_hashtab_t *ht = (bi_hashtab_t *)_ht; PR_RESET_PARAMS (ht->pr); - P_INT (ht->pr, 0) = (long) (key); + P_INT (ht->pr, 0) = (intptr_t) (key); P_INT (ht->pr, 1) = ht->ud; PR_ExecuteProgram (ht->pr, ht->gh); return R_INT (ht->pr); @@ -121,8 +121,8 @@ bi_compare (void *key1, void *key2, void *_ht) { bi_hashtab_t *ht = (bi_hashtab_t *)_ht; PR_RESET_PARAMS (ht->pr); - P_INT (ht->pr, 0) = (long) (key1); - P_INT (ht->pr, 1) = (long) (key2); + P_INT (ht->pr, 0) = (intptr_t) (key1); + P_INT (ht->pr, 1) = (intptr_t) (key2); P_INT (ht->pr, 2) = ht->ud; PR_ExecuteProgram (ht->pr, ht->cmp); return R_INT (ht->pr); @@ -133,7 +133,7 @@ bi_free (void *key, void *_ht) { bi_hashtab_t *ht = (bi_hashtab_t *)_ht; PR_RESET_PARAMS (ht->pr); - P_INT (ht->pr, 0) = (long) (key); + P_INT (ht->pr, 0) = (intptr_t) (key); P_INT (ht->pr, 1) = ht->ud; PR_ExecuteProgram (ht->pr, ht->f); } @@ -180,7 +180,7 @@ static void bi_Hash_SetHashCompare (progs_t *pr) { bi_hashtab_t *ht = get_table (pr, __FUNCTION__, P_INT (pr, 0)); - unsigned long (*gh)(void*,void*); + uintptr_t (*gh)(void*,void*); int (*cmp)(void*,void*,void*); ht->gh = P_FUNCTION (pr, 1); @@ -214,7 +214,7 @@ bi_Hash_Add (progs_t *pr) { bi_hashtab_t *ht = get_table (pr, __FUNCTION__, P_INT (pr, 0)); - R_INT (pr) = Hash_Add (ht->tab, (void *) (long) P_INT (pr, 1)); + R_INT (pr) = Hash_Add (ht->tab, (void *) (intptr_t) P_INT (pr, 1)); } static void @@ -222,7 +222,7 @@ bi_Hash_AddElement (progs_t *pr) { bi_hashtab_t *ht = get_table (pr, __FUNCTION__, P_INT (pr, 0)); - R_INT (pr) = Hash_AddElement (ht->tab, (void *) (long) P_INT (pr, 1)); + R_INT (pr) = Hash_AddElement (ht->tab, (void *) (intptr_t) P_INT (pr, 1)); } static void @@ -230,7 +230,7 @@ bi_Hash_Find (progs_t *pr) { bi_hashtab_t *ht = get_table (pr, __FUNCTION__, P_INT (pr, 0)); - R_INT (pr) = (long) Hash_Find (ht->tab, P_GSTRING (pr, 1)); + R_INT (pr) = (intptr_t) Hash_Find (ht->tab, P_GSTRING (pr, 1)); } static void @@ -238,8 +238,8 @@ bi_Hash_FindElement (progs_t *pr) { bi_hashtab_t *ht = get_table (pr, __FUNCTION__, P_INT (pr, 0)); - R_INT (pr) = (long) Hash_FindElement (ht->tab, - (void *) (long) P_INT (pr, 1)); + R_INT (pr) = (intptr_t) Hash_FindElement (ht->tab, + (void *) (intptr_t) P_INT (pr, 1)); } static void @@ -256,7 +256,7 @@ bi_Hash_FindList (progs_t *pr) pr_list = PR_Zone_Malloc (pr, count * sizeof (pr_type_t)); // the hash tables stores progs pointers... for (count = 0, l = list; *l; l++) - pr_list[count++].integer_var = (long) *l; + pr_list[count++].integer_var = (intptr_t) *l; free (list); RETURN_POINTER (pr, pr_list); } @@ -269,13 +269,13 @@ bi_Hash_FindElementList (progs_t *pr) pr_type_t *pr_list; int count; - list = Hash_FindElementList (ht->tab, (void *) (long) P_INT (pr, 1)); + list = Hash_FindElementList (ht->tab, (void *) (intptr_t) P_INT (pr, 1)); for (count = 1, l = list; *l; l++) count++; pr_list = PR_Zone_Malloc (pr, count * sizeof (pr_type_t)); // the hash tables stores progs pointers... for (count = 0, l = list; *l; l++) - pr_list[count++].integer_var = (long) *l; + pr_list[count++].integer_var = (intptr_t) *l; free (list); RETURN_POINTER (pr, pr_list); } @@ -285,7 +285,7 @@ bi_Hash_Del (progs_t *pr) { bi_hashtab_t *ht = get_table (pr, __FUNCTION__, P_INT (pr, 0)); - R_INT (pr) = (long) Hash_Del (ht->tab, P_GSTRING (pr, 1)); + R_INT (pr) = (intptr_t) Hash_Del (ht->tab, P_GSTRING (pr, 1)); } static void @@ -293,8 +293,8 @@ bi_Hash_DelElement (progs_t *pr) { bi_hashtab_t *ht = get_table (pr, __FUNCTION__, P_INT (pr, 0)); - R_INT (pr) = (long) Hash_DelElement (ht->tab, - (void *) (long) P_INT (pr, 1)); + R_INT (pr) = (intptr_t) Hash_DelElement (ht->tab, + (void *) (intptr_t) P_INT (pr, 1)); } static void @@ -302,7 +302,7 @@ bi_Hash_Free (progs_t *pr) { bi_hashtab_t *ht = get_table (pr, __FUNCTION__, P_INT (pr, 0)); - Hash_Free (ht->tab, (void *) (long) P_INT (pr, 1)); + Hash_Free (ht->tab, (void *) (intptr_t) P_INT (pr, 1)); } static void @@ -331,7 +331,7 @@ bi_Hash_GetList (progs_t *pr) pr_list = PR_Zone_Malloc (pr, count * sizeof (pr_type_t)); // the hash tables stores progs pointers... for (count = 0, l = list; *l; l++) - pr_list[count++].integer_var = (long) *l; + pr_list[count++].integer_var = (intptr_t) *l; free (list); RETURN_POINTER (pr, pr_list); } diff --git a/libs/ruamoko/rua_obj.c b/libs/ruamoko/rua_obj.c index 3faa0fa20..8caf57f19 100644 --- a/libs/ruamoko/rua_obj.c +++ b/libs/ruamoko/rua_obj.c @@ -292,7 +292,7 @@ static const char * selector_get_key (void *s, void *_pr) { progs_t *pr = (progs_t *) _pr; - return PR_GetString (pr, pr->selector_names[(long) s]); + return PR_GetString (pr, pr->selector_names[(intptr_t) s]); } static const char * @@ -301,10 +301,10 @@ class_get_key (void *c, void *pr) return PR_GetString ((progs_t *)pr, ((pr_class_t *)c)->name); } -static unsigned long +static uintptr_t load_methods_get_hash (void *m, void *pr) { - return (unsigned long) m; + return (uintptr_t) m; } static int @@ -408,11 +408,11 @@ static pr_sel_t * sel_register_typed_name (progs_t *pr, const char *name, const char *types, pr_sel_t *sel) { - long index; + intptr_t index; int is_new = 0; obj_list *l; - index = (long) Hash_Find (pr->selector_hash, name); + index = (intptr_t) Hash_Find (pr->selector_hash, name); if (index) { for (l = pr->selector_sels[index]; l; l = l->next) { pr_sel_t *s = l->data; @@ -586,8 +586,8 @@ obj_send_message_in_list (progs_t *pr, pr_method_list_t *method_list, pr_method_t *mth = &method_list->method_list[i]; if (mth->method_name && sel_eq (&G_STRUCT (pr, pr_sel_t, mth->method_name), op) - && !Hash_FindElement (pr->load_methods, (void *) (long) mth->method_imp)) { - Hash_AddElement (pr->load_methods, (void *) (long) mth->method_imp); + && !Hash_FindElement (pr->load_methods, (void *) (intptr_t) mth->method_imp)) { + Hash_AddElement (pr->load_methods, (void *) (intptr_t) mth->method_imp); PR_ExecuteProgram (pr, mth->method_imp); break; diff --git a/libs/ruamoko/rua_plist.c b/libs/ruamoko/rua_plist.c index 7eb896e29..db1efe9c8 100644 --- a/libs/ruamoko/rua_plist.c +++ b/libs/ruamoko/rua_plist.c @@ -205,10 +205,10 @@ bi_plist_clear (progs_t *pr, void *data) Hash_FlushTable (res->items); } -static unsigned long +static uintptr_t plist_get_hash (void *key, void *unused) { - return (unsigned long) key; + return (uintptr_t) key; } static int diff --git a/libs/util/hash.c b/libs/util/hash.c index f1a9e2066..8e8155e87 100644 --- a/libs/util/hash.c +++ b/libs/util/hash.c @@ -58,7 +58,7 @@ struct hashtab_s { size_t num_ele; void *user_data; int (*compare)(void*,void*,void*); - unsigned long (*get_hash)(void*,void*); + uintptr_t (*get_hash)(void*,void*); const char *(*get_key)(void*,void*); void (*free_ele)(void*,void*); hashlink_t *tab[1]; // variable size @@ -146,10 +146,10 @@ Hash_Buffer (const void *_buf, int len) #endif } -static unsigned long +static uintptr_t get_hash (void *ele, void *data) { - return (unsigned long)ele; + return (uintptr_t)ele; } static int @@ -159,7 +159,7 @@ compare (void *a, void *b, void *data) } static inline int -get_index (unsigned long hash, size_t size, size_t bits) +get_index (uintptr_t hash, size_t size, size_t bits) { #if 0 unsigned long mask = ~0UL << bits; @@ -178,7 +178,7 @@ get_index (unsigned long hash, size_t size, size_t bits) } return hash; #else - return hash % size; + return (int)(hash % size); #endif } @@ -205,7 +205,7 @@ Hash_NewTable (int tsize, const char *(*gk)(void*,void*), } VISIBLE void -Hash_SetHashCompare (hashtab_t *tab, unsigned long (*gh)(void*,void*), +Hash_SetHashCompare (hashtab_t *tab, uintptr_t (*gh)(void*,void*), int (*cmp)(void*,void*,void*)) { tab->get_hash = gh; diff --git a/libs/util/sys.c b/libs/util/sys.c index 018b51acc..2fe09ed88 100644 --- a/libs/util/sys.c +++ b/libs/util/sys.c @@ -334,7 +334,7 @@ Sys_TimeOfDay (date_t *date) } VISIBLE void -Sys_MakeCodeWriteable (unsigned long startaddr, unsigned long length) +Sys_MakeCodeWriteable (uintptr_t startaddr, size_t length) { #ifdef _WIN32 DWORD flOldProtect; diff --git a/libs/util/wadfile.c b/libs/util/wadfile.c index 3e4fd7dd1..0599e5abc 100644 --- a/libs/util/wadfile.c +++ b/libs/util/wadfile.c @@ -58,7 +58,7 @@ static __attribute__ ((used)) const char rcsid[] = #include "QF/wad.h" // case insensitive hash and compare -static unsigned long +static uintptr_t wad_get_hash (void *l, void *unused) { char name[16]; diff --git a/qw/include/server.h b/qw/include/server.h index 2d3c0abb7..1d5f0328e 100644 --- a/qw/include/server.h +++ b/qw/include/server.h @@ -627,7 +627,7 @@ extern int fp_messages; extern int fp_persecond; extern int fp_secondsdead; extern struct cvar_s *pausable; -extern struct cvar_s *nouse; +extern qboolean nouse; extern char fp_msg[255]; diff --git a/qw/source/sv_recorder.c b/qw/source/sv_recorder.c index 7a12dd134..045de5c68 100644 --- a/qw/source/sv_recorder.c +++ b/qw/source/sv_recorder.c @@ -128,7 +128,7 @@ static byte msg_buffer[2][MAX_DATAGRAM]; rec.dbuffer.start - rec.dbuffer.end : \ rec.dbuffer.maxsize - rec.dbuffer.end) -#define HEADER ((int) &((header_t *) 0)->data) +#define HEADER ((size_t)(intptr_t) &((header_t *) 0)->data) static void dbuffer_init (dbuffer_t *dbuffer, byte *buf, size_t size) diff --git a/qw/source/sv_user.c b/qw/source/sv_user.c index 90ed77f42..66e62b5e3 100644 --- a/qw/source/sv_user.c +++ b/qw/source/sv_user.c @@ -1325,7 +1325,7 @@ static void call_qc_hook (void *qc_hook) { *sv_globals.self = EDICT_TO_PROG (&sv_pr_state, sv_player); - PR_ExecuteProgram (&sv_pr_state, (func_t) (long) qc_hook); + PR_ExecuteProgram (&sv_pr_state, (func_t) (intptr_t) qc_hook); } static const char * @@ -1355,7 +1355,7 @@ ucmds_free (void *_c, void *unused) pointer. */ -static unsigned long +static uintptr_t ucmd_get_hash (void *_a, void *data) { ucmd_t *a = (ucmd_t*)_a; @@ -1421,7 +1421,7 @@ PF_AddUserCommand (progs_t *pr) ucmd_t *cmd; cmd = SV_AddUserCommand (name, call_qc_hook, P_INT (pr, 2) ? UCMD_NO_REDIRECT : 0, - (void *) (long) P_FUNCTION (pr, 1), + (void *) (intptr_t) P_FUNCTION (pr, 1), NULL); if (!cmd) diff --git a/tools/qfbsp/source/qfbsp.c b/tools/qfbsp/source/qfbsp.c index b0fac947f..c306ebb44 100644 --- a/tools/qfbsp/source/qfbsp.c +++ b/tools/qfbsp/source/qfbsp.c @@ -135,10 +135,10 @@ BaseWindingForPlane (plane_t *p) winding_t * CopyWinding (winding_t *w) { - int size; + size_t size; winding_t *c; - size = (long) &((winding_t *) 0)->points[w->numpoints]; + size = (size_t) (uintptr_t) &((winding_t *) 0)->points[w->numpoints]; c = malloc (size); memcpy (c, w, size); return c; @@ -147,10 +147,11 @@ CopyWinding (winding_t *w) winding_t * CopyWindingReverse (winding_t *w) { - int i, size; + int i; + size_t size; winding_t *c; - size = (long) &((winding_t *) 0)->points[w->numpoints]; + size = (size_t) (uintptr_t) &((winding_t *) 0)->points[w->numpoints]; c = malloc (size); c->numpoints = w->numpoints; for (i = 0; i < w->numpoints; i++) { @@ -327,7 +328,7 @@ DivideWinding (winding_t *in, plane_t *split, winding_t **front, winding_t * NewWinding (int points) { - int size; + size_t size; winding_t *w; if (points < 3) @@ -337,7 +338,7 @@ NewWinding (int points) if (c_activewindings > c_peakwindings) c_peakwindings = c_activewindings; - size = (long) &((winding_t *) 0)->points[points]; + size = (size_t) (uintptr_t) &((winding_t *) 0)->points[points]; w = malloc (size); memset (w, 0, size); diff --git a/tools/qfvis/source/qfvis.c b/tools/qfvis/source/qfvis.c index 31d8deb93..6c8e81ded 100644 --- a/tools/qfvis/source/qfvis.c +++ b/tools/qfvis/source/qfvis.c @@ -114,12 +114,12 @@ winding_t * NewWinding (int points) { winding_t *winding; - int size; + size_t size; if (points > MAX_POINTS_ON_WINDING) Sys_Error ("NewWinding: %i points", points); - size = (long) ((winding_t *) 0)->points[points]; + size = (size_t)(uintptr_t) ((winding_t *) 0)->points[points]; winding = calloc (1, size); return winding; @@ -135,10 +135,10 @@ FreeWinding (winding_t *winding) winding_t * CopyWinding (winding_t *winding) { - int size; + size_t size; winding_t *copy; - size = (long) ((winding_t *) 0)->points[winding->numpoints]; + size = (size_t) (uintptr_t) ((winding_t *) 0)->points[winding->numpoints]; copy = malloc (size); memcpy (copy, winding, size); copy->original = false; diff --git a/vc2005/QuakeForge.sln b/vc2005/QuakeForge.sln index 5b47be523..2a561af40 100644 --- a/vc2005/QuakeForge.sln +++ b/vc2005/QuakeForge.sln @@ -84,93 +84,179 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {9A942925-61E6-4975-935A-5D62E8248E64}.Debug|Win32.ActiveCfg = Debug|Win32 {9A942925-61E6-4975-935A-5D62E8248E64}.Debug|Win32.Build.0 = Debug|Win32 + {9A942925-61E6-4975-935A-5D62E8248E64}.Debug|x64.ActiveCfg = Debug|x64 + {9A942925-61E6-4975-935A-5D62E8248E64}.Debug|x64.Build.0 = Debug|x64 {9A942925-61E6-4975-935A-5D62E8248E64}.Release|Win32.ActiveCfg = Release|Win32 {9A942925-61E6-4975-935A-5D62E8248E64}.Release|Win32.Build.0 = Release|Win32 + {9A942925-61E6-4975-935A-5D62E8248E64}.Release|x64.ActiveCfg = Release|x64 + {9A942925-61E6-4975-935A-5D62E8248E64}.Release|x64.Build.0 = Release|x64 {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|Win32.ActiveCfg = Debug|Win32 {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|Win32.Build.0 = Debug|Win32 + {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|x64.ActiveCfg = Debug|x64 + {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|x64.Build.0 = Debug|x64 {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|Win32.ActiveCfg = Release|Win32 {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|Win32.Build.0 = Release|Win32 + {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|x64.ActiveCfg = Release|x64 + {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|x64.Build.0 = Release|x64 {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|Win32.ActiveCfg = Debug|Win32 {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|Win32.Build.0 = Debug|Win32 + {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|x64.ActiveCfg = Debug|x64 + {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|x64.Build.0 = Debug|x64 {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|Win32.ActiveCfg = Release|Win32 {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|Win32.Build.0 = Release|Win32 + {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|x64.ActiveCfg = Release|x64 + {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|x64.Build.0 = Release|x64 {51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|Win32.ActiveCfg = Debug|Win32 {51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|Win32.Build.0 = Debug|Win32 + {51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|x64.ActiveCfg = Debug|x64 + {51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|x64.Build.0 = Debug|x64 {51028ACF-53D4-4478-8500-55E6B8A81375}.Release|Win32.ActiveCfg = Release|Win32 {51028ACF-53D4-4478-8500-55E6B8A81375}.Release|Win32.Build.0 = Release|Win32 + {51028ACF-53D4-4478-8500-55E6B8A81375}.Release|x64.ActiveCfg = Release|x64 + {51028ACF-53D4-4478-8500-55E6B8A81375}.Release|x64.Build.0 = Release|x64 {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|Win32.ActiveCfg = Debug|Win32 {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|Win32.Build.0 = Debug|Win32 + {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|x64.ActiveCfg = Debug|x64 + {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|x64.Build.0 = Debug|x64 {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|Win32.ActiveCfg = Release|Win32 {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|Win32.Build.0 = Release|Win32 + {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|x64.ActiveCfg = Release|x64 + {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|x64.Build.0 = Release|x64 {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|Win32.ActiveCfg = Debug|Win32 {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|Win32.Build.0 = Debug|Win32 + {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|x64.ActiveCfg = Debug|x64 + {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|x64.Build.0 = Debug|x64 {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|Win32.ActiveCfg = Release|Win32 {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|Win32.Build.0 = Release|Win32 + {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|x64.ActiveCfg = Release|x64 + {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|x64.Build.0 = Release|x64 {01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|Win32.ActiveCfg = Debug|Win32 {01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|Win32.Build.0 = Debug|Win32 + {01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|x64.ActiveCfg = Debug|x64 + {01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|x64.Build.0 = Debug|x64 {01C3B138-9D45-4ED6-A763-893C067262C2}.Release|Win32.ActiveCfg = Release|Win32 {01C3B138-9D45-4ED6-A763-893C067262C2}.Release|Win32.Build.0 = Release|Win32 + {01C3B138-9D45-4ED6-A763-893C067262C2}.Release|x64.ActiveCfg = Release|x64 + {01C3B138-9D45-4ED6-A763-893C067262C2}.Release|x64.Build.0 = Release|x64 {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|Win32.ActiveCfg = Debug|Win32 {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|Win32.Build.0 = Debug|Win32 + {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|x64.ActiveCfg = Debug|x64 + {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|x64.Build.0 = Debug|x64 {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|Win32.ActiveCfg = Release|Win32 {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|Win32.Build.0 = Release|Win32 + {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|x64.ActiveCfg = Release|x64 + {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|x64.Build.0 = Release|x64 {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|Win32.ActiveCfg = Debug|Win32 {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|Win32.Build.0 = Debug|Win32 + {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|x64.ActiveCfg = Debug|x64 + {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|x64.Build.0 = Debug|x64 {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|Win32.ActiveCfg = Release|Win32 {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|Win32.Build.0 = Release|Win32 + {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|x64.ActiveCfg = Release|x64 + {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|x64.Build.0 = Release|x64 {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|Win32.ActiveCfg = Debug|Win32 {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|Win32.Build.0 = Debug|Win32 + {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|x64.ActiveCfg = Debug|x64 + {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|x64.Build.0 = Debug|x64 {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|Win32.ActiveCfg = Release|Win32 {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|Win32.Build.0 = Release|Win32 + {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|x64.ActiveCfg = Release|x64 + {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|x64.Build.0 = Release|x64 {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|Win32.ActiveCfg = Debug|Win32 {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|Win32.Build.0 = Debug|Win32 + {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|x64.ActiveCfg = Debug|x64 + {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|x64.Build.0 = Debug|x64 {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|Win32.ActiveCfg = Release|Win32 {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|Win32.Build.0 = Release|Win32 + {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|x64.ActiveCfg = Release|x64 + {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|x64.Build.0 = Release|x64 {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|Win32.ActiveCfg = Debug|Win32 {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|Win32.Build.0 = Debug|Win32 + {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|x64.ActiveCfg = Debug|x64 + {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|x64.Build.0 = Debug|x64 {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|Win32.ActiveCfg = Release|Win32 {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|Win32.Build.0 = Release|Win32 + {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|x64.ActiveCfg = Release|x64 + {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|x64.Build.0 = Release|x64 {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|Win32.ActiveCfg = Debug|Win32 {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|Win32.Build.0 = Debug|Win32 + {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|x64.ActiveCfg = Debug|x64 + {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|x64.Build.0 = Debug|x64 {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|Win32.ActiveCfg = Release|Win32 {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|Win32.Build.0 = Release|Win32 + {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|x64.ActiveCfg = Release|x64 + {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|x64.Build.0 = Release|x64 {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|Win32.ActiveCfg = Debug|Win32 {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|Win32.Build.0 = Debug|Win32 + {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|x64.ActiveCfg = Debug|x64 + {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|x64.Build.0 = Debug|x64 {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|Win32.ActiveCfg = Release|Win32 {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|Win32.Build.0 = Release|Win32 + {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|x64.ActiveCfg = Release|x64 + {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|x64.Build.0 = Release|x64 {544D097C-9C24-4C57-A171-8C8029421185}.Debug|Win32.ActiveCfg = Debug|Win32 {544D097C-9C24-4C57-A171-8C8029421185}.Debug|Win32.Build.0 = Debug|Win32 + {544D097C-9C24-4C57-A171-8C8029421185}.Debug|x64.ActiveCfg = Debug|x64 + {544D097C-9C24-4C57-A171-8C8029421185}.Debug|x64.Build.0 = Debug|x64 {544D097C-9C24-4C57-A171-8C8029421185}.Release|Win32.ActiveCfg = Release|Win32 {544D097C-9C24-4C57-A171-8C8029421185}.Release|Win32.Build.0 = Release|Win32 + {544D097C-9C24-4C57-A171-8C8029421185}.Release|x64.ActiveCfg = Release|x64 + {544D097C-9C24-4C57-A171-8C8029421185}.Release|x64.Build.0 = Release|x64 {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|Win32.ActiveCfg = Debug|Win32 {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|Win32.Build.0 = Debug|Win32 + {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|x64.ActiveCfg = Debug|x64 + {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|x64.Build.0 = Debug|x64 {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|Win32.ActiveCfg = Release|Win32 {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|Win32.Build.0 = Release|Win32 + {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|x64.ActiveCfg = Release|x64 + {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|x64.Build.0 = Release|x64 {226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|Win32.ActiveCfg = Debug|Win32 {226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|Win32.Build.0 = Debug|Win32 + {226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|x64.ActiveCfg = Debug|x64 + {226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|x64.Build.0 = Debug|x64 {226D42CE-5833-444E-94FA-84C1D51892A8}.Release|Win32.ActiveCfg = Release|Win32 {226D42CE-5833-444E-94FA-84C1D51892A8}.Release|Win32.Build.0 = Release|Win32 + {226D42CE-5833-444E-94FA-84C1D51892A8}.Release|x64.ActiveCfg = Release|x64 + {226D42CE-5833-444E-94FA-84C1D51892A8}.Release|x64.Build.0 = Release|x64 {B37FE734-01F4-4799-86B2-D084820715BE}.Debug|Win32.ActiveCfg = Debug|Win32 {B37FE734-01F4-4799-86B2-D084820715BE}.Debug|Win32.Build.0 = Debug|Win32 + {B37FE734-01F4-4799-86B2-D084820715BE}.Debug|x64.ActiveCfg = Debug|x64 + {B37FE734-01F4-4799-86B2-D084820715BE}.Debug|x64.Build.0 = Debug|x64 {B37FE734-01F4-4799-86B2-D084820715BE}.Release|Win32.ActiveCfg = Release|Win32 {B37FE734-01F4-4799-86B2-D084820715BE}.Release|Win32.Build.0 = Release|Win32 + {B37FE734-01F4-4799-86B2-D084820715BE}.Release|x64.ActiveCfg = Release|x64 + {B37FE734-01F4-4799-86B2-D084820715BE}.Release|x64.Build.0 = Release|x64 {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|Win32.ActiveCfg = Debug|Win32 {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|Win32.Build.0 = Debug|Win32 + {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|x64.ActiveCfg = Debug|x64 + {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|x64.Build.0 = Debug|x64 {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|Win32.ActiveCfg = Release|Win32 {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|Win32.Build.0 = Release|Win32 + {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|x64.ActiveCfg = Release|x64 + {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|x64.Build.0 = Release|x64 {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|Win32.ActiveCfg = Debug|Win32 {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|Win32.Build.0 = Debug|Win32 + {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|x64.ActiveCfg = Debug|x64 + {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|x64.Build.0 = Debug|x64 {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|Win32.ActiveCfg = Release|Win32 {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|Win32.Build.0 = Release|Win32 + {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|x64.ActiveCfg = Release|x64 + {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|x64.Build.0 = Release|x64 {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|Win32.ActiveCfg = Debug|Win32 {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|Win32.Build.0 = Debug|Win32 + {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|x64.ActiveCfg = Debug|x64 + {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|x64.Build.0 = Debug|x64 {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|Win32.ActiveCfg = Release|Win32 {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|Win32.Build.0 = Release|Win32 + {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|x64.ActiveCfg = Release|x64 + {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/vc2005/builtins/builtins.vcproj b/vc2005/builtins/builtins.vcproj index 761d942dc..0018fc104 100644 --- a/vc2005/builtins/builtins.vcproj +++ b/vc2005/builtins/builtins.vcproj @@ -11,6 +11,9 @@ + @@ -83,6 +86,75 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vc2005/clean.ps1 b/vc2005/clean.ps1 index 5a0b295a7..b1e75f990 100644 --- a/vc2005/clean.ps1 +++ b/vc2005/clean.ps1 @@ -1,3 +1,3 @@ -ls -recurse -include 'win32','*.user' | rm -recurse +ls -recurse -include 'win32','x64','*.user' | rm -recurse if(test-path QuakeForge.suo) { rm QuakeForge.suo -force } if(test-path QuakeForge.ncb) { rm QuakeForge.ncb } \ No newline at end of file diff --git a/vc2005/common/common.vcproj b/vc2005/common/common.vcproj index aa1787804..99f7b1cd0 100644 --- a/vc2005/common/common.vcproj +++ b/vc2005/common/common.vcproj @@ -11,6 +11,9 @@ + @@ -83,6 +86,75 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vc2005/console/console.vcproj b/vc2005/console/console.vcproj index da0c0e535..e62d06d00 100644 --- a/vc2005/console/console.vcproj +++ b/vc2005/console/console.vcproj @@ -11,6 +11,9 @@ + @@ -83,6 +86,75 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vc2005/console_client/console_client.vcproj b/vc2005/console_client/console_client.vcproj index e4d64bc58..ca7b87f53 100644 --- a/vc2005/console_client/console_client.vcproj +++ b/vc2005/console_client/console_client.vcproj @@ -11,6 +11,9 @@ + @@ -83,6 +86,75 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vc2005/console_server/console_server.vcproj b/vc2005/console_server/console_server.vcproj index ff2db304e..c1412e1dc 100644 --- a/vc2005/console_server/console_server.vcproj +++ b/vc2005/console_server/console_server.vcproj @@ -11,6 +11,9 @@ + @@ -83,6 +86,75 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vc2005/engine/engine.vcproj b/vc2005/engine/engine.vcproj index 15a4679c0..a0c1b731a 100644 --- a/vc2005/engine/engine.vcproj +++ b/vc2005/engine/engine.vcproj @@ -11,6 +11,9 @@ + @@ -83,6 +86,75 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vc2005/gib/gib.vcproj b/vc2005/gib/gib.vcproj index ef6b86648..cb64a2bed 100644 --- a/vc2005/gib/gib.vcproj +++ b/vc2005/gib/gib.vcproj @@ -11,6 +11,9 @@ + @@ -83,6 +86,75 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vc2005/image/image.vcproj b/vc2005/image/image.vcproj index 6af7605e3..78c7799cd 100644 --- a/vc2005/image/image.vcproj +++ b/vc2005/image/image.vcproj @@ -11,6 +11,9 @@ + @@ -83,6 +86,75 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vc2005/include/config.h b/vc2005/include/config.h index 9d5691464..ac6488168 100644 --- a/vc2005/include/config.h +++ b/vc2005/include/config.h @@ -722,5 +722,15 @@ void *alloca (int size); /* used in access() */ #define R_OK 04 -/* disable silent conversion warnings for fixing later.. */ -#pragma warning(disable:4244 4311 4267 4305 4312 4047) +/* + disable silent conversion warnings for fixing later.. + + 4047: 'operator' : 'identifier1' differs in levels of indirection from 'identifier2' + 4244: 'argument' : conversion from 'type1' to 'type2', possible loss of data + 4267: 'var' : conversion from 'size_t' to 'type', possible loss of data (/Wp64 warning) + 4305: 'identifier' : truncation from 'type1' to 'type2' + 4311: 'variable' : pointer truncation from 'type' to 'type' (/Wp64 warning) + 4312: 'operation' : conversion from 'type1' to 'type2' of greater size (/Wp64 warning) +*/ +//#pragma warning(disable:4047 4244 4267 4305 4311 4312) +#pragma warning(disable:4047 4244 4305) diff --git a/vc2005/models/models.vcproj b/vc2005/models/models.vcproj index 094cdfedb..d691550d4 100644 --- a/vc2005/models/models.vcproj +++ b/vc2005/models/models.vcproj @@ -11,6 +11,9 @@ + @@ -83,6 +86,75 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vc2005/modelsgl/modelsgl.vcproj b/vc2005/modelsgl/modelsgl.vcproj index ae98d7050..c7e21ba5e 100644 --- a/vc2005/modelsgl/modelsgl.vcproj +++ b/vc2005/modelsgl/modelsgl.vcproj @@ -11,6 +11,9 @@ + @@ -83,6 +86,75 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vc2005/net/net.vcproj b/vc2005/net/net.vcproj index e6c293f86..00dc2d70e 100644 --- a/vc2005/net/net.vcproj +++ b/vc2005/net/net.vcproj @@ -11,6 +11,9 @@ + @@ -83,6 +86,75 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vc2005/qfbsp/qfbsp.vcproj b/vc2005/qfbsp/qfbsp.vcproj index 1a99b6524..110d8ff99 100644 --- a/vc2005/qfbsp/qfbsp.vcproj +++ b/vc2005/qfbsp/qfbsp.vcproj @@ -11,6 +11,9 @@ + @@ -97,6 +100,89 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vc2005/qfclient/qfclient.vcproj b/vc2005/qfclient/qfclient.vcproj index f2e3182c5..6a13e3478 100644 --- a/vc2005/qfclient/qfclient.vcproj +++ b/vc2005/qfclient/qfclient.vcproj @@ -11,6 +11,9 @@ + @@ -97,6 +100,89 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vc2005/qflight/qflight.vcproj b/vc2005/qflight/qflight.vcproj index dd9eb06d4..d352863ca 100644 --- a/vc2005/qflight/qflight.vcproj +++ b/vc2005/qflight/qflight.vcproj @@ -11,6 +11,9 @@ + @@ -97,6 +100,89 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vc2005/qfserver/qfserver.vcproj b/vc2005/qfserver/qfserver.vcproj index 66ecf9f0f..a426106a9 100644 --- a/vc2005/qfserver/qfserver.vcproj +++ b/vc2005/qfserver/qfserver.vcproj @@ -11,6 +11,9 @@ + @@ -97,6 +100,89 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vc2005/qfvis/qfvis.vcproj b/vc2005/qfvis/qfvis.vcproj index f44e100d7..cb746cd8b 100644 --- a/vc2005/qfvis/qfvis.vcproj +++ b/vc2005/qfvis/qfvis.vcproj @@ -11,6 +11,9 @@ + @@ -97,6 +100,89 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vc2005/qw/qw.vcproj b/vc2005/qw/qw.vcproj index 4d5933eb7..febe419f9 100644 --- a/vc2005/qw/qw.vcproj +++ b/vc2005/qw/qw.vcproj @@ -11,6 +11,9 @@ + @@ -83,6 +86,75 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vc2005/ruamoko/ruamoko.vcproj b/vc2005/ruamoko/ruamoko.vcproj index 6e1a416f8..f00c02d59 100644 --- a/vc2005/ruamoko/ruamoko.vcproj +++ b/vc2005/ruamoko/ruamoko.vcproj @@ -11,6 +11,9 @@ + @@ -83,6 +86,75 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vc2005/sound/sound.vcproj b/vc2005/sound/sound.vcproj index a970ae378..e2668b14d 100644 --- a/vc2005/sound/sound.vcproj +++ b/vc2005/sound/sound.vcproj @@ -11,6 +11,9 @@ + @@ -83,6 +86,75 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vc2005/util/util.vcproj b/vc2005/util/util.vcproj index b50491ee9..73a15b01a 100644 --- a/vc2005/util/util.vcproj +++ b/vc2005/util/util.vcproj @@ -11,6 +11,9 @@ + @@ -83,6 +86,75 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vc2005/video/video.vcproj b/vc2005/video/video.vcproj index 64153f379..2d694fae5 100644 --- a/vc2005/video/video.vcproj +++ b/vc2005/video/video.vcproj @@ -11,6 +11,9 @@ + @@ -83,6 +86,75 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +