Fixed issues building 64-bit Windows binary

slouken · slouken · commit e6ab3592e3dd · 2009-09-05T23:37:35.000Z
diff --git a/include/SDL_rwops.h b/include/SDL_rwops.h
@@ -82,8 +82,8 @@ typedef struct SDL_RWops
             struct
             {
                 void *data;
-                int size;
-                int left;
+                size_t size;
+                size_t left;
             } buffer;
         } win32io;
 #endif
@@ -147,12 +147,12 @@ extern DECLSPEC Uint64 SDLCALL SDL_ReadLE64(SDL_RWops * src);
 extern DECLSPEC Uint64 SDLCALL SDL_ReadBE64(SDL_RWops * src);
 
 /* Write an item of native format to the specified endianness */
-extern DECLSPEC int SDLCALL SDL_WriteLE16(SDL_RWops * dst, Uint16 value);
-extern DECLSPEC int SDLCALL SDL_WriteBE16(SDL_RWops * dst, Uint16 value);
-extern DECLSPEC int SDLCALL SDL_WriteLE32(SDL_RWops * dst, Uint32 value);
-extern DECLSPEC int SDLCALL SDL_WriteBE32(SDL_RWops * dst, Uint32 value);
-extern DECLSPEC int SDLCALL SDL_WriteLE64(SDL_RWops * dst, Uint64 value);
-extern DECLSPEC int SDLCALL SDL_WriteBE64(SDL_RWops * dst, Uint64 value);
+extern DECLSPEC size_t SDLCALL SDL_WriteLE16(SDL_RWops * dst, Uint16 value);
+extern DECLSPEC size_t SDLCALL SDL_WriteBE16(SDL_RWops * dst, Uint16 value);
+extern DECLSPEC size_t SDLCALL SDL_WriteLE32(SDL_RWops * dst, Uint32 value);
+extern DECLSPEC size_t SDLCALL SDL_WriteBE32(SDL_RWops * dst, Uint32 value);
+extern DECLSPEC size_t SDLCALL SDL_WriteLE64(SDL_RWops * dst, Uint64 value);
+extern DECLSPEC size_t SDLCALL SDL_WriteBE64(SDL_RWops * dst, Uint64 value);
 
 
 /* Ends C function definitions when using C++ */
diff --git a/src/audio/disk/SDL_diskaudio.c b/src/audio/disk/SDL_diskaudio.c
@@ -67,14 +67,14 @@ DISKAUD_WaitDevice(_THIS)
 static void
 DISKAUD_PlayDevice(_THIS)
 {
-    int written;
+    size_t written;
 
     /* Write the audio data */
     written = SDL_RWwrite(this->hidden->output,
                           this->hidden->mixbuf, 1, this->hidden->mixlen);
 
     /* If we couldn't write, assume fatal error for now */
-    if ((Uint32) written != this->hidden->mixlen) {
+    if (written != this->hidden->mixlen) {
         this->enabled = 0;
     }
 #ifdef DEBUG_AUDIO
diff --git a/src/events/SDL_mouse.c b/src/events/SDL_mouse.c
@@ -70,7 +70,8 @@ SDL_AddMouse(const SDL_Mouse * mouse, char *name, int pressure_max,
 {
     SDL_Mouse **mice;
     int selected_mouse;
-    int index, length;
+    int index;
+    size_t length;
 
     if (SDL_GetMouseIndexId(mouse->id) != -1) {
         SDL_SetError("Mouse ID already in use");
diff --git a/src/file/SDL_rwops.c b/src/file/SDL_rwops.c
@@ -150,7 +150,7 @@ win32_file_seek(SDL_RWops * context, long offset, int whence)
 
     /* FIXME: We may be able to satisfy the seek within buffered data */
     if (whence == RW_SEEK_CUR && context->hidden.win32io.buffer.left) {
-        offset -= context->hidden.win32io.buffer.left;
+        offset -= (long)context->hidden.win32io.buffer.left;
     }
     context->hidden.win32io.buffer.left = 0;
 
@@ -198,7 +198,7 @@ win32_file_read(SDL_RWops * context, void *ptr, size_t size, size_t maxnum)
             context->hidden.win32io.buffer.size -
             context->hidden.win32io.buffer.left;
         read_ahead =
-            SDL_min(total_need, (size_t) context->hidden.win32io.buffer.left);
+            SDL_min(total_need, context->hidden.win32io.buffer.left);
         SDL_memcpy(ptr, data, read_ahead);
         context->hidden.win32io.buffer.left -= read_ahead;
 
@@ -224,7 +224,7 @@ win32_file_read(SDL_RWops * context, void *ptr, size_t size, size_t maxnum)
         total_read += read_ahead;
     } else {
         if (!ReadFile
-            (context->hidden.win32io.h, ptr, total_need, &byte_read, NULL)) {
+            (context->hidden.win32io.h, ptr, (DWORD)total_need, &byte_read, NULL)) {
             SDL_Error(SDL_EFREAD);
             return 0;
         }
@@ -239,7 +239,8 @@ win32_file_write(SDL_RWops * context, const void *ptr, size_t size,
 {
 
     size_t total_bytes;
-    DWORD byte_written, nwritten;
+    DWORD byte_written;
+    size_t nwritten;
 
     total_bytes = size * num;
 
@@ -249,7 +250,7 @@ win32_file_write(SDL_RWops * context, const void *ptr, size_t size,
 
     if (context->hidden.win32io.buffer.left) {
         SetFilePointer(context->hidden.win32io.h,
-                       -context->hidden.win32io.buffer.left, NULL,
+                       -(LONG)context->hidden.win32io.buffer.left, NULL,
                        FILE_CURRENT);
         context->hidden.win32io.buffer.left = 0;
     }
@@ -264,7 +265,7 @@ win32_file_write(SDL_RWops * context, const void *ptr, size_t size,
     }
 
     if (!WriteFile
-        (context->hidden.win32io.h, ptr, total_bytes, &byte_written, NULL)) {
+        (context->hidden.win32io.h, ptr, (DWORD)total_bytes, &byte_written, NULL)) {
         SDL_Error(SDL_EFWRITE);
         return 0;
     }
@@ -377,7 +378,7 @@ mem_seek(SDL_RWops * context, long offset, int whence)
         newpos = context->hidden.mem.stop;
     }
     context->hidden.mem.here = newpos;
-    return (context->hidden.mem.here - context->hidden.mem.base);
+    return (long)(context->hidden.mem.here - context->hidden.mem.base);
 }
 
 static size_t SDLCALL
@@ -608,42 +609,42 @@ SDL_ReadBE64(SDL_RWops * src)
     return (SDL_SwapBE64(value));
 }
 
-int
+size_t
 SDL_WriteLE16(SDL_RWops * dst, Uint16 value)
 {
     value = SDL_SwapLE16(value);
     return (SDL_RWwrite(dst, &value, (sizeof value), 1));
 }
 
-int
+size_t
 SDL_WriteBE16(SDL_RWops * dst, Uint16 value)
 {
     value = SDL_SwapBE16(value);
     return (SDL_RWwrite(dst, &value, (sizeof value), 1));
 }
 
-int
+size_t
 SDL_WriteLE32(SDL_RWops * dst, Uint32 value)
 {
     value = SDL_SwapLE32(value);
     return (SDL_RWwrite(dst, &value, (sizeof value), 1));
 }
 
-int
+size_t
 SDL_WriteBE32(SDL_RWops * dst, Uint32 value)
 {
     value = SDL_SwapBE32(value);
     return (SDL_RWwrite(dst, &value, (sizeof value), 1));
 }
 
-int
+size_t
 SDL_WriteLE64(SDL_RWops * dst, Uint64 value)
 {
     value = SDL_SwapLE64(value);
     return (SDL_RWwrite(dst, &value, (sizeof value), 1));
 }
 
-int
+size_t
 SDL_WriteBE64(SDL_RWops * dst, Uint64 value)
 {
     value = SDL_SwapBE64(value);
diff --git a/src/stdlib/SDL_stdlib.c b/src/stdlib/SDL_stdlib.c
@@ -28,7 +28,7 @@
 #ifndef HAVE_LIBC
 /* These are some C runtime intrinsics that need to be defined */
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(_WIN64)
 
 #ifndef __FLTUSED__
 #define __FLTUSED__
@@ -40,7 +40,9 @@ __declspec(selectany)
 #endif
 
 /* Float to long */
-     void __declspec(naked) _ftol()
+void
+__declspec(naked)
+_ftol()
 {
     /* *INDENT-OFF* */
     __asm {
diff --git a/src/stdlib/SDL_string.c b/src/stdlib/SDL_string.c
@@ -1342,7 +1342,7 @@ SDL_vsnprintf(char *text, size_t maxlen, const char *fmt, va_list ap)
     }
     *text = '\0';
 
-    return (text - textstart);
+    return (int)(text - textstart);
 }
 #endif
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_renderer_gl.c b/src/video/SDL_renderer_gl.c
@@ -515,7 +515,7 @@ compile_shader(GL_RenderData * data, GLenum shader_type, const char *_code)
     data->glGenProgramsARB(1, &program);
     data->glBindProgramARB(shader_type, program);
     data->glProgramStringARB(shader_type, GL_PROGRAM_FORMAT_ASCII_ARB,
-                             SDL_strlen(code), code);
+                             (GLsizei)SDL_strlen(code), code);
 
     SDL_free(code);
 
diff --git a/src/video/win32/SDL_win32events.c b/src/video/win32/SDL_win32events.c
@@ -141,7 +141,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
             /* if we receive such data we need to update the pressure */
             SDL_VideoData *videodata = data->videodata;
             if (videodata->wintabDLL
-                && videodata->WTPacket((HCTX) lParam, wParam, &packet)) {
+                && videodata->WTPacket((HCTX) lParam, (UINT) wParam, &packet)) {
                 SDL_ChangeEnd(tablet, (int) packet.pkCursor);
                 pressure = (int) packet.pkNormalPressure;
             }
diff --git a/src/video/win32/SDL_win32mouse.c b/src/video/win32/SDL_win32mouse.c
@@ -44,7 +44,7 @@ WIN_InitMouse(_THIS)
     RAWINPUTDEVICELIST *deviceList = NULL;
     int devCount = 0;
     int i;
-    int tmp = 0;
+    UINT tmp = 0;
     char *buffer = NULL;
     char *tab = "wacom";        /* since windows does't give us handles to tablets, we have to detect a tablet by it's name */
     const char *rdp = "rdp_mou";
@@ -71,8 +71,8 @@ WIN_InitMouse(_THIS)
     /* we're getting the details of the devices */
     for (i = 0; i < devCount; ++i) {
         int is_rdp = 0;
-        int j;
-        int k;
+        UINT j;
+        UINT k;
         char *default_device_name = "Pointing device xx";
         const char *reg_key_root = "System\\CurrentControlSet\\Enum\\";
         char *device_name = SDL_malloc(256 * sizeof(char));
@@ -83,7 +83,7 @@ WIN_InitMouse(_THIS)
         DWORD regtype = REG_SZ;
         DWORD out = 256 * sizeof(char);
         SDL_Mouse mouse;
-        int l;
+        size_t l;
         if (deviceList[i].dwType != RIM_TYPEMOUSE) {    /* if a device isn't a mouse type we don't want it */
             continue;
         }

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,8 @@ SDL_AddMouse(const SDL_Mouse * mouse, char *name, int pressure_max,`
`70`	`70`	`{`
`71`	`71`	`SDL_Mouse **mice;`
`72`	`72`	`int selected_mouse;`
`73`		`- int index, length;`
	`73`	`+ int index;`
	`74`	`+ size_t length;`
`74`	`75`
`75`	`76`	`if (SDL_GetMouseIndexId(mouse->id) != -1) {`
`76`	`77`	`SDL_SetError("Mouse ID already in use");`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ win32_file_seek(SDL_RWops * context, long offset, int whence)`
`150`	`150`
`151`	`151`	`/* FIXME: We may be able to satisfy the seek within buffered data */`
`152`	`152`	`if (whence == RW_SEEK_CUR && context->hidden.win32io.buffer.left) {`
`153`		`- offset -= context->hidden.win32io.buffer.left;`
	`153`	`+ offset -= (long)context->hidden.win32io.buffer.left;`
`154`	`154`	`}`
`155`	`155`	`context->hidden.win32io.buffer.left = 0;`
`156`	`156`
`@@ -198,7 +198,7 @@ win32_file_read(SDL_RWops * context, void *ptr, size_t size, size_t maxnum)`
`198`	`198`	`context->hidden.win32io.buffer.size -`
`199`	`199`	`context->hidden.win32io.buffer.left;`
`200`	`200`	`read_ahead =`
`201`		`- SDL_min(total_need, (size_t) context->hidden.win32io.buffer.left);`
	`201`	`+ SDL_min(total_need, context->hidden.win32io.buffer.left);`
`202`	`202`	`SDL_memcpy(ptr, data, read_ahead);`
`203`	`203`	`context->hidden.win32io.buffer.left -= read_ahead;`
`204`	`204`
`@@ -224,7 +224,7 @@ win32_file_read(SDL_RWops * context, void *ptr, size_t size, size_t maxnum)`
`224`	`224`	`total_read += read_ahead;`
`225`	`225`	`} else {`
`226`	`226`	`if (!ReadFile`
`227`		`- (context->hidden.win32io.h, ptr, total_need, &byte_read, NULL)) {`
	`227`	`+ (context->hidden.win32io.h, ptr, (DWORD)total_need, &byte_read, NULL)) {`
`228`	`228`	`SDL_Error(SDL_EFREAD);`
`229`	`229`	`return 0;`
`230`	`230`	`}`
`@@ -239,7 +239,8 @@ win32_file_write(SDL_RWops * context, const void *ptr, size_t size,`
`239`	`239`	`{`
`240`	`240`
`241`	`241`	`size_t total_bytes;`
`242`		`- DWORD byte_written, nwritten;`
	`242`	`+ DWORD byte_written;`
	`243`	`+ size_t nwritten;`
`243`	`244`
`244`	`245`	`total_bytes = size * num;`
`245`	`246`
`@@ -249,7 +250,7 @@ win32_file_write(SDL_RWops * context, const void *ptr, size_t size,`
`249`	`250`
`250`	`251`	`if (context->hidden.win32io.buffer.left) {`
`251`	`252`	`SetFilePointer(context->hidden.win32io.h,`
`252`		`- -context->hidden.win32io.buffer.left, NULL,`
	`253`	`+ -(LONG)context->hidden.win32io.buffer.left, NULL,`
`253`	`254`	`FILE_CURRENT);`
`254`	`255`	`context->hidden.win32io.buffer.left = 0;`
`255`	`256`	`}`
`@@ -264,7 +265,7 @@ win32_file_write(SDL_RWops * context, const void *ptr, size_t size,`
`264`	`265`	`}`
`265`	`266`
`266`	`267`	`if (!WriteFile`
`267`		`- (context->hidden.win32io.h, ptr, total_bytes, &byte_written, NULL)) {`
	`268`	`+ (context->hidden.win32io.h, ptr, (DWORD)total_bytes, &byte_written, NULL)) {`
`268`	`269`	`SDL_Error(SDL_EFWRITE);`
`269`	`270`	`return 0;`
`270`	`271`	`}`
`@@ -377,7 +378,7 @@ mem_seek(SDL_RWops * context, long offset, int whence)`
`377`	`378`	`newpos = context->hidden.mem.stop;`
`378`	`379`	`}`
`379`	`380`	`context->hidden.mem.here = newpos;`
`380`		`- return (context->hidden.mem.here - context->hidden.mem.base);`
	`381`	`+ return (long)(context->hidden.mem.here - context->hidden.mem.base);`
`381`	`382`	`}`
`382`	`383`
`383`	`384`	`static size_t SDLCALL`
`@@ -608,42 +609,42 @@ SDL_ReadBE64(SDL_RWops * src)`
`608`	`609`	`return (SDL_SwapBE64(value));`
`609`	`610`	`}`
`610`	`611`
`611`		`-int`
	`612`	`+size_t`
`612`	`613`	`SDL_WriteLE16(SDL_RWops * dst, Uint16 value)`
`613`	`614`	`{`
`614`	`615`	`value = SDL_SwapLE16(value);`
`615`	`616`	`return (SDL_RWwrite(dst, &value, (sizeof value), 1));`
`616`	`617`	`}`
`617`	`618`
`618`		`-int`
	`619`	`+size_t`
`619`	`620`	`SDL_WriteBE16(SDL_RWops * dst, Uint16 value)`
`620`	`621`	`{`
`621`	`622`	`value = SDL_SwapBE16(value);`
`622`	`623`	`return (SDL_RWwrite(dst, &value, (sizeof value), 1));`
`623`	`624`	`}`
`624`	`625`
`625`		`-int`
	`626`	`+size_t`
`626`	`627`	`SDL_WriteLE32(SDL_RWops * dst, Uint32 value)`
`627`	`628`	`{`
`628`	`629`	`value = SDL_SwapLE32(value);`
`629`	`630`	`return (SDL_RWwrite(dst, &value, (sizeof value), 1));`
`630`	`631`	`}`
`631`	`632`
`632`		`-int`
	`633`	`+size_t`
`633`	`634`	`SDL_WriteBE32(SDL_RWops * dst, Uint32 value)`
`634`	`635`	`{`
`635`	`636`	`value = SDL_SwapBE32(value);`
`636`	`637`	`return (SDL_RWwrite(dst, &value, (sizeof value), 1));`
`637`	`638`	`}`
`638`	`639`
`639`		`-int`
	`640`	`+size_t`
`640`	`641`	`SDL_WriteLE64(SDL_RWops * dst, Uint64 value)`
`641`	`642`	`{`
`642`	`643`	`value = SDL_SwapLE64(value);`
`643`	`644`	`return (SDL_RWwrite(dst, &value, (sizeof value), 1));`
`644`	`645`	`}`
`645`	`646`
`646`		`-int`
	`647`	`+size_t`
`647`	`648`	`SDL_WriteBE64(SDL_RWops * dst, Uint64 value)`
`648`	`649`	`{`
`649`	`650`	`value = SDL_SwapBE64(value);`
Original file line number	Diff line number	Diff line change
`@@ -1342,7 +1342,7 @@ SDL_vsnprintf(char text, size_t maxlen, const char fmt, va_list ap)`
`1342`	`1342`	`}`
`1343`	`1343`	`*text = '\0';`
`1344`	`1344`
`1345`		`- return (text - textstart);`
	`1345`	`+ return (int)(text - textstart);`
`1346`	`1346`	`}`
`1347`	`1347`	`#endif`
`1348`	`1348`	`/* vi: set ts=4 sw=4 expandtab: */`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)`
`141`	`141`	`/* if we receive such data we need to update the pressure */`
`142`	`142`	`SDL_VideoData *videodata = data->videodata;`
`143`	`143`	`if (videodata->wintabDLL`
`144`		`- && videodata->WTPacket((HCTX) lParam, wParam, &packet)) {`
	`144`	`+ && videodata->WTPacket((HCTX) lParam, (UINT) wParam, &packet)) {`
`145`	`145`	`SDL_ChangeEnd(tablet, (int) packet.pkCursor);`
`146`	`146`	`pressure = (int) packet.pkNormalPressure;`
`147`	`147`	`}`