[UXTHEME]

[reactos.git] / reactos / dll / win32 / uxtheme / msstyles.c

diff --git a/reactos/dll/win32/uxtheme/msstyles.c b/reactos/dll/win32/uxtheme/msstyles.c
index 3f2a054..0adb70d 100644 (file)
--- a/reactos/dll/win32/uxtheme/msstyles.c
+++ b/reactos/dll/win32/uxtheme/msstyles.c
@@ -364,7 +364,10 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR
             lstrcpynW(part, comp, sizeof(part)/sizeof(part[0]));
             comp = tmp;
             /* now get the state */
-            *strchrW(comp, ')') = 0;
+            tmp = strchrW(comp, ')');
+            if (!tmp)
+                return FALSE;
+            *tmp = 0;
             lstrcpynW(state, comp, sizeof(state)/sizeof(state[0]));
         }
         else {
@@ -378,7 +381,10 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR
             lstrcpynW(szClassName, comp, MAX_THEME_CLASS_NAME);
             comp = tmp;
             /* now get the state */
-            *strchrW(comp, ')') = 0;
+            tmp = strchrW(comp, ')');
+            if (!tmp)
+                return FALSE;
+            *tmp = 0;
             lstrcpynW(state, comp, sizeof(state)/sizeof(state[0]));
         }
         else {
@@ -733,9 +739,9 @@ static inline void parse_init_nonclient (struct PARSENONCLIENTSTATE* state)
     memset (state, 0, sizeof (*state));
     state->metrics.cbSize = sizeof (NONCLIENTMETRICSW);
     SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, sizeof (NONCLIENTMETRICSW),
-        (PVOID)&state->metrics, 0);
+        &state->metrics, 0);
     SystemParametersInfoW (SPI_GETICONTITLELOGFONT, sizeof (LOGFONTW),
-        (PVOID)&state->iconTitleFont, 0);
+        &state->iconTitleFont, 0);
 }
 
 static BOOL parse_handle_nonclient_font (struct PARSENONCLIENTSTATE* state, 
@@ -838,9 +844,9 @@ static void parse_apply_nonclient (struct PARSENONCLIENTSTATE* state)
     if (state->metricsDirty)
     {
         SystemParametersInfoW (SPI_SETNONCLIENTMETRICS, sizeof (state->metrics),
-            (PVOID)&state->metrics, 0);
+            &state->metrics, 0);
         SystemParametersInfoW (SPI_SETICONTITLELOGFONT, sizeof (state->iconTitleFont),
-            (PVOID)&state->iconTitleFont, 0);
+            &state->iconTitleFont, 0);
     }
 }
 
@@ -1086,8 +1092,8 @@ static BOOL prepare_alpha (HBITMAP bmp, BOOL* hasAlpha)
         return TRUE;
 
     *hasAlpha = TRUE;
-    p = (BYTE*)dib.dsBm.bmBits;
-    n = abs(dib.dsBmih.biHeight) * dib.dsBmih.biWidth;
+    p = dib.dsBm.bmBits;
+    n = dib.dsBmih.biHeight * dib.dsBmih.biWidth;
     /* AlphaBlend() wants premultiplied alpha, so do that now */
     while (n-- > 0)
     {