Commit fe4c4780 authored by Alexandre Julliard's avatar Alexandre Julliard

riched20: Fix an uninitialized variable bug.

Mark todo a test that depended on the bug to succeed.
parent 405e11ea
...@@ -310,7 +310,8 @@ static void ME_RTFCharAttrHook(RTF_Info *info) ...@@ -310,7 +310,8 @@ static void ME_RTFCharAttrHook(RTF_Info *info)
CHARFORMAT2W fmt; CHARFORMAT2W fmt;
fmt.cbSize = sizeof(fmt); fmt.cbSize = sizeof(fmt);
fmt.dwMask = 0; fmt.dwMask = 0;
fmt.dwEffects = 0;
switch(info->rtfMinor) switch(info->rtfMinor)
{ {
case rtfPlain: case rtfPlain:
......
...@@ -343,7 +343,8 @@ static void test_EM_SETTEXTMODE(void) ...@@ -343,7 +343,8 @@ static void test_EM_SETTEXTMODE(void)
/*Compare the two formattings*/ /*Compare the two formattings*/
ok((cf2.dwMask == cf2test.dwMask) && (cf2.dwEffects == cf2test.dwEffects), ok((cf2.dwMask == cf2test.dwMask) && (cf2.dwEffects == cf2test.dwEffects),
"two formats found in plain text mode - cf2.dwEffects: %f cf2test.dwEffects: %f\n",(double) cf2.dwEffects, (double) cf2test.dwEffects); "two formats found in plain text mode - cf2.dwEffects: %lx cf2test.dwEffects: %lx\n",
cf2.dwEffects, cf2test.dwEffects);
/*Test TM_RICHTEXT by: switching back to Rich Text mode /*Test TM_RICHTEXT by: switching back to Rich Text mode
printing "wine" in the current format(normal) printing "wine" in the current format(normal)
pasting "wine" from the clipboard(italicized) pasting "wine" from the clipboard(italicized)
...@@ -385,7 +386,7 @@ static void test_EM_SETTEXTMODE(void) ...@@ -385,7 +386,7 @@ static void test_EM_SETTEXTMODE(void)
(LPARAM) &cf2test); (LPARAM) &cf2test);
/*Test that the two formattings are not the same*/ /*Test that the two formattings are not the same*/
ok((cf2.dwMask == cf2test.dwMask) && (cf2.dwEffects != cf2test.dwEffects), todo_wine ok((cf2.dwMask == cf2test.dwMask) && (cf2.dwEffects != cf2test.dwEffects),
"expected different formats - cf2.dwMask: %lx, cf2test.dwMask: %lx, cf2.dwEffects: %lx, cf2test.dwEffects: %lx\n", "expected different formats - cf2.dwMask: %lx, cf2test.dwMask: %lx, cf2.dwEffects: %lx, cf2test.dwEffects: %lx\n",
cf2.dwMask, cf2test.dwMask, cf2.dwEffects, cf2test.dwEffects); cf2.dwMask, cf2test.dwMask, cf2.dwEffects, cf2test.dwEffects);
......
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