Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 09:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix butterflies' build

Browse source 
All screensavers using the scrnsave library must be compiled with Unicode now.

svn path=/trunk/; revision=32439
This commit is contained in:
Colin Finck 2008-02-20 22:14:36 +00:00
parent 25b4943288
commit ce08340bab
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
rosapps/applications/screensavers/butterflies/butterflies.c
View file

@ -1,5 +1,6 @@
#include <windows.h>
#include <scrnsave.h>
#include <tchar.h>
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
@ -12,7 +13,7 @@ HINSTANCE hInstance; // Holds The Instance Of The Application
GLuint texture[3]; //stores texture objects and display list
LPCTSTR registryPath = ("Software\\Microsoft\\ScreenSavers\\Butterflies");
LPCTSTR registryPath = _T("Software\\Microsoft\\ScreenSavers\\Butterflies");
BOOL dRotate;
@ -50,7 +51,7 @@ void ReadRegistry(){
valsize=sizeof(val);
result = RegQueryValueEx(skey, "Rotate", 0, &valtype, (LPBYTE)&val, &valsize);
result = RegQueryValueEx(skey, _T("Rotate"), 0, &valtype, (LPBYTE)&val, &valsize);
if(result == ERROR_SUCCESS)
dRotate = val;
RegCloseKey(skey);
@ -66,7 +67,7 @@ void WriteRegistry(){
return;
val = dRotate;
RegSetValueEx(skey, "Rotate", 0, REG_DWORD, (CONST BYTE*)&val, sizeof(val));
RegSetValueEx(skey, _T("Rotate"), 0, REG_DWORD, (CONST BYTE*)&val, sizeof(val));
RegCloseKey(skey);
}
@ -246,10 +247,10 @@ BOOL AboutProc(HWND hdlg, UINT msg, WPARAM wpm, LPARAM lpm){
EndDialog(hdlg, LOWORD(wpm));
break;
case WEBPAGE1:
ShellExecute(NULL, "open", "http://nehe.gamedev.net", NULL, NULL, SW_SHOWNORMAL);
ShellExecute(NULL, _T("open"), _T("http://nehe.gamedev.net"), NULL, NULL, SW_SHOWNORMAL);
break;
case WEBPAGE2:
ShellExecute(NULL, "open", "http://www.thaputer.com", NULL, NULL, SW_SHOWNORMAL);
ShellExecute(NULL, _T("open"), _T("http://www.thaputer.com"), NULL, NULL, SW_SHOWNORMAL);
break;
}
}

4
rosapps/applications/screensavers/butterflies/butterflies.rbuild
View file

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
<module name="butterflies" type="win32scr" installbase="system32" installname="butterflies.scr" allowwarnings="true">
<module name="butterflies" type="win32scr" installbase="system32" installname="butterflies.scr" unicode="yes">
<importlibrary definition="butterflies.def" />
<include base="butterflies">.</include>
<library>scrnsave</library>
@ -10,7 +10,7 @@
<library>opengl32</library>
<library>glu32</library>
<library>advapi32</library>
<library>shell32</library>
<library>shell32</library>
<metadata description = "OpenGL Butterflies screensaver" />