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

Removed LoadOEMResource from USER driver.

This commit is contained in:
Alexandre Julliard 2002-01-04 18:27:41 +00:00
parent 4e78461b5e
commit 80a3bb4fc0
25 changed files with 0 additions and 743 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/ttydrv/ttydrv.spec
View File

@ -55,7 +55,6 @@ debug_channels (ttydrv)
@ cdecl SetCursor(ptr) TTYDRV_SetCursor
@ cdecl GetScreenSaveActive() TTYDRV_GetScreenSaveActive
@ cdecl SetScreenSaveActive(long) TTYDRV_SetScreenSaveActive
@ cdecl LoadOEMResource(long long) TTYDRV_LoadOEMResource
@ cdecl CreateWindow(long ptr long) TTYDRV_CreateWindow
@ cdecl DestroyWindow(long) TTYDRV_DestroyWindow
@ cdecl GetDC(long long long long) TTYDRV_GetDC

22
dlls/ttydrv/user.c
View File

@ -7,7 +7,6 @@
#include "config.h"
#include "dinput.h"
#include "gdi.h"
#include "ttydrv.h"
#include "debugtools.h"
@ -85,27 +84,6 @@ void TTYDRV_SetScreenSaveActive(BOOL bActivate)
FIXME("(%d): stub\n", bActivate);
}
/**********************************************************************
* LoadOEMResource (TTYDRV.@)
*/
HANDLE TTYDRV_LoadOEMResource(WORD resid, WORD type)
{
HBITMAP hbitmap;
switch(type)
{
case OEM_BITMAP:
hbitmap = CreateBitmap(1, 1, 1, 1, NULL);
TTYDRV_DC_CreateBitmap(hbitmap);
return hbitmap;
case OEM_CURSOR:
case OEM_ICON:
break;
default:
ERR("unknown type (%d)\n", type);
}
return 0;
}
/***********************************************************************
* AcquireClipboard (TTYDRV.@)
*/

1
dlls/user/user_main.c
View File

@ -73,7 +73,6 @@ static BOOL load_driver(void)
GET_USER_FUNC(SetCursorPos);
GET_USER_FUNC(GetScreenSaveActive);
GET_USER_FUNC(SetScreenSaveActive);
GET_USER_FUNC(LoadOEMResource);
GET_USER_FUNC(AcquireClipboard);
GET_USER_FUNC(ReleaseClipboard);
GET_USER_FUNC(SetClipboardData);

1
dlls/x11drv/x11drv.spec
View File

@ -72,7 +72,6 @@ debug_channels (bitblt bitmap clipboard cursor dinput event font gdi graphics
@ cdecl SetCursorPos(long long) X11DRV_SetCursorPos
@ cdecl GetScreenSaveActive() X11DRV_GetScreenSaveActive
@ cdecl SetScreenSaveActive(long) X11DRV_SetScreenSaveActive
@ cdecl LoadOEMResource(long long) X11DRV_LoadOEMResource
@ cdecl CreateWindow(long ptr long) X11DRV_CreateWindow
@ cdecl DestroyWindow(long) X11DRV_DestroyWindow
@ cdecl GetDC(long long long long) X11DRV_GetDC

1
graphics/x11drv/Makefile.in
View File

@ -15,7 +15,6 @@ C_SRCS = \
graphics.c \
init.c \
objects.c \
oembitmap.c \
opengl.c \
palette.c \
pen.c \

2
graphics/x11drv/init.c
View File

@ -64,8 +64,6 @@ BOOL X11DRV_GDI_Initialize( Display *display )
palette_size = X11DRV_PALETTE_Init();
if( !X11DRV_OBM_Init() ) return FALSE;
if (!X11DRV_BITMAP_Init()) return FALSE;
/* Initialize fonts and text caps */

345
graphics/x11drv/oembitmap.c
View File

@ -1,345 +0,0 @@
/*
* X11DRV OEM bitmap objects
*
* Copyright 1994, 1995 Alexandre Julliard
*
*/
#include "config.h"
#include "ts_xlib.h"
#include "ts_xutil.h"
#ifdef HAVE_LIBXXPM
#include "ts_xpm.h"
#else /* defined(HAVE_LIBXXPM) */
typedef unsigned long Pixel;
#endif /* defined(HAVE_LIBXXPM) */
#include <stdlib.h>
#include <string.h>
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "wine/winuser16.h"
#include "bitmap.h"
#include "cursoricon.h"
#include "debugtools.h"
#include "gdi.h"
#include "user.h" /* for TWEAK_WineLook (FIXME) */
#include "x11drv.h"
/* Include OEM pixmaps */
#include "bitmaps/obm_close"
#include "bitmaps/obm_close_95"
#include "bitmaps/obm_closed_95"
#include "bitmaps/obm_reduce"
#include "bitmaps/obm_reduce_95"
#include "bitmaps/obm_reduced"
#include "bitmaps/obm_reduced_95"
#include "bitmaps/obm_restore"
#include "bitmaps/obm_restore_95"
#include "bitmaps/obm_restored"
#include "bitmaps/obm_restored_95"
#include "bitmaps/obm_zoom"
#include "bitmaps/obm_zoom_95"
#include "bitmaps/obm_zoomd"
#include "bitmaps/obm_zoomd_95"
DECLARE_DEBUG_CHANNEL(bitmap);
DECLARE_DEBUG_CHANNEL(cursor);
DECLARE_DEBUG_CHANNEL(x11drv);
#define OBM_FIRST OBM_CLOSED /* First OEM bitmap */
#define OBM_LAST OBM_OLD_CLOSE /* Last OEM bitmap */
static struct
{
char** data; /* Pointer to bitmap data */
BOOL color; /* Is it a color bitmap? */
} OBM_Pixmaps_Data[OBM_LAST-OBM_FIRST+1] = {
{ obm_closed_95,TRUE}, /* OBM_CLOSED */
{ NULL, FALSE }, /* OBM_TRTYPE */
{ NULL, FALSE }, /* unused */
{ NULL, FALSE }, /* OBM_LFARROWI */
{ NULL, FALSE }, /* OBM_RGARROWI */
{ NULL, FALSE }, /* OBM_DNARROWI */
{ NULL, FALSE }, /* OBM_UPARROWI */
{ NULL, FALSE }, /* OBM_COMBO */
{ NULL, FALSE }, /* OBM_MNARROW */
{ NULL, FALSE }, /* OBM_LFARROWD */
{ NULL, FALSE }, /* OBM_RGARROWD */
{ NULL, FALSE }, /* OBM_DNARROWD */
{ NULL, FALSE }, /* OBM_UPARROWD */
{ obm_restored, TRUE }, /* OBM_RESTORED */
{ obm_zoomd, TRUE }, /* OBM_ZOOMD */
{ obm_reduced, TRUE }, /* OBM_REDUCED */
{ obm_restore, TRUE }, /* OBM_RESTORE */
{ obm_zoom, TRUE }, /* OBM_ZOOM */
{ obm_reduce, TRUE }, /* OBM_REDUCE */
{ NULL, FALSE }, /* OBM_LFARROW */
{ NULL, FALSE }, /* OBM_RGARROW */
{ NULL, FALSE }, /* OBM_DNARROW */
{ NULL, FALSE }, /* OBM_UPARROW */
{ obm_close, TRUE }, /* OBM_CLOSE */
{ NULL, FALSE }, /* OBM_OLD_RESTORE */
{ NULL, FALSE }, /* OBM_OLD_ZOOM */
{ NULL, FALSE }, /* OBM_OLD_REDUCE */
{ NULL, FALSE }, /* OBM_BTNCORNERS */
{ NULL, FALSE }, /* OBM_CHECKBOXES */
{ NULL, FALSE }, /* OBM_CHECK */
{ NULL, FALSE }, /* OBM_BTSIZE */
{ NULL, FALSE }, /* OBM_OLD_LFARROW */
{ NULL, FALSE }, /* OBM_OLD_RGARROW */
{ NULL, FALSE }, /* OBM_OLD_DNARROW */
{ NULL, FALSE }, /* OBM_OLD_UPARROW */
{ NULL, FALSE }, /* OBM_SIZE */
{ NULL, FALSE }, /* OBM_OLD_CLOSE */
};
/* All the colors used in the xpm files must be included in this */
/* list, to make sure that the loaded bitmaps only use colors from */
/* the Windows colormap. Note: the PALETTEINDEX() are not really */
/* palette indexes, but system colors that will be converted to */
/* indexes later on. */
#ifndef HAVE_LIBXXPM
typedef struct {
char *name;
char *value;
Pixel pixel;
} XpmColorSymbol;
#endif /* !defined(HAVE_LIBXXPM) */
static XpmColorSymbol OBM_Colors[] =
{
{ "black", NULL, (Pixel)RGB(0,0,0) },
{ "white", NULL, (Pixel)RGB(255,255,255) },
{ "red", NULL, (Pixel)RGB(255,0,0) },
{ "green", NULL, (Pixel)RGB(0,255,0) },
{ "blue", NULL, (Pixel)RGB(0,0,255) },
{ "yellow", NULL, (Pixel)RGB(255,255,0) },
{ "cyan", NULL, (Pixel)RGB(0,255,255) },
{ "dkyellow", NULL, (Pixel)RGB(128,128,0) },
{ "purple", NULL, (Pixel)RGB(128,0,128) },
{ "ltgray", NULL, (Pixel)RGB(192,192,192) },
{ "dkgray", NULL, (Pixel)RGB(128,128,128) },
{ "button_face", NULL, (Pixel)PALETTEINDEX(COLOR_BTNFACE) },
{ "button_shadow", NULL, (Pixel)PALETTEINDEX(COLOR_BTNSHADOW) },
{ "button_highlight", NULL, (Pixel)PALETTEINDEX(COLOR_BTNHIGHLIGHT) },
{ "button_edge", NULL, (Pixel)PALETTEINDEX(COLOR_BTNHIGHLIGHT) },
{ "button_text", NULL, (Pixel)PALETTEINDEX(COLOR_BTNTEXT) },
{ "window_frame", NULL, (Pixel)PALETTEINDEX(COLOR_WINDOWFRAME) }
};
#define NB_COLOR_SYMBOLS (sizeof(OBM_Colors)/sizeof(OBM_Colors[0]))
/* These are the symbolic colors for monochrome bitmaps */
/* This is needed to make sure that black is always 0 and */
/* white always 1, as required by Windows. */
#ifdef HAVE_LIBXXPM
static XpmColorSymbol OBM_BlackAndWhite[2] =
{
{ "black", NULL, 0 },
{ "white", NULL, 0xffffffff }
};
#endif /* defined(HAVE_LIBXXPM) */
extern const DC_FUNCTIONS *X11DRV_DC_Funcs; /* hack */
/***********************************************************************
* OBM_InitColorSymbols
*/
static BOOL OBM_InitColorSymbols()
{
static BOOL initialized = FALSE;
int i;
if (initialized) return TRUE; /* Already initialised */
initialized = TRUE;
for (i = 0; i < NB_COLOR_SYMBOLS; i++)
{
if (OBM_Colors[i].pixel & 0xff000000) /* PALETTEINDEX */
OBM_Colors[i].pixel = X11DRV_PALETTE_ToPhysical( NULL,
GetSysColor(OBM_Colors[i].pixel & 0xff));
else /* RGB*/
OBM_Colors[i].pixel = X11DRV_PALETTE_ToPhysical( NULL, OBM_Colors[i].pixel);
}
return TRUE;
}
/***********************************************************************
* OBM_MakeBitmap
*
* Allocate a GDI bitmap.
*/
#ifdef HAVE_LIBXXPM
static HBITMAP16 OBM_MakeBitmap( WORD width, WORD height,
WORD bpp, Pixmap pixmap )
{
HBITMAP hbitmap;
BITMAPOBJ * bmpObjPtr;
if (!pixmap) return 0;
if (!(bmpObjPtr = GDI_AllocObject( sizeof(BITMAPOBJ), BITMAP_MAGIC, &hbitmap ))) return 0;
bmpObjPtr->size.cx = width;
bmpObjPtr->size.cy = height;
bmpObjPtr->bitmap.bmType = 0;
bmpObjPtr->bitmap.bmWidth = width;
bmpObjPtr->bitmap.bmHeight = height;
bmpObjPtr->bitmap.bmWidthBytes = BITMAP_GetWidthBytes( width, bpp );
bmpObjPtr->bitmap.bmPlanes = 1;
bmpObjPtr->bitmap.bmBitsPixel = bpp;
bmpObjPtr->bitmap.bmBits = NULL;
bmpObjPtr->dib = NULL;
bmpObjPtr->funcs = X11DRV_DC_Funcs;
bmpObjPtr->physBitmap = (void *)pixmap;
GDI_ReleaseObj( hbitmap );
return hbitmap;
}
#endif /* defined(HAVE_LIBXXPM) */
/***********************************************************************
* OBM_CreateBitmaps
*
* Create the 2 bitmaps from XPM data.
*/
static BOOL OBM_CreateBitmaps( char **data, BOOL color,
HBITMAP16 *bitmap, HBITMAP16 *mask, POINT *hotspot )
{
#ifdef HAVE_LIBXXPM
XpmAttributes *attrs;
Pixmap pixmap, pixmask;
int err;
attrs = (XpmAttributes *)HeapAlloc( GetProcessHeap(), 0, XpmAttributesSize() );
if (attrs == NULL) return FALSE;
attrs->valuemask = XpmColormap | XpmDepth | XpmColorSymbols | XpmHotspot;
attrs->colormap = X11DRV_PALETTE_PaletteXColormap;
attrs->depth = color ? screen_depth : 1;
attrs->colorsymbols = (attrs->depth > 1) ? OBM_Colors : OBM_BlackAndWhite;
attrs->numsymbols = (attrs->depth > 1) ? NB_COLOR_SYMBOLS : 2;
err = TSXpmCreatePixmapFromData( gdi_display, root_window, data, &pixmap, &pixmask, attrs );
if (err != XpmSuccess)
{
HeapFree( GetProcessHeap(), 0, attrs );
return FALSE;
}
if (hotspot)
{
hotspot->x = attrs->x_hotspot;
hotspot->y = attrs->y_hotspot;
}
if (bitmap)
*bitmap = OBM_MakeBitmap( attrs->width, attrs->height,
attrs->depth, pixmap );
if (mask)
*mask = OBM_MakeBitmap( attrs->width, attrs->height,
1, pixmask );
HeapFree( GetProcessHeap(), 0, attrs );
if (pixmap && (!bitmap || !*bitmap)) TSXFreePixmap( gdi_display, pixmap );
if (pixmask && (!mask || !*mask)) TSXFreePixmap( gdi_display, pixmask );
if (bitmap && !*bitmap)
{
if (mask && *mask) DeleteObject( *mask );
return FALSE;
}
return TRUE;
#else /* defined(HAVE_LIBXXPM) */
FIXME_(x11drv)(
"Xpm support not in the binary, "
"please install the Xpm and Xpm-devel packages and recompile wine\n"
);
return FALSE;
#endif /* defined(HAVE_LIBXXPM) */
}
/***********************************************************************
* OBM_LoadBitmap
*/
static HBITMAP16 OBM_LoadBitmap( WORD id )
{
HBITMAP16 bitmap;
if ((id < OBM_FIRST) || (id > OBM_LAST)) return 0;
id -= OBM_FIRST;
if (!OBM_Pixmaps_Data[id].data) return 0;
if (!OBM_InitColorSymbols()) return 0;
if (!OBM_CreateBitmaps( OBM_Pixmaps_Data[id].data, OBM_Pixmaps_Data[id].color,
&bitmap, NULL, NULL ))
{
WARN_(bitmap)("Error creating OEM bitmap %d\n", OBM_FIRST+id );
return 0;
}
return bitmap;
}
/***********************************************************************
* LoadOEMResource (X11DRV.@)
*
*/
HANDLE X11DRV_LoadOEMResource(WORD resid, WORD type)
{
switch(type) {
case OEM_BITMAP:
return OBM_LoadBitmap(resid);
default:
ERR_(x11drv)("Unknown type\n");
}
return 0;
}
/***********************************************************************
* X11DRV_OBM_Init
*
* Initializes the OBM_Pixmaps_Data and OBM_Icons_Data struct
*/
BOOL X11DRV_OBM_Init(void)
{
if (TWEAK_WineLook == WIN31_LOOK) {
OBM_Pixmaps_Data[OBM_ZOOMD - OBM_FIRST].data = obm_zoomd;
OBM_Pixmaps_Data[OBM_REDUCED - OBM_FIRST].data = obm_reduced;
OBM_Pixmaps_Data[OBM_ZOOM - OBM_FIRST].data = obm_zoom;
OBM_Pixmaps_Data[OBM_REDUCE - OBM_FIRST].data = obm_reduce;
OBM_Pixmaps_Data[OBM_CLOSE - OBM_FIRST].data = obm_close;
OBM_Pixmaps_Data[OBM_RESTORE - OBM_FIRST].data = obm_restore;
OBM_Pixmaps_Data[OBM_RESTORED - OBM_FIRST].data = obm_restored;
}
else {
OBM_Pixmaps_Data[OBM_ZOOMD - OBM_FIRST].data = obm_zoomd_95;
OBM_Pixmaps_Data[OBM_REDUCED - OBM_FIRST].data = obm_reduced_95;
OBM_Pixmaps_Data[OBM_ZOOM - OBM_FIRST].data = obm_zoom_95;
OBM_Pixmaps_Data[OBM_REDUCE - OBM_FIRST].data = obm_reduce_95;
OBM_Pixmaps_Data[OBM_CLOSE - OBM_FIRST].data = obm_close_95;
OBM_Pixmaps_Data[OBM_RESTORE - OBM_FIRST].data = obm_restore_95;
OBM_Pixmaps_Data[OBM_RESTORED - OBM_FIRST].data = obm_restored_95;
}
return 1;
}

25
include/bitmaps/obm_close
View File

@ -1,25 +0,0 @@
/* XPM */
static char * obm_close[] = {
"36 18 4 1",
" s button_face c grey75",
". s window_frame c black",
"X s white c white",
"o s button_shadow c grey50",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ............. ....... ",
" .XXXXXXXXXXX.o .XXXXX.o ",
" .............o .......o ",
" ooooooooooooo ooooooo ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};

23
include/bitmaps/obm_close_95
View File

@ -1,23 +0,0 @@
/* XPM */
static char * obm_close_95[] = {
"16 14 6 1",
" s button_highlight c white",
"+ s button_edge c grey85",
"X s button_face c grey75",
"o s button_shadow c grey50",
". s button_text c black",
"O s window_frame c black",
" O",
" +++++++++++++oO",
" +XXXXXXXXXXXXoO",
" +XX..XXXX..XXoO",
" +XXX..XX..XXXoO",
" +XXXX....XXXXoO",
" +XXXXX..XXXXXoO",
" +XXXX....XXXXoO",
" +XXX..XX..XXXoO",
" +XX..XXXX..XXoO",
" +XXXXXXXXXXXXoO",
" +XXXXXXXXXXXXoO",
" ooooooooooooooO",
"OOOOOOOOOOOOOOOO"};

23
include/bitmaps/obm_closed_95
View File

@ -1,23 +0,0 @@
/* XPM */
static char * obm_closed_95[] = {
"16 14 6 1",
" s button_highlight c white",
"+ s button_edge c grey85",
"X s button_face c grey75",
"o s button_shadow c grey50",
". s button_text c black",
"O s window_frame c black",
"OOOOOOOOOOOOOOO ",
"Oooooooooooooo+ ",
"OoXXXXXXXXXXXX+ ",
"OoXXXXXXXXXXXX+ ",
"OoXXX..XXXX..X+ ",
"OoXXXX..XX..XX+ ",
"OoXXXXX....XXX+ ",
"OoXXXXXX..XXXX+ ",
"OoXXXXX....XXX+ ",
"OoXXXX..XX..XX+ ",
"OoXXX..XXXX..X+ ",
"OoXXXXXXXXXXXX+ ",
"O++++++++++++++ ",
" "};

26
include/bitmaps/obm_reduce
View File

@ -1,26 +0,0 @@
/* XPM */
static char * obm_reduce[] = {
"19 18 5 1",
" s window_frame c black",
". s button_highlight c white",
"X s button_shadow c grey50",
"o s button_face c grey75",
"O s button_text c black",
" .................X",
" .oooooooooooooooXX",
" .oooooooooooooooXX",
" .oooooooooooooooXX",
" .oooooooooooooooXX",
" .oooooooooooooooXX",
" .oooooooooooooooXX",
" .ooooOOOOOOOooooXX",
" .oooooOOOOOoooooXX",
" .ooooooOOOooooooXX",
" .oooooooOoooooooXX",
" .oooooooooooooooXX",
" .oooooooooooooooXX",
" .oooooooooooooooXX",
" .oooooooooooooooXX",
" .oooooooooooooooXX",
" .XXXXXXXXXXXXXXXXX",
" XXXXXXXXXXXXXXXXXX"};

23
include/bitmaps/obm_reduce_95
View File

@ -1,23 +0,0 @@
/* XPM */
static char * obm_reduce_95[] = {
"16 14 6 1",
" s button_highlight c white",
"+ s button_edge c grey85",
"X s button_face c grey75",
"o s button_shadow c grey50",
". s button_text c black",
"O s window_frame c black",
" O",
" +++++++++++++oO",
" +XXXXXXXXXXXXoO",
" +XXXXXXXXXXXXoO",
" +XXXXXXXXXXXXoO",
" +XXXXXXXXXXXXoO",
" +XXXXXXXXXXXXoO",
" +XXXXXXXXXXXXoO",
" +XXXXXXXXXXXXoO",
" +XX......XXXXoO",
" +XX......XXXXoO",
" +XXXXXXXXXXXXoO",
" ooooooooooooooO",
"OOOOOOOOOOOOOOOO"};

25
include/bitmaps/obm_reduced
View File

@ -1,25 +0,0 @@
/* XPM */
static char * obm_reduced[] = {
"19 18 4 1",
" s window_frame c black",
". s button_shadow c grey50",
"X s button_face c grey75",
"o s button_text c black",
" ..................",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXoooooooXXXXX",
" .XXXXXXoooooXXXXXX",
" .XXXXXXXoooXXXXXXX",
" .XXXXXXXXoXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX"};

23
include/bitmaps/obm_reduced_95
View File

@ -1,23 +0,0 @@
/* XPM */
static char * obm_reduced_95[] = {
"16 14 6 1",
"O s button_highlight c white",
"o s button_edge c grey85",
"X s button_face c grey75",
"+ s button_shadow c grey50",
". s button_text c black",
" s window_frame c black",
" ",
" +++++++++++++oO",
" +XXXXXXXXXXXXoO",
" +XXXXXXXXXXXXoO",
" +XXXXXXXXXXXXoO",
" +XXXXXXXXXXXXoO",
" +XXXXXXXXXXXXoO",
" +XXXXXXXXXXXXoO",
" +XXXXXXXXXXXXoO",
" +XXXXXXXXXXXXoO",
" +XXX......XXXoO",
" +XXX......XXXoO",
" ooooooooooooooO",
"OOOOOOOOOOOOOOOO"};

26
include/bitmaps/obm_restore
View File

@ -1,26 +0,0 @@
/* XPM */
static char * obm_restore[] = {
"19 18 5 1",
" s window_frame c black",
". s button_highlight c white",
"X s button_shadow c grey50",
"o s button_face c grey75",
"O s button_text c black",
" .................X",
" .oooooooooooooooXX",
" .oooooooooooooooXX",
" .oooooooooooooooXX",
" .oooooooOoooooooXX",
" .ooooooOOOooooooXX",
" .oooooOOOOOoooooXX",
" .ooooOOOOOOOooooXX",
" .oooooooooooooooXX",
" .oooooooooooooooXX",
" .ooooOOOOOOOooooXX",
" .oooooOOOOOoooooXX",
" .ooooooOOOooooooXX",
" .oooooooOoooooooXX",
" .oooooooooooooooXX",
" .oooooooooooooooXX",
" .XXXXXXXXXXXXXXXXX",
" XXXXXXXXXXXXXXXXXX"};

23
include/bitmaps/obm_restore_95
View File

@ -1,23 +0,0 @@
/* XPM */
static char * obm_restore_95[] = {
"16 14 6 1",
" s button_highlight c white",
"+ s button_edge c grey85",
"X s button_face c grey75",
"o s button_shadow c grey50",
". s button_text c black",
"O s window_frame c black",
" O",
" +++++++++++++oO",
" +XXX......XXXoO",
" +XXX......XXXoO",
" +XXX.XXXX.XXXoO",
" +X......X.XXXoO",
" +X......X.XXXoO",
" +X.XXXX...XXXoO",
" +X.XXXX.XXXXXoO",
" +X.XXXX.XXXXXoO",
" +X......XXXXXoO",
" +XXXXXXXXXXXXoO",
" ooooooooooooooO",
"OOOOOOOOOOOOOOOO"};

25
include/bitmaps/obm_restored
View File

@ -1,25 +0,0 @@
/* XPM */
static char * obm_restored[] = {
"19 18 4 1",
" s window_frame c black",
". s button_shadow c grey50",
"X s button_face c grey75",
"o s button_text c black",
" ..................",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXoXXXXXXXX",
" .XXXXXXXoooXXXXXXX",
" .XXXXXXoooooXXXXXX",
" .XXXXXoooooooXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXoooooooXXXXX",
" .XXXXXXoooooXXXXXX",
" .XXXXXXXoooXXXXXXX",
" .XXXXXXXXoXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX"};

23
include/bitmaps/obm_restored_95
View File

@ -1,23 +0,0 @@
/* XPM */
static char * obm_restored_95[] = {
"16 14 6 1",
" s button_highlight c white",
"+ s button_edge c grey85",
"X s button_face c grey75",
"o s button_shadow c grey50",
". s button_text c black",
"O s window_frame c black",
"OOOOOOOOOOOOOOO ",
"Oooooooooooooo+ ",
"OoXXXXXXXXXXXX+ ",
"OoXXXX......XX+ ",
"OoXXXX......XX+ ",
"OoXXXX.XXXX.XX+ ",
"OoXX......X.XX+ ",
"OoXX......X.XX+ ",
"OoXX.XXXX...XX+ ",
"OoXX.XXXX.XXXX+ ",
"OoXX.XXXX.XXXX+ ",
"OoXX......XXXX+ ",
"O++++++++++++++ ",
" "};

26
include/bitmaps/obm_zoom
View File

@ -1,26 +0,0 @@
/* XPM */
static char * obm_zoom[] = {
"19 18 5 1",
" s window_frame c black",
". s button_highlight c white",
"X s button_shadow c grey50",
"o s button_face c grey75",
"O s button_text c black",
" .................X",
" .oooooooooooooooXX",
" .oooooooooooooooXX",
" .oooooooooooooooXX",
" .oooooooooooooooXX",
" .oooooooooooooooXX",
" .oooooooOoooooooXX",
" .ooooooOOOooooooXX",
" .oooooOOOOOoooooXX",
" .ooooOOOOOOOooooXX",
" .oooooooooooooooXX",
" .oooooooooooooooXX",
" .oooooooooooooooXX",
" .oooooooooooooooXX",
" .oooooooooooooooXX",
" .oooooooooooooooXX",
" .XXXXXXXXXXXXXXXXX",
" XXXXXXXXXXXXXXXXXX"};

23
include/bitmaps/obm_zoom_95
View File

@ -1,23 +0,0 @@
/* XPM */
static char * obm_zoom_95[] = {
"16 14 6 1",
" s button_highlight c white",
"+ s button_edge c grey85",
"X s button_face c grey75",
"o s button_shadow c grey50",
". s button_text c black",
"O s window_frame c black",
" O",
" +++++++++++++oO",
" +X.........XXoO",
" +X.........XXoO",
" +X.XXXXXXX.XXoO",
" +X.XXXXXXX.XXoO",
" +X.XXXXXXX.XXoO",
" +X.XXXXXXX.XXoO",
" +X.XXXXXXX.XXoO",
" +X.XXXXXXX.XXoO",
" +X.........XXoO",
" +XXXXXXXXXXXXoO",
" ooooooooooooooO",
"OOOOOOOOOOOOOOOO"};

25
include/bitmaps/obm_zoomd
View File

@ -1,25 +0,0 @@
/* XPM */
static char * obm_zoomd[] = {
"19 18 4 1",
" s window_frame c black",
". s button_shadow c grey50",
"X s button_face c grey75",
"o s button_text c black",
" ..................",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXoXXXXXXXX",
" .XXXXXXXoooXXXXXXX",
" .XXXXXXoooooXXXXXX",
" .XXXXXoooooooXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX",
" .XXXXXXXXXXXXXXXXX"};

23
include/bitmaps/obm_zoomd_95
View File

@ -1,23 +0,0 @@
/* XPM */
static char * obm_zoomd_95[] = {
"16 14 6 1",
"O s button_highlight c white",
"o s button_edge c grey85",
"X s button_face c grey75",
"+ s button_shadow c grey50",
". s button_text c black",
" s window_frame c black",
" ",
" +++++++++++++oO",
" +XXXXXXXXXXXXoO",
" +XX.........XoO",
" +XX.........XoO",
" +XX.XXXXXXX.XoO",
" +XX.XXXXXXX.XoO",
" +XX.XXXXXXX.XoO",
" +XX.XXXXXXX.XoO",
" +XX.XXXXXXX.XoO",
" +XX.XXXXXXX.XoO",
" +XX.........XoO",
" ooooooooooooooO",
"OOOOOOOOOOOOOOOO"};

5
include/gdi.h
View File

@ -228,11 +228,6 @@ typedef struct tagDC_FUNCS
BOOL (*pWidenPath)(DC*);
} DC_FUNCTIONS;
/* LoadOEMResource types */
#define OEM_BITMAP 1
#define OEM_CURSOR 2
#define OEM_ICON 3
/* DC hook codes */
#define DCHC_INVALIDVISRGN 0x0001
#define DCHC_DELETEDC 0x0002

2
include/user.h
View File

@ -63,8 +63,6 @@ typedef struct tagUSER_DRIVER {
/* screen saver functions */
BOOL (*pGetScreenSaveActive)(void);
void (*pSetScreenSaveActive)(BOOL);
/* resource functions */
HANDLE (*pLoadOEMResource)(WORD,WORD);
/* clipboard functions */
void (*pAcquireClipboard)(void); /* Acquire selection */
void (*pReleaseClipboard)(void); /* Release selection */

1
include/x11drv.h
View File

@ -168,7 +168,6 @@ extern BOOL X11DRV_SwapBuffers(DC *dc) ;
extern BOOL X11DRV_BITMAP_Init(void);
extern int X11DRV_FONT_Init( int *log_pixels_x, int *log_pixels_y );
extern BOOL X11DRV_OBM_Init(void);
extern HBRUSH X11DRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush );
extern HFONT X11DRV_FONT_SelectObject( DC * dc, HFONT hfont );
extern HPEN X11DRV_PEN_SelectObject( DC * dc, HPEN hpen );