[USER32]

- Rafal Harabien: Add some missing bitmaps to user32. They are copied from Wine. Change "old" cursors identifiers to defines from winuser.h (OCR_*).
See issue #6000 for more details.

svn path=/trunk/; revision=51029

diff --git a/reactos/dll/win32/user32/resources/obm_btncorners.bmp b/reactos/dll/win32/user32/resources/obm_btncorners.bmp
new file mode 100644 (file)
index 0000000..e783862
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_btncorners.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_btsize.bmp b/reactos/dll/win32/user32/resources/obm_btsize.bmp
new file mode 100644 (file)
index 0000000..076e4f8
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_btsize.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_check.bmp b/reactos/dll/win32/user32/resources/obm_check.bmp
new file mode 100644 (file)
index 0000000..e9e4fb5
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_check.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_dnarrow.bmp b/reactos/dll/win32/user32/resources/obm_dnarrow.bmp
new file mode 100644 (file)
index 0000000..0f3288f
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_dnarrow.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_dnarrowd.bmp b/reactos/dll/win32/user32/resources/obm_dnarrowd.bmp
new file mode 100644 (file)
index 0000000..51b38e9
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_dnarrowd.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_dnarrowi.bmp b/reactos/dll/win32/user32/resources/obm_dnarrowi.bmp
new file mode 100644 (file)
index 0000000..3cbf4fb
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_dnarrowi.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_lfarrow.bmp b/reactos/dll/win32/user32/resources/obm_lfarrow.bmp
new file mode 100644 (file)
index 0000000..6ceef25
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_lfarrow.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_lfarrowd.bmp b/reactos/dll/win32/user32/resources/obm_lfarrowd.bmp
new file mode 100644 (file)
index 0000000..bb446c3
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_lfarrowd.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_lfarrowi.bmp b/reactos/dll/win32/user32/resources/obm_lfarrowi.bmp
new file mode 100644 (file)
index 0000000..c81363d
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_lfarrowi.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_old_close.bmp b/reactos/dll/win32/user32/resources/obm_old_close.bmp
new file mode 100644 (file)
index 0000000..905e927
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_old_close.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_old_dnarrow.bmp b/reactos/dll/win32/user32/resources/obm_old_dnarrow.bmp
new file mode 100644 (file)
index 0000000..bab716f
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_old_dnarrow.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_old_lfarrow.bmp b/reactos/dll/win32/user32/resources/obm_old_lfarrow.bmp
new file mode 100644 (file)
index 0000000..4d4c4c6
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_old_lfarrow.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_old_reduce.bmp b/reactos/dll/win32/user32/resources/obm_old_reduce.bmp
new file mode 100644 (file)
index 0000000..cee2329
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_old_reduce.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_old_restore.bmp b/reactos/dll/win32/user32/resources/obm_old_restore.bmp
new file mode 100644 (file)
index 0000000..f6938f0
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_old_restore.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_old_rgarrow.bmp b/reactos/dll/win32/user32/resources/obm_old_rgarrow.bmp
new file mode 100644 (file)
index 0000000..0c05d81
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_old_rgarrow.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_old_uparrow.bmp b/reactos/dll/win32/user32/resources/obm_old_uparrow.bmp
new file mode 100644 (file)
index 0000000..299fadb
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_old_uparrow.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_old_zoom.bmp b/reactos/dll/win32/user32/resources/obm_old_zoom.bmp
new file mode 100644 (file)
index 0000000..c1b4eb6
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_old_zoom.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_reduce.bmp b/reactos/dll/win32/user32/resources/obm_reduce.bmp
new file mode 100644 (file)
index 0000000..d0dbf01
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_reduce.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_reduced.bmp b/reactos/dll/win32/user32/resources/obm_reduced.bmp
new file mode 100644 (file)
index 0000000..c39f8e9
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_reduced.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_restore.bmp b/reactos/dll/win32/user32/resources/obm_restore.bmp
new file mode 100644 (file)
index 0000000..a22d3dd
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_restore.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_restored.bmp b/reactos/dll/win32/user32/resources/obm_restored.bmp
new file mode 100644 (file)
index 0000000..6958dc2
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_restored.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_rgarrow.bmp b/reactos/dll/win32/user32/resources/obm_rgarrow.bmp
new file mode 100644 (file)
index 0000000..75cc1ff
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_rgarrow.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_rgarrowd.bmp b/reactos/dll/win32/user32/resources/obm_rgarrowd.bmp
new file mode 100644 (file)
index 0000000..abf3f7c
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_rgarrowd.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_rgarrowi.bmp b/reactos/dll/win32/user32/resources/obm_rgarrowi.bmp
new file mode 100644 (file)
index 0000000..a90b836
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_rgarrowi.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_size.bmp b/reactos/dll/win32/user32/resources/obm_size.bmp
new file mode 100644 (file)
index 0000000..d4eedf9
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_size.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_trtype.bmp b/reactos/dll/win32/user32/resources/obm_trtype.bmp
new file mode 100644 (file)
index 0000000..da41d32
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_trtype.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_uparrow.bmp b/reactos/dll/win32/user32/resources/obm_uparrow.bmp
new file mode 100644 (file)
index 0000000..ce3aa0e
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_uparrow.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_uparrowd.bmp b/reactos/dll/win32/user32/resources/obm_uparrowd.bmp
new file mode 100644 (file)
index 0000000..872dc32
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_uparrowd.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_uparrowi.bmp b/reactos/dll/win32/user32/resources/obm_uparrowi.bmp
new file mode 100644 (file)
index 0000000..6abb810
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_uparrowi.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_zoom.bmp b/reactos/dll/win32/user32/resources/obm_zoom.bmp
new file mode 100644 (file)
index 0000000..a3838eb
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_zoom.bmp differ

diff --git a/reactos/dll/win32/user32/resources/obm_zoomd.bmp b/reactos/dll/win32/user32/resources/obm_zoomd.bmp
new file mode 100644 (file)
index 0000000..649958d
Binary files /dev/null and b/reactos/dll/win32/user32/resources/obm_zoomd.bmp differ

diff --git a/reactos/dll/win32/user32/user32.rc b/reactos/dll/win32/user32/user32.rc
index 3521e70..083085f 100644 (file)
--- a/reactos/dll/win32/user32/user32.rc
+++ b/reactos/dll/win32/user32/user32.rc
@@ -38,34 +38,34 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 116 CURSOR "resources/ocr_cdautostart.cur"
 
 /* Compatible cursor resources (will be removed) */
-32512 CURSOR "resources/ocr_normal.cur"
-32513 CURSOR "resources/ocr_ibeam.cur"
-32514 CURSOR "resources/ocr_wait.cur"
-32515 CURSOR "resources/ocr_cross.cur"
-32516 CURSOR "resources/ocr_up.cur"
-32642 CURSOR "resources/ocr_sizenwse.cur"
-32643 CURSOR "resources/ocr_sizenesw.cur"
-32644 CURSOR "resources/ocr_sizewe.cur"
-32645 CURSOR "resources/ocr_sizens.cur"
-32646 CURSOR "resources/ocr_sizeall.cur"
-32648 CURSOR "resources/ocr_no.cur"
-32650 CURSOR "resources/ocr_appstarting.cur"
-32651 CURSOR "resources/ocr_help.cur"
-32640 CURSOR "resources/ocr_size.cur"
-32641 CURSOR "resources/ocr_icon.cur"
-32649 CURSOR "resources/ocr_hand.cur"
+OCR_NORMAL CURSOR "resources/ocr_normal.cur"
+OCR_IBEAM CURSOR "resources/ocr_ibeam.cur"
+OCR_WAIT CURSOR "resources/ocr_wait.cur"
+OCR_CROSS CURSOR "resources/ocr_cross.cur"
+OCR_UP CURSOR "resources/ocr_up.cur"
+OCR_SIZENWSE CURSOR "resources/ocr_sizenwse.cur"
+OCR_SIZENESW CURSOR "resources/ocr_sizenesw.cur"
+OCR_SIZEWE CURSOR "resources/ocr_sizewe.cur"
+OCR_SIZENS CURSOR "resources/ocr_sizens.cur"
+OCR_SIZEALL CURSOR "resources/ocr_sizeall.cur"
+OCR_NO CURSOR "resources/ocr_no.cur"
+OCR_APPSTARTING CURSOR "resources/ocr_appstarting.cur"
+OCR_HELP CURSOR "resources/ocr_help.cur"
+OCR_SIZE CURSOR "resources/ocr_size.cur"
+OCR_ICON CURSOR "resources/ocr_icon.cur"
+OCR_HAND CURSOR "resources/ocr_hand.cur"
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icons
 //
 
-32512 ICON "resources/oic_sample.ico"
-32513 ICON "resources/oic_hand.ico"
-32514 ICON "resources/oic_ques.ico"
-32515 ICON "resources/oic_bang.ico"
-32516 ICON "resources/oic_note.ico"
-32517 ICON "resources/oic_reactos.ico"
+OIC_SAMPLE ICON "resources/oic_sample.ico"
+OIC_HAND ICON "resources/oic_hand.ico"
+OIC_QUES ICON "resources/oic_ques.ico"
+OIC_BANG ICON "resources/oic_bang.ico"
+OIC_NOTE ICON "resources/oic_note.ico"
+OIC_WINLOGO ICON "resources/oic_reactos.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -76,6 +76,37 @@ OBM_CHECKBOXES BITMAP "resources/obm_checkboxes.bmp"
 OBM_CLOSE BITMAP "resources/obm_close.bmp"
 OBM_COMBO BITMAP "resources/obm_combo.bmp"
 OBM_MNARROW BITMAP "resources/obm_mnarrow.bmp"
+OBM_TRTYPE BITMAP "resources/obm_trtype.bmp"
+OBM_LFARROWI BITMAP "resources/obm_lfarrowi.bmp"
+OBM_RGARROWI BITMAP "resources/obm_rgarrowi.bmp"
+OBM_DNARROWI BITMAP "resources/obm_dnarrowi.bmp"
+OBM_UPARROWI BITMAP "resources/obm_uparrowi.bmp"
+OBM_LFARROWD BITMAP "resources/obm_lfarrowd.bmp"
+OBM_RGARROWD BITMAP "resources/obm_rgarrowd.bmp"
+OBM_DNARROWD BITMAP "resources/obm_dnarrowd.bmp"
+OBM_UPARROWD BITMAP "resources/obm_uparrowd.bmp"
+OBM_RESTORED BITMAP "resources/obm_restored.bmp"
+OBM_ZOOMD BITMAP "resources/obm_zoomd.bmp"
+OBM_REDUCED BITMAP "resources/obm_reduced.bmp"
+OBM_RESTORE BITMAP "resources/obm_restore.bmp"
+OBM_ZOOM BITMAP "resources/obm_zoom.bmp"
+OBM_REDUCE BITMAP "resources/obm_reduce.bmp"
+OBM_LFARROW BITMAP "resources/obm_lfarrow.bmp"
+OBM_RGARROW BITMAP "resources/obm_rgarrow.bmp"
+OBM_DNARROW BITMAP "resources/obm_dnarrow.bmp"
+OBM_UPARROW BITMAP "resources/obm_uparrow.bmp"
+OBM_OLD_RESTORE BITMAP "resources/obm_old_restore.bmp"
+OBM_OLD_ZOOM BITMAP "resources/obm_old_zoom.bmp"
+OBM_OLD_REDUCE BITMAP "resources/obm_old_reduce.bmp"
+OBM_BTNCORNERS BITMAP "resources/obm_btncorners.bmp"
+OBM_CHECK BITMAP "resources/obm_check.bmp"
+OBM_BTSIZE BITMAP "resources/obm_btsize.bmp"
+OBM_OLD_LFARROW BITMAP "resources/obm_old_lfarrow.bmp"
+OBM_OLD_RGARROW BITMAP "resources/obm_old_rgarrow.bmp"
+OBM_OLD_DNARROW BITMAP "resources/obm_old_dnarrow.bmp"
+OBM_OLD_UPARROW BITMAP "resources/obm_old_uparrow.bmp"
+OBM_SIZE BITMAP "resources/obm_size.bmp"
+OBM_OLD_CLOSE BITMAP "resources/obm_old_close.bmp"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/reactos/include/psdk/winuser.h b/reactos/include/psdk/winuser.h
index f58684c..4cebd7a 100644 (file)
--- a/reactos/include/psdk/winuser.h
+++ b/reactos/include/psdk/winuser.h
@@ -1067,40 +1067,41 @@ extern "C" {
 #define KEYEVENTF_UNICODE 0x00000004
 #define KEYEVENTF_SCANCODE 0x00000008
 #endif
-#define OBM_BTNCORNERS 32758
-#define OBM_BTSIZE 32761
-#define OBM_CHECK 32760
-#define OBM_CHECKBOXES 32759
-#define OBM_CLOSE 32754
+#define OBM_TRTYPE 32732
+#define OBM_LFARROWI 32734
+#define OBM_RGARROWI 32735
+#define OBM_DNARROWI 32736
+#define OBM_UPARROWI 32737
 #define OBM_COMBO 32738
-#define OBM_DNARROW 32752
+#define OBM_MNARROW 32739
+#define OBM_LFARROWD 32740
+#define OBM_RGARROWD 32741
 #define OBM_DNARROWD 32742
-#define OBM_DNARROWI 32736
+#define OBM_UPARROWD 32743
+#define OBM_RESTORED 32744
+#define OBM_ZOOMD 32745
+#define OBM_REDUCED 32746
+#define OBM_RESTORE 32747
+#define OBM_ZOOM 32748
+#define OBM_REDUCE 32749
 #define OBM_LFARROW 32750
-#define OBM_LFARROWI 32734
-#define OBM_LFARROWD 32740
-#define OBM_MNARROW 32739
-#define OBM_OLD_CLOSE 32767
-#define OBM_OLD_DNARROW 32764
-#define OBM_OLD_LFARROW 32762
-#define OBM_OLD_REDUCE 32757
+#define OBM_RGARROW 32751
+#define OBM_DNARROW 32752
+#define OBM_UPARROW 32753
+#define OBM_CLOSE 32754
 #define OBM_OLD_RESTORE 32755
+#define OBM_OLD_ZOOM 32756
+#define OBM_OLD_REDUCE 32757
+#define OBM_BTNCORNERS 32758
+#define OBM_CHECKBOXES 32759
+#define OBM_CHECK 32760
+#define OBM_BTSIZE 32761
+#define OBM_OLD_LFARROW 32762
 #define OBM_OLD_RGARROW 32763
+#define OBM_OLD_DNARROW 32764
 #define OBM_OLD_UPARROW 32765
-#define OBM_OLD_ZOOM 32756
-#define OBM_REDUCE 32749
-#define OBM_REDUCED 32746
-#define OBM_RESTORE 32747
-#define OBM_RESTORED 32744
-#define OBM_RGARROW 32751
-#define OBM_RGARROWD 32741
-#define OBM_RGARROWI 32735
 #define OBM_SIZE 32766
-#define OBM_UPARROW 32753
-#define OBM_UPARROWD 32743
-#define OBM_UPARROWI 32737
-#define OBM_ZOOM 32748
-#define OBM_ZOOMD 32745
+#define OBM_OLD_CLOSE 32767
 #define OCR_NORMAL 32512
 #define OCR_IBEAM 32513
 #define OCR_WAIT 32514
@@ -1114,7 +1115,9 @@ extern "C" {
 #define OCR_SIZENS 32645
 #define OCR_SIZEALL 32646
 #define OCR_NO 32648
+#define OCR_HAND 32649
 #define OCR_APPSTARTING 32650
+#define OCR_HELP 32651
 #define OIC_SAMPLE 32512
 #define OIC_HAND 32513
 #define OIC_QUES 32514