localspl: Fix MONITOR2.cbSize calculation when converting from MONITOREX.

Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

localspl: Fix MONITOR2.cbSize calculation when converting from MONITOREX.
24a16c00 · Dmitry Timoshkov · Alexandre Julliard · e620a3f3 · 24a16c00 · 24a16c00
Commit 24a16c00 authored Sep 09, 2019 by Dmitry Timoshkov Committed by Alexandre Julliard Sep 09, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

localmon.c dlls/localspl/localmon.c +1 -1

provider.c dlls/localspl/provider.c +3 -1

No files found.
--- a/dlls/localspl/localmon.c
+++ b/dlls/localspl/localmon.c
@@ -777,7 +777,7 @@ LPMONITOREX WINAPI InitializePrintMonitor(LPWSTR regroot)
 {
    static MONITOREX mymonitorex =
    {
-        sizeof(MONITOREX) - sizeof(DWORD),
+        sizeof(MONITOR),
        {
            localmon_EnumPortsW,
            localmon_OpenPortW,

--- a/dlls/localspl/provider.c
+++ b/dlls/localspl/provider.c
@@ -504,7 +504,9 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname)
            if (pmonitorEx)
            {
                /* Layout of MONITOREX and MONITOR2 mostly matches */
-                memcpy(&pm->monitor, pmonitorEx, min(pmonitorEx->dwMonitorSize + sizeof(DWORD), sizeof(pm->monitor)));
+                memcpy(&pm->monitor, pmonitorEx, min(pmonitorEx->dwMonitorSize + sizeof(void *), sizeof(pm->monitor)));
+                /* MONITOREX.dwMonitorSize doesn't include the size field, while MONITOR2.cbSize does */
+                pm->monitor.cbSize += sizeof(void *);
                pm->old_XcvOpenPort = pmonitorEx->Monitor.pfnXcvOpenPort;
                pm->monitor.pfnXcvOpenPort = NULL;
            }