Removed LoadOEMResource from USER driver.

dlls/ttydrv/ttydrv.spec

@@ -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

dlls/ttydrv/user.c

@@ -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.@)
  */

dlls/user/user_main.c

@@ -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);

dlls/x11drv/x11drv.spec

@@ -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

graphics/x11drv/Makefile.in

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

graphics/x11drv/init.c

@@ -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 */

include/bitmaps/obm_close

-/* 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    ",
-"                                    ",
-"                                    ",
-"                                    ",
-"                                    ",
-"                                    ",
-"                                    ",
-"                                    "};

include/bitmaps/obm_close_95

-/* 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"};

include/bitmaps/obm_closed_95

-/* 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++++++++++++++ ",
-"                "};

include/bitmaps/obm_reduce

-/* 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"};

include/bitmaps/obm_reduce_95

-/* 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"};

include/bitmaps/obm_reduced

-/* 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"};

include/bitmaps/obm_reduced_95

-/* 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"};

include/bitmaps/obm_restore

-/* 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"};

include/bitmaps/obm_restore_95

-/* 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"};

include/bitmaps/obm_restored

-/* 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"};

include/bitmaps/obm_restored_95

-/* 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++++++++++++++ ",
-"                "};

include/bitmaps/obm_zoom

-/* 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"};

include/bitmaps/obm_zoom_95

-/* 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"};

include/bitmaps/obm_zoomd

-/* 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"};

include/bitmaps/obm_zoomd_95

-/* 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"};

include/gdi.h

@@ -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

include/user.h

@@ -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 */

include/x11drv.h

@@ -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 );