Changeset 22060 for trunk/src

Timestamp:

Jan 22, 2013, 11:45:00 PM (13 years ago)

Author:

dmik

Message:

riched32: Return TRUE from EM_SETBKGNDCOLOR and EM_SETCHARFORMAT.

This in particular fixes debug assertions in Java.

File:

• trunk/src/riched32/richedit.c (modified) (11 diffs)

trunk/src/riched32/richedit.c

@@ -143 +143 @@
     if(IsWindowUnicode(hwnd)) {
          pfnEditProc = pfnEditProcW;
-    } 
+    }
     else pfnEditProc = pfnEditProcA;
 
@@ -160 +160 @@
 
         hProp = GlobalAlloc(GMEM_MOVEABLE|GMEM_ZEROINIT, sizeof(RICHEDIT_INFO));
-        SetPropA(hwnd, RICHEDIT_WND_PROP, hProp);          
+        SetPropA(hwnd, RICHEDIT_WND_PROP, hProp);
         return 0 ;
     }
@@ -217 +217 @@
             return 0;
     }
- 
+
     case EM_AUTOURLDETECT:
             DPRINTF_EDIT_MSG32("EM_AUTOURLDETECT Ignored");
@@ -443 +443 @@
             hProp = GetPropA(hwnd, RICHEDIT_WND_PROP);
             prinfo = (RICHEDIT_INFO *)GlobalLock(hProp);
-            if(prinfo) 
+            if(prinfo)
             {
                 prinfo->cf.dwMask     |= CFM_BACKCOLOR;
@@ -453 +453 @@
                 //Create a brush that we return in WM_CTLCOLORSTATIC
                 prinfo->hbrBackground  = (DWORD)CreateSolidBrush(prinfo->cf.crBackColor);
- 
+
                 dprintf(("Set background color to %x brush %x", prinfo->cf.crBackColor, prinfo->hbrBackground));
 
                 GlobalUnlock(hProp);
             }
-            return 0;
+            return 1;
     }
 
@@ -470 +470 @@
             hProp = GetPropA(hwnd, RICHEDIT_WND_PROP);
             prinfo = (RICHEDIT_INFO *)GlobalLock(hProp);
-            if(prinfo && pnewcf && pnewcf->cbSize >= sizeof(CHARFORMATA)) 
+            if(prinfo && pnewcf && pnewcf->cbSize >= sizeof(CHARFORMATA))
             {
                 if((pnewcf->dwMask & CFM_COLOR) && !(pnewcf->dwEffects & CFE_AUTOCOLOR)) {
@@ -477 +477 @@
                     dprintf(("Set text color to %x", prinfo->cf.crTextColor));
                 }
-                if(pnewcf->cbSize == sizeof(CHARFORMAT2A)) 
+                if(pnewcf->cbSize == sizeof(CHARFORMAT2A))
                 {
-                    if((pnewcf->dwMask & CFM_BACKCOLOR) && !(pnewcf->dwEffects & CFE_AUTOBACKCOLOR)) 
+                    if((pnewcf->dwMask & CFM_BACKCOLOR) && !(pnewcf->dwEffects & CFE_AUTOBACKCOLOR))
                     {
                         prinfo->cf.dwMask     |= CFM_BACKCOLOR;
                         prinfo->cf.crBackColor = pnewcf->crBackColor;
- 
+
                         //Destroy old brush if present
                         if(prinfo->hbrBackground) DeleteObject(prinfo->hbrBackground);
@@ -489 +489 @@
                         //Create a brush that we return in WM_CTLCOLORSTATIC
                         prinfo->hbrBackground = (DWORD)CreateSolidBrush(prinfo->cf.crBackColor);
- 
+
                         dprintf(("Set background color to %x brush %x", prinfo->cf.crBackColor, prinfo->hbrBackground));
                     }
@@ -496 +496 @@
 
             if(prinfo) GlobalUnlock(hProp);
-            return 0;
+            return 1;
     }
 
@@ -614 +614 @@
             if(prinfo) GlobalUnlock(hProp);
 
-            if(hBrush) return hBrush;          
+            if(hBrush) return hBrush;
     }
 #endif
@@ -699 +699 @@
     WNDCLASSW classinfoW;
 
-    if(GetClassInfoA(NULL, "EDIT", &classinfoA)) 
+    if(GetClassInfoA(NULL, "EDIT", &classinfoA))
     {
         pfnEditProcA = classinfoA.lpfnWndProc;
     }
     else DebugInt3();
-    if(GetClassInfoW(NULL, L"EDIT", &classinfoW)) 
+    if(GetClassInfoW(NULL, L"EDIT", &classinfoW))
     {
         pfnEditProcW = classinfoW.lpfnWndProc;