Changeset 4223 for trunk/src/gdi32


Ignore:
Timestamp:
Sep 8, 2000, 8:06:33 PM (25 years ago)
Author:
sandervl
Message:

Fixed FS bug in OSLibDeleteRegion

Location:
trunk/src/gdi32
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/gdi32/objhandle.cpp

    r4209 r4223  
    1 /* $Id: objhandle.cpp,v 1.3 2000-09-07 22:14:51 phaller Exp $ */
     1/* $Id: objhandle.cpp,v 1.4 2000-09-08 18:06:32 sandervl Exp $ */
    22/*
    33 * Win32 Handle Management Code for OS/2
     
    1313 *
    1414 */
    15 
    16 /*****************************************************************************
    17  * Includes                                                                  *
    18  *****************************************************************************/
    19 
    20 #include <odin.h>
    21 #include <odinwrap.h>
    22 #include <os2sel.h>
    23 
    2415
    2516#include <os2win.h>
     
    3324
    3425//******************************************************************************
    35 
    36 /*****************************************************************************
    37  * Defines                                                                   *
    38  *****************************************************************************/
    39 
    40 ODINDEBUGCHANNEL(GDI32-REGION)
    41 
    4226
    4327static ULONG  objHandleTable[MAX_OBJECT_HANDLES] = {0};
     
    218202//******************************************************************************
    219203//******************************************************************************
    220 ODINFUNCTION1(BOOL, DeleteObject,
    221               HANDLE, hObj)
    222 {
    223   if(ObjGetHandleType(hObj) == GDIOBJ_REGION)
    224   {
    225     OSLibDeleteRegion(ObjGetHandleData(hObj));
    226     ObjFreeHandle(hObj);
    227     SetLastError(ERROR_SUCCESS);
    228     return OBJ_REGION;
     204BOOL WIN32API DeleteObject(HANDLE hObj)
     205{
     206  dprintf(("GDI32: DeleteObject %x", hObj));
     207  if(ObjGetHandleType(hObj) == GDIOBJ_REGION) {
     208        OSLibDeleteRegion(ObjGetHandleData(hObj));
     209        ObjFreeHandle(hObj);
     210        SetLastError(ERROR_SUCCESS);
     211        return OBJ_REGION;
    229212  }
    230213  DIBSection::deleteSection((DWORD)hObj);
  • trunk/src/gdi32/region.cpp

    r4148 r4223  
    1 /* $Id: region.cpp,v 1.11 2000-09-02 08:31:23 sandervl Exp $ */
     1/* $Id: region.cpp,v 1.12 2000-09-08 18:06:33 sandervl Exp $ */
    22
    33/*
     
    14991499}
    15001500//******************************************************************************
    1501 //******************************************************************************
    1502 void OSLibDeleteRegion(HANDLE hRegion)
     1501//Needs wrapper as this file includes os2.h!!
     1502//******************************************************************************
     1503ODINFUNCTIONNODBG1(BOOL, OSLibDeleteRegion, HANDLE, hRegion)
    15031504{
    15041505    if(GpiDestroyRegion(hpsRegion, hRegion) == FALSE) {
    15051506        dprintf(("WARNING: OSLibDeleteRegion %x; GpiDestroyRegion failed (%x)", hRegion, WinGetLastError(0)));
    15061507    }
     1508    return (0);
    15071509}
    15081510/*****************************************************************************
  • trunk/src/gdi32/region.h

    r3705 r4223  
    1 //$Id: region.h,v 1.1 2000-06-14 13:17:51 sandervl Exp $
     1//$Id: region.h,v 1.2 2000-09-08 18:06:33 sandervl Exp $
    22#ifndef __REGION_H__
    33#define __REGION_H__
     
    55BOOL InitRegionSpace();
    66
    7 void OSLibDeleteRegion(HANDLE hRegion);
     7BOOL WIN32API OSLibDeleteRegion(HANDLE hRegion);
    88
    99#endif //__REGION_H__
Note: See TracChangeset for help on using the changeset viewer.