[setup - the official Cygwin setup program] branch master, updated. release_2.933-3-g2907af95

[Jon Turney via Cygwin-apps-cvs]

Diff:
---
 Makefile.am  | 13 ++++++-------
 proppage.cc  | 15 ---------------
 propsheet.cc | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a5899f03..4046d375 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,13 +50,14 @@ EXTRA_DIST = \
        tree-plus.ico
 
 # iniparse.hh is generated from iniparse.yy via bison -d, so it needs to be
-# included here for proper tracking (but not iniparse.cc, since automake
-# knows about that already)
+# included here for proper dependency tracking (but not iniparse.cc, since
+# automake knows about that already)
 BUILT_SOURCES = \
        setup_version.c \
        iniparse.hh
 
 CLEANFILES = setup_version.c
+MAINTAINERCLEANFILES = iniparse.hh
 
 inilint_LDADD = \
        libgetopt++/libgetopt++.la \
@@ -100,7 +101,7 @@ wininet-delaylib.a:
        $(NM) -g --defined-only $$IMPLIB | grep ' T ' | cut -d' ' -f3 
>>wininet.def
        $(AM_V_GEN)$(DLLTOOL) --no-leading-underscore --input-def wininet.def 
--output-delaylib $@
 
-CLEANFILES += wininet-delaylib.a
+CLEANFILES += wininet-delaylib.a wininet.def
 
 # Unfortunately, the delay-loading stub lib doesn't work properly on 32-bit
 # currently, so don't bother (since we're probably going to stop building that
@@ -348,8 +349,6 @@ strip:      all
        $(OBJCOPY) --strip-all setup$(EXEEXT) stripped/setup$(EXEEXT)
        $(OBJCOPY) --add-gnu-debuglink=stripped/setup.dbg 
stripped/setup$(EXEEXT) stripped/setup$(EXEEXT)
 
-CLEANFILES += setup.dbg
-
 upx:   strip
        @if [ -e `which upx` ]; then\
                $(MKDIR_P) upx ;\
@@ -365,7 +364,7 @@ PKCSMODULE=/usr/lib64/libykcs11.so.2
 # PKCS#11 URI to locate signing key in HSM
 PKCS11_URI="pkcs11:id=%01;pin-value=123456"
 # our code-signing certificate and all intermediate and CA certificates
-CERT_SIGNING_CHAIN=code-signing-chain.pem
+CERT_SIGNING_CHAIN=~/certs/code-signing-chain.pem
 # CA timestamp service
 CA_TIMESTAMP=http://timestamp.sectigo.com
 
@@ -391,7 +390,7 @@ release: sign
        cp signed//setup-uncompressed${EXEEXT} 
release/setup-${VER}-uncompressed.${ARCH}${EXEEXT}
        cp signed/setup${EXEEXT} release/setup-${VER}.${ARCH}${EXEEXT}
 
-UPLOAD_HOST=cygwin-ad...@cygwin.com
+UPLOAD_HOST=cygwin.com
 UPLOAD_PATH=/www/sourceware/htdocs/cygwin/setup
 GPG_SIGN_KEYS="--enable-dsa2 --personal-digest-preferences=sha256 -u 
1A698DE9E2E56300"
 
diff --git a/proppage.cc b/proppage.cc
index 2ab03397..d177f2dd 100644
--- a/proppage.cc
+++ b/proppage.cc
@@ -361,21 +361,6 @@ PropertyPage::DialogProc (UINT message, WPARAM wParam, 
LPARAM lParam)
                // similar delegation as with WM_MOUSEWHEEL
         return OnTimerMessage (message, wParam, lParam);
 
-      case WM_DPICHANGED:
-        {
-          // To support Per Monitor V2 DPI Awareness declared in the manifest,
-          // adjust the window size after DPI changes.
-          RECT* const prcNewWindow = (RECT*)lParam;
-          SetWindowPos(GetHWND (),
-                       NULL,
-                       prcNewWindow -> left,
-                       prcNewWindow -> top,
-                       prcNewWindow -> right - prcNewWindow -> left,
-                       prcNewWindow -> bottom - prcNewWindow -> top,
-                       SWP_NOZORDER | SWP_NOACTIVATE);
-          return TRUE;
-        }
-
       default:
         break;
     }
diff --git a/propsheet.cc b/propsheet.cc
index faf6583f..749fba1c 100644
--- a/propsheet.cc
+++ b/propsheet.cc
@@ -275,6 +275,21 @@ static LRESULT CALLBACK PropSheetWndProc (HWND hwnd, UINT 
uMsg,
         InvalidateRect(hwnd, &rect, FALSE);
       }
       break;
+
+    case WM_DPICHANGED:
+      {
+        // adjust the window size after DPI changes.
+        RECT* const prcNewWindow = (RECT*)lParam;
+        SetWindowPos(hwnd,
+                     NULL,
+                     prcNewWindow -> left,
+                     prcNewWindow -> top,
+                     prcNewWindow -> right - prcNewWindow -> left,
+                     prcNewWindow -> bottom - prcNewWindow -> top,
+                     SWP_NOZORDER | SWP_NOACTIVATE);
+        return TRUE;
+      }
+      break;
     }
 
   return CallWindowProc (psd.oldWndProc,