[ros-diffs] [janderwald] 32702: - make desk strict ANSI-C compilable - do not disable color changer when a background image is selected

[janderwald at svn.reactos.org]

Author: janderwald
Date: Sun Mar 16 13:29:28 2008
New Revision: 32702

URL: http://svn.reactos.org/svn/reactos?rev=3D32702&view=3Drev
Log:
- make desk strict ANSI-C compilable
- do not disable color changer when a background image is selected

Modified:
    trunk/reactos/dll/cpl/desk/background.c
    trunk/reactos/dll/cpl/desk/general.c

Modified: trunk/reactos/dll/cpl/desk/background.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/backgrou=
nd.c?rev=3D32702&r1=3D32701&r2=3D32702&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/dll/cpl/desk/background.c (original)
+++ trunk/reactos/dll/cpl/desk/background.c Sun Mar 16 13:29:28 2008
@@ -481,8 +481,6 @@
     InvalidateRect(GetDlgItem(hwndDlg, IDC_BACKGROUND_PREVIEW),
                    NULL, TRUE);
 =

-    EnableWindow(GetDlgItem(hwndDlg, IDC_COLOR_BUTTON),
-                 (backgroundItem->bWallpaper =3D=3D FALSE ? TRUE : FALSE));
     EnableWindow(GetDlgItem(hwndDlg, IDC_PLACEMENT_COMBO),
                  backgroundItem->bWallpaper);
 =


Modified: trunk/reactos/dll/cpl/desk/general.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/general.=
c?rev=3D32702&r1=3D32701&r2=3D32702&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/dll/cpl/desk/general.c (original)
+++ trunk/reactos/dll/cpl/desk/general.c Sun Mar 16 13:29:28 2008
@@ -15,6 +15,7 @@
     HWND hFontSize;
     INFCONTEXT Context;
     int i, ci =3D 0;
+    DWORD dwSize, dwValue, dwType;
 =

     hFontSize =3D GetDlgItem(hWnd, IDC_FONTSIZE_COMBO);
 =

@@ -39,7 +40,8 @@
                     if (i !=3D CB_ERR)
                         SendMessage(hFontSize, CB_SETITEMDATA, (WPARAM)i, =
(LPARAM)ci);
 =

-                    DWORD dwSize =3D MAX_PATH, dwValue, dwType =3D REG_DWO=
RD;
+                    dwSize =3D MAX_PATH;
+                    dwType =3D REG_DWORD;
 =

                     if (RegQueryValueEx(hKey, _T("LogPixels"), NULL,
                                         &dwType, (LPBYTE)&dwValue, &dwSize=
) =3D=3D ERROR_SUCCESS)