From 33ac91fa10baf96d92ef49806cdaf44f27ec63ac Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Fri, 24 Feb 2006 18:24:57 +0000 Subject: [PATCH] Update for Visual C++ 6.0 --- VisualC.zip | Bin 39778 -> 39785 bytes include/SDL_config_win32.h | 3 +++ src/audio/SDL_audiocvt.c | 28 ++++++++------------ src/audio/SDL_wave.c | 8 +++--- src/video/SDL_RLEaccel.c | 38 ++++++++++++++-------------- src/video/SDL_blit_A.c | 18 ++++++------- src/video/SDL_blit_N.c | 34 ++++++++++++------------- src/video/SDL_cursor.c | 12 ++++----- src/video/SDL_surface.c | 2 +- src/video/SDL_video.c | 8 +++--- src/video/SDL_yuv_sw.c | 36 +++++++++++++------------- src/video/wincommon/SDL_sysevents.c | 2 +- 12 files changed, 91 insertions(+), 98 deletions(-) diff --git a/VisualC.zip b/VisualC.zip index d863de97d638f8a7ff1953e85c44e01ccbd435b3..d949eeeb1455b748e66fd5bc8d8b0b9f19522b73 100644 GIT binary patch delta 3036 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 255 ) { *dst = 255; } else { - *dst = sample; + *dst = (Uint8)sample; } src += 2; dst += 1; @@ -68,7 +68,7 @@ void SDL_ConvertMono(SDL_AudioCVT *cvt, Uint16 format) if ( sample < -128 ) { *dst = -128; } else { - *dst = sample; + *dst = (Sint8)sample; } src += 2; dst += 1; @@ -185,10 +185,8 @@ void SDL_ConvertStrip(SDL_AudioCVT *cvt, Uint16 format) src = cvt->buf; dst = cvt->buf; for ( i=cvt->len_cvt/6; i; --i ) { - lsample = src[0]; - rsample = src[1]; - dst[0] = lsample; - dst[1] = rsample; + dst[0] = src[0]; + dst[1] = src[1]; src += 6; dst += 2; } @@ -201,10 +199,8 @@ void SDL_ConvertStrip(SDL_AudioCVT *cvt, Uint16 format) src = (Sint8 *)cvt->buf; dst = (Sint8 *)cvt->buf; for ( i=cvt->len_cvt/6; i; --i ) { - lsample = src[0]; - rsample = src[1]; - dst[0] = lsample; - dst[1] = rsample; + dst[0] = src[0]; + dst[1] = src[1]; src += 6; dst += 2; } @@ -305,10 +301,8 @@ void SDL_ConvertStrip_2(SDL_AudioCVT *cvt, Uint16 format) src = cvt->buf; dst = cvt->buf; for ( i=cvt->len_cvt/4; i; --i ) { - lsample = src[0]; - rsample = src[1]; - dst[0] = lsample; - dst[1] = rsample; + dst[0] = src[0]; + dst[1] = src[1]; src += 4; dst += 2; } @@ -321,10 +315,8 @@ void SDL_ConvertStrip_2(SDL_AudioCVT *cvt, Uint16 format) src = (Sint8 *)cvt->buf; dst = (Sint8 *)cvt->buf; for ( i=cvt->len_cvt/4; i; --i ) { - lsample = src[0]; - rsample = src[1]; - dst[0] = lsample; - dst[1] = rsample; + dst[0] = src[0]; + dst[1] = src[1]; src += 4; dst += 2; } diff --git a/src/audio/SDL_wave.c b/src/audio/SDL_wave.c index b55b9a6aa..7e3f4a5b1 100644 --- a/src/audio/SDL_wave.c +++ b/src/audio/SDL_wave.c @@ -108,9 +108,9 @@ static Sint32 MS_ADPCM_nibble(struct MS_ADPCM_decodestate *state, if ( delta < 16 ) { delta = 16; } - state->iDelta = delta; + state->iDelta = (Uint16)delta; state->iSamp2 = state->iSamp1; - state->iSamp1 = new_sample; + state->iSamp1 = (Sint16)new_sample; return(new_sample); } @@ -371,8 +371,8 @@ static int IMA_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len) } /* Store the initial sample we start with */ - decoded[0] = state[c].sample&0xFF; - decoded[1] = state[c].sample>>8; + decoded[0] = (Uint8)(state[c].sample&0xFF); + decoded[1] = (Uint8)(state[c].sample>>8); decoded += 2; } diff --git a/src/video/SDL_RLEaccel.c b/src/video/SDL_RLEaccel.c index aa5d1ba9b..cba9ace76 100644 --- a/src/video/SDL_RLEaccel.c +++ b/src/video/SDL_RLEaccel.c @@ -110,9 +110,9 @@ #define PIXEL_COPY(to, from, len, bpp) \ do { \ if(bpp == 4) { \ - SDL_memcpy4(to, from, (unsigned)(len)); \ + SDL_memcpy4(to, from, (size_t)(len)); \ } else { \ - SDL_memcpy(to, from, (unsigned)(len) * (bpp)); \ + SDL_memcpy(to, from, (size_t)(len) * (bpp)); \ } \ } while(0) @@ -423,7 +423,7 @@ do { \ d = (d | d << 16) & 0x07e0f81f; \ d += (s - d) * ALPHA >> 5; \ d &= 0x07e0f81f; \ - *dst++ = d | d >> 16; \ + *dst++ = (Uint16)(d | d >> 16); \ } \ } while(0) @@ -440,7 +440,7 @@ do { \ d = (d | d << 16) & 0x03e07c1f; \ d += (s - d) * ALPHA >> 5; \ d &= 0x03e07c1f; \ - *dst++ = d | d >> 16; \ + *dst++ = (Uint16)(d | d >> 16); \ } \ } while(0) @@ -482,17 +482,17 @@ do { \ PIXEL_FROM_RGB(d, fmt, rd, gd, bd); \ switch(bpp) { \ case 2: \ - *(Uint16 *)dst = d; \ + *(Uint16 *)dst = (Uint16)d; \ break; \ case 3: \ if(SDL_BYTEORDER == SDL_BIG_ENDIAN) { \ - dst[0] = d >> 16; \ - dst[1] = d >> 8; \ - dst[2] = d; \ + dst[0] = (Uint8)(d >> 16); \ + dst[1] = (Uint8)(d >> 8); \ + dst[2] = (Uint8)(d); \ } else { \ - dst[0] = d; \ - dst[1] = d >> 8; \ - dst[2] = d >> 16; \ + dst[0] = (Uint8)d; \ + dst[1] = (Uint8)(d >> 8); \ + dst[2] = (Uint8)(d >> 16); \ } \ break; \ case 4: \ @@ -575,10 +575,10 @@ do { \ /* helper: blend a single 16 bit pixel at 50% */ #define BLEND16_50(dst, src, mask) \ do { \ - Uint32 s = *src++; \ + Uint32 s = *src++; \ Uint32 d = *dst; \ - *dst++ = (((s & mask) + (d & mask)) >> 1) \ - + (s & d & (~mask & 0xffff)); \ + *dst++ = (Uint16)((((s & mask) + (d & mask)) >> 1) + \ + (s & d & (~mask & 0xffff))); \ } while(0) /* basic 16bpp blender. mask is the pixels to keep when adding. */ @@ -971,32 +971,32 @@ int SDL_RLEBlit(SDL_Surface *src, SDL_Rect *srcrect, */ #define BLIT_TRANSL_565(src, dst) \ do { \ - Uint32 s = src; \ + Uint32 s = src; \ Uint32 d = dst; \ unsigned alpha = (s & 0x3e0) >> 5; \ s &= 0x07e0f81f; \ d = (d | d << 16) & 0x07e0f81f; \ d += (s - d) * alpha >> 5; \ d &= 0x07e0f81f; \ - dst = d | d >> 16; \ + dst = (Uint16)(d | d >> 16); \ } while(0) #define BLIT_TRANSL_555(src, dst) \ do { \ - Uint32 s = src; \ + Uint32 s = src; \ Uint32 d = dst; \ unsigned alpha = (s & 0x3e0) >> 5; \ s &= 0x03e07c1f; \ d = (d | d << 16) & 0x03e07c1f; \ d += (s - d) * alpha >> 5; \ d &= 0x03e07c1f; \ - dst = d | d >> 16; \ + dst = (Uint16)(d | d >> 16); \ } while(0) /* used to save the destination format in the encoding. Designed to be macro-compatible with SDL_PixelFormat but without the unneeded fields */ typedef struct { - Uint8 BytesPerPixel; + Uint8 BytesPerPixel; Uint8 Rloss; Uint8 Gloss; Uint8 Bloss; diff --git a/src/video/SDL_blit_A.c b/src/video/SDL_blit_A.c index ccd7ace37..61c911086 100644 --- a/src/video/SDL_blit_A.c +++ b/src/video/SDL_blit_A.c @@ -1483,9 +1483,9 @@ static void Blit16to16SurfaceAlpha128(SDL_BlitInfo *info, Uint16 mask) if(w) { Uint16 d = *dstp, s; if(SDL_BYTEORDER == SDL_BIG_ENDIAN) - s = prev_sw; + s = (Uint16)prev_sw; else - s = prev_sw >> 16; + s = (Uint16)(prev_sw >> 16); *dstp = BLEND16_50(d, s, mask); srcp++; dstp++; @@ -1858,7 +1858,7 @@ static void Blit565to565SurfaceAlpha(SDL_BlitInfo *info) d = (d | d << 16) & 0x07e0f81f; d += (s - d) * alpha >> 5; d &= 0x07e0f81f; - *dstp++ = d | d >> 16; + *dstp++ = (Uint16)(d | d >> 16); }, width); srcp += srcskip; dstp += dstskip; @@ -1894,7 +1894,7 @@ static void Blit555to555SurfaceAlpha(SDL_BlitInfo *info) d = (d | d << 16) & 0x03e07c1f; d += (s - d) * alpha >> 5; d &= 0x03e07c1f; - *dstp++ = d | d >> 16; + *dstp++ = (Uint16)(d | d >> 16); }, width); srcp += srcskip; dstp += dstskip; @@ -1922,8 +1922,7 @@ static void BlitARGBto565PixelAlpha(SDL_BlitInfo *info) Benchmark this! */ if(alpha) { if(alpha == (SDL_ALPHA_OPAQUE >> 3)) { - *dstp = (s >> 8 & 0xf800) + (s >> 5 & 0x7e0) - + (s >> 3 & 0x1f); + *dstp = (Uint16)((s >> 8 & 0xf800) + (s >> 5 & 0x7e0) + (s >> 3 & 0x1f)); } else { Uint32 d = *dstp; /* @@ -1935,7 +1934,7 @@ static void BlitARGBto565PixelAlpha(SDL_BlitInfo *info) d = (d | d << 16) & 0x07e0f81f; d += (s - d) * alpha >> 5; d &= 0x07e0f81f; - *dstp = d | d >> 16; + *dstp = (Uint16)(d | d >> 16); } } srcp++; @@ -1967,8 +1966,7 @@ static void BlitARGBto555PixelAlpha(SDL_BlitInfo *info) Benchmark this! */ if(alpha) { if(alpha == (SDL_ALPHA_OPAQUE >> 3)) { - *dstp = (s >> 9 & 0x7c00) + (s >> 6 & 0x3e0) - + (s >> 3 & 0x1f); + *dstp = (Uint16)((s >> 9 & 0x7c00) + (s >> 6 & 0x3e0) + (s >> 3 & 0x1f)); } else { Uint32 d = *dstp; /* @@ -1980,7 +1978,7 @@ static void BlitARGBto555PixelAlpha(SDL_BlitInfo *info) d = (d | d << 16) & 0x03e07c1f; d += (s - d) * alpha >> 5; d &= 0x03e07c1f; - *dstp = d | d >> 16; + *dstp = (Uint16)(d | d >> 16); } } srcp++; diff --git a/src/video/SDL_blit_N.c b/src/video/SDL_blit_N.c index 2935e5a65..33117056b 100644 --- a/src/video/SDL_blit_N.c +++ b/src/video/SDL_blit_N.c @@ -858,9 +858,9 @@ static Uint32 GetBlitFeatures( void ) /* Special optimized blit for RGB 8-8-8 --> RGB 3-3-2 */ #define RGB888_RGB332(dst, src) { \ - dst = (((src)&0x00E00000)>>16)| \ - (((src)&0x0000E000)>>11)| \ - (((src)&0x000000C0)>>6); \ + dst = (Uint8)((((src)&0x00E00000)>>16)| \ + (((src)&0x0000E000)>>11)| \ + (((src)&0x000000C0)>>6)); \ } static void Blit_RGB888_index8(SDL_BlitInfo *info) { @@ -962,9 +962,9 @@ static void Blit_RGB888_index8(SDL_BlitInfo *info) } /* Special optimized blit for RGB 8-8-8 --> RGB 5-5-5 */ #define RGB888_RGB555(dst, src) { \ - *(Uint16 *)(dst) = (((*src)&0x00F80000)>>9)| \ - (((*src)&0x0000F800)>>6)| \ - (((*src)&0x000000F8)>>3); \ + *(Uint16 *)(dst) = (Uint16)((((*src)&0x00F80000)>>9)| \ + (((*src)&0x0000F800)>>6)| \ + (((*src)&0x000000F8)>>3)); \ } #define RGB888_RGB555_TWO(dst, src) { \ *(Uint32 *)(dst) = (((((src[HI])&0x00F80000)>>9)| \ @@ -1082,9 +1082,9 @@ static void Blit_RGB888_RGB555(SDL_BlitInfo *info) } /* Special optimized blit for RGB 8-8-8 --> RGB 5-6-5 */ #define RGB888_RGB565(dst, src) { \ - *(Uint16 *)(dst) = (((*src)&0x00F80000)>>8)| \ - (((*src)&0x0000FC00)>>5)| \ - (((*src)&0x000000F8)>>3); \ + *(Uint16 *)(dst) = (Uint16)((((*src)&0x00F80000)>>8)| \ + (((*src)&0x0000FC00)>>5)| \ + (((*src)&0x000000F8)>>3)); \ } #define RGB888_RGB565_TWO(dst, src) { \ *(Uint32 *)(dst) = (((((src[HI])&0x00F80000)>>8)| \ @@ -2101,7 +2101,7 @@ static void BlitNto1Key(SDL_BlitInfo *info) Uint32 rgbmask = ~srcfmt->Amask; int srcbpp; Uint32 Pixel; - Uint8 sR, sG, sB; + unsigned sR, sG, sB; /* Set up some basic variables */ srcbpp = srcfmt->BytesPerPixel; @@ -2115,9 +2115,9 @@ static void BlitNto1Key(SDL_BlitInfo *info) sR, sG, sB); if ( (Pixel & rgbmask) != ckey ) { /* Pack RGB into 8bit pixel */ - *dst = ((sR>>5)<<(3+2))| - ((sG>>5)<<(2)) | - ((sB>>6)<<(0)) ; + *dst = (Uint8)(((sR>>5)<<(3+2))| + ((sG>>5)<<(2)) | + ((sB>>6)<<(0))); } dst++; src += srcbpp; @@ -2134,9 +2134,9 @@ static void BlitNto1Key(SDL_BlitInfo *info) sR, sG, sB); if ( (Pixel & rgbmask) != ckey ) { /* Pack RGB into 8bit pixel */ - *dst = palmap[((sR>>5)<<(3+2))| - ((sG>>5)<<(2)) | - ((sB>>6)<<(0)) ]; + *dst = (Uint8)palmap[((sR>>5)<<(3+2))| + ((sG>>5)<<(2)) | + ((sB>>6)<<(0)) ]; } dst++; src += srcbpp; @@ -2232,7 +2232,7 @@ static void BlitNtoNKeyCopyAlpha(SDL_BlitInfo *info) Uint8 srcbpp; Uint8 dstbpp; Uint32 Pixel; - Uint8 sR, sG, sB, sA; + unsigned sR, sG, sB, sA; /* Set up some basic variables */ srcbpp = srcfmt->BytesPerPixel; diff --git a/src/video/SDL_cursor.c b/src/video/SDL_cursor.c index 429960361..723040e0b 100644 --- a/src/video/SDL_cursor.c +++ b/src/video/SDL_cursor.c @@ -331,7 +331,7 @@ void SDL_MoveCursor(int x, int y) /* Keep track of the current cursor colors */ static int palette_changed = 1; -static Uint32 pixels8[2]; +static Uint8 pixels8[2]; void SDL_CursorPaletteChanged(void) { @@ -377,8 +377,8 @@ static void SDL_DrawCursorFast(SDL_Surface *screen, SDL_Rect *area) int dstskip; if ( palette_changed ) { - pixels8[0] = SDL_MapRGB(screen->format, 255, 255, 255); - pixels8[1] = SDL_MapRGB(screen->format, 0, 0, 0); + pixels8[0] = (Uint8)SDL_MapRGB(screen->format, 255, 255, 255); + pixels8[1] = (Uint8)SDL_MapRGB(screen->format, 0, 0, 0); palette_changed = 0; } dst = (Uint8 *)screen->pixels + @@ -419,7 +419,7 @@ static void SDL_DrawCursorFast(SDL_Surface *screen, SDL_Rect *area) datab = *data++; for ( i=0; i<8; ++i ) { if ( maskb & 0x80 ) { - *dst = pixels[datab>>7]; + *dst = (Uint16)pixels[datab>>7]; } maskb <<= 1; datab <<= 1; @@ -509,8 +509,8 @@ static void SDL_DrawCursorSlow(SDL_Surface *screen, SDL_Rect *area) maxx = area->x+area->w; if ( screen->format->BytesPerPixel == 1 ) { if ( palette_changed ) { - pixels8[0] = SDL_MapRGB(screen->format, 255, 255, 255); - pixels8[1] = SDL_MapRGB(screen->format, 0, 0, 0); + pixels8[0] = (Uint8)SDL_MapRGB(screen->format, 255, 255, 255); + pixels8[1] = (Uint8)SDL_MapRGB(screen->format, 0, 0, 0); palette_changed = 0; } for ( h=area->h; h; h-- ) { diff --git a/src/video/SDL_surface.c b/src/video/SDL_surface.c index 26c300ffd..578401ac7 100644 --- a/src/video/SDL_surface.c +++ b/src/video/SDL_surface.c @@ -687,7 +687,7 @@ int SDL_FillRect(SDL_Surface *dst, SDL_Rect *dstrect, Uint32 color) case 2: for ( y=dstrect->h; y; --y ) { Uint16 *pixels = (Uint16 *)row; - Uint16 c = color; + Uint16 c = (Uint16)color; Uint32 cc = (Uint32)c << 16 | c; int n = dstrect->w; if((unsigned long)pixels & 3) { diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c index 2c64c4cef..2cf6b6c5c 100644 --- a/src/video/SDL_video.c +++ b/src/video/SDL_video.c @@ -995,10 +995,10 @@ void SDL_UpdateRect(SDL_Surface *screen, Sint32 x, Sint32 y, Uint32 w, Uint32 h) return; /* Fill the rectangle */ - rect.x = x; - rect.y = y; - rect.w = w; - rect.h = h; + rect.x = (Sint16)x; + rect.y = (Sint16)y; + rect.w = (Uint16)w; + rect.h = (Uint16)h; SDL_UpdateRects(screen, 1, &rect); } } diff --git a/src/video/SDL_yuv_sw.c b/src/video/SDL_yuv_sw.c index 74570394d..8bb1cce71 100644 --- a/src/video/SDL_yuv_sw.c +++ b/src/video/SDL_yuv_sw.c @@ -167,27 +167,27 @@ static void Color16DitherYV12Mod1X( int *colortab, Uint32 *rgb_2_pix, ++cr; ++cb; L = *lum++; - *row1++ = (rgb_2_pix[ L + cr_r ] | - rgb_2_pix[ L + crb_g ] | - rgb_2_pix[ L + cb_b ]); + *row1++ = (unsigned short)(rgb_2_pix[ L + cr_r ] | + rgb_2_pix[ L + crb_g ] | + rgb_2_pix[ L + cb_b ]); L = *lum++; - *row1++ = (rgb_2_pix[ L + cr_r ] | - rgb_2_pix[ L + crb_g ] | - rgb_2_pix[ L + cb_b ]); + *row1++ = (unsigned short)(rgb_2_pix[ L + cr_r ] | + rgb_2_pix[ L + crb_g ] | + rgb_2_pix[ L + cb_b ]); /* Now, do second row. */ L = *lum2++; - *row2++ = (rgb_2_pix[ L + cr_r ] | - rgb_2_pix[ L + crb_g ] | - rgb_2_pix[ L + cb_b ]); + *row2++ = (unsigned short)(rgb_2_pix[ L + cr_r ] | + rgb_2_pix[ L + crb_g ] | + rgb_2_pix[ L + cb_b ]); L = *lum2++; - *row2++ = (rgb_2_pix[ L + cr_r ] | - rgb_2_pix[ L + crb_g ] | - rgb_2_pix[ L + cb_b ]); + *row2++ = (unsigned short)(rgb_2_pix[ L + cr_r ] | + rgb_2_pix[ L + crb_g ] | + rgb_2_pix[ L + cb_b ]); } /* @@ -638,14 +638,14 @@ static void Color16DitherYUY2Mod1X( int *colortab, Uint32 *rgb_2_pix, cr += 4; cb += 4; L = *lum; lum += 2; - *row++ = (rgb_2_pix[ L + cr_r ] | - rgb_2_pix[ L + crb_g ] | - rgb_2_pix[ L + cb_b ]); + *row++ = (unsigned short)(rgb_2_pix[ L + cr_r ] | + rgb_2_pix[ L + crb_g ] | + rgb_2_pix[ L + cb_b ]); L = *lum; lum += 2; - *row++ = (rgb_2_pix[ L + cr_r ] | - rgb_2_pix[ L + crb_g ] | - rgb_2_pix[ L + cb_b ]); + *row++ = (unsigned short)(rgb_2_pix[ L + cr_r ] | + rgb_2_pix[ L + crb_g ] | + rgb_2_pix[ L + cb_b ]); } diff --git a/src/video/wincommon/SDL_sysevents.c b/src/video/wincommon/SDL_sysevents.c index 25f29aa52..6e3ca6477 100644 --- a/src/video/wincommon/SDL_sysevents.c +++ b/src/video/wincommon/SDL_sysevents.c @@ -78,7 +78,7 @@ extern void DIB_SwapGamma(_THIS); static int codepage; static int Is9xME(); static int GetCodePage(); -static int WINAPI ToUnicode9xME(UINT vkey, UINT scancode, BYTE *keystate, Uint16 *wchars, int wsize, UINT flags); +static int WINAPI ToUnicode9xME(UINT vkey, UINT scancode, BYTE *keystate, LPWSTR wchars, int wsize, UINT flags); ToUnicodeFN SDL_ToUnicode = ToUnicode9xME; #endif /* !NO_GETKEYBOARDSTATE */