Alexandre Julliard : user32: Get rid of the Wine-specific OCR_DRAGOBJECT.
Alexandre Julliard
julliard at winehq.org
Fri Jul 7 14:10:06 CDT 2017
Module: wine
Branch: master
Commit: 078dad1ad118f35e3729f4138d58c220ab66acc6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=078dad1ad118f35e3729f4138d58c220ab66acc6
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Jul 7 09:20:12 2017 +0200
user32: Get rid of the Wine-specific OCR_DRAGOBJECT.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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(-)
diff --git a/dlls/user32/resources/ocr_dragobject.cur b/dlls/user32/resources/ocr_dragobject.cur
deleted file mode 100644
index 45f593f..0000000
Binary files a/dlls/user32/resources/ocr_dragobject.cur and /dev/null differ
diff --git a/dlls/user32/user32.rc b/dlls/user32/user32.rc
index 01fe13a..9009e0a 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 e48a935..350d427 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 */
More information about the wine-cvs
mailing list