Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

[x86/Linux] Fix mismatch between sortversioning.h and sortversioning.cpp #8366

Merged
merged 1 commit into from
Nov 30, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/inc/sortversioning.h
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ namespace SortVersioning

PSORTHANDLE GetSortHandle(__in LPCWSTR lpLocaleName, __in_opt CONST NLSVERSIONINFO * pVersion);

int SortCompareString(__in LPCWSTR lpLocaleName,
int WINAPI SortCompareString(__in LPCWSTR lpLocaleName,
__in DWORD dwCmpFlags,
__in_ecount(cchCount1) LPCWSTR lpString1,
__in int cchCount1,
Expand Down Expand Up @@ -137,7 +137,7 @@ namespace SortVersioning
__reserved LPVOID lpReserved,
__reserved LPARAM lParam );

__success(return != 0) int SortDllChangeCase(
__success(return != 0) int WINAPI SortDllChangeCase(
__in PSORTHANDLE pSort,
__in DWORD dwFlags,
__in_ecount(cchSrc) LPCWSTR pSrc,
Expand All @@ -147,7 +147,7 @@ namespace SortVersioning
__in_opt LPVOID lpReserved,
__in_opt LPARAM lParam );

__success(return != 0) int SortDllGetSortKey(
__success(return != 0) int WINAPI SortDllGetSortKey(
__in PSORTHANDLE pSort,
__in DWORD dwFlags,
__in_ecount(cchSrc) LPCWSTR pSrc,
Expand All @@ -157,7 +157,7 @@ namespace SortVersioning
__in_opt LPVOID lpReserved,
__in_opt LPARAM lParam );

int SortFindString(__in LPCWSTR lpLocaleName,
int WINAPI SortFindString(__in LPCWSTR lpLocaleName,
__in DWORD dwFindNLSStringFlags,
__in_ecount(cchSource) LPCWSTR lpStringSource,
__in int cchSource,
Expand All @@ -168,7 +168,7 @@ namespace SortVersioning
__reserved LPVOID lpReserved,
__reserved LPARAM lParam);

__success(return != 0) int SortDllFindString(
__success(return != 0) int WINAPI SortDllFindString(
__in PSORTHANDLE pSort,
__in DWORD dwFindNLSStringFlags,
__in_ecount(cchSource) LPCWSTR lpStringSource,
Expand All @@ -179,7 +179,7 @@ namespace SortVersioning
__in_opt LPVOID lpReserved,
__in_opt LPARAM lParam);

BOOL SortIsDefinedString(__in NLS_FUNCTION Function,
BOOL WINAPI SortIsDefinedString(__in NLS_FUNCTION Function,
__in DWORD dwFlags,
__in_opt CONST NLSVERSIONINFOEX * lpVersionInfo,
__in LPCWSTR lpString,
Expand Down