From 3dd6046d7c641d0096d790d400b0953ddb2429db Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 17 Oct 2017 16:14:28 +0200
Subject: [PATCH] user32: Specify cursor hotspots separately for each size.

This is supported in icoutils as of version 0.32.0.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/user32/resources/ocr_appstarting.svg |  28 ++++++++++++++++------
 dlls/user32/resources/ocr_cross.cur       | Bin 33134 -> 33134 bytes
 dlls/user32/resources/ocr_cross.svg       |  28 ++++++++++++++++------
 dlls/user32/resources/ocr_hand.cur        | Bin 33134 -> 33134 bytes
 dlls/user32/resources/ocr_hand.svg        |  28 ++++++++++++++++------
 dlls/user32/resources/ocr_help.svg        |  28 ++++++++++++++++------
 dlls/user32/resources/ocr_ibeam.cur       | Bin 33134 -> 33134 bytes
 dlls/user32/resources/ocr_ibeam.svg       |  28 ++++++++++++++++------
 dlls/user32/resources/ocr_no.svg          |  28 ++++++++++++++++------
 dlls/user32/resources/ocr_normal.svg      |  28 ++++++++++++++++------
 dlls/user32/resources/ocr_pen.cur         | Bin 33134 -> 33134 bytes
 dlls/user32/resources/ocr_pen.svg         |  28 ++++++++++++++++------
 dlls/user32/resources/ocr_size.cur        | Bin 33134 -> 33134 bytes
 dlls/user32/resources/ocr_size.svg        |  28 ++++++++++++++++------
 dlls/user32/resources/ocr_sizeall.cur     | Bin 35374 -> 35374 bytes
 dlls/user32/resources/ocr_sizeall.svg     |  28 ++++++++++++++++------
 dlls/user32/resources/ocr_sizenesw.svg    |  28 ++++++++++++++++------
 dlls/user32/resources/ocr_sizens.cur      | Bin 33134 -> 33134 bytes
 dlls/user32/resources/ocr_sizens.svg      |  28 ++++++++++++++++------
 dlls/user32/resources/ocr_sizenwse.svg    |  28 ++++++++++++++++------
 dlls/user32/resources/ocr_sizewe.cur      | Bin 33134 -> 33134 bytes
 dlls/user32/resources/ocr_sizewe.svg      |  28 ++++++++++++++++------
 dlls/user32/resources/ocr_up.cur          | Bin 33134 -> 33134 bytes
 dlls/user32/resources/ocr_up.svg          |  28 ++++++++++++++++------
 dlls/user32/resources/ocr_wait.cur        | Bin 33134 -> 33134 bytes
 dlls/user32/resources/ocr_wait.svg        |  28 ++++++++++++++++------
 tools/buildimage                          |  11 +++++++--
 27 files changed, 345 insertions(+), 114 deletions(-)

diff --git a/dlls/user32/resources/ocr_appstarting.svg b/dlls/user32/resources/ocr_appstarting.svg
index 701f229fcde..4fba91dce88 100644
--- a/dlls/user32/resources/ocr_appstarting.svg
+++ b/dlls/user32/resources/ocr_appstarting.svg
@@ -50,6 +50,27 @@
      inkscape:window-y="-68"
      inkscape:window-maximized="0"
      inkscape:current-layer="svg2" />
+  <rect
+     id="hotspot:64"
+     height="1"
+     width="1"
+     y="0"
+     x="0"
+     style="fill:none" />
+  <rect
+     id="hotspot:48"
+     height="1"
+     width="1"
+     y="0"
+     x="0"
+     style="fill:none" />
+  <rect
+     id="hotspot:32"
+     height="1"
+     width="1"
+     y="0"
+     x="0"
+     style="fill:none" />
   <rect
      id="cursor:64-32"
      height="64"
@@ -71,13 +92,6 @@
      y="32"
      x="112"
      style="fill:none" />
-  <rect
-     id="hotspot"
-     height="1"
-     width="1"
-     y="0"
-     x="0"
-     style="fill:none" />
   <g
      style="display:inline;opacity:1"
      id="g6054"
diff --git a/dlls/user32/resources/ocr_cross.cur b/dlls/user32/resources/ocr_cross.cur
index 7d54ba7fe2648ef07956268352a19304a7000fc8..448f37c74a3f1416aad364cd56498840b65a8c1a 100644
GIT binary patch
delta 19
acmaFY#PqI-X@U%+_(WNKM)8flij4qAUj{w^

delta 19
acmaFY#PqI-X@U%+*hE=<MzM{)ij4qAPzF2z

diff --git a/dlls/user32/resources/ocr_cross.svg b/dlls/user32/resources/ocr_cross.svg
index 34cd91ace3e..af75c2379bc 100644
--- a/dlls/user32/resources/ocr_cross.svg
+++ b/dlls/user32/resources/ocr_cross.svg
@@ -50,6 +50,27 @@
      inkscape:window-y="7"
      inkscape:window-maximized="0"
      inkscape:current-layer="svg2" />
+  <rect
+     id="hotspot:64"
+     height="1"
+     width="1"
+     y="30"
+     x="30"
+     style="fill:none" />
+  <rect
+     id="hotspot:48"
+     height="1"
+     width="1"
+     y="23"
+     x="22"
+     style="fill:none" />
+  <rect
+     id="hotspot:32"
+     height="1"
+     width="1"
+     y="15"
+     x="15"
+     style="fill:none" />
   <rect
      id="cursor:64-32"
      height="64"
@@ -71,13 +92,6 @@
      y="32"
      x="112"
      style="fill:none" />
-  <rect
-     id="hotspot"
-     height="1"
-     width="1"
-     y="15"
-     x="15"
-     style="fill:none" />
   <g
      style="display:inline;opacity:1"
      transform="matrix(0.52397812,0,0,0.52397812,-1.9634705,-486.38388)"
diff --git a/dlls/user32/resources/ocr_hand.cur b/dlls/user32/resources/ocr_hand.cur
index 7e191e10af4916549255cfa0102ece6387f586ef..bcc930497e2306ed99aa86cec2b5ffb5c3eacd9a 100644
GIT binary patch
delta 59
zcmaFY#PqI-Nt%IyiGhv5!GVE+pMilv!-;_*4M-apFfedWl$I9+2^z34Fx;yE2{JKo
JZ}e7f1OOph2~+?8

delta 59
zcmaFY#PqI-Nt%IyiGhv5!GVE+kAZ<f!-;_*4M-apFfedUl$I9+2^z34Fx;yE2{JKo
JZS+=d1OOoY2~Yq4

diff --git a/dlls/user32/resources/ocr_hand.svg b/dlls/user32/resources/ocr_hand.svg
index f2decbfb348..b94298ca5bf 100644
--- a/dlls/user32/resources/ocr_hand.svg
+++ b/dlls/user32/resources/ocr_hand.svg
@@ -50,6 +50,27 @@
      inkscape:window-y="23"
      inkscape:window-maximized="0"
      inkscape:current-layer="svg2" />
+  <rect
+     id="hotspot:64"
+     height="1"
+     width="1"
+     y="0"
+     x="15"
+     style="fill:none" />
+  <rect
+     id="hotspot:48"
+     height="1"
+     width="1"
+     y="0"
+     x="11"
+     style="fill:none" />
+  <rect
+     id="hotspot:32"
+     height="1"
+     width="1"
+     y="0"
+     x="7"
+     style="fill:none" />
   <rect
      id="cursor:64-32"
      height="64"
@@ -71,13 +92,6 @@
      y="32"
      x="112"
      style="fill:none" />
-  <rect
-     id="hotspot"
-     height="1"
-     width="1"
-     y="0"
-     x="7"
-     style="fill:none" />
   <g
      transform="matrix(0.49646702,0,0,0.49659531,-9.4425305,-10.050669)"
      id="g2996-3"
diff --git a/dlls/user32/resources/ocr_help.svg b/dlls/user32/resources/ocr_help.svg
index 2cf73270f3c..22b9931668c 100644
--- a/dlls/user32/resources/ocr_help.svg
+++ b/dlls/user32/resources/ocr_help.svg
@@ -50,6 +50,27 @@
      inkscape:window-y="-88"
      inkscape:window-maximized="0"
      inkscape:current-layer="svg2" />
+  <rect
+     id="hotspot:64"
+     height="1"
+     width="1"
+     y="0"
+     x="0"
+     style="fill:none" />
+  <rect
+     id="hotspot:48"
+     height="1"
+     width="1"
+     y="0"
+     x="0"
+     style="fill:none" />
+  <rect
+     id="hotspot:32"
+     height="1"
+     width="1"
+     y="0"
+     x="0"
+     style="fill:none" />
   <rect
      id="cursor:64-32"
      height="64"
@@ -71,13 +92,6 @@
      y="32"
      x="112"
      style="fill:none" />
-  <rect
-     id="hotspot"
-     height="1"
-     width="1"
-     y="0"
-     x="0"
-     style="fill:none" />
   <g
      style="display:inline;opacity:1"
      id="g6054"
diff --git a/dlls/user32/resources/ocr_ibeam.cur b/dlls/user32/resources/ocr_ibeam.cur
index 96060f5d2660ca5ef30f9068d7636e434b7898ef..5dd5839b5b5a0885dc3cf515a40d69b408a065fc 100644
GIT binary patch
delta 59
zcmaFY#PqI-Nt%IyiGhv5!GVE+ok55}!-;_*je&u|z<_~)b)vMqAV|=Fg@NH-1xS#I
Kfpw#|aw7mD&k0-r

delta 59
zcmaFY#PqI-Nt%IyiGhv5!GQrt3NdInF)*YtFfbSxFfg!8l$I9+2^z34Fx;yE2{JLT
JZ1h%c1OOs&30MFC

diff --git a/dlls/user32/resources/ocr_ibeam.svg b/dlls/user32/resources/ocr_ibeam.svg
index 7520463d7ad..fe3051e3fa1 100644
--- a/dlls/user32/resources/ocr_ibeam.svg
+++ b/dlls/user32/resources/ocr_ibeam.svg
@@ -50,6 +50,27 @@
      inkscape:window-y="28"
      inkscape:window-maximized="0"
      inkscape:current-layer="svg2" />
+  <rect
+     id="hotspot:64"
+     height="1"
+     width="1"
+     y="18"
+     x="7"
+     style="fill:none" />
+  <rect
+     id="hotspot:48"
+     height="1"
+     width="1"
+     y="13"
+     x="5"
+     style="fill:none" />
+  <rect
+     id="hotspot:32"
+     height="1"
+     width="1"
+     y="9"
+     x="3"
+     style="fill:none" />
   <rect
      id="cursor:64-32"
      height="64"
@@ -71,13 +92,6 @@
      y="32"
      x="112"
      style="fill:none" />
-  <rect
-     id="hotspot"
-     height="1"
-     width="1"
-     y="9"
-     x="3"
-     style="fill:none" />
   <g
      style="display:inline;opacity:1"
      transform="matrix(0.49522582,0,0,0.49522582,-23.104839,-469.24018)"
diff --git a/dlls/user32/resources/ocr_no.svg b/dlls/user32/resources/ocr_no.svg
index 3318041d1f4..db42056a7e1 100644
--- a/dlls/user32/resources/ocr_no.svg
+++ b/dlls/user32/resources/ocr_no.svg
@@ -50,6 +50,27 @@
      inkscape:window-y="4"
      inkscape:window-maximized="0"
      inkscape:current-layer="svg2" />
+  <rect
+     id="hotspot:64"
+     height="1"
+     width="1"
+     y="16"
+     x="16"
+     style="fill:none" />
+  <rect
+     id="hotspot:48"
+     height="1"
+     width="1"
+     y="12"
+     x="12"
+     style="fill:none" />
+  <rect
+     id="hotspot:32"
+     height="1"
+     width="1"
+     y="8"
+     x="8"
+     style="fill:none" />
   <rect
      id="cursor:64-32"
      height="64"
@@ -71,13 +92,6 @@
      y="32"
      x="112"
      style="fill:none" />
-  <rect
-     id="hotspot"
-     height="1"
-     width="1"
-     y="8"
-     x="8"
-     style="fill:none" />
   <g
      style="display:inline;opacity:1"
      id="g7513"
diff --git a/dlls/user32/resources/ocr_normal.svg b/dlls/user32/resources/ocr_normal.svg
index 4a63426af4e..8096ac71aad 100644
--- a/dlls/user32/resources/ocr_normal.svg
+++ b/dlls/user32/resources/ocr_normal.svg
@@ -50,6 +50,27 @@
      inkscape:window-y="48"
      inkscape:window-maximized="0"
      inkscape:current-layer="svg2" />
+  <rect
+     id="hotspot:64"
+     height="1"
+     width="1"
+     y="0"
+     x="0"
+     style="fill:none" />
+  <rect
+     id="hotspot:48"
+     height="1"
+     width="1"
+     y="0"
+     x="0"
+     style="fill:none" />
+  <rect
+     id="hotspot:32"
+     height="1"
+     width="1"
+     y="0"
+     x="0"
+     style="fill:none" />
   <rect
      id="cursor:64-32"
      height="64"
@@ -71,13 +92,6 @@
      y="32"
      x="112"
      style="fill:none" />
-  <rect
-     id="hotspot"
-     height="1"
-     width="1"
-     y="0"
-     x="0"
-     style="fill:none" />
   <g
      style="display:inline;opacity:1"
      id="g6054"
diff --git a/dlls/user32/resources/ocr_pen.cur b/dlls/user32/resources/ocr_pen.cur
index 2baf78d22a5a72e8061d5dedad917cb8470b97c3..3874533666160f66285e4216721fe64ec5cf9f63 100644
GIT binary patch
delta 61
zcmaFY#PqI-NtS_uiGhv5!GQq?v>7y<7#PxkECT}&UtyxGyr4FN0Sg1ey$X;Z6G(8Q
HuVNzrII;=4

delta 61
zcmaFY#PqI-NtS_uiGhv5!GQq?v=}s;7#PxkECT}&Uw)#jyr33?0Sg1ey$X;Z6G(8Q
HuVNzrI8+I?

diff --git a/dlls/user32/resources/ocr_pen.svg b/dlls/user32/resources/ocr_pen.svg
index 7c31788e379..c343d97ed6a 100644
--- a/dlls/user32/resources/ocr_pen.svg
+++ b/dlls/user32/resources/ocr_pen.svg
@@ -50,6 +50,27 @@
      inkscape:window-y="4"
      inkscape:window-maximized="0"
      inkscape:current-layer="svg2" />
+  <rect
+     id="hotspot:64"
+     height="1"
+     width="1"
+     y="43"
+     x="0"
+     style="fill:none" />
+  <rect
+     id="hotspot:48"
+     height="1"
+     width="1"
+     y="32"
+     x="0"
+     style="fill:none" />
+  <rect
+     id="hotspot:32"
+     height="1"
+     width="1"
+     y="21"
+     x="0"
+     style="fill:none" />
   <rect
      id="cursor:64-32"
      height="64"
@@ -71,13 +92,6 @@
      y="32"
      x="112"
      style="fill:none" />
-  <rect
-     id="hotspot"
-     height="1"
-     width="1"
-     y="21"
-     x="0"
-     style="fill:none" />
   <g
      style="display:inline;opacity:1;stroke-width:12.33332825"
      transform="matrix(0.14986395,0.04015593,-0.04015593,0.14986395,45.748216,-191.99561)"
diff --git a/dlls/user32/resources/ocr_size.cur b/dlls/user32/resources/ocr_size.cur
index bebbafa6c9080cdba854277dca78954c7640d1eb..143a80910939fdd5b01523bb2faba86ce750243d 100644
GIT binary patch
delta 63
zcmaFY#PqI-NtS_uiGhv5!GVE67zj0-7#PwR7#Iu;7#R2%_$JEA3WJ0VSQr@YRe*$<
KK*Ae+6&nFVF$t&u

delta 63
zcmaFY#PqI-NtS_uiGhv5!GVE61PC>p7#PwR7#Iu;7#R2&_$SKB3WJ0VSQr@YRe*$<
KK*Ae+6&nFV{RyxD

diff --git a/dlls/user32/resources/ocr_size.svg b/dlls/user32/resources/ocr_size.svg
index 0a6fe2de9f8..51edfbc4008 100644
--- a/dlls/user32/resources/ocr_size.svg
+++ b/dlls/user32/resources/ocr_size.svg
@@ -50,6 +50,27 @@
      inkscape:window-y="-16"
      inkscape:window-maximized="0"
      inkscape:current-layer="svg2" />
+  <rect
+     id="hotspot:64"
+     height="1"
+     width="1"
+     y="19"
+     x="19"
+     style="fill:none" />
+  <rect
+     id="hotspot:48"
+     height="1"
+     width="1"
+     y="14"
+     x="14"
+     style="fill:none" />
+  <rect
+     id="hotspot:32"
+     height="1"
+     width="1"
+     y="10"
+     x="10"
+     style="fill:none" />
   <rect
      id="cursor:64-32"
      height="64"
@@ -71,13 +92,6 @@
      y="32"
      x="112"
      style="fill:none" />
-  <rect
-     id="hotspot"
-     height="1"
-     width="1"
-     y="10"
-     x="10"
-     style="fill:none" />
   <g
      id="g9368"
      transform="matrix(0.43521339,0,0,0.43527092,-6.3667091,-410.06917)"
diff --git a/dlls/user32/resources/ocr_sizeall.cur b/dlls/user32/resources/ocr_sizeall.cur
index 99275cd90b33fe3ead2922e35320f6ed0b39f848..5d07e401e3e56c41587d3d7435241c5178e9ab2f 100644
GIT binary patch
delta 95
zcmZ2Cg=yUsCR+vuCI(Ih2L}cQVIb6SVqloYzyRbkf%yh33=I2#Vg?2b417SiLY0Bx
bog0YH1maJ$)fEP511X!=2p8U1yRj1hpnnd#

delta 95
zcmZ2Cg=yUsCR+vuCI(Ih2L}cQ5g^oXVqloYzyRbkf%yh33=I2#Vg?2b4E#X2LY0Bx
bog0YH1maJ$)fEP511X!=2p8U1yRj1hqF)Zj

diff --git a/dlls/user32/resources/ocr_sizeall.svg b/dlls/user32/resources/ocr_sizeall.svg
index 634a9a30c86..c3669b83db6 100644
--- a/dlls/user32/resources/ocr_sizeall.svg
+++ b/dlls/user32/resources/ocr_sizeall.svg
@@ -50,6 +50,27 @@
      inkscape:window-y="3"
      inkscape:window-maximized="0"
      inkscape:current-layer="svg2" />
+  <rect
+     id="hotspot:64"
+     height="1"
+     width="1"
+     y="19"
+     x="19"
+     style="fill:none" />
+  <rect
+     id="hotspot:48"
+     height="1"
+     width="1"
+     y="14"
+     x="14"
+     style="fill:none" />
+  <rect
+     id="hotspot:32"
+     height="1"
+     width="1"
+     y="10"
+     x="10"
+     style="fill:none" />
   <rect
      id="cursor:64-32"
      height="64"
@@ -92,13 +113,6 @@
      y="32"
      x="256"
      style="fill:none" />
-  <rect
-     id="hotspot"
-     height="1"
-     width="1"
-     y="10"
-     x="10"
-     style="fill:none" />
   <g
      id="g9368"
      transform="matrix(0.43521339,0,0,0.43527092,-6.3667091,-410.06917)"
diff --git a/dlls/user32/resources/ocr_sizenesw.svg b/dlls/user32/resources/ocr_sizenesw.svg
index f266d4a0147..9770d2f1fdb 100644
--- a/dlls/user32/resources/ocr_sizenesw.svg
+++ b/dlls/user32/resources/ocr_sizenesw.svg
@@ -50,6 +50,27 @@
      inkscape:window-y="23"
      inkscape:window-maximized="0"
      inkscape:current-layer="svg2" />
+  <rect
+     id="hotspot:64"
+     height="1"
+     width="1"
+     y="14"
+     x="14"
+     style="fill:none" />
+  <rect
+     id="hotspot:48"
+     height="1"
+     width="1"
+     y="10"
+     x="10"
+     style="fill:none" />
+  <rect
+     id="hotspot:32"
+     height="1"
+     width="1"
+     y="7"
+     x="7"
+     style="fill:none" />
   <rect
      id="cursor:64-32"
      height="64"
@@ -71,13 +92,6 @@
      y="32"
      x="112"
      style="fill:none" />
-  <rect
-     id="hotspot"
-     height="1"
-     width="1"
-     y="7"
-     x="7"
-     style="fill:none" />
   <g
      style="display:inline;opacity:1"
      inkscape:transform-center-y="1.0996192"
diff --git a/dlls/user32/resources/ocr_sizens.cur b/dlls/user32/resources/ocr_sizens.cur
index d6f8645ffe21d25c26fe5aae979ae7c13a628daf..27e7ab8ef1e7f590acf185de2d87c5a4a4f2fabf 100644
GIT binary patch
delta 19
acmaFY#PqI-X@U$R-$Yq`M!t={ij4q9*aj>B

delta 19
acmaFY#PqI-X@U$R??hRBM&6CSij4q9$p$I_

diff --git a/dlls/user32/resources/ocr_sizens.svg b/dlls/user32/resources/ocr_sizens.svg
index 62f92bcbc0e..5ea5703eac4 100644
--- a/dlls/user32/resources/ocr_sizens.svg
+++ b/dlls/user32/resources/ocr_sizens.svg
@@ -50,6 +50,27 @@
      inkscape:window-y="23"
      inkscape:window-maximized="0"
      inkscape:current-layer="svg2" />
+  <rect
+     id="hotspot:64"
+     height="1"
+     width="1"
+     y="18"
+     x="12"
+     style="fill:none" />
+  <rect
+     id="hotspot:48"
+     height="1"
+     width="1"
+     y="14"
+     x="9"
+     style="fill:none" />
+  <rect
+     id="hotspot:32"
+     height="1"
+     width="1"
+     y="9"
+     x="6"
+     style="fill:none" />
   <rect
      id="cursor:64-32"
      height="64"
@@ -71,13 +92,6 @@
      y="32"
      x="112"
      style="fill:none" />
-  <rect
-     id="hotspot"
-     height="1"
-     width="1"
-     y="9"
-     x="6"
-     style="fill:none" />
   <g
      style="display:inline;opacity:1"
      id="g8894"
diff --git a/dlls/user32/resources/ocr_sizenwse.svg b/dlls/user32/resources/ocr_sizenwse.svg
index 471f5be3f89..f194b366cca 100644
--- a/dlls/user32/resources/ocr_sizenwse.svg
+++ b/dlls/user32/resources/ocr_sizenwse.svg
@@ -50,6 +50,27 @@
      inkscape:window-y="23"
      inkscape:window-maximized="0"
      inkscape:current-layer="svg2" />
+  <rect
+     id="hotspot:64"
+     height="1"
+     width="1"
+     y="14"
+     x="14"
+     style="fill:none" />
+  <rect
+     id="hotspot:48"
+     height="1"
+     width="1"
+     y="10"
+     x="10"
+     style="fill:none" />
+  <rect
+     id="hotspot:32"
+     height="1"
+     width="1"
+     y="7"
+     x="7"
+     style="fill:none" />
   <rect
      id="cursor:64-32"
      height="64"
@@ -71,13 +92,6 @@
      y="32"
      x="112"
      style="fill:none" />
-  <rect
-     id="hotspot"
-     height="1"
-     width="1"
-     y="7"
-     x="7"
-     style="fill:none" />
   <g
      style="display:inline;opacity:1"
      id="g8900"
diff --git a/dlls/user32/resources/ocr_sizewe.cur b/dlls/user32/resources/ocr_sizewe.cur
index c75f18b1d7a42c9bfccba4df455fec2b9ae2b814..254eef8e63dc7e8ad07c278eda6cd542116bdae7 100644
GIT binary patch
delta 19
acmaFY#PqI-X@U$R$3$6uMvjfXij4q9eg+@_

delta 19
acmaFY#PqI-X@U$R=R{e3M$V1Cij4q9jRqnB

diff --git a/dlls/user32/resources/ocr_sizewe.svg b/dlls/user32/resources/ocr_sizewe.svg
index 79732ea7b0d..5d6273d6f72 100644
--- a/dlls/user32/resources/ocr_sizewe.svg
+++ b/dlls/user32/resources/ocr_sizewe.svg
@@ -50,6 +50,27 @@
      inkscape:window-y="4"
      inkscape:window-maximized="0"
      inkscape:current-layer="svg2" />
+  <rect
+     id="hotspot:64"
+     height="1"
+     width="1"
+     y="12"
+     x="20"
+     style="fill:none" />
+  <rect
+     id="hotspot:48"
+     height="1"
+     width="1"
+     y="8"
+     x="15"
+     style="fill:none" />
+  <rect
+     id="hotspot:32"
+     height="1"
+     width="1"
+     y="6"
+     x="10"
+     style="fill:none" />
   <rect
      id="cursor:64-32"
      height="64"
@@ -71,13 +92,6 @@
      y="32"
      x="112"
      style="fill:none" />
-  <rect
-     id="hotspot"
-     height="1"
-     width="1"
-     y="6"
-     x="10"
-     style="fill:none" />
   <g
      style="display:inline;opacity:1"
      transform="matrix(0.41976423,0,0,0.41976423,-5.9763671,-402.06047)"
diff --git a/dlls/user32/resources/ocr_up.cur b/dlls/user32/resources/ocr_up.cur
index 9fca12a676413f037998856f272f852ab7bb4c46..051f26dd029e188b7415661652d947d8b65e5a7e 100644
GIT binary patch
delta 59
zcmaFY#PqI-Nt%IyiGhv5!GVE+mw|yn!-;_*4M-apFfedUl$I9+2^z34Fx;yE2{JKo
JZS+=d1OOnu2~Ge2

delta 59
zcmaFY#PqI-Nt%IyiGhv5!GVE+hk=1X!-;_*4M-apFfedVl$I9+2^z34Fx;yE2{JKo
JZuC}e1OOml2}%F}

diff --git a/dlls/user32/resources/ocr_up.svg b/dlls/user32/resources/ocr_up.svg
index c7eee66dd71..ae4cfba41fe 100644
--- a/dlls/user32/resources/ocr_up.svg
+++ b/dlls/user32/resources/ocr_up.svg
@@ -50,6 +50,27 @@
      inkscape:window-y="23"
      inkscape:window-maximized="0"
      inkscape:current-layer="svg2" />
+  <rect
+     id="hotspot:64"
+     height="1"
+     width="1"
+     y="0"
+     x="13"
+     style="fill:none" />
+  <rect
+     id="hotspot:48"
+     height="1"
+     width="1"
+     y="0"
+     x="10"
+     style="fill:none" />
+  <rect
+     id="hotspot:32"
+     height="1"
+     width="1"
+     y="0"
+     x="6"
+     style="fill:none" />
   <rect
      id="cursor:64-32"
      height="64"
@@ -71,13 +92,6 @@
      y="32"
      x="112"
      style="fill:none" />
-  <rect
-     id="hotspot"
-     height="1"
-     width="1"
-     y="0"
-     x="6"
-     style="fill:none" />
   <g
      style="display:inline;opacity:1"
      transform="matrix(0.45710405,0,0,0.45710405,-15.459802,20.963507)"
diff --git a/dlls/user32/resources/ocr_wait.cur b/dlls/user32/resources/ocr_wait.cur
index bc292e4d54451ff16ede70fabf7fefe31847241c..84cabd78768f65fa20a7e5ac1cac55542d2e1679 100644
GIT binary patch
delta 19
acmaFY#PqI-X@V4^_(W-aM)8f_%8dX=H3m8W

delta 19
acmaFY#PqI-X@V4^*hFc4MzM|F%8dX=CI&bF

diff --git a/dlls/user32/resources/ocr_wait.svg b/dlls/user32/resources/ocr_wait.svg
index a89591ee125..a01808b5c67 100644
--- a/dlls/user32/resources/ocr_wait.svg
+++ b/dlls/user32/resources/ocr_wait.svg
@@ -50,6 +50,27 @@
      inkscape:window-y="28"
      inkscape:window-maximized="0"
      inkscape:current-layer="svg2" />
+  <rect
+     id="hotspot:64"
+     height="1"
+     width="1"
+     y="30"
+     x="30"
+     style="fill:none" />
+  <rect
+     id="hotspot:48"
+     height="1"
+     width="1"
+     y="22"
+     x="23"
+     style="fill:none" />
+  <rect
+     id="hotspot:32"
+     height="1"
+     width="1"
+     y="15"
+     x="15"
+     style="fill:none" />
   <rect
      id="cursor:64-32"
      height="64"
@@ -71,13 +92,6 @@
      y="32"
      x="112"
      style="fill:none" />
-  <rect
-     id="hotspot"
-     height="1"
-     width="1"
-     y="15"
-     x="15"
-     style="fill:none" />
   <g
      transform="matrix(0.44197283,0,0,0.44197283,-8.0778187,-406.26428)"
      id="layer1-9"
diff --git a/tools/buildimage b/tools/buildimage
index fd6661e4f41..cd247558067 100755
--- a/tools/buildimage
+++ b/tools/buildimage
@@ -38,6 +38,7 @@ die "Only BMP, ICO and CUR outputs are supported" unless $ext eq "bmp" or $ext e
 
 my $renderedSVGFileName = "$svgFileName.png";
 my @pngFiles;
+my @hotspot;
 
 # Get the programs from the environment variables
 my $convert = $ENV{"CONVERT"} || "convert";
@@ -77,9 +78,9 @@ sub svg_element_start
     my $width = 0;
     my $height = 0;
 
-    if ($id eq "hotspot")
+    if ($id =~ /hotspot:(\d*)/)
     {
-        push @icotool_args, "--hotspot-x=$attr{x}", "--hotspot-y=$attr{y}";
+        $hotspot[$1] = [ $attr{x}, $attr{y} ];
         return;
     }
 
@@ -148,6 +149,12 @@ sub svg_element_start
         return;
     }
 
+    if (defined $hotspot[$size])
+    {
+        my @coords = @{$hotspot[$size]};
+        push @icotool_args, "--hotspot-x=$coords[0]", "--hotspot-y=$coords[1]";
+    }
+
     if ($width >= 128 && $height >= 128)
     {
         push @icotool_args, "--raw=$pngFileName";