Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- More fixes, leaving what's unfixed yet to Marc. 3dtext now compiles fine.

Browse source 
svn path=/trunk/; revision=29972
This commit is contained in:
Aleksey Bragin 2007-10-30 08:37:54 +00:00
parent e57b602266
commit 9df7f026a3
1 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

30
reactos/base/applications/screensavers/3dtext/3dtext.c
View file

@ -84,7 +84,15 @@ GLvoid glPrint(LPTSTR text) // Custom GL "Print" Routine
glPushAttrib(GL_LIST_BIT); // Pushes The Display List Bits glPushAttrib(GL_LIST_BIT); // Pushes The Display List Bits
glListBase(base); // Sets The Base Character to 32 glListBase(base); // Sets The Base Character to 32
glCallLists(_tcslen(text), GL_UNSIGNED_SHORT, text); // Draws The Display List Text
glCallLists(_tcslen(text),
#ifdef UNICODE
GL_UNSIGNED_SHORT
#else
GL_UNSIGNED_BYTE
#endif
, text); // Draws The Display List Text
glPopAttrib(); // Pops The Display List Bits glPopAttrib(); // Pops The Display List Bits
} }
@ -320,28 +328,28 @@ void InitSaver(HWND hwndParent)
// -p <hwnd> (preview) // -p <hwnd> (preview)
// -c <hwnd> (configure) // -c <hwnd> (configure)
// //
VOID ParseCommandLine(LPWSTR szCmdLine, UCHAR *chOption, HWND *hwndParent) VOID ParseCommandLine(LPTSTR szCmdLine, UCHAR *chOption, HWND *hwndParent)
{ {
UCHAR ch = *szCmdLine++; TCHAR ch = *szCmdLine++;
if(ch == '-' || ch == '/') if(ch == _T('-') || ch == _T('/'))
ch = *szCmdLine++; ch = *szCmdLine++;
if(ch >= 'A' && ch <= 'Z') if(ch >= _T('A') && ch <= _T('Z'))
ch += 'a' - 'A'; //convert to lower case ch += _T('a') - _T('A'); //convert to lower case
*chOption = ch; *chOption = ch;
ch = *szCmdLine++; ch = *szCmdLine++;
if(ch == ':') if(ch == _T(':'))
ch = *szCmdLine++; ch = *szCmdLine++;
while(ch == ' ' || ch == '\t') while(ch == _T(' ') || ch == _T('\t'))
ch = *szCmdLine++; ch = *szCmdLine++;
if(isdigit(ch)) if(isdigit(ch))
{ {
unsigned int i = _wtoi(szCmdLine - 1); unsigned int i = _ttoi(szCmdLine - 1);
*hwndParent = (HWND)i; *hwndParent = (HWND)i;
} }
else else
@ -386,9 +394,9 @@ void Configure(void)
DialogBox(hInstance, MAKEINTRESOURCE(IDD_CONFIG), NULL , (DLGPROC)ConfigDlgProc); DialogBox(hInstance, MAKEINTRESOURCE(IDD_CONFIG), NULL , (DLGPROC)ConfigDlgProc);
} }
int CALLBACK wWinMain (HINSTANCE hInst, int CALLBACK WinMain (HINSTANCE hInst,
HINSTANCE hPrev, HINSTANCE hPrev,
LPWSTR lpCmdLine, LPTSTR lpCmdLine,
int iCmdShow) int iCmdShow)
{ {
HWND hwndParent = 0; HWND hwndParent = 0;