[PATCH 0/3] prototype / implementation mismatch

[Eric Pouech]

Janitorial: found a couple of places where implentation didn't
exactly match prototype.
Mainly (unsigned) int vs. (U)LONG|DWORD.

0 impact as they all boil down to 4-byte integers.
Generate warnings when DWORD is typedef:ed to a long (as it should).

V1 => V2:
- updated dwrite as Nikolay comment
- changed another proto in winternl.h (even if MS doc seems broken, but
  aligned proto to very similar APIs)
- fixed another one in programs/rpcss

A+
---

Eric Pouech (3):
      include/winternl.h: fix prototype definition
      dlls/dwrite: adjust implementation to match prototype
      programs/rpcss: fix implem declaration to match prototype

dlls/dwrite/dwrite_private.h | 8 ++++----
 include/winternl.h           | 4 ++--
 programs/rpcss/rpcss_main.c  | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

[PATCH 1/3] include/winternl.h: fix prototype definition

[Eric Pouech]

https://docs.microsoft.com/en-us/windows-hardware/drivers/ddi/ntifs/nf-ntifs...

funnily enough, implementation is correct

Signed-off-by: Eric Pouech

---
 include/winternl.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/winternl.h b/include/winternl.h
index 0e23fdd97bf..5be28856920 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -4374,7 +4374,7 @@ NTSYSAPI NTSTATUS  WINAPI RtlLookupAtomInAtomTable(RTL_ATOM_TABLE,const WCHAR*,R
 NTSYSAPI NTSTATUS  WINAPI RtlMakeSelfRelativeSD(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,LPDWORD);
 NTSYSAPI void      WINAPI RtlMapGenericMask(PACCESS_MASK,const GENERIC_MAPPING*);
 NTSYSAPI NTSTATUS  WINAPI RtlMultiByteToUnicodeN(LPWSTR,DWORD,LPDWORD,LPCSTR,DWORD);
-NTSYSAPI NTSTATUS  WINAPI RtlMultiByteToUnicodeSize(DWORD*,LPCSTR,UINT);
+NTSYSAPI NTSTATUS  WINAPI RtlMultiByteToUnicodeSize(DWORD*,LPCSTR,ULONG);
 NTSYSAPI NTSTATUS  WINAPI RtlNewSecurityObject(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,BOOLEAN,HANDLE,PGENERIC_MAPPING);
 NTSYSAPI PRTL_USER_PROCESS_PARAMETERS WINAPI RtlNormalizeProcessParams(RTL_USER_PROCESS_PARAMETERS*);
 NTSYSAPI NTSTATUS  WINAPI RtlNormalizeString(ULONG,const WCHAR*,INT,WCHAR*,INT*);
@@ -4382,7 +4382,7 @@ NTSYSAPI ULONG     WINAPI RtlNtStatusToDosError(NTSTATUS);
 NTSYSAPI ULONG     WINAPI RtlNtStatusToDosErrorNoTeb(NTSTATUS);
 NTSYSAPI ULONG     WINAPI RtlNumberOfSetBits(PCRTL_BITMAP);
 NTSYSAPI ULONG     WINAPI RtlNumberOfClearBits(PCRTL_BITMAP);
-NTSYSAPI UINT      WINAPI RtlOemStringToUnicodeSize(const STRING*);
+NTSYSAPI ULONG     WINAPI RtlOemStringToUnicodeSize(const STRING*);
 NTSYSAPI NTSTATUS  WINAPI RtlOemStringToUnicodeString(UNICODE_STRING*,const STRING*,BOOLEAN);
 NTSYSAPI NTSTATUS  WINAPI RtlOemToUnicodeN(LPWSTR,DWORD,LPDWORD,LPCSTR,DWORD);
 NTSYSAPI NTSTATUS  WINAPI RtlOpenCurrentUser(ACCESS_MASK,PHANDLE);

[PATCH 2/3] dlls/dwrite: adjust implementation to match prototype

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/dwrite/dwrite_private.h |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h
index 024741388cf..141b57fbaee 100644
--- a/dlls/dwrite/dwrite_private.h
+++ b/dlls/dwrite/dwrite_private.h
@@ -687,10 +687,10 @@ extern void release_scriptshaping_cache(struct scriptshaping_cache*) DECLSPEC_HI
 extern struct scriptshaping_cache *fontface_get_shaping_cache(struct dwrite_fontface *fontface) DECLSPEC_HIDDEN;

extern void opentype_layout_scriptshaping_cache_init(struct scriptshaping_cache *cache) DECLSPEC_HIDDEN;
-extern DWORD opentype_layout_find_script(const struct scriptshaping_cache *cache, DWORD kind, DWORD tag,
-        unsigned int *script_index) DECLSPEC_HIDDEN;
-extern DWORD opentype_layout_find_language(const struct scriptshaping_cache *cache, DWORD kind, DWORD tag,
-        unsigned int script_index, unsigned int *language_index) DECLSPEC_HIDDEN;
+extern unsigned int opentype_layout_find_script(const struct scriptshaping_cache *cache, unsigned int kind,
+        DWORD tag, unsigned int *script_index) DECLSPEC_HIDDEN;
+extern unsigned int opentype_layout_find_language(const struct scriptshaping_cache *cache, unsigned int kind,
+        DWORD tag, unsigned int script_index, unsigned int *language_index) DECLSPEC_HIDDEN;
 extern void opentype_layout_apply_gsub_features(struct scriptshaping_context *context, unsigned int script_index,
         unsigned int language_index, struct shaping_features *features) DECLSPEC_HIDDEN;
 extern void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, unsigned int script_index,

[PATCH 2/3] dlls/dwrite: adjust implementation to match prototype

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov

[PATCH 3/3] programs/rpcss: fix implem declaration to match prototype

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 programs/rpcss/rpcss_main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/programs/rpcss/rpcss_main.c b/programs/rpcss/rpcss_main.c
index 7df859155e2..af055e6000a 100644
--- a/programs/rpcss/rpcss_main.c
+++ b/programs/rpcss/rpcss_main.c
@@ -52,7 +52,7 @@ struct registered_class
 static CRITICAL_SECTION registered_classes_cs = { NULL, -1, 0, 0, 0, 0 };
 static struct list registered_classes = LIST_INIT(registered_classes);

-HRESULT __cdecl irpcss_server_register(handle_t h, const GUID *clsid, DWORD flags,
+HRESULT __cdecl irpcss_server_register(handle_t h, const GUID *clsid, unsigned int flags,
         PMInterfacePointer object, unsigned int *cookie)
 {
     struct registered_class *entry;