[PATCH v3 3/3] include: Correct IRowsetNotify HROW parameter type

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 dlls/msdaps/usrmarshal.c |  4 ++--
 include/rstnot.idl       |  4 ++--
 include/shobjidl.idl     | 24 ------------------------
 3 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c
index 10b840b1991..48308c7ee71 100644
--- a/dlls/msdaps/usrmarshal.c
+++ b/dlls/msdaps/usrmarshal.c
@@ -1180,14 +1180,14 @@ HRESULT __RPC_STUB IDBAsynchStatus_GetStatus_Stub(IDBAsynchStatus* This, HCHAPTE
     return hr;
 }

-HRESULT CALLBACK IRowsetNotify_OnRowChange_Proxy(IRowsetNotify* This, IRowset *rowset, DBCOUNTITEM rows, HROW *hrows, DBREASON reason,
+HRESULT CALLBACK IRowsetNotify_OnRowChange_Proxy(IRowsetNotify* This, IRowset *rowset, DBCOUNTITEM rows, const HROW *hrows, DBREASON reason,
                                                  DBEVENTPHASE phase, BOOL cantdeny)
 {
     TRACE("(%p)->(%p %Id %p %ld %ld %d)\n", This, rowset, rows, hrows, reason, phase, cantdeny);
     return IRowsetNotify_RemoteOnRowChange_Proxy(This, rowset, rows, hrows, reason, phase, cantdeny);
 }

-HRESULT __RPC_STUB IRowsetNotify_OnRowChange_Stub(IRowsetNotify* This, IRowset *rowset, DBCOUNTITEM rows, HROW *hrows, DBREASON reason,
+HRESULT __RPC_STUB IRowsetNotify_OnRowChange_Stub(IRowsetNotify* This, IRowset *rowset, DBCOUNTITEM rows, const HROW *hrows, DBREASON reason,
                                                   DBEVENTPHASE phase, BOOL cantdeny)
 {
     TRACE("(%p)->(%p %Id %p %ld %ld %d)\n", This, rowset, rows, hrows, reason, phase, cantdeny);
diff --git a/include/rstnot.idl b/include/rstnot.idl
index 9e6975f9c78..048ac887b4f 100644
--- a/include/rstnot.idl
+++ b/include/rstnot.idl
@@ -49,7 +49,7 @@ interface IRowsetNotify : IUnknown
     [local]
     HRESULT OnRowChange([in] IRowset *rowset,
                         [in] DBCOUNTITEM rows,
-                        [in, size_is((ULONG)rows)] HROW *hrows,
+                        [in, size_is((ULONG)rows)] const HROW *hrows,
                         [in] DBREASON reason,
                         [in] DBEVENTPHASE phase,
                         [in] BOOL cantdeny);
@@ -58,7 +58,7 @@ interface IRowsetNotify : IUnknown
     HRESULT RemoteOnRowChange(
                         [in] IRowset *rowset,
                         [in] DBCOUNTITEM rows,
-                        [in, size_is((ULONG)rows)] HROW *hrows,
+                        [in, size_is((ULONG)rows)] const HROW *hrows,
                         [in] DBREASON reason,
                         [in] DBEVENTPHASE phase,
                         [in] BOOL cantdeny);
diff --git a/include/shobjidl.idl b/include/shobjidl.idl
index df817cc17b2..886cff89ef9 100644
--- a/include/shobjidl.idl
+++ b/include/shobjidl.idl
@@ -45,30 +45,6 @@ cpp_quote("# define WINSHELLAPI DECLSPEC_IMPORT")
 cpp_quote("#endif")
 cpp_quote("#endif")

-cpp_quote("#ifndef _WINGDI_")
-/* already defined in wingdi.h but needed for WIDL */
-#define LF_FACESIZE     32
-
-    typedef struct tagLOGFONTW
-    {
-        LONG   lfHeight;
-        LONG   lfWidth;
-        LONG   lfEscapement;
-        LONG   lfOrientation;
-        LONG   lfWeight;
-        BYTE   lfItalic;
-        BYTE   lfUnderline;
-        BYTE   lfStrikeOut;
-        BYTE   lfCharSet;
-        BYTE   lfOutPrecision;
-        BYTE   lfClipPrecision;
-        BYTE   lfQuality;
-        BYTE   lfPitchAndFamily;
-        WCHAR  lfFaceName[LF_FACESIZE];
-    } LOGFONTW, *PLOGFONTW, *LPLOGFONTW;
-cpp_quote("#endif /* _WINGDI_ */")
-
-
 /*****************************************************************************
  * IPersistFolder interface
  */