From: jimtabor <james.tabor@reactos.org>
Date: Sat, 19 Oct 2019 04:49:13 +0000 (-0500)
Subject: [GDI32] Update Gdi Driver Header.
X-Git-Tag: 0.4.14-RC~1504
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=333b8f19a4af478329a19d3246c8919460c98573;ds=sidebyside

[GDI32] Update Gdi Driver Header.

Patch by : Akihiro Sagawa : Implement GetCharWidthInfo().

https://source.winehq.org/git/wine.git/commit/1128587fd262f9ad476b49e7837ac74dd656e6ba
---

diff --git a/win32ss/gdi/gdi32/include/wine/gdi_driver.h b/win32ss/gdi/gdi32/include/wine/gdi_driver.h
index fcf3de9d889..cd6350e4977 100644
--- a/win32ss/gdi/gdi32/include/wine/gdi_driver.h
+++ b/win32ss/gdi/gdi32/include/wine/gdi_driver.h
@@ -101,6 +101,7 @@ struct gdi_dc_funcs
     BOOL     (*pGetCharABCWidths)(PHYSDEV,UINT,UINT,LPABC);
     BOOL     (*pGetCharABCWidthsI)(PHYSDEV,UINT,UINT,WORD*,LPABC);
     BOOL     (*pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT);
+    BOOL     (*pGetCharWidthInfo)(PHYSDEV,PVOID);
     INT      (*pGetDeviceCaps)(PHYSDEV,INT);
     BOOL     (*pGetDeviceGammaRamp)(PHYSDEV,LPVOID);
     DWORD    (*pGetFontData)(PHYSDEV,DWORD,DWORD,LPVOID,DWORD);
@@ -197,7 +198,7 @@ struct gdi_dc_funcs
 };
 
 /* increment this when you change the DC function table */
-#define WINE_GDI_DRIVER_VERSION 46
+#define WINE_GDI_DRIVER_VERSION 49
 
 #define GDI_PRIORITY_NULL_DRV        0  /* null driver */
 #define GDI_PRIORITY_FONT_DRV      100  /* any font driver */
diff --git a/win32ss/gdi/gdi32/wine/enhmfdrv/dc.c b/win32ss/gdi/gdi32/wine/enhmfdrv/dc.c
index b5b472e86d6..eabfaeaab8c 100644
--- a/win32ss/gdi/gdi32/wine/enhmfdrv/dc.c
+++ b/win32ss/gdi/gdi32/wine/enhmfdrv/dc.c
@@ -858,6 +858,7 @@ static const struct gdi_dc_funcs emfpath_driver =
     NULL,                               /* pGetCharABCWidths */
     NULL,                               /* pGetCharABCWidthsI */
     NULL,                               /* pGetCharWidth */
+    NULL,                               /* pGetCharWidthInfo */
 #ifdef __REACTOS__
     EMFDRV_GetDeviceCaps, //// Work around HACK.
 #else
diff --git a/win32ss/gdi/gdi32/wine/enhmfdrv/init.c b/win32ss/gdi/gdi32/wine/enhmfdrv/init.c
index ce9d9fb333b..47debb0543a 100644
--- a/win32ss/gdi/gdi32/wine/enhmfdrv/init.c
+++ b/win32ss/gdi/gdi32/wine/enhmfdrv/init.c
@@ -73,6 +73,7 @@ static const struct gdi_dc_funcs emfdrv_driver =
     NULL,                            /* pGetCharABCWidths */
     NULL,                            /* pGetCharABCWidthsI */
     NULL,                            /* pGetCharWidth */
+    NULL,                            /* pGetCharWidthInfo */
     EMFDRV_GetDeviceCaps,            /* pGetDeviceCaps */
     NULL,                            /* pGetDeviceGammaRamp */
     NULL,                            /* pGetFontData */
diff --git a/win32ss/gdi/gdi32/wine/mfdrv/init.c b/win32ss/gdi/gdi32/wine/mfdrv/init.c
index 50f8ba3b4e7..8c24f783f1d 100644
--- a/win32ss/gdi/gdi32/wine/mfdrv/init.c
+++ b/win32ss/gdi/gdi32/wine/mfdrv/init.c
@@ -136,6 +136,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs =
     NULL,                            /* pGetCharABCWidths */
     NULL,                            /* pGetCharABCWidthsI */
     NULL,                            /* pGetCharWidth */
+    NULL,                            /* pGetCharWidthInfo */
     MFDRV_GetDeviceCaps,             /* pGetDeviceCaps */
     NULL,                            /* pGetDeviceGammaRamp */
     NULL,                            /* pGetFontData */
diff --git a/win32ss/gdi/gdi32/wine/path.c b/win32ss/gdi/gdi32/wine/path.c
index 5cf9d3ae80a..4b5e3dd5fe7 100644
--- a/win32ss/gdi/gdi32/wine/path.c
+++ b/win32ss/gdi/gdi32/wine/path.c
@@ -476,6 +476,7 @@ const struct gdi_dc_funcs path_driver =
     NULL,                               /* pGetCharABCWidths */
     NULL,                               /* pGetCharABCWidthsI */
     NULL,                               /* pGetCharWidth */
+    NULL,                               /* pGetCharWidthInfo */
     NULL,                               /* pGetDeviceCaps */
     NULL,                               /* pGetDeviceGammaRamp */
     NULL,                               /* pGetFontData */
diff --git a/win32ss/gdi/gdi32/wine/rosglue.c b/win32ss/gdi/gdi32/wine/rosglue.c
index d1b5038f27d..b537b90e419 100644
--- a/win32ss/gdi/gdi32/wine/rosglue.c
+++ b/win32ss/gdi/gdi32/wine/rosglue.c
@@ -89,6 +89,7 @@ static const struct gdi_dc_funcs DummyPhysDevFuncs =
     (PVOID)NULL_Unused, //BOOL     (*pGetCharABCWidths)(PHYSDEV,UINT,UINT,LPABC);
     (PVOID)NULL_Unused, //BOOL     (*pGetCharABCWidthsI)(PHYSDEV,UINT,UINT,WORD*,LPABC);
     (PVOID)NULL_Unused, //BOOL     (*pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT);
+    (PVOID)NULL_Unused, //BOOL     (*pGetCharWidthInfo)(PHYSDEV,void*);
     (PVOID)NULL_Unused, //INT      (*pGetDeviceCaps)(PHYSDEV,INT);
     (PVOID)NULL_Unused, //BOOL     (*pGetDeviceGammaRamp)(PHYSDEV,LPVOID);
     (PVOID)NULL_Unused, //DWORD    (*pGetFontData)(PHYSDEV,DWORD,DWORD,LPVOID,DWORD);