ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

riched20: Add the ability to create ME_Strings from constants. 

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Huw Davies 2016-10-07 10:49:33 +01:00 committed by Alexandre Julliard
parent 880b45ffb0
commit 1abe4cc738
3 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/riched20/editor.h
View File

@ -100,6 +100,7 @@ void ME_DumpDocument(ME_TextBuffer *buffer) DECLSPEC_HIDDEN;
/* string.c */ /* string.c */
ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) DECLSPEC_HIDDEN; ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) DECLSPEC_HIDDEN;
ME_String *ME_MakeStringR(WCHAR cRepeat, int nMaxChars) DECLSPEC_HIDDEN; ME_String *ME_MakeStringR(WCHAR cRepeat, int nMaxChars) DECLSPEC_HIDDEN;
ME_String *ME_MakeStringConst(const WCHAR *str, int len) DECLSPEC_HIDDEN;
void ME_DestroyString(ME_String *s) DECLSPEC_HIDDEN; void ME_DestroyString(ME_String *s) DECLSPEC_HIDDEN;
BOOL ME_AppendString(ME_String *s, const WCHAR *append, int len) DECLSPEC_HIDDEN; BOOL ME_AppendString(ME_String *s, const WCHAR *append, int len) DECLSPEC_HIDDEN;
ME_String *ME_VSplitString(ME_String *orig, int nVPos) DECLSPEC_HIDDEN; ME_String *ME_VSplitString(ME_String *orig, int nVPos) DECLSPEC_HIDDEN;

1
dlls/riched20/editstr.h
View File

@ -58,6 +58,7 @@ typedef struct tagME_String
{ {
WCHAR *szData; WCHAR *szData;
int nLen, nBuffer; int nLen, nBuffer;
void (*free)(struct tagME_String *);
} ME_String; } ME_String;
typedef struct tagME_FontCacheItem typedef struct tagME_FontCacheItem

37
dlls/riched20/string.c
View File

@ -27,10 +27,37 @@ static int ME_GetOptimalBuffer(int nLen)
return ((sizeof(WCHAR) * nLen) + 128) & ~63; return ((sizeof(WCHAR) * nLen) + 128) & ~63;
} }
static ME_String *make_string( void (*free)(ME_String *) )
{
ME_String *s = heap_alloc( sizeof(*s) );
if (s) s->free = free;
return s;
}
/* Create a ME_String using the const string provided.
* str must exist for the lifetime of the returned ME_String.
*/
ME_String *ME_MakeStringConst(const WCHAR *str, int len)
{
ME_String *s = make_string( NULL );
if (!s) return NULL;
s->szData = (WCHAR *)str;
s->nLen = len;
s->nBuffer = 0;
return s;
}
static void heap_string_free(ME_String *s)
{
heap_free( s->szData );
}
/* Create a buffer (uninitialized string) of size nMaxChars */ /* Create a buffer (uninitialized string) of size nMaxChars */
static ME_String *ME_MakeStringB(int nMaxChars) static ME_String *ME_MakeStringB(int nMaxChars)
{ {
ME_String *s = heap_alloc( sizeof(*s) ); ME_String *s = make_string( heap_string_free );
if (!s) return NULL; if (!s) return NULL;
s->nLen = nMaxChars; s->nLen = nMaxChars;
@ -69,7 +96,7 @@ ME_String *ME_MakeStringR(WCHAR cRepeat, int nMaxChars)
void ME_DestroyString(ME_String *s) void ME_DestroyString(ME_String *s)
{ {
if (!s) return; if (!s) return;
heap_free( s->szData ); if (s->free) s->free( s );
heap_free( s ); heap_free( s );
} }
@ -78,6 +105,7 @@ BOOL ME_InsertString(ME_String *s, int ofs, const WCHAR *insert, int len)
DWORD new_len = s->nLen + len + 1; DWORD new_len = s->nLen + len + 1;
WCHAR *new; WCHAR *new;
assert( s->nBuffer ); /* Not a const string */
assert( ofs <= s->nLen ); assert( ofs <= s->nLen );
if( new_len > s->nBuffer ) if( new_len > s->nBuffer )
@ -104,9 +132,7 @@ ME_String *ME_VSplitString(ME_String *orig, int charidx)
{ {
ME_String *s; ME_String *s;
/*if (charidx<0) charidx = 0; assert(orig->nBuffer); /* Not a const string */
if (charidx>orig->nLen) charidx = orig->nLen;
*/
assert(charidx>=0); assert(charidx>=0);
assert(charidx<=orig->nLen); assert(charidx<=orig->nLen);
@ -122,6 +148,7 @@ void ME_StrDeleteV(ME_String *s, int nVChar, int nChars)
{ {
int end_ofs = nVChar + nChars; int end_ofs = nVChar + nChars;
assert(s->nBuffer); /* Not a const string */
assert(nChars >= 0); assert(nChars >= 0);
assert(nVChar >= 0); assert(nVChar >= 0);
assert(end_ofs <= s->nLen); assert(end_ofs <= s->nLen);