These are the copies of user32 bitmaps.
This patch makes an application that uses these bitmaps in its own dialogs work.
Signed-off-by: Dmitry Timoshkov dmitry@baikal.ru --- dlls/shell32/resources/obm_dnarrowi.bmp | Bin 0 -> 322 bytes dlls/shell32/resources/obm_uparrowi.bmp | Bin 0 -> 322 bytes dlls/shell32/shell32.rc | 6 ++++++ dlls/shell32/shresdef.h | 3 +++ 4 files changed, 9 insertions(+) create mode 100644 dlls/shell32/resources/obm_dnarrowi.bmp create mode 100644 dlls/shell32/resources/obm_uparrowi.bmp
diff --git a/dlls/shell32/resources/obm_dnarrowi.bmp b/dlls/shell32/resources/obm_dnarrowi.bmp new file mode 100644 index 0000000000000000000000000000000000000000..3cbf4fbba4cf728c361ad1a2ac2f24576df47145 GIT binary patch literal 322 zcmZ?rbz)=ygEAng0mOn(%*en37RN>G-@l)szP_H}|NsBEln^D(qyzyV#mvZTK`>AP zivyX$f`V|ivLT!;q+|?dD=8@(Le&TXO@fOHDIu#zW+Ryiv;uBER<<!17@>O#07Y~Y AfdBvi
literal 0 HcmV?d00001
diff --git a/dlls/shell32/resources/obm_uparrowi.bmp b/dlls/shell32/resources/obm_uparrowi.bmp new file mode 100644 index 0000000000000000000000000000000000000000..6abb810636636c1570c395a20254108ac3237835 GIT binary patch literal 322 zcmZ?rbz)=ygEAng0mOn(%*en37RN>G-@l)szP_H}|NsBEln^D(qyzyV#mvZTK`>AP zivyX)hJrA*kP=q5u#u9mAykbJ&?LBeB_%~TTS!R|&K6WeVgs#!nGdoUlWhzJM(Cab E0AU&vp8x;=
literal 0 HcmV?d00001
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 5c11590d7c..89ea40b345 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -1064,6 +1064,12 @@ IDI_SHELL_RESTRICTED2 ICON resources/restricted.ico /* @makedep: resources/internet.ico */ IDI_SHELL_WEB_BROWSER ICON resources/internet.ico
+/* @makedep: resources/obm_uparrowi.bmp */ +IDB_UP_ARROW BITMAP resources/obm_uparrowi.bmp + +/* @makedep: resources/obm_uparrowi.bmp */ +IDB_DOWN_ARROW BITMAP resources/obm_dnarrowi.bmp + /* @makedep: resources/idb_tb_large.bmp */ IDB_TB_LARGE_LIGHT BITMAP resources/idb_tb_large.bmp
diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 16c92936ab..49fffeab5e 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -427,6 +427,9 @@ FIXME: Need to add them, but for now just let them use the same: searching.avi /* explorer toolbar icons * FIXME: images are hacky and should be re-drawn; also dark and light bitmaps are same for now */ +#define IDB_UP_ARROW 133 +#define IDB_DOWN_ARROW 134 + #define IDB_TB_LARGE_LIGHT 214 #define IDB_TB_LARGE_DARK 215 #define IDB_TB_SMALL_LIGHT 216
Hi Dmitry,
On Wed, Oct 24, 2018 at 11:18:33AM +0300, Dmitry Timoshkov wrote:
diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 16c92936ab..49fffeab5e 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -427,6 +427,9 @@ FIXME: Need to add them, but for now just let them use the same: searching.avi /* explorer toolbar icons
- FIXME: images are hacky and should be re-drawn; also dark and light bitmaps are same for now
*/
I'd suggest moving the new defines before the above comment, since the comment relates to the toolbar bitmaps. Better still, perhaps the comment should just go away?
+#define IDB_UP_ARROW 133 +#define IDB_DOWN_ARROW 134
#define IDB_TB_LARGE_LIGHT 214 #define IDB_TB_LARGE_DARK 215
#define IDB_TB_SMALL_LIGHT 216
2.17.1
Hi Huw,
Huw Davies huw@codeweavers.com wrote:
@@ -427,6 +427,9 @@ FIXME: Need to add them, but for now just let them use the same: searching.avi /* explorer toolbar icons
- FIXME: images are hacky and should be re-drawn; also dark and light bitmaps are same for now
*/
I'd suggest moving the new defines before the above comment, since the comment relates to the toolbar bitmaps. Better still, perhaps the comment should just go away?
The bimaps I've copied from user32 also need to be redrawn since they should look a bit differently, so I'd prefer to leave both the comment and the bitmaps order.
On Wed, Oct 24, 2018 at 12:34:20PM +0300, Dmitry Timoshkov wrote:
Hi Huw,
Huw Davies huw@codeweavers.com wrote:
@@ -427,6 +427,9 @@ FIXME: Need to add them, but for now just let them use the same: searching.avi /* explorer toolbar icons
- FIXME: images are hacky and should be re-drawn; also dark and light bitmaps are same for now
*/
I'd suggest moving the new defines before the above comment, since the comment relates to the toolbar bitmaps. Better still, perhaps the comment should just go away?
The bimaps I've copied from user32 also need to be redrawn since they should look a bit differently, so I'd prefer to leave both the comment and the bitmaps order.
They're not 'explorer toolbar icons', right?
Huw.
Huw Davies huw@codeweavers.com wrote:
@@ -427,6 +427,9 @@ FIXME: Need to add them, but for now just let them use the same: searching.avi /* explorer toolbar icons
- FIXME: images are hacky and should be re-drawn; also dark and light bitmaps are same for now
*/
I'd suggest moving the new defines before the above comment, since the comment relates to the toolbar bitmaps. Better still, perhaps the comment should just go away?
The bimaps I've copied from user32 also need to be redrawn since they should look a bit differently, so I'd prefer to leave both the comment and the bitmaps order.
They're not 'explorer toolbar icons', right?
They look like a toolbar icon (an image list) although being a bitmap, probably you are right about 'explorer', but personally I don't know where they are supposed to be used. If you feel strongly about the bitmap placement I'll resend with the suggested changes.
On Wed, Oct 24, 2018 at 12:45:34PM +0300, Dmitry Timoshkov wrote:
Huw Davies huw@codeweavers.com wrote:
@@ -427,6 +427,9 @@ FIXME: Need to add them, but for now just let them use the same: searching.avi /* explorer toolbar icons
- FIXME: images are hacky and should be re-drawn; also dark and light bitmaps are same for now
*/
I'd suggest moving the new defines before the above comment, since the comment relates to the toolbar bitmaps. Better still, perhaps the comment should just go away?
The bimaps I've copied from user32 also need to be redrawn since they should look a bit differently, so I'd prefer to leave both the comment and the bitmaps order.
They're not 'explorer toolbar icons', right?
They look like a toolbar icon (an image list) although being a bitmap, probably you are right about 'explorer', but personally I don't know where they are supposed to be used. If you feel strongly about the bitmap placement I'll resend with the suggested changes.
I'm not really bothered either way and am happy for you to decide; I just wanted to flag it.
Huw.
On 2018/10/24 16:18, Dmitry Timoshkov wrote:
These are the copies of user32 bitmaps.
This patch makes an application that uses these bitmaps in its own dialogs work.
Signed-off-by: Dmitry Timoshkov dmitry@baikal.ru
dlls/shell32/resources/obm_dnarrowi.bmp | Bin 0 -> 322 bytes dlls/shell32/resources/obm_uparrowi.bmp | Bin 0 -> 322 bytes dlls/shell32/shell32.rc | 6 ++++++ dlls/shell32/shresdef.h | 3 +++ 4 files changed, 9 insertions(+) create mode 100644 dlls/shell32/resources/obm_dnarrowi.bmp create mode 100644 dlls/shell32/resources/obm_uparrowi.bmp
diff --git a/dlls/shell32/resources/obm_dnarrowi.bmp b/dlls/shell32/resources/obm_dnarrowi.bmp new file mode 100644 index 0000000000000000000000000000000000000000..3cbf4fbba4cf728c361ad1a2ac2f24576df47145 GIT binary patch literal 322 zcmZ?rbz)=ygEAng0mOn(%*en37RN>G-@l)szP_H}|NsBEln^D(qyzyV#mvZTK`>AP zivyX$f`V|ivLT!;q+|?dD=8@(Le&TXO@fOHDIu#zW+Ryiv;uBER<<!17@>O#07Y~Y AfdBvi
literal 0 HcmV?d00001
diff --git a/dlls/shell32/resources/obm_uparrowi.bmp b/dlls/shell32/resources/obm_uparrowi.bmp new file mode 100644 index 0000000000000000000000000000000000000000..6abb810636636c1570c395a20254108ac3237835 GIT binary patch literal 322 zcmZ?rbz)=ygEAng0mOn(%*en37RN>G-@l)szP_H}|NsBEln^D(qyzyV#mvZTK`>AP zivyX)hJrA*kP=q5u#u9mAykbJ&?LBeB_%~TTS!R|&K6WeVgs#!nGdoUlWhzJM(Cab E0AU&vp8x;=
literal 0 HcmV?d00001
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 5c11590d7c..89ea40b345 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -1064,6 +1064,12 @@ IDI_SHELL_RESTRICTED2 ICON resources/restricted.ico /* @makedep: resources/internet.ico */ IDI_SHELL_WEB_BROWSER ICON resources/internet.ico
+/* @makedep: resources/obm_uparrowi.bmp */ +IDB_UP_ARROW BITMAP resources/obm_uparrowi.bmp
+/* @makedep: resources/obm_uparrowi.bmp */
Hi, Dmitry, wrong filename here.
+IDB_DOWN_ARROW BITMAP resources/obm_dnarrowi.bmp
/* @makedep: resources/idb_tb_large.bmp */ IDB_TB_LARGE_LIGHT BITMAP resources/idb_tb_large.bmp
diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 16c92936ab..49fffeab5e 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -427,6 +427,9 @@ FIXME: Need to add them, but for now just let them use the same: searching.avi /* explorer toolbar icons
- FIXME: images are hacky and should be re-drawn; also dark and light bitmaps are same for now
*/ +#define IDB_UP_ARROW 133 +#define IDB_DOWN_ARROW 134
#define IDB_TB_LARGE_LIGHT 214 #define IDB_TB_LARGE_DARK 215 #define IDB_TB_SMALL_LIGHT 216
Zhiyi Zhang zzhang@codeweavers.com wrote:
+/* @makedep: resources/obm_uparrowi.bmp */ +IDB_UP_ARROW BITMAP resources/obm_uparrowi.bmp
+/* @makedep: resources/obm_uparrowi.bmp */
Hi, Dmitry, wrong filename here.
+IDB_DOWN_ARROW BITMAP resources/obm_dnarrowi.bmp
Well spotted, thanks.