Commit 41e9dd3d authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

winhlp32: Make some functions static in hlpfile.c and remove HLPFILE_PointsToTwips().

parent ffdf89c4
...@@ -66,7 +66,7 @@ static HLPFILE *first_hlpfile = 0; ...@@ -66,7 +66,7 @@ static HLPFILE *first_hlpfile = 0;
* Pointer to block identified by key, or NULL if failure. * Pointer to block identified by key, or NULL if failure.
* *
*/ */
void* HLPFILE_BPTreeSearch(BYTE* buf, const void* key, static void* HLPFILE_BPTreeSearch(BYTE* buf, const void* key,
HLPFILE_BPTreeCompare comp) HLPFILE_BPTreeCompare comp)
{ {
unsigned magic; unsigned magic;
...@@ -396,7 +396,7 @@ HLPFILE_PAGE *HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset, ULONG* relativ ...@@ -396,7 +396,7 @@ HLPFILE_PAGE *HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset, ULONG* relativ
* *
* HLPFILE_Contents * HLPFILE_Contents
*/ */
HLPFILE_PAGE* HLPFILE_Contents(HLPFILE *hlpfile, ULONG* relative) static HLPFILE_PAGE* HLPFILE_Contents(HLPFILE *hlpfile, ULONG* relative)
{ {
HLPFILE_PAGE* page = NULL; HLPFILE_PAGE* page = NULL;
...@@ -1093,7 +1093,7 @@ static HLPFILE_LINK* HLPFILE_AllocLink(struct RtfData* rd, int cookie, ...@@ -1093,7 +1093,7 @@ static HLPFILE_LINK* HLPFILE_AllocLink(struct RtfData* rd, int cookie,
return link; return link;
} }
unsigned HLPFILE_HalfPointsToTwips(unsigned pts) static unsigned HLPFILE_HalfPointsToTwips(unsigned pts)
{ {
static unsigned logPxY; static unsigned logPxY;
if (!logPxY) if (!logPxY)
......
...@@ -164,20 +164,12 @@ typedef int (*HLPFILE_BPTreeCompare)(void *p, const void *key, ...@@ -164,20 +164,12 @@ typedef int (*HLPFILE_BPTreeCompare)(void *p, const void *key,
typedef void (*HLPFILE_BPTreeCallback)(void *p, void **next, void *cookie); typedef void (*HLPFILE_BPTreeCallback)(void *p, void **next, void *cookie);
HLPFILE* HLPFILE_ReadHlpFile(LPCSTR lpszPath); HLPFILE* HLPFILE_ReadHlpFile(LPCSTR lpszPath);
HLPFILE_PAGE* HLPFILE_Contents(HLPFILE* hlpfile, ULONG* relative);
HLPFILE_PAGE* HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash, ULONG* relative); HLPFILE_PAGE* HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash, ULONG* relative);
HLPFILE_PAGE* HLPFILE_PageByMap(HLPFILE* hlpfile, LONG lMap, ULONG* relative); HLPFILE_PAGE* HLPFILE_PageByMap(HLPFILE* hlpfile, LONG lMap, ULONG* relative);
HLPFILE_PAGE* HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset, ULONG* relative); HLPFILE_PAGE* HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset, ULONG* relative);
LONG HLPFILE_Hash(LPCSTR lpszContext); LONG HLPFILE_Hash(LPCSTR lpszContext);
void HLPFILE_FreeHlpFile(HLPFILE*); void HLPFILE_FreeHlpFile(HLPFILE*);
unsigned HLPFILE_HalfPointsToTwips(unsigned pts);
static inline unsigned HLPFILE_PointsToTwips(unsigned pts)
{
return HLPFILE_HalfPointsToTwips(2 * pts);
}
void* HLPFILE_BPTreeSearch(BYTE*, const void*, HLPFILE_BPTreeCompare);
void HLPFILE_BPTreeEnum(BYTE*, HLPFILE_BPTreeCallback cb, void *cookie); void HLPFILE_BPTreeEnum(BYTE*, HLPFILE_BPTreeCallback cb, void *cookie);
struct RtfData { struct RtfData {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment