Merge branch 'stable' into main

ChangeLog.md

@@ -1,6 +1,28 @@
 This is the master changelog for Elite Dangerous Market Connector.  Entries are in reverse chronological order (latest first).
 ---
 
+Release 4.1.3
+===
+
+* Revert to not setting `gdiScaling` in the application manifest.  This should
+ fix [#734](https://github.com/EDCD/EDMarketConnector/issues/734)
+ and [#739](https://github.com/EDCD/EDMarketConnector/issues/739).
+ 
+  A side effect will be that the radio buttons in Preferences > Appearance
+ for the Theme selection will once more be improperly sized under any UI
+ scaling.  This is a Tcl/Tk bug which they have fixed in their code, but not
+ yet made a new release containing that fix.  We'll have it fixed when Tcl/Tk
+ release a fixed version *and* Python releases a fixed version, that we use,
+ that includes the fixed libraries.
+
+* Wraps some ctypes code in a try/except in order to fix
+ [#737](https://github.com/EDCD/EDMarketConnector/issues/737).  This should
+ benefit anyone running EDMC under any Wine version that doesn't set the
+ registry key we check for.
+ 
+  **Note, however, that we recommend running EDMarketConnector natively from
+  source if using Linux**.
+
 Release 4.1.2
 ===
 

config.py

@@ -13,7 +13,7 @@ appcmdname = 'EDMC'
 # appversion **MUST** follow Semantic Versioning rules:
 # <https://semver.org/#semantic-versioning-specification-semver>
 # Major.Minor.Patch(-prerelease)(+buildmetadata)
-appversion = '4.1.2'  #-rc1+a872b5f'
+appversion = '4.1.3'  #-rc1+a872b5f'
 # For some things we want appversion without (possible) +build metadata
 appversion_nobuild = str(semantic_version.Version(appversion).truncate('prerelease'))
 copyright = u'© 2015-2019 Jonathan Harris, 2020 EDCD'

edmarketconnector.xml

@@ -168,11 +168,34 @@
 		<!-- Windows -->
 
 		<item>
-			<title>Release 4.1.1</title>
+			<title>Release 4.1.3</title>
 			<description>
 				<![CDATA[
 <style>body { font-family:"Segoe UI","Tahoma"; font-size: 75%; } h2 { font-family:"Segoe UI","Tahoma"; font-size: 105%; }</style>
 
+<h2>Release 4.1.3</h2>
+<ul>
+<li>
+<p>Revert to not setting <code>gdiScaling</code> in the application manifest.  This should
+fix <a href="https://github.com/EDCD/EDMarketConnector/issues/734">#734</a>
+and <a href="https://github.com/EDCD/EDMarketConnector/issues/739">#739</a>.</p>
+<p>A side effect will be that the radio buttons in Preferences &gt; Appearance
+for the Theme selection will once more be improperly sized under any UI
+scaling.  This is a Tcl/Tk bug which they have fixed in their code, but not
+yet made a new release containing that fix.  We'll have it fixed when Tcl/Tk
+release a fixed version <em>and</em> Python releases a fixed version, that we use,
+that includes the fixed libraries.</p>
+</li>
+<li>
+<p>Wraps some ctypes code in a try/except in order to fix
+<a href="https://github.com/EDCD/EDMarketConnector/issues/737">#737</a>.  This should
+benefit anyone running EDMC under any Wine version that doesn't set the
+registry key we check for.</p>
+<p><strong>Note, however, that we recommend running EDMarketConnector natively from
+source if using Linux</strong>.</p>
+</li>
+</ul>
+
 <h2>Release 4.1.2</h2>
 <ul>
 <li>Minor fix to EDMC.py to revert broken logic trying to detect when there is
@@ -793,11 +816,11 @@ If any of your plugins are listed in that section then they will need updating,
 				]]>
 			</description>
 			<enclosure
-				url="https://github.com/EDCD/EDMarketConnector/releases/download/Release/4.1.2/EDMarketConnector_win_4.1.2.msi"
+				url="https://github.com/EDCD/EDMarketConnector/releases/download/Release/4.1.3/EDMarketConnector_win_4.1.3.msi"
 				sparkle:os="windows"
 				sparkle:installerArguments="/passive LAUNCH=yes"
-				sparkle:version="4.1.2"
-				length="11362304"
+				sparkle:version="4.1.3"
+				length="11354112"
 				type="application/octet-stream"
 			/>
 		</item>

prefs.py

@@ -206,19 +206,28 @@ elif platform == 'win32':
 
     CalculatePopupWindowPosition = None
     if not is_wine:
-        CalculatePopupWindowPosition = ctypes.windll.user32.CalculatePopupWindowPosition
-        CalculatePopupWindowPosition.argtypes = [
-            ctypes.POINTER(POINT),
-            ctypes.POINTER(SIZE),
-            UINT,
-            ctypes.POINTER(RECT),
-            ctypes.POINTER(RECT)
-        ]
+        try:
+            CalculatePopupWindowPosition = ctypes.windll.user32.CalculatePopupWindowPosition
 
-        GetParent = ctypes.windll.user32.GetParent
-        GetParent.argtypes = [HWND]
-        GetWindowRect = ctypes.windll.user32.GetWindowRect
-        GetWindowRect.argtypes = [HWND, ctypes.POINTER(RECT)]
+        except AttributeError as e:
+            logger.error(
+                'win32 and not is_wine, but ctypes.windll.user32.CalculatePopupWindowPosition invalid',
+                exc_info=e
+            )
+
+        else:
+            CalculatePopupWindowPosition.argtypes = [
+                ctypes.POINTER(POINT),
+                ctypes.POINTER(SIZE),
+                UINT,
+                ctypes.POINTER(RECT),
+                ctypes.POINTER(RECT)
+            ]
+
+            GetParent = ctypes.windll.user32.GetParent
+            GetParent.argtypes = [HWND]
+            GetWindowRect = ctypes.windll.user32.GetWindowRect
+            GetWindowRect.argtypes = [HWND, ctypes.POINTER(RECT)]
 
     SHGetLocalizedName = ctypes.windll.shell32.SHGetLocalizedName
     SHGetLocalizedName.argtypes = [LPCWSTR, LPWSTR, UINT, ctypes.POINTER(ctypes.c_int)]