From 078dad1ad118f35e3729f4138d58c220ab66acc6 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Fri, 7 Jul 2017 09:20:12 +0200 Subject: [PATCH] user32: Get rid of the Wine-specific OCR_DRAGOBJECT. Signed-off-by: Alexandre Julliard --- dlls/user32/resources/ocr_dragobject.cur | Bin 326 -> 0 bytes dlls/user32/user32.rc | 7 +------ include/winuser.rh | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 dlls/user32/resources/ocr_dragobject.cur diff --git a/dlls/user32/resources/ocr_dragobject.cur b/dlls/user32/resources/ocr_dragobject.cur deleted file mode 100644 index 45f593fb3e615e9372a3a4c67e8687ec69be3bb6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcwPel00001 literal 326 zcwUvvF$%&!6olc~M2Ui6DzVF!mbrmBir3H-TY3$TB3O70gBQ?lMdA6!qzY-A<>N7L z*_9GGc`r>hSLvjcqzzc9g5&(sk73Mg{9=LyW>_Pal2S@NZulVL(f6}dpRkh-^gU{X mF?<)QZnm*u-gu(Hoq92QUCrVVOYkB(q{zCR{#9U$VD<&L5_Gcw diff --git a/dlls/user32/user32.rc b/dlls/user32/user32.rc index 01fe13ac9b7..9009e0a0af7 100644 --- a/dlls/user32/user32.rc +++ b/dlls/user32/user32.rc @@ -260,9 +260,6 @@ OCR_APPSTARTING CURSOR resources/ocr_appstarting.cur /* @makedep: resources/ocr_help.cur */ OCR_HELP CURSOR resources/ocr_help.cur -/* @makedep: resources/ocr_dragobject.cur */ -OCR_DRAGOBJECT CURSOR resources/ocr_dragobject.cur - /* @makedep: resources/ocr_pen.cur */ OCR_PEN CURSOR resources/ocr_pen.cur @@ -270,9 +267,7 @@ OCR_PEN CURSOR resources/ocr_pen.cur OCR_RDRVERT CURSOR resources/ocr_rdrvert.cur /* @makedep: resources/ocr_rdrhorz.cur */ -/* FIXME: OCR_DRAGOBJECT already uses same resource number even though cursor image - * is entirely different */ -/*OCR_RDRHORZ CURSOR resources/ocr_rdrhorz.cur*/ +OCR_RDRHORZ CURSOR resources/ocr_rdrhorz.cur /* @makedep: resources/ocr_rdr2dim.cur */ OCR_RDR2DIM CURSOR resources/ocr_rdr2dim.cur diff --git a/include/winuser.rh b/include/winuser.rh index e48a9357d29..350d427f372 100644 --- a/include/winuser.rh +++ b/include/winuser.rh @@ -1014,7 +1014,6 @@ #define OCR_HELP 32651 /* DDK / Win16 */ #define OCR_RDRVERT 32652 /* DDK / Win16 */ #define OCR_RDRHORZ 32653 /* DDK / Win16 */ -#define OCR_DRAGOBJECT OCR_RDRHORZ /* FIXME: Wine-only */ #define OCR_RDR2DIM 32654 /* DDK / Win16 */ #define OCR_RDRNORTH 32655 /* DDK / Win16 */ #define OCR_RDRSOUTH 32656 /* DDK / Win16 */ -- 2.11.4.GIT