- Fix include path

- Make code c compatible
- Fix bug in parsing routine

svn path=/trunk/; revision=25684

diff --git a/reactos/base/applications/screensavers/cylfrac/cylfrac.c b/reactos/base/applications/screensavers/cylfrac/cylfrac.c
index 410b138..fcc7d99 100644 (file)
--- a/reactos/base/applications/screensavers/cylfrac/cylfrac.c
+++ b/reactos/base/applications/screensavers/cylfrac/cylfrac.c
@@ -18,8 +18,8 @@
  */
 
 #include <windows.h>
-#include <gl.h>
-#include <glu.h>
+#include <GL/gl.h>
+#include <GL/glu.h>
 #include <tchar.h>
 
 #define APPNAME _T("Cylfrac")
@@ -159,9 +159,9 @@ LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
                case WM_PAINT:
                {
                        DWORD ticks = oldticks;
+                       POINT currpoint;
                        oldticks = GetTickCount();
                        DrawScene(hwnd, dc, oldticks - ticks);
-                       POINT currpoint;
                        if(fullscreen)
                        {
                                GetCursorPos(&currpoint);
@@ -187,10 +187,11 @@ LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
                {
                        int width = LOWORD(lParam);
                        int height = HIWORD(lParam);
+                       float fscale;
                        glViewport(0, 0, width, height);
                        glMatrixMode(GL_MODELVIEW);
                        glLoadIdentity();
-                       float fscale = 0.8/(float)lvls;
+                       fscale = 0.8/(float)lvls;
                        glScalef(fscale, fscale, fscale);
                        break;
                }
@@ -236,7 +237,12 @@ void InitSaver(HWND hwndParent)
 
 void ParseCommandLine(PSTR szCmdLine, int *chOption, HWND *hwndParent)
 {
-       int ch = *szCmdLine++;
+       int ch;
+       
+       if (!strlen(szCmdLine))
+               return;
+
+       ch = *szCmdLine++;
 
        if(ch == '-' || ch == '/')
                ch = *szCmdLine++;
@@ -245,6 +251,10 @@ void ParseCommandLine(PSTR szCmdLine, int *chOption, HWND *hwndParent)
                ch += 'a' - 'A';
 
        *chOption = ch;
+
+       if (ch == 's' || ch == 'c')
+               return;
+
        ch = *szCmdLine++;
 
        if(ch == ':')
@@ -268,7 +278,7 @@ int WINAPI WinMain (HINSTANCE hInst,
                     int iCmdShow)
 {
        HWND    hwndParent;
-       int     chOption;
+       int     chOption = 0;
        MSG     Message;
 
        hInstance = hInst;