On 21.12.2015 22:59, Jean-Christophe Cardot wrote:
Fixes https://bugs.winehq.org/show_bug.cgi?id=20977 Fixes https://bugs.winehq.org/show_bug.cgi?id=14288
Fix bugs in the handling of the hlp values in order to generate correct rtf tables; Read the DPI from the registry (instead of hardcoded 72); Use font scaling (depends on the version) to compute the rtf values so that the columns width are correct and precise (compared with MS winhlp32.exe); Add some comments and DEFINES tu make the code easier to understand. This is a first step into making wine's winhlp much better at handling hlp files and - when time permits - mvp files.
Tested on Linux (Mageia 5)
Hi, Jean-Christophe.
Thanks for working on this. Please try to split this one to several patches, for example one to introduce symbols for magic numbers, one for HLPFILE_ReadFont changes, one for DPI changes etc. It will make it much easier to read.
+#define DEFDPI 96 +static const WCHAR logpixels_reg[] = {'S','y','s','t','e','m','\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\','H','a','r','d','w','a','r','e',' ','P','r','o','f','i','l','e','s','\','C','u','r','r','e','n','t','\','S','o','f','t','w','a','r','e','\','F','o','n','t','s',0}; +static const WCHAR logpixels[] = {'L','o','g','P','i','x','e','l','s',0};
You sure you need this? Won't it work with GetDevicesCaps() on desktop HDC?
Also your mail client wrapped your patch, so it can't be applied. You need to fix the way it sends inline patches, send it as attachment, or use git-send-email to do the job for you.
-
Nikolay Sivov