ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Remove remaining references to gdi32 internals from gdi16.c.

This commit is contained in:
Alexandre Julliard 2009-11-17 22:30:08 +01:00
parent 06e09f67b4
commit 17349a06b1
3 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/gdi32/gdi16.c
View File

@ -25,7 +25,6 @@
#include "wingdi.h" #include "wingdi.h"
#include "wownt32.h" #include "wownt32.h"
#include "wine/wingdi16.h" #include "wine/wingdi16.h"
#include "gdi_private.h"
#include "wine/list.h" #include "wine/list.h"
#include "wine/debug.h" #include "wine/debug.h"
@ -43,6 +42,8 @@ struct saved_visrgn
static struct list saved_regions = LIST_INIT( saved_regions ); static struct list saved_regions = LIST_INIT( saved_regions );
static HPALETTE16 hPrimaryPalette;
/* /*
* ############################################################################ * ############################################################################
*/ */
@ -2421,7 +2422,9 @@ HPALETTE16 WINAPI CreatePalette16( const LOGPALETTE* palette )
*/ */
HPALETTE16 WINAPI GDISelectPalette16( HDC16 hdc, HPALETTE16 hpalette, WORD wBkg ) HPALETTE16 WINAPI GDISelectPalette16( HDC16 hdc, HPALETTE16 hpalette, WORD wBkg )
{ {
return HPALETTE_16( GDISelectPalette( HDC_32(hdc), HPALETTE_32(hpalette), wBkg )); HPALETTE16 ret = HPALETTE_16( SelectPalette( HDC_32(hdc), HPALETTE_32(hpalette), wBkg ));
if (ret && !wBkg) hPrimaryPalette = hpalette;
return ret;
} }
@ -2430,7 +2433,7 @@ HPALETTE16 WINAPI GDISelectPalette16( HDC16 hdc, HPALETTE16 hpalette, WORD wBkg
*/ */
UINT16 WINAPI GDIRealizePalette16( HDC16 hdc ) UINT16 WINAPI GDIRealizePalette16( HDC16 hdc )
{ {
return GDIRealizePalette( HDC_32(hdc) ); return RealizePalette( HDC_32(hdc) );
} }
@ -3539,16 +3542,8 @@ void WINAPI Copy16( LPVOID src, LPVOID dst, WORD size )
*/ */
UINT16 WINAPI RealizeDefaultPalette16( HDC16 hdc ) UINT16 WINAPI RealizeDefaultPalette16( HDC16 hdc )
{ {
UINT16 ret = 0; FIXME( "%04x semi-stub\n", hdc );
DC *dc; return GDIRealizePalette16( hdc );
TRACE("%04x\n", hdc );
if (!(dc = get_dc_ptr( HDC_32(hdc) ))) return 0;
if (dc->funcs->pRealizeDefaultPalette) ret = dc->funcs->pRealizeDefaultPalette( dc->physDev );
release_dc_ptr( dc );
return ret;
} }
/*********************************************************************** /***********************************************************************
@ -3556,14 +3551,7 @@ UINT16 WINAPI RealizeDefaultPalette16( HDC16 hdc )
*/ */
BOOL16 WINAPI IsDCCurrentPalette16(HDC16 hDC) BOOL16 WINAPI IsDCCurrentPalette16(HDC16 hDC)
{ {
DC *dc = get_dc_ptr( HDC_32(hDC) ); return HPALETTE_16( GetCurrentObject( HDC_32(hDC), OBJ_PAL )) == hPrimaryPalette;
if (dc)
{
BOOL bRet = dc->hPalette == hPrimaryPalette;
release_dc_ptr( dc );
return bRet;
}
return FALSE;
} }
/********************************************************************* /*********************************************************************

1
dlls/gdi32/gdi_private.h
View File

@ -484,7 +484,6 @@ extern POINT *GDI_Bezier( const POINT *Points, INT count, INT *nPtsOut ) DECLSPE
extern HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg); extern HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg);
extern UINT WINAPI GDIRealizePalette( HDC hdc ); extern UINT WINAPI GDIRealizePalette( HDC hdc );
extern HPALETTE PALETTE_Init(void) DECLSPEC_HIDDEN; extern HPALETTE PALETTE_Init(void) DECLSPEC_HIDDEN;
extern HPALETTE hPrimaryPalette DECLSPEC_HIDDEN;
/* region.c */ /* region.c */
extern BOOL REGION_FrameRgn( HRGN dest, HRGN src, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL REGION_FrameRgn( HRGN dest, HRGN src, INT x, INT y ) DECLSPEC_HIDDEN;

2
dlls/gdi32/palette.c
View File

@ -67,7 +67,7 @@ UINT (WINAPI *pfnRealizePalette)(HDC hdc) = GDIRealizePalette;
static UINT SystemPaletteUse = SYSPAL_STATIC; /* currently not considered */ static UINT SystemPaletteUse = SYSPAL_STATIC; /* currently not considered */
HPALETTE hPrimaryPalette = 0; /* used for WM_PALETTECHANGED */ static HPALETTE hPrimaryPalette = 0; /* used for WM_PALETTECHANGED */
static HPALETTE hLastRealizedPalette = 0; /* UnrealizeObject() needs it */ static HPALETTE hLastRealizedPalette = 0; /* UnrealizeObject() needs it */
#define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */ #define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */