chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Alex2539 found a problem in the ccalc lexer.c file which caused an error if a number was used in a calc statement (say from a WebParser measure) which had a leading "0". (08 for instance) This would cause the library to see the number as an Octal, and the formula would be incorrect at best, and fail with an error in the log at worst. (08 is an invalid Octal number) Alex has changed the library so you CAN indicate and do math with Octal, Hex and Binary numbers, but the numbers must be preceded with 0b (binary) 0x (hex) 0o (octal). If a number like 08 is used, it will be treated as "8", as it should.

Browse Source 
Change to RainThemes to support new Logging= setting in Rainmeter.ini
This commit is contained in:
jsmorley 2010-07-07 22:31:44 +00:00
parent cae7c84431
commit 36dfa2c6e5
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Application/Application.rc
View File

@ -28,8 +28,8 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,3,0,454
PRODUCTVERSION 1,3,0,454
FILEVERSION 1,3,0,455
PRODUCTVERSION 1,3,0,455
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -45,12 +45,12 @@ BEGIN
BLOCK "040b04b0"
BEGIN
VALUE "FileDescription", "Rainmeter - A Customizable Resource Meter"
VALUE "FileVersion", "1, 3, 0, 454"
VALUE "FileVersion", "1, 3, 0, 455"
VALUE "InternalName", "Rainmeter"
VALUE "LegalCopyright", "Copyright (C) 2010 - Rainy"
VALUE "OriginalFilename", "Rainmeter.exe"
VALUE "ProductName", "Rainmeter"
VALUE "ProductVersion", "1, 3, 0, 454"
VALUE "ProductVersion", "1, 3, 0, 455"
END
END
BLOCK "VarFileInfo"

10
Library/ccalc-0.5.1/lexer.c
View File

@ -137,8 +137,14 @@ next_token:
intreaded = 1;
}
// Readind oct number
if ( ch == '0' && nch >= '0' && nch <= '9' ) {
lexer->IntValue = strtol( lexer->SS, &NewSS, 8 );
if ( ch == '0' && nch == 'o') { // original version: if ( ch == '0' && nch >= '0' && nch <='9')
lexer->IntValue = strtol( lexer->SS+2, &NewSS, 8 );
intreaded = 1;
}
// Readind bin number
if ( ch == '0' && nch == 'b') { // original version: if ( ch == '0' && nch >= '0' && nch <='9')
lexer->IntValue = strtol( lexer->SS+2, &NewSS, 2 );
intreaded = 1;
}

2
revision-number.h
View File

@ -1,2 +1,2 @@
#pragma once
const int revision_number = 454;
const int revision_number = 455;