sdl-ios-xcode: src/video/os2fslib/SDL

comparison src/video/os2fslib/SDL_os2fslib.c @ 1336:3692456e7b0f

Use SDL_ prefixed versions of C library functions. FIXME: Change #include <stdlib.h> to #include "SDL_stdlib.h" Change #include <string.h> to #include "SDL_string.h" Make sure nothing else broke because of this...

author	Sam Lantinga <slouken@libsdl.org>
date	Tue, 07 Feb 2006 06:59:48 +0000
parents	173c063d4f55
children	604d73db6802

comparison

equal deleted inserted replaced

-:c39265384763
+:3692456e7b0f
 {
 if (cursor)
 {
 GpiDeleteBitmap(cursor->hbm);
 WinDestroyPointer(cursor->hptr);
-free(cursor->pchData);
+SDL_free(cursor->pchData);
-free(cursor);
+SDL_free(cursor);
 }
 }
 /* Local functions to convert the SDL cursor mask into OS/2 format */
 static void memnot(Uint8 *dst, Uint8 *src, int len)
 // Check for max size!
 if ((w>maxx) || (h>maxy))
 return (WMcursor *) NULL;
-pResult = (WMcursor *) malloc(sizeof(WMcursor));
+pResult = (WMcursor *) SDL_malloc(sizeof(WMcursor));
 if (!pResult) return (WMcursor *) NULL;
-pchTemp = (char *) malloc((maxx + 7)/8 * maxy*2);
+pchTemp = (char *) SDL_malloc((maxx + 7)/8 * maxy*2);
 if (!pchTemp)
 {
-free(pResult);
+SDL_free(pResult);
 return (WMcursor *) NULL;
 }
-memset(pchTemp, 0, (maxx + 7)/8 * maxy*2);
+SDL_memset(pchTemp, 0, (maxx + 7)/8 * maxy*2);
 hps = WinGetPS(_this->hidden->hwndClient);
 bmi.cbFix = sizeof(BITMAPINFOHEADER);
 bmi.cx = maxx;
 bmi.argbColor[0].bRed = 0x00;
 bmi.argbColor[1].bBlue = 0x00;
 bmi.argbColor[1].bGreen = 0x00;
 bmi.argbColor[1].bRed = 0xff;
-memset(&bmih, 0, sizeof(BITMAPINFOHEADER));
+SDL_memset(&bmih, 0, sizeof(BITMAPINFOHEADER));
 bmih.cbFix = sizeof(BITMAPINFOHEADER);
 bmih.cx = maxx;
 bmih.cy = 2*maxy;
 bmih.cPlanes = 1;
 bmih.cBitCount = 1;
 xptr += run;
 data += run;
 memnot(aptr, mask, run);
 mask += run;
 aptr += run;
-memset(xptr,  0, pad);
+SDL_memset(xptr,  0, pad);
 xptr += pad;
-memset(aptr, ~0, pad);
+SDL_memset(aptr, ~0, pad);
 aptr += pad;
 }
 pad += run;
 for (i=h ; i<maxy; i++ )
 {
 xptr = pchTemp + (maxx+7)/8 * (maxy-1-i);
 aptr = pchTemp + (maxx+7)/8 * (maxy+maxy-1-i);
-memset(xptr,  0, (maxx+7)/8);
+SDL_memset(xptr,  0, (maxx+7)/8);
 xptr += (maxx+7)/8;
-memset(aptr, ~0, (maxx+7)/8);
+SDL_memset(aptr, ~0, (maxx+7)/8);
 aptr += (maxx+7)/8;
 }
 hbm = GpiCreateBitmap(hps, (PBITMAPINFOHEADER2)&bmih, CBM_INIT, (PBYTE) pchTemp, (PBITMAPINFO2)&bmi);
 hptr = WinCreatePointer(HWND_DESKTOP, hbm, TRUE, hot_x, maxy - hot_y - 1);
 // Check for max size!
 if ((w>maxx) || (h>maxy))
 return;
-pchTemp = (char *) malloc(w * h*2 * 4);
+pchTemp = (char *) SDL_malloc(w * h*2 * 4);
 if (!pchTemp)
 return;
-memset(pchTemp, 0, w * h*2 * 4);
+SDL_memset(pchTemp, 0, w * h*2 * 4);
 // Convert surface to RGB, if it's not RGB yet!
 icon_rgb = SDL_CreateRGBSurface(SDL_SWSURFACE, icon->w, icon->h,
 32, 0, 0, 0, 0);
 if ( icon_rgb == NULL )
 {
-free(pchTemp);
+SDL_free(pchTemp);
 return;
 }
 bounds.x = 0;
 bounds.y = 0;
 bounds.w = icon->w;
 bounds.h = icon->h;
 if ( SDL_LowerBlit(icon, &bounds, icon_rgb, &bounds) < 0 )
 {
 SDL_FreeSurface(icon_rgb);
-free(pchTemp);
+SDL_free(pchTemp);
 return;
 }
 /* Copy pixels upside-down from RGB surface into BMP, masked with the icon mask */
 bmi.cx = w;
 bmi.cy = 2*h;
 bmi.cPlanes = 1;
 bmi.cBitCount = 32;
-memset(&bmih, 0, sizeof(BITMAPINFOHEADER));
+SDL_memset(&bmih, 0, sizeof(BITMAPINFOHEADER));
 bmih.cbFix = sizeof(BITMAPINFOHEADER);
 bmih.cx = w;
 bmih.cy = 2*h;
 bmih.cPlanes = 1;
 bmih.cBitCount = 32;
 hptrIcon = WinCreatePointer(HWND_DESKTOP, hbm, FALSE, 0, 0);
 WinReleasePS(hps);
 // Free pixel array
-free(pchTemp);
+SDL_free(pchTemp);
 // Change icon in frame window
 WinSendMsg(hwndFrame,
 WM_SETICON,
 (MPARAM) hptrIcon,
 // Free result of an old ListModes() call, because there is
 // no FreeListModes() call in SDL!
 if (_this->hidden->pListModesResult)
 {
-free(_this->hidden->pListModesResult); _this->hidden->pListModesResult = NULL;
+SDL_free(_this->hidden->pListModesResult); _this->hidden->pListModesResult = NULL;
 }
 // Free list of available fullscreen modes
 if (_this->hidden->pAvailableFSLibVideoModes)
 {
 printf("[os2fslib_SetVideoMode] : Found mode!\n"); fflush(stdout);
 #endif
 // We'll possibly adjust the structure, so copy out the values
 // into TempModeInfo!
-memcpy(&TempModeInfo, pModeInfoFound, sizeof(TempModeInfo));
+SDL_memcpy(&TempModeInfo, pModeInfoFound, sizeof(TempModeInfo));
 pModeInfoFound = &TempModeInfo;
 if (flags & SDL_RESIZABLE)
 {
 #ifdef DEBUG_BUILD
 // It might be that the software surface pitch is not the same as
 // the pitch we have, so adjust that!
 pModeInfoFound->uiScanLineSize = pResult->pitch;
 // Store new source buffer parameters!
-memcpy(&(_this->hidden->SrcBufferDesc), pModeInfoFound, sizeof(*pModeInfoFound));
+SDL_memcpy(&(_this->hidden->SrcBufferDesc), pModeInfoFound, sizeof(*pModeInfoFound));
 _this->hidden->pchSrcBuffer = pResult->pixels;
 #ifdef DEBUG_BUILD
 printf("[os2fslib_SetVideoMode] : Telling FSLib the stuffs\n"); fflush(stdout);
 #endif
 printf("[os2fslib_ListModes] : ListModes of %d Bpp\n", format->BitsPerPixel);
 #endif
 // Destroy result of previous call, if there is any
 if (_this->hidden->pListModesResult)
 {
-free(_this->hidden->pListModesResult); _this->hidden->pListModesResult = NULL;
+SDL_free(_this->hidden->pListModesResult); _this->hidden->pListModesResult = NULL;
 }
 // For resizable and windowed mode we support every resolution!
 if ((flags & SDL_RESIZABLE) && ((flags & SDL_FULLSCREEN) == 0))
 return (SDL_Rect **)-1;
 pFSMode = _this->hidden->pAvailableFSLibVideoModes;
 while (pFSMode)
 {
 if (pFSMode->uiBPP == format->BitsPerPixel)
 {
-SDL_Rect *pRect = (SDL_Rect *) malloc(sizeof(SDL_Rect));
+SDL_Rect *pRect = (SDL_Rect *) SDL_malloc(sizeof(SDL_Rect));
 if (pRect)
 {
 // Fill description
 pRect->x = 0;
 pRect->y = 0;
 #ifdef DEBUG_BUILD
 //            printf("!!! Inserting to beginning\n");
 #endif
 // We're the first one to be inserted!
-_this->hidden->pListModesResult = (SDL_Rect**) malloc(2*sizeof(SDL_Rect*));
+_this->hidden->pListModesResult = (SDL_Rect**) SDL_malloc(2*sizeof(SDL_Rect*));
 if (_this->hidden->pListModesResult)
 {
 _this->hidden->pListModesResult[0] = pRect;
 	      _this->hidden->pListModesResult[1] = NULL;
 } else
 {
-free(pRect);
+SDL_free(pRect);
 }
 } else
 {
 // We're not the first ones, so find the place where we
 // have to insert ourselves
 #ifdef DEBUG_BUILD
 //            printf("!!! From %d slots, it will be at %d\n", iNumOfSlots, iPlace);
 #endif
-pNewList = (SDL_Rect**) realloc(_this->hidden->pListModesResult, (iNumOfSlots+1)*sizeof(SDL_Rect*));
+pNewList = (SDL_Rect**) SDL_realloc(_this->hidden->pListModesResult, (iNumOfSlots+1)*sizeof(SDL_Rect*));
 if (pNewList)
 {
 for (i=iNumOfSlots;i>iPlace;i--)
 pNewList[i] = pNewList[i-1];
 pNewList[iPlace] = pRect;
 _this->hidden->pListModesResult = pNewList;
 } else
 {
-free(pRect);
+SDL_free(pRect);
 }
 }
 }
 }
 pFSMode = pFSMode->pNext;
 // Now create our window with a default size
 // For this, we select the first available fullscreen mode as
 // current window size!
-memcpy(&(_this->hidden->SrcBufferDesc), _this->hidden->pAvailableFSLibVideoModes, sizeof(_this->hidden->SrcBufferDesc));
+SDL_memcpy(&(_this->hidden->SrcBufferDesc), _this->hidden->pAvailableFSLibVideoModes, sizeof(_this->hidden->SrcBufferDesc));
 // Allocate new video buffer!
-_this->hidden->pchSrcBuffer = (char *) malloc(_this->hidden->pAvailableFSLibVideoModes->uiScanLineSize * _this->hidden->pAvailableFSLibVideoModes->uiYResolution);
+_this->hidden->pchSrcBuffer = (char *) SDL_malloc(_this->hidden->pAvailableFSLibVideoModes->uiScanLineSize * _this->hidden->pAvailableFSLibVideoModes->uiYResolution);
 if (!_this->hidden->pchSrcBuffer)
 {
 #ifdef DEBUG_BUILD
 printf("[os2fslib_VideoInit] : Yikes, not enough memory for new video buffer!\n"); fflush(stdout);
 #endif
 printf("[os2fslib_DeleteDevice]\n"); fflush(stdout);
 #endif
 // Free used memory
 FSLib_FreeVideoModeList(_this->hidden->pAvailableFSLibVideoModes);
 if (_this->hidden->pListModesResult)
-free(_this->hidden->pListModesResult);
+SDL_free(_this->hidden->pListModesResult);
 if (_this->hidden->pchSrcBuffer)
-free(_this->hidden->pchSrcBuffer);
+SDL_free(_this->hidden->pchSrcBuffer);
 DosCloseMutexSem(_this->hidden->hmtxUseSrcBuffer);
-free(_this->hidden);
+SDL_free(_this->hidden);
-free(_this);
+SDL_free(_this);
 FSLib_Uninitialize();
 }
 static int os2fslib_Available(void)
 {
 #ifdef DEBUG_BUILD
 printf("[os2fslib_CreateDevice] : Enter\n"); fflush(stdout);
 #endif
 /* Initialize all variables that we clean on shutdown */
-device = (SDL_VideoDevice *)malloc(sizeof(SDL_VideoDevice));
+device = (SDL_VideoDevice *)SDL_malloc(sizeof(SDL_VideoDevice));
 if ( device )
 {
-memset(device, 0, (sizeof *device));
+SDL_memset(device, 0, (sizeof *device));
 // Also allocate memory for private data
-device->hidden = (struct SDL_PrivateVideoData *) malloc((sizeof(struct SDL_PrivateVideoData)));
+device->hidden = (struct SDL_PrivateVideoData *) SDL_malloc((sizeof(struct SDL_PrivateVideoData)));
 }
 if ( (device == NULL) || (device->hidden == NULL) )
 {
 SDL_OutOfMemory();
 if ( device )
-free(device);
+SDL_free(device);
 return NULL;
 }
-memset(device->hidden, 0, (sizeof *device->hidden));
+SDL_memset(device->hidden, 0, (sizeof *device->hidden));
 /* Set the function pointers */
 #ifdef DEBUG_BUILD
 printf("[os2fslib_CreateDevice] : VideoInit is %p\n", os2fslib_VideoInit); fflush(stdout);
 #endif
 // Could not initialize FSLib!
 #ifdef DEBUG_BUILD
 printf("[os2fslib_CreateDevice] : Could not initialize FSLib!\n");
 #endif
 SDL_SetError("Could not initialize FSLib!");
-free(device->hidden);
+SDL_free(device->hidden);
-free(device);
+SDL_free(device);
 return NULL;
 }
 device->hidden->pAvailableFSLibVideoModes =
 FSLib_GetVideoModeList();

Mercurial > sdl-ios-xcode

comparison src/video/os2fslib/SDL_os2fslib.c @ 1336:3692456e7b0f