mirror of
https://github.com/reactos/reactos.git
synced 2024-07-04 11:44:33 +00:00
Fix butterflies' build
All screensavers using the scrnsave library must be compiled with Unicode now. svn path=/trunk/; revision=32439
This commit is contained in:
parent
25b4943288
commit
ce08340bab
|
@ -1,5 +1,6 @@
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <scrnsave.h>
|
#include <scrnsave.h>
|
||||||
|
#include <tchar.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.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
|
GLuint texture[3]; //stores texture objects and display list
|
||||||
|
|
||||||
LPCTSTR registryPath = ("Software\\Microsoft\\ScreenSavers\\Butterflies");
|
LPCTSTR registryPath = _T("Software\\Microsoft\\ScreenSavers\\Butterflies");
|
||||||
BOOL dRotate;
|
BOOL dRotate;
|
||||||
|
|
||||||
|
|
||||||
|
@ -50,7 +51,7 @@ void ReadRegistry(){
|
||||||
|
|
||||||
valsize=sizeof(val);
|
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)
|
if(result == ERROR_SUCCESS)
|
||||||
dRotate = val;
|
dRotate = val;
|
||||||
RegCloseKey(skey);
|
RegCloseKey(skey);
|
||||||
|
@ -66,7 +67,7 @@ void WriteRegistry(){
|
||||||
return;
|
return;
|
||||||
|
|
||||||
val = dRotate;
|
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);
|
RegCloseKey(skey);
|
||||||
}
|
}
|
||||||
|
@ -246,10 +247,10 @@ BOOL AboutProc(HWND hdlg, UINT msg, WPARAM wpm, LPARAM lpm){
|
||||||
EndDialog(hdlg, LOWORD(wpm));
|
EndDialog(hdlg, LOWORD(wpm));
|
||||||
break;
|
break;
|
||||||
case WEBPAGE1:
|
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;
|
break;
|
||||||
case WEBPAGE2:
|
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;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
|
<!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" />
|
<importlibrary definition="butterflies.def" />
|
||||||
<include base="butterflies">.</include>
|
<include base="butterflies">.</include>
|
||||||
<library>scrnsave</library>
|
<library>scrnsave</library>
|
||||||
|
|
Loading…
Reference in a new issue