Frédéric Delanoy : riched20: Use BOOL type where appropriate.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e81412a4db1454fa8e63e0c1a91fd10c052f01c3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e81412a4db1454fa8e63e0c1a9...

Author: Frédéric Delanoy 
Date:   Wed Nov 20 01:26:24 2013 +0100

riched20: Use BOOL type where appropriate.

---

dlls/riched20/editor.c |    2 +-
 dlls/riched20/editor.h |    4 ++--
 dlls/riched20/run.c    |   14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index e70bbbe..b82b543 100644
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -247,7 +247,7 @@ static const WCHAR REListBox20W[] = {'R','E','L','i','s','t','B','o','x','2','0'
 static const WCHAR REComboBox20W[] = {'R','E','C','o','m','b','o','B','o','x','2','0','W', 0};
 static HCURSOR hLeft;

-int me_debug = 0;
+BOOL me_debug = FALSE;
 HANDLE me_heap = NULL;

static BOOL ME_ListBoxRegistered = FALSE;
diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h
index 5893051..2f2dc96 100644
--- a/dlls/riched20/editor.h
+++ b/dlls/riched20/editor.h
@@ -144,7 +144,7 @@ int ME_CharFromPointContext(ME_Context *c, int cx, ME_Run *run, BOOL closest, BO
 int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run, BOOL closest, BOOL visual_order) DECLSPEC_HIDDEN;
 int ME_PointFromCharContext(ME_Context *c, ME_Run *pRun, int nOffset, BOOL visual_order) DECLSPEC_HIDDEN;
 int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset, BOOL visual_order) DECLSPEC_HIDDEN;
-int ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) DECLSPEC_HIDDEN;
+BOOL ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) DECLSPEC_HIDDEN;
 void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) DECLSPEC_HIDDEN;
 ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN;
 void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN;
@@ -257,7 +257,7 @@ void ME_RTFParAttrHook(struct _RTF_Info *info) DECLSPEC_HIDDEN;
 void ME_RTFTblAttrHook(struct _RTF_Info *info) DECLSPEC_HIDDEN;
 void ME_RTFSpecialCharHook(struct _RTF_Info *info) DECLSPEC_HIDDEN;
 void ME_StreamInFill(ME_InStream *stream) DECLSPEC_HIDDEN;
-extern int me_debug DECLSPEC_HIDDEN;
+extern BOOL me_debug DECLSPEC_HIDDEN;

/* table.c */
 BOOL ME_IsInTable(ME_DisplayItem *pItem) DECLSPEC_HIDDEN;
diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c
index 8929fc5..263fee4 100644
--- a/dlls/riched20/run.c
+++ b/dlls/riched20/run.c
@@ -30,17 +30,17 @@ WINE_DECLARE_DEBUG_CHANNEL(richedit_lists);
 /******************************************************************************
  * ME_CanJoinRuns
  *
- * Returns 1 if two runs can be safely merged into one, 0 otherwise.
- */ 
-int ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2)
+ * Returns TRUE if two runs can be safely merged into one, FALSE otherwise.
+ */
+BOOL ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2)
 {
   if ((run1->nFlags | run2->nFlags) & MERF_NOJOIN)
-    return 0;
+    return FALSE;
   if (run1->style != run2->style)
-    return 0;
+    return FALSE;
   if ((run1->nFlags & MERF_STYLEFLAGS) != (run2->nFlags & MERF_STYLEFLAGS))
-    return 0;
-  return 1;
+    return FALSE;
+  return TRUE;
 }

void ME_SkipAndPropagateCharOffset(ME_DisplayItem *p, int shift)