From 3b5c37cfb0ece04481e68af51d117a3978ba833e Mon Sep 17 00:00:00 2001
From: Mikhail Filippov <mikhail@filippov.me>
Date: Thu, 2 Apr 2026 00:39:40 +0300
Subject: [PATCH] w32: Modernize dialog for Windows Vista and later.

* w32/app.manifest: New.  Declare Common Controls v6 dependency
for visual styles and PerMonitorV2 DPI awareness.
* w32/pinentry-w32.rc: Embed app.manifest.  Switch from DIALOG to
DIALOGEX with DS_SHELLFONT and Segoe UI 9pt.  Reflow controls per
Microsoft UX guidelines; tighten IDC_PINENT_TEXT to 12 DLU so the
themed edit text sits at the optical centre and align
IDC_PINENT_PROMPT to that baseline.  Size IDC_PINENT_DESC to 56
DLU, the smallest height that fits the seven-line CHV1 prompt
with "Remaining attempts: N" without truncation; the standard
five-line CHV1 prompt fits with a small bottom padding.
* w32/main.c (set_bitmap): Use the smaller of width/height from
MapDialogRect so the icon stays square.  Select the closest bitmap
that is at least as large as the target size to prefer downscaling
over upscaling.
* w32/gnupg-logo.svg: New.  Vector source for the GnuPG logo,
traced from the original artwork in Inkscape.
* w32/logo-32.bmp, w32/logo-48.bmp, w32/logo-64.bmp,
w32/logo-96.bmp, w32/logo-128.bmp: Regenerate as 4-bit BMPs with
full 16-entry palettes using standard gray (192,192,192) background.
* w32/Makefile.am (EXTRA_DIST): Add app.manifest and gnupg-logo.svg.
(pinentry-w32.o): Depend on app.manifest.
--

The previous BMPs had truncated palettes (biClrUsed=4 with only
4 palette entries) which caused LR_LOADTRANSPARENT to silently
fail on Windows 10 and later.  The new BMPs use standard gray
(192,192,192) as background which LR_LOADMAP3DCOLORS correctly
maps to the current COLOR_3DFACE.

Signed-off-by: Mikhail Filippov <mikhail@filippov.me>
---
 w32/Makefile.am     |   4 ++--
 w32/app.manifest    |  27 +++++++++++++++++++++++++++
 w32/gnupg-logo.svg  |   6 ++++++
 w32/logo-128.bmp    | Bin 8262 -> 8310 bytes
 w32/logo-32.bmp     | Bin 582 -> 630 bytes
 w32/logo-48.bmp     | Bin 1222 -> 1270 bytes
 w32/logo-64.bmp     | Bin 4738 -> 2166 bytes
 w32/logo-96.bmp     | Bin 4678 -> 4726 bytes
 w32/main.c          |  37 +++++++++++++++++++++++--------------
 w32/pinentry-w32.rc |  23 +++++++++++++----------
 10 files changed, 71 insertions(+), 26 deletions(-)
 create mode 100644 w32/app.manifest
 create mode 100644 w32/gnupg-logo.svg

diff --git a/w32/Makefile.am b/w32/Makefile.am
index 12c66db..b8913b5 100644
--- a/w32/Makefile.am
+++ b/w32/Makefile.am
@@ -21,7 +21,7 @@
 
 logos = logo-32.bmp logo-48.bmp logo-64.bmp logo-96.bmp logo-128.bmp
 
-EXTRA_DIST = $(logos)
+EXTRA_DIST = $(logos) app.manifest gnupg-logo.svg
 
 bin_PROGRAMS = pinentry-w32
 
@@ -37,6 +37,6 @@ pinentry_w32_LDADD = pinentry-w32.o \
 	../pinentry/libpinentry.a ../secmem/libsecmem.a \
         $(COMMON_LIBS)
 
-pinentry-w32.o: pinentry-w32.rc resource.h $(logos)
+pinentry-w32.o: pinentry-w32.rc resource.h $(logos) app.manifest
 	$(WINDRES) -I.. -v -o $@ $<
 
diff --git a/w32/app.manifest b/w32/app.manifest
new file mode 100644
index 0000000..1df9c45
--- /dev/null
+++ b/w32/app.manifest
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity
+    version="1.0.0.0"
+    processorArchitecture="*"
+    name="Pinentry.Native"
+    type="win32"/>
+
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+        type="win32"
+        name="Microsoft.Windows.Common-Controls"
+        version="6.0.0.0"
+        processorArchitecture="*"
+        publicKeyToken="6595b64144ccf1df"
+        language="*"/>
+    </dependentAssembly>
+  </dependency>
+
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2,PerMonitor</dpiAwareness>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+</assembly>
diff --git a/w32/gnupg-logo.svg b/w32/gnupg-logo.svg
new file mode 100644
index 0000000..32a905e
--- /dev/null
+++ b/w32/gnupg-logo.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     viewBox="0 0 135.46667 135.46667"
+     width="512" height="512">
+  <path fill="#0093dd" d="M 59.823116,0.6505142 C 33.424751,3.3209141 9.6008502,23.020126 2.6727271,48.739529 -5.0920409,74.955285 4.1821124,105.71285 26.476279,121.99397 50.510296,140.57285 87.131257,140.29225 110.57095,120.8201 130.39179,105.35661 139.47113,78.166884 133.89692,53.782548 129.04711,29.671972 110.1959,8.7825409 86.201889,2.665949 77.637514,0.34886499 68.639437,-0.28140778 59.823116,0.6505142 Z M 19.387529,102.91095 C 18.123916,93.886617 16.860304,84.862285 15.596691,75.837952 18.334517,75.628087 21.072344,75.418221 23.81017,75.208356 22.948201,60.379658 18.535893,44.20332 26.679545,30.523169 40.509034,5.4042563 78.02201,-3.9695957 100.81121,14.479783 c 12.68511,9.636418 16.33212,27.139862 12.64981,42.048487 -0.75113,6.055367 -2.39888,13.026997 -8.65507,15.655865 C 86.421565,81.109288 65.608234,81.975391 46.165542,87.330688 35.897701,90.057496 27.65418,96.608106 19.387529,102.91095 Z M 30.76004,46.876129 C 34.232961,41.700172 37.40321,34.49382 42.755298,30.026479 56.149842,17.013637 76.79832,12.241874 94.572436,17.914305 79.174613,6.3777104 56.69968,11.007477 43.436591,23.661005 36.84759,29.73856 31.985893,37.918207 30.76004,46.876129 Z M 47.186997,73.319541 C 62.701102,72.908845 78.145215,71.150681 93.631546,70.199584 94.456878,59.869371 99.030816,48.449719 92.985802,38.890097 86.300254,27.875439 70.703139,26.34686 60.18498,32.44983 51.381662,36.844762 46.02764,46.487378 46.456214,56.250707 c -0.09795,5.701396 0.696628,11.371045 0.730783,17.068834 z m 68.235033,1.259194 c -2.81354,12.784604 -5.60854,25.573985 -8.66049,38.304445 -22.670902,3.3379 -45.297033,7.03929 -67.788023,11.43435 10.546197,-7.1233 24.04929,-5.4569 35.64442,-9.75717 8.907683,-2.73318 17.438715,-6.9731 24.554199,-13.04093 -13.833165,4.1626 -27.974702,7.99067 -42.508048,8.31718 4.281175,-2.15319 11.32367,-2.0521 16.554765,-3.80334 14.650452,-3.40432 29.165607,-10.178193 38.682487,-22.202021 -10.15936,5.195687 -20.627431,10.22973 -32.107244,11.564185 -2.721155,0.696051 -13.397047,2.063515 -5.776411,-0.187622 14.891042,-4.380705 28.762985,-11.683876 41.404345,-20.629077 z"/>
+</svg>
diff --git a/w32/logo-128.bmp b/w32/logo-128.bmp
index 883475b3f4654c63807961cc00641b4ab120723d..b6ce2000634440202b380d883d632b3b957c7614 100644
GIT binary patch
literal 8310
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

literal 8262
zcmbVRJCY+s5Un2J60tqHz({g1HLV+9tj9692bbUyoPm1~fq{>`E(An=Ugpd0s&37^
zh}l?G)ysVOsp{X4KYe{`im$D;A6jd__}|pNvx&FX{`lVhWJLb{`n9#cfB(6C`}4Q<
z?|=Wa$1bkd>vea*4lZ9zL~GOQ&ayt13&@7oTYudEE4JVR8kSJbn4XoeFpF^>sI7Qs
zO2sn<cIfR11H1HN1H;&XgCuq{U$ARHHpE<(Z!pzt7ijR)?Ye8?rBE0M{`MHOkYN}>
z1h2h1R56NxOJ_c=VX@%Eq7!9Jn|Dkkhj6casf3xxg8=9Xz+{1$Sk{4%TVU(nfNYf`
zp(CKUEx^gKP$2Lc7`YeZ$+4ibHUj#U0(j%w%5ZGp+V?<BYZr}`fPME8LpZcZ^S1z<
z&zP^b$8`?FLGVnKT`<U=UN~?mfB_GcB6{q|*9(WG-5Jmt0rlkv%&%n4tKc(KlYx9d
z8%QoH=F*2LfJo8^>g&xZSRDaqL@y(*LW8)N9q=Onm47-2Lh7}s8Nchu7E*&J#5F>7
z$1SCd(@_?~KnV2&SVNp2M*?6V_KGVqd*??^j9>&b5GrW-l>8twglVQz!wq2CJKBEg
ze!vW4y3sjaS7`!V4*!3R*Sd*fTI2C_S~4TI6>@^v0V?MP8pt}pgZ5%{QlNOnHStDi
z(k)=tJQp;%f~*zeFOL+dBwH8!de9SOg_QoBd=+g=Xg5ZGtRP8vmy<9T*oc77)BgQq
zYrgy(4J0hjIP-@wNC=lUWdTS0kp;`aIRbl$e8=t#EO~Y(Bu$r7{GOs2wtPXk=qfbM
zXrL)Jtu}TCo4X)!ludTX-->ud&Rc8PJ!s!Pcng;XY&X=hPYht0;7kp4MlZ$65h#^p
zEl%wbjSyLTNj2b4*HHloLCXdLUyxgH2rvAk>jliGEx3#<L=27rUpCeJ+Iw_e8F--s
zkG5crPP5#{5U37v8j(HX)2LxeF=g&qzQR?ofe-N!hieirpSCc&NMJ#1-%s+%I{Syb
zvcVbfpVcY#JLIE413nd*6cWJ4o|X8?)@S(KzfbdHAJ+YI$d3({F%A4vg$c32bL^D4
zh*`cvD2Np~ddgU0cF2ziQyyJQBf4XLmiLxgKEThS$MvV)0i?hJbSU#<DY|P%KlqXK
ziLQlD@UelIA6h=ZkD~F-81pm11@IsI6Ww$RALo9EssKNVCLApJ3||rozSRF+vrnQb
zkpJLtt%ScoVdVj9zP3DK)gMS=bVY%y3;)`(g^wog79e++TUBpS3=L*40T37dEm}wv
z>Kj7DAY;QfXV5CtJJw*30o(BJ@gM=B<{dFcR0&K4-;;&iAg-5ivK0Vn@xEYHY&93F
zwgNo0*<KicEBXBvDlrP6w84*+NPtY;L)E$j@D}&K5f7wFJWKjPUJM9UVA8T2-mPjd
zPw8TS)Z>{U1$h7(&^>jLfkL;)Xb1s_#di__PenY+#{qEwU)b_v>3jk)xhX#$C_Dhl
zOc$Cyk{=CeHV^NlRc&Tp;LV~HxUb_~Lkb$rWAIw*sARKRuh8(Lc^sZW<=r>t3v_82
z$qZUn<i={fAR+SC?xWjvnM5-*pz_li;5}%DC7r7b1w{VVeHEY$nXi2rnrR*YT!87e
zj^-AXzLkGOTF-s-x|PlfS|nU-f6G&E7u*BbB>CO!VqV4lN>;#oz}3ZDkZGRfwYR<n
z6(6I-#x_Rtc~cwAsr(<)TOb0gh}Z4-6fsVo!99|~Wu9mMj$!8!&2``@=r59@hPFPe
z?)@C;96}qxQ_%6FGo#WaU|_vepL>t#bZAfX{B3Vgo}p(ONY7}v_yX`89WNT!ILLfK
deaKhfE6|fzS@_`hYeBwr`o#BhN9W?T!vD%BIE4TJ

diff --git a/w32/logo-32.bmp b/w32/logo-32.bmp
index 38d60183cab4c7c44a6ce2eb33481e876cffa794..2ec7837efd61313ef6da15433b57816615aeb639 100644
GIT binary patch
literal 630
zcmXw1T}V@57=F%~X9e9XN5bw_4H9<apg>p`!w3@>EGYW1!HjTG5s|XUz(r+7-efak
z4pzx1M{5xMtoCzS(JY-i5~QO%o-VcRoOgF2MI*lBeBix!p67eN=ly;<4hDGW2mojW
zU~LqKrgeh{%v;vW1n8B|=aGM(#fRJ*e9R<Jc>563ukT^z#SP3ozW^!j#n)IDzCCJ3
zIby?)2hEVj1uTaEIn>zpSfXAl4zoB0{;Whqq&{f~U2;}of)>;57EznJJ;5Zk7XWvj
zs8)=R_$RW;XA@v#&Dyg3)Umrq^#R>_YdZWaW!+4#z(q?;sL4~8PZ^b8RzVrj)Be?G
z4mC-d&r<W9U};O?#Frf+O}aG?e^p@-w+6?fR0ygr7|tYq68*jD57Jt)+6KUU^iGbd
z{a&g_Rfj$$w`Xwv&pA>REd^}rJG^f@*O@DkR;N|KuF1u8+|{ZO)oBHA>NEQIB#}bD
zfxV2=MGTQ9(&7fc3oliZw6MV+!%dYSEpV{w>&M`vvYQqK>n5FFgPlHEXvOF=i0nQ+
zaMG9{Rm>rD*NMs|xK$4qRXtbQ45OvlUSMd|1Sd^eV&M080DST#Ac$+tkxTlSj7uH>
zJ=*nMnE}Vvou-ooCJW+s*MV$0Jlv9DHqb7m9JapGw$aA(a>q-vfg}FNefDP<xX#F2
J@!fz<{{umi9h(3E

literal 582
zcmZWmyG;c#5FGnRk@n6F_|6HT&(i_H%V>j=Xn;DX10o6_B|`|I+4U0vD_Qc4_cJ@b
zf4F3LTmakwsPiP;#6t#NZ{vv3d4B>vULNuJ_KfeJFHkY|b={g@9Y*z)m=IUOaO|Fu
zJi7x(>#-ZKh_I+G9H#DPq#l-eqL31)XnPsRB(_Op4dOuYjAY0JT1T5DTP?sM%otx*
zL#}fJO>Gs~XZjL`)YS&$a7Ic3OY*vjNTw}>mFGDBVG9}aT|!dTl96B7k^4WK$8@Z*
zV;M-JarT#ZfGR}Hksob$S4h?@zm~JOUQ&J$i56cmeAkXL;w!5AO_OVB-A4R}fY;9|
O5jc2wvl+XkEv~=21V9r2

diff --git a/w32/logo-48.bmp b/w32/logo-48.bmp
index 53c627433ac98952d232a0f442c4c7a4484f919d..1c7611cacde804d8e40ab1fcefe3af4de014c720 100644
GIT binary patch
literal 1270
zcmYjQT}%{L7(Fw)KoeiKk~H|XDp>0i#2;#XSw&ErHbLSaaUWK}5L+#_6pR{$M5{t0
zX~im$xG}XDEE{av(7?L8u89;`VMvpP-(h$Zc4yAM>4S+eckay6o80W|Ip6)h^Zo7m
z^0gQCX#ubiK&f*TNTSUP6t0rj2iP~6Od|O-j$~pO&tiY#`EW1(8SKK?AFUXVe1plp
zTKxOlKKysT9Me4|n7iYHek%_PU4Y&t;{i~rIwnYcxL){OIcja3_L;ve#JETO%8)Q=
zJ@mUMuy1j}#cB2C@C{mas6DpmQ08|I;kiMYeJ2_^V$$1;6Jq;2VW~&2ojBYfUS*|B
zPuTT6f4gkUq4vnTW&6QK+nm%FXblCRlxW$TBEo6MJk{MEF<u0q4saTPH{rU`qgNXu
zfBVr%vl{q><1RsK=s?3UG?F)gAbTI@2+q~5MUb3=8s<-*YLYNxi=5k!9c0>{r?E{r
zDkYhHXMfaYO4pE9^#{y`;JF|PYpniAe6WCI+YVaQfcN~QbT!|!t^c4w{uQJd0H9X&
zOxVoZrjj2ta;lXXSthmeTtw9E?eX;k<WiXFTqBAP_e_$r)tzKI!R2);JyolE434&v
zrbaUw0#LkJ(uF5AD^6O%<rx4+pF|&BZ#lTTOsy4AR$O7<DAZ&Z#s{HXl#=ZPaLM`e
z3fLq*4ax*ud<n=mNK13@PRBm&gI8b)%EVkeQwop3!emAy=Hg}mN|;=36~)F%Tv4q~
z@=ege-R=wg5;^jj@UtHH!ig)Y*hv0bAmWz$QRM3J+xVG0jb@-IlpB{RJC+$x!pw&9
z9{{K1g9o;@C7+mzpVdAeKC<U469AL}K8J8Tg5bBn-bvEDB_>eIw%K#I>@OPiLD_Tn
zQL|`KzL6HK4blpE?p+p3`Jufjn>ZqV3k(io``mtKdw|oHXq4zfCg8a-R^t%f#I$Vq
z$Kt_;r>W*Lps)g;Th8Jsr<gg8^0*o8Ztt$~4vf0<k@uLhJF&GR_HwvR{W`M}sa)fW
z8Yr79{A#U!B`3hnDb-xDc6H@>{TJ7Zt!YohuwMS&Kc4#j|1f}(bNv%~>W(WG?*XB|
BS7!hK

literal 1222
zcmZuxyK!4F5L`Se)eP>v2JnEyp@8eafitJB$3?gV*Ps&If*m<lu1JABo?QTskF;(E
z9CGiodv^doe*W<Q*(U%W06dKo&>deNfS-^35aId#4S0F}g4bW)@#pUwd|KPh)-r!h
zYkQ}-^R(DuAe>XK@U0`k?3yuadj&$yW~0_N9KDL=oOih<#gGDuQP$EEj>^F5RNNWr
zC>zX74s?bzrQ4cwT-~D*8p3oSWZw(x7K&VM2nq{q?g^L4fCy?y`i!_76l7l1raP04
z`PjN+V|wYT+MGei8N#c`-TMd_SsAlE4cuGar7M&iflI<^m6@S|4J>Ee-5JY%c<g3%
zJ3@qx##GI?0V*IneZu?nf@uQ(;hF&TE1vb|v=^=WUA!@#aTGY?gA1qrdt80-uHVHI
z*G}HSH<A!%o*Ht+7bo62*~AlP%<Z?ry~%jjbWyndHo6}(iKDxVn~xpq3Pw$gGf8DI
za3rm-keg{N+xEVR+OsML9Z$QdDnliU*X!%?sD{*1@pL$vw9=T+;(R_y<TNp~sFzXN
ls7_0IYuRk|Q^DT(5VX%PGG6GFEgUS<#)Upq9d`FW^A98ffy@8^

diff --git a/w32/logo-64.bmp b/w32/logo-64.bmp
index 7d4ca29a5d0df6662fcf9cce90b867367d3098ef..f517b9206752b63819863c6c15b37e3b3a49cce8 100644
GIT binary patch
literal 2166
zcmZuyTTEPK5dO|CtR#JbE{*kV35e*^wh=A72n{W1s|nO{G4eo>tELeZ>7s4GT1%mk
zq}(rMO|6BNtBKS?Q@3bZxiruR(-JQ3qlLZ9zG+0<nwfLiL+zKGlbrL-KmW`(GylK;
zt=bp}Y5}AG$j}}IQ7RDw*mtN;EFjPH^fadLc<{4l62IIY$KA=xn7MHg^WUGw!f+KH
z4Cdpv%Wq(*FA2+C@mTHHfwlH1{N4tvwW)43Bvtl#iGsJz?brX9VaaBe5uEzeVP*uD
zsyiyn2y{B1GO$!>i&X>%wtG+xEk4mG&7gx5H1Lv#=6ZiJTlhaVNWj`p<nPRL^*)H0
zEVFtV4)gE8wX&@Ix?#iQs?H*MOkK8htJ`Ga&(RIujd<O<UgJp2cS$TaG(JjOt~u$-
zgpzoma?Eg$ZY<wg2or@Sb9v#1MBj-6i`(Eg8(mE!UYgAW@FvlQh-5P<w>H#OR?+9Z
z=>&TXeZ&rq7|R9oommBa9kF<UNFr2PXvO4#C^Yq6Qbh)yBXxu5MVk10yNi{YxCH)B
z!D8TLqAR*UI{cpiRu2)i0!94Zx2RKrZq{bAL`~}<Z%+-dydTyL=FjETjdFEbIDlB|
z7*RD~jf4;w%uH<#U&RR`@@Lq*6e<P~-yBI|>ZrYHwOI15-c1ygLfNZE^et$v#PZIM
zukdGUIy(`amDIXn-N$l?rLd6si6SDO-mFSeh2CV#xt7<Ne^jrRLB-AkF4f6w1`9;%
zZcaiY1xiwZ49Y+v3$!stv>q2{HUR9EqeQ`WuDj1e<nKAlyb`feQZIzb$88l5VIK-#
zcfPSaFKcfCZx{cWDritLx+}b!D71EesONlbnG@Dih8jc@%$xe`-(ui-T?-<*BD|@M
zs||Cp`j&aFl#T{K>O&!k@1pRWuZC7ggAxVgCz~V6#Pf#SpyU^)|KmBK80LN4B^=K7
z^(=^u6<Du-CjSQ@4NQ-UnCAxC7XM@Z=6EJ#IE6RqBfRKwMWU!i0w4{m;ZI%92AR%k
z9D_`Pj(Zv(%n{WZQ0S0J(!u%jem<voZADrR5FHVS1>yZ4tK<CxV%h-Zw7y(Anmtbd
zySYmdb(8N5y`;a2UW+_=BKvx*av=w>XhRl|bHf%UUk0Gm%Y+=^!)Vtf-XSy~4IM-D
z7yDs_zJP6or|8Azg(s_B>b#^A$^F4$--D$^&Qtrr@?+Z3enL9{Ic%R3Y5wEv&49&C
zOX^2TnCJ|w?pf1`4cNS)Gb(R&6D`Fe%{!<MD&sJ1=$~oCDOpYh2l?P+#IbwhcC&s%
zG~>Xo{?JtE9-g#Uok;QituF`mc`4WqBwwPf>y0N*Hg!6zUkAU`d~qp0Ao7)P`h0u*
z)42zS!ZYR@EWV#;E*G%pyLuW+9Z2?U${}wcd7NnODC-&rD6jSN3Azp0<3uZ8?PUvl
y!KnYNl)wZfdxUS^#`1DkuXm;9X<BNdU68BS-hKuR>^#^sbo>5LcPTfsj{gALKmKk2

literal 4738
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
U?{iCBPN!?hvuixwEe|vOe>r-K?f?J)

diff --git a/w32/logo-96.bmp b/w32/logo-96.bmp
index f0496c88fadd1a4c71d0a354b4d5643043491c83..522f27a47c32415654a337002d385fc026da4225 100644
GIT binary patch
literal 4726
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
XIG|5Lq_Aw$!TP3CyAxCWHOBZKV2aY6

literal 4678
zcmbtYJFXK!5S+0|kvzK>uy+$eznvQpyo@^#aU-t4EjR}v;Q*wB2!Xn*y63aA&mc;&
z^z5zfuKvtt-`jW3Q&2pI5Z;6k-t!Z~D?FG&`0^Sb`9(h8K8Eo9^M~-`>!<MR_s@_A
z*p?-wX;}x423XPs(PCN#k2`D$WFS3?aied?)cI?1bDrZRg8@B+)Vi!Nq=&-@2lOL@
zO=7$326H9CA(feyU4aB~P}ZwHnQ|VPoZPEH)Ci)~&s*%+DJp%!7%Xin(fkrm?nxn&
zvo$7Nfa0D|T~(AeK<8e;qF9tBz|OtGMrV=7bpR_)4>Qo`RRGl9k!;17Q{`7Za3+zK
zyrI!lp}%{R2iZz_HW@&8)%;vgCx;O6w*Z#%J!4~Zkb-U(-9g}yf<(@7L9e3duC6FZ
zjF-+gAt7$gXNAP~I?f?b11f?9w77>Yg8>_=f>c``6%~*yYrZIvNS&gzaQ*At!Bi6v
z`NF4<g0ya4chpZ45Q6@(GYFH^Ut0#gXw%eDsr_6;ZE;vl?95iMvIB!v!k*Z$aAulk
zF5|tVpav@%EPhp)@e#g-7@Qb6lJBFMy8}aNAqJe6m{Hk^FWVKXLByOlo|IvQVqZFj
zW*e1i&~}Be9iOX<m?=Ai8GLiwq8tdTHEc$qT3&%!L~GdjWj^LXbZ{C^;4jA~Gea2P
zrdTI#2n;E)<8N_)bEw+kd`_HCP)bX=a1?`RdU`$(6SiD8c)+&}!spicHlhB+fYw`p
z9e=lEFp4JI`8J{d&4*B~uTsxL|KM9#&I7l-JlN*`m5;_)*&h3E`DYVmqh{Y7Y&^en
zeT8E_2bT?-P1vFTmcLq{Lq4Cd!M>3Hj&J*$c`5T>08eOew4+jf)k(B`3Tpmo$G1W_
zm@oXFeE?+JR8Ka!2J+DtnKC@!!R+xI>=*bV8J(DOzN-H|0WLh%qp=`BPA1H>Ej@x;
zvGO$*B1t9)-Axe61HL+hfK$#JQ!~#B%7=<dfN(GP-UOf=<<lP$STn9VUV+BFX4RBx
zmR7)9*<pESWz`X$9XQMEuy|%r=$d4$O~qZU8hSOX-@YU#%D0iwyM&cP-U;h7M9Ob+
zsx$cFF*`^TO%97I;qE0s3%|K4&@!>FqgD|4MGgaq_NO{*!L`a(fR;*t%g~^6&!Lv;
zi?lkj;@-Kh14t-)PcU5eK6Hq*`f@-=ul)^IJnxmEln5t!oaA=CTqM*mCk+5MuvG~C
zZf^}ObRBXYcxlji+jhwU@M@`+`5CGapb2JR7}Ul96|KQ#EFQqhEUQEpj*s{NmM6-u
j_sTY059CncWqP@=0hP2vl>eYS{O^fjTW+aYz6E~(bsg57

diff --git a/w32/main.c b/w32/main.c
index b6243f5..f821fb5 100644
--- a/w32/main.c
+++ b/w32/main.c
@@ -270,20 +270,29 @@ set_bitmap (HWND dlg, int item)
     }
   /* fprintf (stderr, "MapDialogRect: %d/%d\n", rect.right, rect.bottom); */
 
-  switch (rect.right)
-    {
-    case 32: resid = IDB_ICON_32; break;
-    case 48: resid = IDB_ICON_48; break;
-    case 64: resid = IDB_ICON_64; break;
-    case 96: resid = IDB_ICON_96; break;
-    default: resid = IDB_ICON_128;break;
-    }
-
-  bitmap = LoadImage (GetModuleHandle (NULL),
-                      MAKEINTRESOURCE (resid),
-                      IMAGE_BITMAP,
-                      rect.right, rect.bottom,
-                      (LR_SHARED | LR_LOADTRANSPARENT | LR_LOADMAP3DCOLORS));
+  /* Use the smaller dimension so the icon stays square and fits
+     the control without clipping.  Pick the closest bitmap that is
+     at least as large as the target to avoid upscaling.  */
+  {
+    long sz = rect.right < rect.bottom ? rect.right : rect.bottom;
+
+    if (sz <= 32)
+      resid = IDB_ICON_32;
+    else if (sz <= 48)
+      resid = IDB_ICON_48;
+    else if (sz <= 64)
+      resid = IDB_ICON_64;
+    else if (sz <= 96)
+      resid = IDB_ICON_96;
+    else
+      resid = IDB_ICON_128;
+
+    bitmap = LoadImage (GetModuleHandle (NULL),
+                        MAKEINTRESOURCE (resid),
+                        IMAGE_BITMAP,
+                        sz, sz,
+                        (LR_SHARED | LR_LOADTRANSPARENT | LR_LOADMAP3DCOLORS));
+  }
   if (!bitmap)
     {
       fprintf (stderr, "LoadImage failed: %s\n",  w32_strerror (-1));
diff --git a/w32/pinentry-w32.rc b/w32/pinentry-w32.rc
index a54bf3a..91e9977 100755
--- a/w32/pinentry-w32.rc
+++ b/w32/pinentry-w32.rc
@@ -21,6 +21,8 @@
 #include <windows.h>
 #include "resource.h"
 
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "app.manifest"
+
 /*
  * Main dialog
  */
@@ -31,18 +33,19 @@ IDB_ICON_64    BITMAP   DISCARDABLE   "logo-64.bmp"
 IDB_ICON_96    BITMAP   DISCARDABLE   "logo-96.bmp"
 IDB_ICON_128   BITMAP   DISCARDABLE   "logo-128.bmp"
 
-IDD_PINENT DIALOG DISCARDABLE  0, 0, 230, 125
-STYLE DS_MODALFRAME | DS_SYSMODAL | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_PINENT DIALOGEX 0, 0, 260, 129
+STYLE DS_SETFONT | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_DLGMODALFRAME
 CAPTION "Pinentry"
-FONT 10, "MS Sans Serif"
+FONT 9, "Segoe UI"
 BEGIN
     CONTROL         "", IDC_PINENT_ICON,
                     "Static", SS_BITMAP|SS_CENTERIMAGE,
-                                           5,  5,  32, 32
-    LTEXT           "", IDC_PINENT_DESC,  45,  5, 180, 65
-    RTEXT           "", IDC_PINENT_PROMPT, 5, 75,  60, 12
-    EDITTEXT        IDC_PINENT_TEXT,      70, 75, 155, 12, ES_PASSWORD | ES_AUTOHSCROLL
-    CTEXT           "", IDC_PINENT_ERR,    5, 90, 220, 12
-    DEFPUSHBUTTON   "O&K", IDOK,          50, 105, 85, 14
-    PUSHBUTTON      "&Cancel", IDCANCEL, 140, 105, 85, 14
+                                           7,   7,  32,  32
+    LTEXT           "", IDC_PINENT_DESC,  46,   7, 207,  56
+    RTEXT           "", IDC_PINENT_PROMPT, 7,  72,  55,   8
+    EDITTEXT        IDC_PINENT_TEXT,      65,  70, 188,  12, ES_PASSWORD | ES_AUTOHSCROLL
+    CTEXT           "", IDC_PINENT_ERR,    7,  91, 246,  10
+    DEFPUSHBUTTON   "O&K", IDOK,          96, 108,  75,  14
+    PUSHBUTTON      "&Cancel", IDCANCEL, 178, 108,  75,  14
 END
-- 
2.54.0