a few x64 warnings fixes

libs/directx/directx.cpp

@@ -136,7 +136,7 @@ HL_PRIM const uchar *HL_NAME(get_device_name)() {
 	if( GetDXGI()->EnumAdapters(0,&adapter) != S_OK || adapter->GetDesc(&desc) != S_OK )
 		return USTR("Unknown");
 	adapter->Release();
-	return (uchar*)hl_copy_bytes((vbyte*)desc.Description,(ustrlen((uchar*)desc.Description)+1)*2);
+	return (uchar*)hl_copy_bytes((vbyte*)desc.Description,(int)(ustrlen((uchar*)desc.Description)+1)*2);
 }
 
 HL_PRIM double HL_NAME(get_supported_version)() {
@@ -216,7 +216,7 @@ HL_PRIM vbyte *HL_NAME(disassemble_shader)( vbyte *data, int dataSize, int flags
 	vbyte *ret;
 	if( D3DDisassemble(data,dataSize,flags,(char*)comments,&out) != S_OK )
 		return NULL;
-	*size = out->GetBufferSize();
+	*size = (int)out->GetBufferSize();
 	ret = hl_copy_bytes((vbyte*)out->GetBufferPointer(),*size);
 	out->Release();
 	return ret;

libs/directx/window.c

@@ -69,7 +69,7 @@ static void updateClipCursor(HWND wnd) {
 }
 
 static dx_event *addEvent( HWND wnd, EventType type ) {
-	dx_events *buf = (dx_events*)GetWindowLongPtr(wnd,GWL_USERDATA);
+	dx_events *buf = (dx_events*)GetWindowLongPtr(wnd,GWLP_USERDATA);
 	dx_event *e;
 	if( buf->event_count == MAX_EVENTS )
 		e = &buf->events[MAX_EVENTS-1];
@@ -95,11 +95,11 @@ static LRESULT CALLBACK WndProc( HWND wnd, UINT umsg, WPARAM wparam, LPARAM lpar
 		PostQuitMessage(0);
 		return 0;
 	case WM_CREATE:
-		SetWindowLongPtr(wnd,GWL_USERDATA,(LONG_PTR)((CREATESTRUCT*)lparam)->lpCreateParams);
+		SetWindowLongPtr(wnd,GWLP_USERDATA,(LONG_PTR)((CREATESTRUCT*)lparam)->lpCreateParams);
 		break;
 	case WM_SIZE:
 		{
-			dx_events *buf = (dx_events*)GetWindowLongPtr(wnd,GWL_USERDATA);
+			dx_events *buf = (dx_events*)GetWindowLongPtr(wnd,GWLP_USERDATA);
 			if( buf->event_count > buf->next_event && buf->events[buf->event_count-1].type == WindowState && buf->events[buf->event_count-1].state == Resize )
 				buf->event_count--;
 		}
@@ -125,14 +125,14 @@ static LRESULT CALLBACK WndProc( HWND wnd, UINT umsg, WPARAM wparam, LPARAM lpar
 	case WM_SYSKEYUP:
 		// right alt has triggered a control !
 		if( wparam == VK_MENU && lparam & (1<<24) ) {
-			dx_events *buf = (dx_events*)GetWindowLongPtr(wnd,GWL_USERDATA);
+			dx_events *buf = (dx_events*)GetWindowLongPtr(wnd,GWLP_USERDATA);
 			if( buf->event_count > buf->next_event && buf->events[buf->event_count-1].type == (umsg == WM_KEYUP ? KeyUp : KeyDown) && buf->events[buf->event_count-1].keyCode == (VK_CONTROL|256) ) {
 				buf->event_count--;
 				//printf("CANCEL\n");
 			}
 		}
 		e = addEvent(wnd,(umsg == WM_KEYUP || umsg == WM_SYSKEYUP) ? KeyUp : KeyDown);
-		e->keyCode = wparam;
+		e->keyCode = (int)wparam;
 		e->keyRepeat = (umsg == WM_KEYDOWN || umsg == WM_SYSKEYDOWN) && (lparam & 0x40000000) != 0;
 		// L/R location
 		if( e->keyCode == VK_SHIFT )
@@ -147,7 +147,7 @@ static LRESULT CALLBACK WndProc( HWND wnd, UINT umsg, WPARAM wparam, LPARAM lpar
 		break;
 	case WM_CHAR:
 		e = addEvent(wnd,TextInput);
-		e->keyCode = wparam;
+		e->keyCode = (int)wparam;
 		e->keyRepeat = (lparam & 0xFFFF) != 0;
 		break;
 	case WM_SETFOCUS:
@@ -267,14 +267,14 @@ HL_PRIM void HL_NAME(win_destroy)(dx_window *win) {
 		cur_clip_cursor_window = NULL;
 		ClipCursor(NULL);
 	}
-	dx_events *buf = (dx_events*)GetWindowLongPtr(win,GWL_USERDATA);
+	dx_events *buf = (dx_events*)GetWindowLongPtr(win,GWLP_USERDATA);
 	free(buf);
-	SetWindowLongPtr(win,GWL_USERDATA,0);
+	SetWindowLongPtr(win,GWLP_USERDATA,0);
 	DestroyWindow(win);
 }
 
 HL_PRIM bool HL_NAME(win_get_next_event)( dx_window *win, dx_event *e ) {
-	dx_events *buf = (dx_events*)GetWindowLongPtr(win,GWL_USERDATA);
+	dx_events *buf = (dx_events*)GetWindowLongPtr(win,GWLP_USERDATA);
 	hl_type *save;
 	if( !buf ) {
 		e->type = Quit;

libs/uv/uv.c

@@ -101,7 +101,7 @@ HL_PRIM bool HL_NAME(stream_write)( uv_stream_t *s, vbyte *b, int size, vclosure
 }
 
 static void on_alloc( uv_handle_t* h, size_t size, uv_buf_t *buf ) {
-	*buf = uv_buf_init(malloc(size), size);
+	*buf = uv_buf_init(malloc(size), (int)size);
 }
 
 static void on_read( uv_stream_t *s, ssize_t nread, const uv_buf_t *buf ) {
@@ -111,7 +111,7 @@ static void on_read( uv_stream_t *s, ssize_t nread, const uv_buf_t *buf ) {
 	bytes.t = &hlt_bytes;
 	bytes.v.ptr = buf->base;
 	len.t = &hlt_i32;
-	len.v.i = nread;
+	len.v.i = (int)nread;
 	args[0] = &bytes;
 	args[1] = &len;
 	trigger_callb((uv_handle_t*)s,EVT_READ,args,2,true);

src/std/file.c

@@ -79,7 +79,7 @@ HL_PRIM int hl_file_read( hl_fdesc *f, vbyte *buf, int pos, int len ) {
 }
 
 HL_PRIM bool hl_file_write_char( hl_fdesc *f, int c ) {
-	int ret;
+	size_t ret;
 	unsigned char cc = (unsigned char)c;
 	if( !f ) return false;
 	hl_blocking(true);

src/std/maps.c

@@ -97,7 +97,7 @@ static void hl_freelist_add_range( hl_free_list *f, int pos, int count ) {
 	}
 	// insert
 	if( f->head == f->nbuckets ) {
-		int pos = b - f->buckets;
+		int pos = (int)(b - f->buckets);
 		hl_freelist_resize(f,((f->nbuckets * 3) + 1) >> 1);
 		b = f->buckets + pos;
 	}

src/std/socket.c

@@ -406,7 +406,7 @@ static fd_set *make_socket_set( varray *a, char **tmp, int *tmp_size, unsigned i
 	for(i=0;i<a->size;i++) {
 		hl_socket *s= hl_aptr(a,hl_socket*)[i];
 		if( s== NULL ) break;
-		if( s->sock > *max ) *max = s->sock;
+		if( s->sock > *max ) *max = (int)s->sock;
 		FD_SET(s->sock,set);
 	}
 	return set;

src/std/sys.c

@@ -491,7 +491,7 @@ HL_PRIM vbyte *hl_sys_full_path( vbyte *path ) {
 	const char sep = '\\';
 	if( GetFullPathNameW((pchar*)path,MAX_PATH+1,out,NULL) == 0 )
 		return NULL;
-	len = ustrlen(out);
+	len = (int)ustrlen(out);
 	i = 0;
 
 	if (len >= 2 && out[1] == ':') {

src/std/types.c

@@ -80,7 +80,7 @@ HL_PRIM int hl_stack_size( hl_type *t ) {
 
 HL_PRIM int hl_pad_struct( int size, hl_type *t ) {
 	int align = sizeof(void*);
-#	define GET_ALIGN(type) { struct { unsigned char a; type b; } s = {0}; align = (unsigned char *)&s.b - (unsigned char*)&s; }
+#	define GET_ALIGN(type) { struct { unsigned char a; type b; } s = {0}; align = (int)((unsigned char *)&s.b - (unsigned char*)&s); }
 	switch( t->kind ) {
 	case HVOID:
 		return 0;