Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 06/13: [CALC] Improve the handling of configuration settings. CORE-3085, CORE-8486
by Carlo-Bramini 18 Mar '19

18 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=857a951f485e1a7043806… commit 857a951f485e1a704380681b314e13474d86ba40 Author: Carlo-Bramini <carlo_bramini(a)users.sourceforge.net> AuthorDate: Mon Aug 6 21:00:43 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 18 01:34:03 2019 +0100 [CALC] Improve the handling of configuration settings. CORE-3085, CORE-8486 Configuration is read from WIN.INI under W32S/Win9x/Me and from the registry for all NT platforms. Although with INI file mapping the keys are still saved in the registry even on NT, I added handling of different platforms for writing directly the configuration in the right place. --- base/applications/calc/winmain.c | 160 ++++++++++++++++++++++++++------------- 1 file changed, 106 insertions(+), 54 deletions(-) diff --git a/base/applications/calc/winmain.c b/base/applications/calc/winmain.c index fceb41fc96..37e194dc09 100644 --- a/base/applications/calc/winmain.c +++ b/base/applications/calc/winmain.c @@ -250,80 +250,108 @@ calc_t calc; BTNINFO BtnInfo[255]; UINT BtnCount; -static void load_config(void) +static void UpdateNumberIntl(void) { + /* Get current user defaults */ + if (!GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, calc.sDecimal, SIZEOF(calc.sDecimal))) + _tcscpy(calc.sDecimal, _T(".")); + + if (!GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, calc.sThousand, SIZEOF(calc.sThousand))) + _tcscpy(calc.sThousand, _T(",")); + + /* get the string lengths */ + calc.sDecimal_len = _tcslen(calc.sDecimal); + calc.sThousand_len = _tcslen(calc.sThousand); +} + +static int LoadRegInt(LPCTSTR lpszApp, LPCTSTR lpszKey, int iDefault) +{ + HKEY hKey; + int iValue; DWORD tmp; - HKEY hKey; - - /* If no settings are found in the registry, then use the default options */ - calc.layout = CALC_LAYOUT_STANDARD; - calc.usesep = FALSE; - /* Get the configuration based on what version of Windows that's being used */ - if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\Calc"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + if (RegOpenKeyEx(HKEY_CURRENT_USER, lpszApp, 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) { - /* Try to load last selected layout */ - tmp = sizeof(calc.layout); - if (RegQueryValueEx(hKey, TEXT("layout"), NULL, NULL, (LPBYTE)&calc.layout, &tmp) != ERROR_SUCCESS) - calc.layout = CALC_LAYOUT_STANDARD; + /* Try to load integer value */ + tmp = sizeof(int); - /* Try to load last selected formatting option */ - tmp = sizeof(calc.usesep); - if (RegQueryValueEx(hKey, TEXT("UseSep"), NULL, NULL, (LPBYTE)&calc.usesep, &tmp) != ERROR_SUCCESS) - calc.usesep = FALSE; + if (RegQueryValueEx(hKey, lpszKey, NULL, NULL, (LPBYTE)&iValue, &tmp) == ERROR_SUCCESS) + iDefault = iValue; /* close the key */ RegCloseKey(hKey); } - /* memory is empty at startup */ - calc.is_memory = FALSE; + return iDefault; +} - /* empty these values */ - calc.sDecimal[0] = TEXT('\0'); - calc.sThousand[0] = TEXT('\0'); +static void SaveRegInt(LPCTSTR lpszApp, LPCTSTR lpszKey, int iValue) +{ + HKEY hKey; - /* try to open the registry */ - if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\International"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + if (RegCreateKeyEx(HKEY_CURRENT_USER, lpszApp, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hKey, NULL) == ERROR_SUCCESS) { - /* get these values (ignore errors) */ - tmp = sizeof(calc.sDecimal); - RegQueryValueEx(hKey, TEXT("sDecimal"), NULL, NULL, (LPBYTE)calc.sDecimal, &tmp); - - tmp = sizeof(calc.sThousand); - RegQueryValueEx(hKey, TEXT("sThousand"), NULL, NULL, (LPBYTE)calc.sThousand, &tmp); + RegSetValueEx(hKey, lpszKey, 0, REG_DWORD, (const BYTE*)&iValue, sizeof(int)); /* close the key */ RegCloseKey(hKey); } - /* if something goes wrong, let's apply the defaults */ - if (calc.sDecimal[0] == TEXT('\0')) - _tcscpy(calc.sDecimal, TEXT(".")); +} - if (calc.sThousand[0] == TEXT('\0')) - _tcscpy(calc.sThousand, TEXT(",")); +static void load_config(void) +{ + OSVERSIONINFO osvi; - /* get the string lengths */ - calc.sDecimal_len = _tcslen(calc.sDecimal); - calc.sThousand_len = _tcslen(calc.sThousand); + osvi.dwOSVersionInfoSize = sizeof(osvi); + GetVersionEx(&osvi); + + switch (osvi.dwPlatformId) { + case VER_PLATFORM_WIN32s: + case VER_PLATFORM_WIN32_WINDOWS: + /* Try to load last selected layout */ + calc.layout = GetProfileInt(_T("SciCalc"), _T("layout"), CALC_LAYOUT_STANDARD); + + /* Try to load last selected formatting option */ + calc.usesep = (GetProfileInt(_T("SciCalc"), _T("UseSep"), FALSE)) ? TRUE : FALSE; + break; + + default: /* VER_PLATFORM_WIN32_NT */ + /* Try to load last selected layout */ + calc.layout = LoadRegInt(_T("SOFTWARE\\Microsoft\\Calc"), _T("layout"), CALC_LAYOUT_STANDARD); + + /* Try to load last selected formatting option */ + calc.usesep = (LoadRegInt(_T("SOFTWARE\\Microsoft\\Calc"), _T("UseSep"), FALSE)) ? TRUE : FALSE; + break; + } + + /* memory is empty at startup */ + calc.is_memory = FALSE; + + /* Get locale info for numbers */ + UpdateNumberIntl(); } static void save_config(void) { - HKEY hKey; - DWORD sepValue; + TCHAR buf[32]; + OSVERSIONINFO osvi; + + osvi.dwOSVersionInfoSize = sizeof(osvi); + GetVersionEx(&osvi); + + switch (osvi.dwPlatformId) { + case VER_PLATFORM_WIN32s: + case VER_PLATFORM_WIN32_WINDOWS: + _stprintf(buf, _T("%lu"), calc.layout); + WriteProfileString(_T("SciCalc"), _T("layout"), buf); + WriteProfileString(_T("SciCalc"), _T("UseSep"), (calc.usesep==TRUE) ? _T("1") : _T("0")); + break; - if (RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\Calc"), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hKey, NULL) != ERROR_SUCCESS) - { - return; + default: /* VER_PLATFORM_WIN32_NT */ + SaveRegInt(_T("SOFTWARE\\Microsoft\\Calc"), _T("layout"), calc.layout); + SaveRegInt(_T("SOFTWARE\\Microsoft\\Calc"), _T("UseSep"), calc.usesep); + break; } - - sepValue = (calc.usesep) ? 1 : 0; - - RegSetValueEx(hKey, TEXT("layout"), 0, REG_DWORD, (const BYTE*)&calc.layout, sizeof(calc.layout)); - RegSetValueEx(hKey, TEXT("UseSep"), 0, REG_DWORD, (const BYTE*)&sepValue, sizeof(sepValue)); - - RegCloseKey(hKey); } static LRESULT post_key_press(LPARAM lParam, WORD idc) @@ -1371,6 +1399,29 @@ static BOOL CALLBACK EnumChildProc(HWND hWnd, LPARAM lParam) return TRUE; } +static INT_PTR CALLBACK OnSettingChange(HWND hWnd, WPARAM wParam, LPARAM lParam) +{ + /* Check for user policy and area string valid */ + if (wParam == 0 && lParam != 0) + { + LPTSTR lpArea = (LPTSTR)lParam; + + /* Check if a parameter has been changed into the locale settings */ + if (!_tcsicmp(lpArea, _T("intl"))) + { + /* Re-load locale parameters */ + UpdateNumberIntl(); + + /* Update text for decimal button */ + SetDlgItemText(hWnd, IDC_BUTTON_DOT, calc.sDecimal); + + /* Update text into the output display */ + update_lcd_display(hWnd); + } + } + return 0; +} + static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) { unsigned int x; @@ -1449,7 +1500,7 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) case WM_COMMAND: /* * if selection of category is changed, we must - * updatethe content of the "from/to" combo boxes. + * update the content of the "from/to" combo boxes. */ if (wp == MAKEWPARAM(IDC_COMBO_CATEGORY, CBN_SELCHANGE)) { ConvAdjust(hWnd, SendDlgItemMessage(hWnd, IDC_COMBO_CATEGORY, CB_GETCURSEL, 0, 0)); @@ -1481,7 +1532,6 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) calc.layout = CALC_LAYOUT_STANDARD; calc.action = IDM_VIEW_STANDARD; DestroyWindow(hWnd); - save_config(); CheckMenuRadioItem(GetMenu(hWnd), IDM_VIEW_STANDARD, @@ -1496,7 +1546,6 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) calc.layout = CALC_LAYOUT_SCIENTIFIC; calc.action = IDM_VIEW_SCIENTIFIC; DestroyWindow(hWnd); - save_config(); CheckMenuRadioItem(GetMenu(hWnd), IDM_VIEW_STANDARD, @@ -1511,7 +1560,6 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) calc.layout = CALC_LAYOUT_CONVERSION; calc.action = IDM_VIEW_CONVERSION; DestroyWindow(hWnd); - save_config(); CheckMenuRadioItem(GetMenu(hWnd), IDM_VIEW_STANDARD, @@ -1559,7 +1607,6 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) calc.usesep = (calc.usesep ? FALSE : TRUE); update_menu(hWnd); update_lcd_display(hWnd); - save_config(); return TRUE; case IDC_BUTTON_CONVERT: ConvExecute(hWnd); @@ -1905,6 +1952,9 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) calc.is_menu_on = FALSE; break; + case WM_SETTINGCHANGE: + return OnSettingChange(hWnd, wp, lp); + case WM_THEMECHANGED: InvalidateRect(hWnd, NULL, FALSE); break; @@ -1975,6 +2025,8 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL TranslateMessage(&msg); DispatchMessage(&msg); } + + save_config(); } while (calc.action != IDC_STATIC); if (calc.hBgIcon != NULL)

1 0

[reactos] 05/13: [CALC] Add theming support, requires Windows XP or later. CORE-13343
by Carlo-Bramini 18 Mar '19

18 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b107f2e309cac23a42dd… commit 0b107f2e309cac23a42dddb9f36ac413a3a571b6 Author: Carlo-Bramini <carlo_bramini(a)users.sourceforge.net> AuthorDate: Mon Aug 6 20:23:12 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 18 01:34:02 2019 +0100 [CALC] Add theming support, requires Windows XP or later. CORE-13343 - Fix errors if a theme api is missing. - Add callback to functions for drawing themed transparent background. - Fix drawing glitch when theming is applied. - Redraw on theme change: automatically redraw the window if the theme is changed while the application is active. - Colours are now declared though RGB() macro. - Removed safe DS_SHELLFONT declaration. --- base/applications/calc/CMakeLists.txt | 1 + base/applications/calc/calc.h | 39 +++++-- base/applications/calc/res/calc_sm.ico | Bin 2550 -> 0 bytes base/applications/calc/resource.h | 7 +- base/applications/calc/resource.rc | 8 +- base/applications/calc/theme.c | 127 +++++++++++++++++++++++ base/applications/calc/winmain.c | 181 +++++++++++++++++++++++++++++---- base/applications/calc/wmmsg.h | 0 8 files changed, 330 insertions(+), 33 deletions(-) diff --git a/base/applications/calc/CMakeLists.txt b/base/applications/calc/CMakeLists.txt index ffe0ee3a5e..d273f10250 100644 --- a/base/applications/calc/CMakeLists.txt +++ b/base/applications/calc/CMakeLists.txt @@ -8,6 +8,7 @@ list(APPEND SOURCE utl_ieee.c winmain.c htmlhelp.c + theme.c calc.h) file(GLOB calc_rc_deps res/*.*) diff --git a/base/applications/calc/calc.h b/base/applications/calc/calc.h index db984f0760..f6c2c7c863 100644 --- a/base/applications/calc/calc.h +++ b/base/applications/calc/calc.h @@ -17,6 +17,9 @@ #endif #include <limits.h> +/* RESOURCES */ +#include "resource.h" + /* Messages reserved for the main dialog */ #define WM_CLOSE_STATS (WM_APP+1) #define WM_HANDLE_CLIPBOARD (WM_APP+2) @@ -41,12 +44,6 @@ #endif -#include "resource.h" - -#ifndef IDC_STATIC -#define IDC_STATIC ((DWORD)-1) -#endif - #define CALC_VERSION _T("1.12") #define MAX_CALC_SIZE 256 @@ -67,6 +64,34 @@ extern type_HtmlHelpW calc_HtmlHelpW; void HtmlHelp_Start(HINSTANCE hInstance); void HtmlHelp_Stop(void); +/* THEMING SUPPORT */ +#if (_WIN32_WINNT >= 0x0600) +#include <vssym32.h> +#include <vsstyle.h> +#else +#include <tmschema.h> +#endif +#include <uxtheme.h> + +void Theme_Start(HINSTANCE hInstance); +void Theme_Stop(void); + +typedef HTHEME (WINAPI* type_OpenThemeData)(HWND,const WCHAR*); +typedef HRESULT (WINAPI* type_CloseThemeData)(HTHEME); +typedef HRESULT (WINAPI* type_DrawThemeBackground)(HTHEME,HDC,int,int,const RECT*,const RECT*); +typedef BOOL (WINAPI* type_IsAppThemed)(void); +typedef BOOL (WINAPI* type_IsThemeActive)(void); +typedef BOOL (WINAPI* type_IsThemeBackgroundPartiallyTransparent)(HTHEME, int, int); +typedef HRESULT (WINAPI* type_DrawThemeParentBackground)(HWND, HDC, RECT *); + +extern type_OpenThemeData calc_OpenThemeData; +extern type_CloseThemeData calc_CloseThemeData; +extern type_DrawThemeBackground calc_DrawThemeBackground; +extern type_IsAppThemed calc_IsAppThemed; +extern type_IsThemeActive calc_IsThemeActive; +extern type_IsThemeBackgroundPartiallyTransparent calc_IsThemeBackgroundPartiallyTransparent; +extern type_DrawThemeParentBackground calc_DrawThemeParentBackground; + /*#define USE_KEYBOARD_HOOK*/ #define SIZEOF(_ar) (sizeof(_ar)/sizeof(_ar[1])) @@ -144,6 +169,8 @@ typedef struct { HHOOK hKeyboardHook; #endif HWND hWnd; + HICON hBgIcon; + HICON hSmIcon; DWORD layout; TCHAR buffer[MAX_CALC_SIZE]; TCHAR source[MAX_CALC_SIZE]; diff --git a/base/applications/calc/res/calc_sm.ico b/base/applications/calc/res/calc_sm.ico deleted file mode 100644 index c6e151d1f0..0000000000 Binary files a/base/applications/calc/res/calc_sm.ico and /dev/null differ diff --git a/base/applications/calc/resource.h b/base/applications/calc/resource.h index c9a3ac0e21..08e985cf73 100644 --- a/base/applications/calc/resource.h +++ b/base/applications/calc/resource.h @@ -1,5 +1,9 @@ #pragma once +#ifndef IDC_STATIC +#define IDC_STATIC -1 +#endif + #define IDS_CALC_NAME 1 #define IDS_MATH_ERROR 2 #define IDS_QUICKHELP 3 @@ -11,8 +15,7 @@ #define IDR_MENU_SCIENTIFIC_1 106 #define IDR_MENU_SCIENTIFIC_2 107 #define IDR_MENU_STANDARD 108 -#define IDI_CALC_BIG 110 -#define IDI_CALC_SMALL 111 +#define IDI_CALC 110 #define IDC_RADIO_HEX 1002 #define IDC_RADIO_DEC 1003 #define IDC_RADIO_OCT 1004 diff --git a/base/applications/calc/resource.rc b/base/applications/calc/resource.rc index 7272276d59..9bb5620d8a 100644 --- a/base/applications/calc/resource.rc +++ b/base/applications/calc/resource.rc @@ -10,18 +10,14 @@ #include "resource.h" -#ifndef IDC_STATIC -#define IDC_STATIC -1 -#endif - /* Common resources */ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* Icons */ -IDI_CALC_BIG ICON "res/calc.ico" -IDI_CALC_SMALL ICON "res/calc_sm.ico" +IDI_CALC ICON DISCARDABLE "res/calc.ico" +/* Manifest */ #include <reactos/manifest_exe.rc> /* UTF-8 */ diff --git a/base/applications/calc/theme.c b/base/applications/calc/theme.c new file mode 100644 index 0000000000..8055b36283 --- /dev/null +++ b/base/applications/calc/theme.c @@ -0,0 +1,127 @@ +/* + * ReactOS Calc (Theming support) + * + * Copyright 2007-2017, Carlo Bramini + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "calc.h" + +#define GET_CB(name) \ + calc_##name = (type_##name)GetProcAddress(hUxTheme, #name); \ + if (calc_##name == NULL) calc_##name = dummy_##name; + +static HTHEME WINAPI +dummy_OpenThemeData(HWND hwnd, const WCHAR *pszClassList); + +static HRESULT WINAPI +dummy_CloseThemeData(HTHEME hTheme); + +static HRESULT WINAPI +dummy_DrawThemeBackground(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, + const RECT *prc, const RECT *prcClip); + +static BOOL WINAPI +dummy_IsAppThemed(void); + +static BOOL WINAPI +dummy_IsThemeActive(void); + +static BOOL WINAPI +dummy_IsThemeBackgroundPartiallyTransparent(HTHEME hTheme, int iPartId, int iStateId); + +static HRESULT WINAPI +dummy_DrawThemeParentBackground(HWND hWnd, HDC hdc, RECT *prc); + + +type_OpenThemeData calc_OpenThemeData = dummy_OpenThemeData; +type_CloseThemeData calc_CloseThemeData = dummy_CloseThemeData; +type_DrawThemeBackground calc_DrawThemeBackground = dummy_DrawThemeBackground; +type_IsAppThemed calc_IsAppThemed = dummy_IsAppThemed; +type_IsThemeActive calc_IsThemeActive = dummy_IsThemeActive; +type_IsThemeBackgroundPartiallyTransparent calc_IsThemeBackgroundPartiallyTransparent = \ + dummy_IsThemeBackgroundPartiallyTransparent; +type_DrawThemeParentBackground calc_DrawThemeParentBackground = \ + dummy_DrawThemeParentBackground; + +static HMODULE hUxTheme; + +static HTHEME WINAPI +dummy_OpenThemeData(HWND hwnd, const WCHAR* pszClassList) +{ + return NULL; +} + +static HRESULT WINAPI +dummy_CloseThemeData(HTHEME hTheme) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI +dummy_DrawThemeBackground(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, + const RECT* prc, const RECT* prcClip) +{ + return E_NOTIMPL; +} + +static BOOL WINAPI +dummy_IsAppThemed(void) +{ + return FALSE; +} + +static BOOL WINAPI +dummy_IsThemeActive(void) +{ + return FALSE; +} + +static BOOL WINAPI +dummy_IsThemeBackgroundPartiallyTransparent(HTHEME hTheme, int iPartId, int iStateId) +{ + return FALSE; +} + +static HRESULT WINAPI +dummy_DrawThemeParentBackground(HWND hWnd, HDC hdc, RECT *prc) +{ + return E_NOTIMPL; +} + +void Theme_Start(HINSTANCE hInstance) +{ + hUxTheme = LoadLibrary(_T("UXTHEME")); + if (hUxTheme == NULL) + return; + + GET_CB(OpenThemeData) + GET_CB(CloseThemeData) + GET_CB(DrawThemeBackground) + GET_CB(IsAppThemed) + GET_CB(IsThemeActive) + GET_CB(IsThemeBackgroundPartiallyTransparent) + GET_CB(DrawThemeParentBackground) +} + +void Theme_Stop(void) +{ + if(hUxTheme == NULL) + return; + + FreeLibrary(hUxTheme); + hUxTheme = NULL; +} diff --git a/base/applications/calc/winmain.c b/base/applications/calc/winmain.c index 696e3ee9df..fceb41fc96 100644 --- a/base/applications/calc/winmain.c +++ b/base/applications/calc/winmain.c @@ -48,9 +48,9 @@ #define BITMASK_OCT_MASK 0x02 #define BITMASK_BIN_MASK 0x01 -#define CALC_CLR_RED 0x000000FF -#define CALC_CLR_BLUE 0x00FF0000 -#define CALC_CLR_PURP 0x00FF00FF +#define CALC_CLR_RED RGB(0xFF, 0x00, 0x00) +#define CALC_CLR_BLUE RGB(0x00, 0x00, 0xFF) +#define CALC_CLR_PURP RGB(0xFF, 0x00, 0xFF) typedef struct { CHAR key; // Virtual key identifier @@ -233,10 +233,22 @@ static const function_table_t function_table[] = { { IDC_BUTTON_LEFTPAR, NO_CHAIN, 0, run_lpar, NULL, NULL, NULL, }, }; +/* Sub-classing information for theming support */ +typedef struct{ + BOOL bHover; + WNDPROC oldProc; +} BTNINFO,*LPBTNINFO; + + /* -*/ + * Global variable declaration + */ + +calc_t calc; -calc_t calc; +/* Hot-state info for theming support */ +BTNINFO BtnInfo[255]; +UINT BtnCount; static void load_config(void) { @@ -326,7 +338,7 @@ static LRESULT post_key_press(LPARAM lParam, WORD idc) if (!GetClassName(hCtlWnd, ClassName, SIZEOF(ClassName))) return 1; - if (!_tcscmp(ClassName, TEXT("Button"))) { + if (!_tcscmp(ClassName, WC_BUTTON)) { DWORD dwStyle = GetWindowLongPtr(hCtlWnd, GWL_STYLE) & 0xF; /* Set states for press/release, but only for push buttons */ @@ -1213,14 +1225,58 @@ static void run_lpar(calc_number_t *c) static LRESULT CALLBACK SubclassButtonProc(HWND hWnd, WPARAM wp, LPARAM lp) { LPDRAWITEMSTRUCT dis = (LPDRAWITEMSTRUCT)lp; - DWORD dwStyle; UINT dwText; TCHAR text[64]; int dx, dy, len; SIZE size; POINT pt; - if(dis->CtlType == ODT_BUTTON) { + if(dis->CtlType == ODT_BUTTON) + { + HTHEME hTheme = NULL; + LPBTNINFO lpBtnInfo; + + if (calc_IsAppThemed() && calc_IsThemeActive()) + hTheme = calc_OpenThemeData(hWnd, L"Button"); + + if (hTheme) + { + int iState = 0; + + if ((dis->itemState & ODS_DISABLED)) + iState |= PBS_DISABLED; + if ((dis->itemState & ODS_SELECTED)) + iState |= PBS_PRESSED; + + lpBtnInfo = (LPBTNINFO)GetWindowLongPtr(dis->hwndItem, GWLP_USERDATA); + if (lpBtnInfo != NULL) + { + if (lpBtnInfo->bHover) + iState |= PBS_HOT; + } + + if (calc_IsThemeBackgroundPartiallyTransparent(hTheme, BP_PUSHBUTTON, iState)) + { + calc_DrawThemeParentBackground(dis->hwndItem, dis->hDC, &dis->rcItem); + } + + // Draw the frame around the control + calc_DrawThemeBackground(hTheme, dis->hDC, BP_PUSHBUTTON, iState, &dis->rcItem, NULL); + + calc_CloseThemeData(hTheme); + } else { + /* default state: unpushed */ + DWORD dwStyle = 0; + + if ((dis->itemState & ODS_SELECTED)) + dwStyle = DFCS_PUSHED; + + DrawFrameControl(dis->hDC, &dis->rcItem, DFC_BUTTON, DFCS_BUTTONPUSH | dwStyle); + } + + /* button text to write */ + len = GetWindowText(dis->hwndItem, text, SIZEOF(text)); + /* * little exception: 1/x has different color * in standard and scientific modes @@ -1236,21 +1292,20 @@ static LRESULT CALLBACK SubclassButtonProc(HWND hWnd, WPARAM wp, LPARAM lp) break; } } - /* button text to write */ - len = GetWindowText(dis->hwndItem, text, SIZEOF(text)); - /* default state: unpushed & enabled */ - dwStyle = 0; + + /* No background, to avoid corruption of the texture */ + SetBkMode(dis->hDC, TRANSPARENT); + + /* Default state: enabled */ dwText = 0; if ((dis->itemState & ODS_DISABLED)) dwText = DSS_DISABLED; - if ((dis->itemState & ODS_SELECTED)) - dwStyle = DFCS_PUSHED; - DrawFrameControl(dis->hDC, &dis->rcItem, DFC_BUTTON, DFCS_BUTTONPUSH | dwStyle); + /* Draw the text in the button */ GetTextExtentPoint32(dis->hDC, text, len, &size); dx = ((dis->rcItem.right-dis->rcItem.left) - size.cx) >> 1; dy = ((dis->rcItem.bottom-dis->rcItem.top) - size.cy) >> 1; - if ((dwStyle & DFCS_PUSHED)) { + if ((dis->itemState & ODS_SELECTED)) { dx++; dy++; } @@ -1261,6 +1316,61 @@ static LRESULT CALLBACK SubclassButtonProc(HWND hWnd, WPARAM wp, LPARAM lp) return 1L; } +static INT_PTR CALLBACK HotButtonProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) +{ + LPBTNINFO lpBtnInfo = (LPBTNINFO)GetWindowLongPtr(hWnd, GWLP_USERDATA); + TRACKMOUSEEVENT mouse_event; + + switch (msg) { + case WM_MOUSEMOVE: + mouse_event.cbSize = sizeof(TRACKMOUSEEVENT); + mouse_event.dwFlags = TME_QUERY; + if (!TrackMouseEvent(&mouse_event) || !(mouse_event.dwFlags & (TME_HOVER|TME_LEAVE))) + { + mouse_event.dwFlags = TME_HOVER|TME_LEAVE; + mouse_event.hwndTrack = hWnd; + mouse_event.dwHoverTime = 1; + TrackMouseEvent(&mouse_event); + } + break; + + case WM_MOUSEHOVER: + lpBtnInfo->bHover = TRUE; + InvalidateRect(hWnd, NULL, FALSE); + break; + + case WM_MOUSELEAVE: + lpBtnInfo->bHover = FALSE; + InvalidateRect(hWnd, NULL, FALSE); + break; + } + + return CallWindowProc(lpBtnInfo->oldProc, hWnd, msg, wp, lp); +} + +static BOOL CALLBACK EnumChildProc(HWND hWnd, LPARAM lParam) +{ + TCHAR szClass[64]; + + if (!GetClassName(hWnd, szClass, SIZEOF(szClass))) + return TRUE; + + if (!_tcscmp(szClass, WC_BUTTON)) + { + int *pnCtrls = (int *)lParam; + int nCtrls = *pnCtrls; + + BtnInfo[nCtrls].oldProc = (WNDPROC)GetWindowLongPtr(hWnd, GWLP_WNDPROC); + BtnInfo[nCtrls].bHover = FALSE; + + SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG_PTR)&BtnInfo[nCtrls]); + SetWindowLongPtr(hWnd, GWLP_WNDPROC, (LONG_PTR)HotButtonProc); + + *pnCtrls = ++nCtrls; + } + return TRUE; +} + static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) { unsigned int x; @@ -1276,6 +1386,9 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) EnableMenuItem(GetMenu(hWnd), IDM_HELP_HELP, MF_BYCOMMAND | MF_GRAYED); #endif calc.hWnd=hWnd; + /* Enumerate children and apply hover function */ + BtnCount = 0; + EnumChildWindows(hWnd, EnumChildProc, (LPARAM)&BtnCount); #ifdef USE_KEYBOARD_HOOK calc.hKeyboardHook=SetWindowsHookEx( @@ -1300,8 +1413,8 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) /* remove keyboard focus */ SetFocus(GetDlgItem(hWnd, IDC_BUTTON_FOCUS)); /* set our calc icon */ - SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIcon(calc.hInstance, MAKEINTRESOURCE(IDI_CALC_BIG))); - SendMessage(hWnd, WM_SETICON, ICON_SMALL, (LPARAM)LoadIcon(calc.hInstance, MAKEINTRESOURCE(IDI_CALC_SMALL))); + SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)calc.hBgIcon); + SendMessage(hWnd, WM_SETICON, ICON_SMALL, (LPARAM)calc.hSmIcon); /* Sets the state of the option to group digits */ hMenu = GetSubMenu(GetMenu(hWnd), 1); @@ -1354,7 +1467,7 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) TCHAR infotext[200]; LoadString(calc.hInstance, IDS_CALC_NAME, infotitle, SIZEOF(infotitle)); LoadString(calc.hInstance, IDS_AUTHOR, infotext, SIZEOF(infotext)); - ShellAbout(hWnd, infotitle, infotext, (HICON)LoadIcon(calc.hInstance, MAKEINTRESOURCE(IDI_CALC_BIG))); + ShellAbout(hWnd, infotitle, infotext, calc.hBgIcon); return TRUE; } case IDM_HELP_HELP: @@ -1791,6 +1904,10 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) case WM_EXITMENULOOP: calc.is_menu_on = FALSE; break; + + case WM_THEMECHANGED: + InvalidateRect(hWnd, NULL, FALSE); + break; } return FALSE; } @@ -1804,6 +1921,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL MSG msg; DWORD dwLayout; + /* Initialize controls for theming & manifest support */ InitCommonControls(); calc.hInstance = hInstance; @@ -1816,6 +1934,24 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL HtmlHelp_Start(hInstance); + Theme_Start(hInstance); + + calc.hBgIcon = LoadImage( + hInstance, + MAKEINTRESOURCE(IDI_CALC), + IMAGE_ICON, + GetSystemMetrics(SM_CXICON), + GetSystemMetrics(SM_CYICON), + 0); + + calc.hSmIcon = LoadImage( + hInstance, + MAKEINTRESOURCE(IDI_CALC), + IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + 0); + do { /* ignore hwnd: dialogs are already visible! */ if (calc.layout == CALC_LAYOUT_SCIENTIFIC) @@ -1841,8 +1977,15 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL } } while (calc.action != IDC_STATIC); + if (calc.hBgIcon != NULL) + DestroyIcon(calc.hBgIcon); + + if (calc.hSmIcon != NULL) + DestroyIcon(calc.hSmIcon); + stop_rpn_engine(); + Theme_Stop(); HtmlHelp_Stop(); return 0; diff --git a/base/applications/calc/wmmsg.h b/base/applications/calc/wmmsg.h deleted file mode 100644 index e69de29bb2..0000000000

1 0

[reactos] 04/13: [CALC] Add support for HTML-Help. CORE-15019
by Carlo-Bramini 18 Mar '19

18 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f6c565bc22e18eb308cc9… commit f6c565bc22e18eb308cc9c072530a6ffdf0b67db Author: Carlo-Bramini <carlo_bramini(a)users.sourceforge.net> AuthorDate: Mon Aug 6 20:22:36 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 18 01:34:01 2019 +0100 [CALC] Add support for HTML-Help. CORE-15019 --- base/applications/calc/CMakeLists.txt | 1 + base/applications/calc/calc.h | 16 +++++++++ base/applications/calc/htmlhelp.c | 67 +++++++++++++++++++++++++++++++++++ base/applications/calc/winmain.c | 14 +++++--- 4 files changed, 94 insertions(+), 4 deletions(-) diff --git a/base/applications/calc/CMakeLists.txt b/base/applications/calc/CMakeLists.txt index a92c7c3911..ffe0ee3a5e 100644 --- a/base/applications/calc/CMakeLists.txt +++ b/base/applications/calc/CMakeLists.txt @@ -7,6 +7,7 @@ list(APPEND SOURCE rpn_ieee.c utl_ieee.c winmain.c + htmlhelp.c calc.h) file(GLOB calc_rc_deps res/*.*) diff --git a/base/applications/calc/calc.h b/base/applications/calc/calc.h index afbc813d83..db984f0760 100644 --- a/base/applications/calc/calc.h +++ b/base/applications/calc/calc.h @@ -51,6 +51,22 @@ #define MAX_CALC_SIZE 256 +/* HTMLHELP SUPPORT */ +typedef HWND (WINAPI* type_HtmlHelpA)(HWND, LPCSTR, UINT, DWORD); +typedef HWND (WINAPI* type_HtmlHelpW)(HWND, LPCWSTR, UINT, DWORD); + +extern type_HtmlHelpA calc_HtmlHelpA; +extern type_HtmlHelpW calc_HtmlHelpW; + +#ifndef UNICODE +#define calc_HtmlHelp calc_HtmlHelpA +#else +#define calc_HtmlHelp calc_HtmlHelpW +#endif + +void HtmlHelp_Start(HINSTANCE hInstance); +void HtmlHelp_Stop(void); + /*#define USE_KEYBOARD_HOOK*/ #define SIZEOF(_ar) (sizeof(_ar)/sizeof(_ar[1])) diff --git a/base/applications/calc/htmlhelp.c b/base/applications/calc/htmlhelp.c new file mode 100644 index 0000000000..a306ae441b --- /dev/null +++ b/base/applications/calc/htmlhelp.c @@ -0,0 +1,67 @@ +/* + * ReactOS Calc (HtmlHelp support) + * + * Copyright 2007-2017, Carlo Bramini + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "calc.h" + +#define GET_CB(name) \ + calc_##name = (type_##name)GetProcAddress(hHtmlHelp, #name); \ + if (calc_##name == NULL) calc_##name = dummy_##name; + +static HWND WINAPI +dummy_HtmlHelpA(HWND hWnd, LPCSTR pszFile, UINT uCommand, DWORD dwData); + +static HWND WINAPI +dummy_HtmlHelpW(HWND hWnd, LPCWSTR pszFile, UINT uCommand, DWORD dwData); + +type_HtmlHelpA calc_HtmlHelpA = dummy_HtmlHelpA; +type_HtmlHelpW calc_HtmlHelpW = dummy_HtmlHelpW; + +static HMODULE hHtmlHelp; + +static HWND WINAPI +dummy_HtmlHelpA(HWND hWnd, LPCSTR pszFile, UINT uCommand, DWORD dwData) +{ + return NULL; +} + +static HWND WINAPI +dummy_HtmlHelpW(HWND hWnd, LPCWSTR pszFile, UINT uCommand, DWORD dwData) +{ + return NULL; +} + +void HtmlHelp_Start(HINSTANCE hInstance) +{ + hHtmlHelp = LoadLibrary(_T("HTMLHELP")); + if (hHtmlHelp == NULL) + return; + + GET_CB(HtmlHelpW) + GET_CB(HtmlHelpA) +} + +void HtmlHelp_Stop(void) +{ + if(hHtmlHelp == NULL) + return; + + FreeLibrary(hHtmlHelp); + hHtmlHelp = NULL; +} diff --git a/base/applications/calc/winmain.c b/base/applications/calc/winmain.c index ad9b5763b4..696e3ee9df 100644 --- a/base/applications/calc/winmain.c +++ b/base/applications/calc/winmain.c @@ -20,7 +20,7 @@ #include "calc.h" -#define HTMLHELP_PATH(_pt) TEXT("%systemroot%\\Help\\calc.chm::") TEXT(_pt) +#define HTMLHELP_PATH(_pt) _T("%systemroot%\\Help\\calc.chm::") _T(_pt) #define MAKE_BITMASK4(_show_b16, _show_b10, _show_b8, _show_b2) \ (((_show_b2) << 0) | \ @@ -1181,7 +1181,7 @@ static void handle_context_menu(HWND hWnd, WPARAM wp, LPARAM lp) popup.rcMargins.left = -1; popup.rcMargins.right = -1; popup.idString = GetWindowLongPtr((HWND)wp, GWL_ID); - HtmlHelp((HWND)wp, HTMLHELP_PATH("/popups.txt"), HH_DISPLAY_TEXT_POPUP, (DWORD_PTR)&popup); + calc_HtmlHelp((HWND)wp, HTMLHELP_PATH("/popups.txt"), HH_DISPLAY_TEXT_POPUP, (DWORD_PTR)&popup); } #else (void)idm; @@ -1272,8 +1272,9 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) return SubclassButtonProc(hWnd, wp, lp); case WM_INITDIALOG: - // For now, the Help dialog is disabled because of lacking of HTML Help support +#ifdef DISABLE_HTMLHELP_SUPPORT EnableMenuItem(GetMenu(hWnd), IDM_HELP_HELP, MF_BYCOMMAND | MF_GRAYED); +#endif calc.hWnd=hWnd; #ifdef USE_KEYBOARD_HOOK @@ -1358,7 +1359,7 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) } case IDM_HELP_HELP: #ifndef DISABLE_HTMLHELP_SUPPORT - HtmlHelp(hWnd, HTMLHELP_PATH("/general_information.htm"), HH_DISPLAY_TOPIC, (DWORD_PTR)NULL); + calc_HtmlHelp(hWnd, HTMLHELP_PATH("/general_information.htm"), HH_DISPLAY_TOPIC, (DWORD_PTR)NULL); #endif return TRUE; case IDM_VIEW_STANDARD: @@ -1763,6 +1764,7 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) calc.action = IDC_STATIC; DestroyWindow(hWnd); return TRUE; + case WM_DESTROY: /* Get (x,y) position of the calculator */ GetWindowRect(hWnd, &rc); @@ -1812,6 +1814,8 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL load_config(); start_rpn_engine(); + HtmlHelp_Start(hInstance); + do { /* ignore hwnd: dialogs are already visible! */ if (calc.layout == CALC_LAYOUT_SCIENTIFIC) @@ -1839,5 +1843,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL stop_rpn_engine(); + HtmlHelp_Stop(); + return 0; }

1 0

[reactos] 03/13: [CALC] Improve headers inclusion.
by Carlo-Bramini 18 Mar '19

18 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec1b499aac8e4db642add… commit ec1b499aac8e4db642add9fa46d55a5903077cab Author: Carlo-Bramini <carlo_bramini(a)users.sourceforge.net> AuthorDate: Mon Aug 6 19:58:23 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 18 01:34:01 2019 +0100 [CALC] Improve headers inclusion. --- base/applications/calc/calc.h | 20 ++++++++++++++------ base/applications/calc/winmain.c | 26 ++++++++++++++++++++------ 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/base/applications/calc/calc.h b/base/applications/calc/calc.h index 702ad47e77..afbc813d83 100644 --- a/base/applications/calc/calc.h +++ b/base/applications/calc/calc.h @@ -1,10 +1,14 @@ -#ifndef _CALC_H -#define _CALC_H +#ifndef __CALC_H__ +#define __CALC_H__ -#include <stdarg.h> -#include <windef.h> -#include <winuser.h> +#define WIN32_LEAN_AND_MEAN +#include <windows.h> #include <tchar.h> +#include <commctrl.h> +#include <shellapi.h> + +#include <stdio.h> +#include <string.h> #include <math.h> #include <float.h> #include <malloc.h> @@ -43,6 +47,8 @@ #define IDC_STATIC ((DWORD)-1) #endif +#define CALC_VERSION _T("1.12") + #define MAX_CALC_SIZE 256 /*#define USE_KEYBOARD_HOOK*/ @@ -226,8 +232,10 @@ void convert_real_integer(unsigned int base); INT_PTR CALLBACK AboutDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp); +// + void ConvExecute(HWND hWnd); void ConvAdjust(HWND hWnd, int n_cat); void ConvInit(HWND hWnd); -#endif /* _CALC_H */ +#endif /* __CALC_H__ */ diff --git a/base/applications/calc/winmain.c b/base/applications/calc/winmain.c index c6723bac18..ad9b5763b4 100644 --- a/base/applications/calc/winmain.c +++ b/base/applications/calc/winmain.c @@ -1,10 +1,24 @@ -#include "calc.h" +/* + * ReactOS Calc (main program) + * + * Copyright 2007-2017, Carlo Bramini + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ -#include <winbase.h> -#include <wingdi.h> -#include <winreg.h> -#include <shellapi.h> -#include <commctrl.h> +#include "calc.h" #define HTMLHELP_PATH(_pt) TEXT("%systemroot%\\Help\\calc.chm::") TEXT(_pt)

1 0

[reactos] 02/13: [CALC] Improve multi-precision support, and powers/roots. CORE-8486
by Carlo-Bramini 18 Mar '19

18 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=295eaf4e326f9ac090402… commit 295eaf4e326f9ac09040222833fcf58ee28fd107 Author: Carlo-Bramini <carlo_bramini(a)users.sourceforge.net> AuthorDate: Mon Aug 6 09:54:21 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 18 01:34:00 2019 +0100 [CALC] Improve multi-precision support, and powers/roots. CORE-8486 - Added support for average of squares and mean of squares into statistical functions. - pop() and push() functions in RPN engines now work with nodes instead of stack units. - Moved the POW and SQR operations near the operators. CORE-12766 - Fix number of digits for IEEE-754 constants. - Show all available digits in exp notation. CORE-14871 - Update help correspondingly. --- base/applications/calc/calc.h | 27 +++++----- base/applications/calc/fun_ieee.c | 73 ++++++++++++++++++++++++-- base/applications/calc/fun_mpfr.c | 64 ++++++++++++++++++++++- base/applications/calc/help.txt | 10 +++- base/applications/calc/resource.h | 1 + base/applications/calc/rpn_ieee.c | 80 ++++++++++++++++++---------- base/applications/calc/rpn_mpfr.c | 106 ++++++++++++++++++++++---------------- base/applications/calc/utl_ieee.c | 58 ++++++++++++++------- base/applications/calc/utl_mpfr.c | 33 +++++++++--- base/applications/calc/winmain.c | 50 +++++++++--------- 10 files changed, 360 insertions(+), 142 deletions(-) diff --git a/base/applications/calc/calc.h b/base/applications/calc/calc.h index d1f23a2811..702ad47e77 100644 --- a/base/applications/calc/calc.h +++ b/base/applications/calc/calc.h @@ -11,6 +11,7 @@ #ifndef DISABLE_HTMLHELP_SUPPORT #include <htmlhelp.h> #endif +#include <limits.h> /* Messages reserved for the main dialog */ #define WM_CLOSE_STATS (WM_APP+1) @@ -21,8 +22,9 @@ #define WM_HANDLE_FROM (WM_APP+6) #define WM_HANDLE_TO (WM_APP+7) +/* GNU MULTI-PRECISION LIBRARY support */ #ifdef ENABLE_MULTI_PRECISION -#include <mpfr.h> +#include "mpfr.h" #ifndef MPFR_DEFAULT_RND #define MPFR_DEFAULT_RND mpfr_get_default_rounding_mode () @@ -155,11 +157,11 @@ typedef struct { extern calc_t calc; -#define CALC_E 2.7182818284590452354 - -#define CALC_PI_2 1.57079632679489661923 -#define CALC_PI 3.14159265358979323846 -#define CALC_3_PI_2 4.71238898038468985769 +/* IEEE constants */ +#define CALC_E 2.718281828459045235360 +#define CALC_PI_2 1.570796326794896619231 +#define CALC_PI 3.141592653589793238462 +#define CALC_3_PI_2 4.712388980384689857694 #define CALC_2_PI 6.283185307179586476925 #define MODIFIER_INV 0x01 @@ -167,14 +169,9 @@ extern calc_t calc; #define NO_CHAIN 0x04 void apply_int_mask(calc_number_t *a); -#ifdef ENABLE_MULTI_PRECISION -void validate_rad2angle(calc_number_t *c); -void validate_angle2rad(calc_number_t *c); -#else +#ifndef ENABLE_MULTI_PRECISION __int64 logic_dbl2int(calc_number_t *a); double logic_int2dbl(calc_number_t *a); -double validate_rad2angle(double a); -double validate_angle2rad(calc_number_t *c); #endif void rpn_sin(calc_number_t *c); void rpn_cos(calc_number_t *c); @@ -206,7 +203,9 @@ void rpn_exp10(calc_number_t *c); void rpn_ln(calc_number_t *c); void rpn_log(calc_number_t *c); void rpn_ave(calc_number_t *c); +void rpn_ave2(calc_number_t *c); void rpn_sum(calc_number_t *c); +void rpn_sum2(calc_number_t *c); void rpn_s(calc_number_t *c); void rpn_s_m1(calc_number_t *c); void rpn_dms2dec(calc_number_t *c); @@ -217,10 +216,14 @@ int rpn_is_zero(calc_number_t *c); void rpn_alloc(calc_number_t *c); void rpn_free(calc_number_t *c); +// + void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base); void convert_text2number_2(calc_number_t *a); void convert_real_integer(unsigned int base); +// + INT_PTR CALLBACK AboutDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp); void ConvExecute(HWND hWnd); diff --git a/base/applications/calc/fun_ieee.c b/base/applications/calc/fun_ieee.c index b5f4ab8824..3e8ba68de8 100644 --- a/base/applications/calc/fun_ieee.c +++ b/base/applications/calc/fun_ieee.c @@ -1,6 +1,27 @@ +/* + * ReactOS Calc (Math functions, IEEE-754 engine) + * + * Copyright 2007-2017, Carlo Bramini + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + #include "calc.h" -#include <limits.h> +static double validate_rad2angle(double a); +static double validate_angle2rad(calc_number_t *c); void apply_int_mask(calc_number_t *r) { @@ -47,7 +68,7 @@ double atanh(double x) return log((1.0+x)/(1.0-x))/2.0; } -double validate_rad2angle(double a) +static double validate_rad2angle(double a) { switch (calc.degr) { case IDC_RADIO_DEG: @@ -62,7 +83,7 @@ double validate_rad2angle(double a) return a; } -double validate_angle2rad(calc_number_t *c) +static double validate_angle2rad(calc_number_t *c) { switch (calc.degr) { case IDC_RADIO_DEG: @@ -250,6 +271,7 @@ __int64 logic_dbl2int(calc_number_t *a) } return (__int64)int_part; } + double logic_int2dbl(calc_number_t *a) { return (double)a->i; @@ -315,9 +337,9 @@ static unsigned __int64 sqrti(unsigned __int64 number) unsigned __int64 n, n1; #ifdef __GNUC__ - if (number == 0xffffffffffffffffLL) + if (number == 0xffffffffffffffffULL) #else - if (number == 0xffffffffffffffff) + if (number == 0xffffffffffffffffUI64) #endif return 0xffffffff; @@ -427,6 +449,21 @@ static double stat_sum(void) return sum; } +static double stat_sum2(void) +{ + double sum = 0; + statistic_t *p = calc.stat; + + while (p != NULL) { + if (p->base == IDC_RADIO_DEC) + sum += p->num.f * p->num.f; + else + sum += (double)p->num.i * (double)p->num.i; + p = (statistic_t *)(p->next); + } + return sum; +} + void rpn_ave(calc_number_t *c) { double ave = 0; @@ -443,6 +480,22 @@ void rpn_ave(calc_number_t *c) c->i = (__int64)ave; } +void rpn_ave2(calc_number_t *c) +{ + double ave = 0; + int n; + + ave = stat_sum2(); + n = SendDlgItemMessage(calc.hStatWnd, IDC_LIST_STAT, LB_GETCOUNT, 0, 0); + + if (n) + ave = ave / (double)n; + if (calc.base == IDC_RADIO_DEC) + c->f = ave; + else + c->i = (__int64)ave; +} + void rpn_sum(calc_number_t *c) { double sum = stat_sum(); @@ -453,6 +506,16 @@ void rpn_sum(calc_number_t *c) c->i = (__int64)sum; } +void rpn_sum2(calc_number_t *c) +{ + double sum = stat_sum2(); + + if (calc.base == IDC_RADIO_DEC) + c->f = sum; + else + c->i = (__int64)sum; +} + static void rpn_s_ex(calc_number_t *c, int pop_type) { double ave = 0; diff --git a/base/applications/calc/fun_mpfr.c b/base/applications/calc/fun_mpfr.c index 8d1534048a..27c7f37b7e 100644 --- a/base/applications/calc/fun_mpfr.c +++ b/base/applications/calc/fun_mpfr.c @@ -1,5 +1,28 @@ +/* + * ReactOS Calc (Math functions, GMP/MPFR engine) + * + * Copyright 2007-2017, Carlo Bramini + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + #include "calc.h" +static void validate_rad2angle(calc_number_t *c); +static void validate_angle2rad(calc_number_t *c); + void apply_int_mask(calc_number_t *r) { mpz_t a, mask; @@ -28,7 +51,7 @@ void apply_int_mask(calc_number_t *r) mpz_clear(mask); } -void validate_rad2angle(calc_number_t *r) +static void validate_rad2angle(calc_number_t *r) { mpfr_t mult, divs; @@ -55,7 +78,7 @@ void validate_rad2angle(calc_number_t *r) mpfr_clear(divs); } -void validate_angle2rad(calc_number_t *r) +static void validate_angle2rad(calc_number_t *r) { mpfr_t mult, divs; @@ -341,6 +364,21 @@ static void stat_sum(mpfr_t sum) } } +static void stat_sum2(mpfr_t sum) +{ + statistic_t *p = calc.stat; + mpfr_t sqr; + + mpfr_init(sqr); + mpfr_set_ui(sum, 0, MPFR_DEFAULT_RND); + while (p != NULL) { + mpfr_mul(sqr, p->num.mf, p->num.mf, MPFR_DEFAULT_RND); + mpfr_add(sum, sum, sqr, MPFR_DEFAULT_RND); + p = (statistic_t *)(p->next); + } + mpfr_clear(sqr); +} + void rpn_ave(calc_number_t *c) { int n; @@ -355,6 +393,20 @@ void rpn_ave(calc_number_t *c) mpfr_trunc(c->mf, c->mf); } +void rpn_ave2(calc_number_t *c) +{ + int n; + + stat_sum2(c->mf); + n = SendDlgItemMessage(calc.hStatWnd, IDC_LIST_STAT, LB_GETCOUNT, 0, 0); + + if (n) + mpfr_div_ui(c->mf, c->mf, n, MPFR_DEFAULT_RND); + + if (calc.base != IDC_RADIO_DEC) + mpfr_trunc(c->mf, c->mf); +} + void rpn_sum(calc_number_t *c) { stat_sum(c->mf); @@ -363,6 +415,14 @@ void rpn_sum(calc_number_t *c) mpfr_trunc(c->mf, c->mf); } +void rpn_sum2(calc_number_t *c) +{ + stat_sum2(c->mf); + + if (calc.base != IDC_RADIO_DEC) + mpfr_trunc(c->mf, c->mf); +} + static void rpn_s_ex(calc_number_t *c, int pop_type) { mpfr_t dev; diff --git a/base/applications/calc/help.txt b/base/applications/calc/help.txt index be9ccd87fd..453ba2641d 100644 --- a/base/applications/calc/help.txt +++ b/base/applications/calc/help.txt @@ -204,10 +204,16 @@ It deletes all numbers currently stored into the list. While the statistical window is shown, four additional buttons are enabled: [Ave] It calculates the arithmetic average of the numbers stored into the list. +[Ave] + [Inv] +It calculates the arithmetic average of the squares of the numbers stored into the list. [Sum] It calculates the sum of all numbers stored into the list. +[Sum] + [Inv] +It calculates the sum of the squares of all numbers stored into the list. [s] -It calculates the population standard deviations of the numbers stored into the list. +It calculates the population standard deviations with base 'n-1' of the numbers stored into the list. +[s] + [Inv] +It calculates the population standard deviations with base 'n' of the numbers stored into the list. [Dat] It inserts the number shown into the output display into the list. @@ -483,10 +489,12 @@ Shortcut from keyboard: CTRL-S Ave It calculates the arithmetic average of the numbers stored into the statistical box. +When used with [Inv] modifier it calculates the average of squares. Shortcut from keyboard: CTRL-A Sum It calculates the sum of the numbers stored into the statistical box. +When used with [Inv] modifier it calculates the summation of squares. Shortcut from keyboard: CTRL-T s diff --git a/base/applications/calc/resource.h b/base/applications/calc/resource.h index 82184624c5..c9a3ac0e21 100644 --- a/base/applications/calc/resource.h +++ b/base/applications/calc/resource.h @@ -101,6 +101,7 @@ #define IDC_COMBO_FROM 1091 #define IDC_COMBO_TO 1092 #define IDC_BUTTON_RSH 1093 +#define IDC_BUTTON_XrY 1094 /* TYPES OF CONVERSIONS */ #define IDS_CONV_ANGLE 2000 diff --git a/base/applications/calc/rpn_ieee.c b/base/applications/calc/rpn_ieee.c index a6f4e417b0..0649789a4f 100644 --- a/base/applications/calc/rpn_ieee.c +++ b/base/applications/calc/rpn_ieee.c @@ -1,3 +1,23 @@ +/* + * ReactOS Calc (RPN encoder/decoder for IEEE-754 engine) + * + * Copyright 2007-2017, Carlo Bramini + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + #include "calc.h" typedef struct { @@ -15,7 +35,7 @@ typedef struct { } calc_operator_t; static stack_node_t *stack; -static stack_node_t temp; +static calc_node_t temp; static BOOL percent_mode; static void rpn_add_f(calc_number_t *r, calc_number_t *a, calc_number_t *b); @@ -67,14 +87,20 @@ static const calc_operator_t operator_list[] = { { 7, rpn_sqr_f, NULL, NULL, }, // RPN_OPERATOR_SQR }; -static stack_node_t *pop(void) +static calc_node_t *pop(void) { + void *next; + if (stack == NULL) return NULL; - temp = *stack; + /* copy the node */ + temp = stack->node; + next = stack->next; + + /* free the node */ free(stack); - stack = temp.next; + stack = next; return &temp; } @@ -84,11 +110,11 @@ static int is_stack_empty(void) return (stack == NULL); } -static void push(stack_node_t *op) +static void push(calc_node_t *op) { stack_node_t *z = (stack_node_t *)malloc(sizeof(stack_node_t)); - *z = *op; + z->node = *op; z->next = stack; stack = z; } @@ -330,20 +356,20 @@ void run_operator(calc_node_t *result, static void evalStack(calc_number_t *number) { - stack_node_t *op, ip; + calc_node_t *op, ip; unsigned int prec; op = pop(); ip = *op; - prec = operator_list[ip.node.operation].prec; + prec = operator_list[ip.operation].prec; while (!is_stack_empty()) { op = pop(); - if (prec <= operator_list[op->node.operation].prec) { - if (op->node.operation == RPN_OPERATOR_PARENT) continue; + if (prec <= operator_list[op->operation].prec) { + if (op->operation == RPN_OPERATOR_PARENT) continue; - calc.prev = ip.node.number; - run_operator(&ip.node, &op->node, &ip.node, op->node.operation); + calc.prev = ip.number; + run_operator(&ip, op, &ip, op->operation); if (calc.is_nan) { flush_postfix(); return; @@ -354,17 +380,17 @@ static void evalStack(calc_number_t *number) } } - if(ip.node.operation != RPN_OPERATOR_EQUAL && ip.node.operation != RPN_OPERATOR_PERCENT) + if (ip.operation != RPN_OPERATOR_EQUAL && ip.operation != RPN_OPERATOR_PERCENT) push(&ip); - calc.prev_operator = op->node.operation; + calc.prev_operator = op->operation; - *number = ip.node.number; + *number = ip.number; } int exec_infix2postfix(calc_number_t *number, unsigned int func) { - stack_node_t tmp; + calc_node_t tmp; if (is_stack_empty() && func == RPN_OPERATOR_EQUAL) { /* if a number has been entered with exponential */ @@ -377,10 +403,9 @@ int exec_infix2postfix(calc_number_t *number, unsigned int func) if (func == RPN_OPERATOR_PERCENT) percent_mode = TRUE; - tmp.node.number = *number; - tmp.node.base = calc.base; - tmp.node.operation = func; - tmp.next = NULL; + tmp.number = *number; + tmp.base = calc.base; + tmp.operation = func; push(&tmp); @@ -410,23 +435,23 @@ void exec_change_infix(void) void exec_closeparent(calc_number_t *number) { - stack_node_t *op, ip; + calc_node_t *op, ip; - ip.node.number = *number; - ip.node.base = calc.base; + ip.number = *number; + ip.base = calc.base; while (!is_stack_empty()) { op = pop(); - if (op->node.operation == RPN_OPERATOR_PARENT) + if (op->operation == RPN_OPERATOR_PARENT) break; - run_operator(&ip.node, &op->node, &ip.node, op->node.operation); + run_operator(&ip, op, &ip, op->operation); if (calc.is_nan) { flush_postfix(); return; } } - *number = ip.node.number; + *number = ip.number; } int eval_parent_count(void) @@ -442,7 +467,7 @@ int eval_parent_count(void) return n; } -void flush_postfix() +void flush_postfix(void) { while (!is_stack_empty()) pop(); @@ -459,4 +484,3 @@ void start_rpn_engine(void) void stop_rpn_engine(void) { } - diff --git a/base/applications/calc/rpn_mpfr.c b/base/applications/calc/rpn_mpfr.c index 93d6f00f20..d555bc2108 100644 --- a/base/applications/calc/rpn_mpfr.c +++ b/base/applications/calc/rpn_mpfr.c @@ -1,3 +1,23 @@ +/* + * ReactOS Calc (RPN encoder/decoder for GMP/MPFR engine) + * + * Copyright 2007-2017, Carlo Bramini + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + #include "calc.h" typedef struct { @@ -15,7 +35,7 @@ typedef struct { } calc_operator_t; static stack_node_t *stack; -static stack_node_t temp; +static calc_node_t temp; static BOOL percent_mode; static void rpn_add_f(calc_number_t *r, calc_number_t *a, calc_number_t *b); @@ -61,25 +81,27 @@ static const calc_operator_t operator_list[] = { { 7, rpn_sqr_f, NULL, NULL, }, // RPN_OPERATOR_SQR }; -static void node_copy(stack_node_t *dst, stack_node_t *src) +static void node_copy(calc_node_t *dst, calc_node_t *src) { - mpfr_set(dst->node.number.mf,src->node.number.mf,MPFR_DEFAULT_RND); - dst->node.operation = src->node.operation; - dst->next = src->next; + mpfr_set(dst->number.mf, src->number.mf, MPFR_DEFAULT_RND); + dst->operation = src->operation; } -static stack_node_t *pop() +static calc_node_t *pop(void) { + void *next; + if (stack == NULL) return NULL; /* copy the node */ - node_copy(&temp, stack); + node_copy(&temp, &stack->node); + next = stack->next; /* free the node */ mpfr_clear(stack->node.number.mf); free(stack); - stack = temp.next; + stack = next; return &temp; } @@ -89,12 +111,12 @@ static int is_stack_empty(void) return (stack == NULL); } -static void push(stack_node_t *op) +static void push(calc_node_t *op) { stack_node_t *z = (stack_node_t *)malloc(sizeof(stack_node_t)); - mpfr_init_set(z->node.number.mf,op->node.number.mf,MPFR_DEFAULT_RND); - z->node.operation = op->node.operation; + mpfr_init_set(z->node.number.mf, op->number.mf, MPFR_DEFAULT_RND); + z->node.operation = op->operation; z->next = stack; stack = z; } @@ -109,8 +131,7 @@ static unsigned int get_prec(unsigned int opc) } */ -typedef -__GMP_DECLSPEC void (*exec_call_t) +typedef void (*exec_call_t) __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr)); static void rpn_exec_int(calc_number_t *r, calc_number_t *a, calc_number_t *b, exec_call_t cb) @@ -286,7 +307,6 @@ static void rpn_div_p(calc_number_t *r, calc_number_t *a, calc_number_t *b) } } - void run_operator(calc_node_t *result, calc_node_t *a, calc_node_t *b, @@ -307,44 +327,44 @@ void run_operator(calc_node_t *result, static void evalStack(calc_number_t *number) { - stack_node_t *op, ip; + calc_node_t *op, ip; unsigned int prec; - mpfr_init(ip.node.number.mf); + mpfr_init(ip.number.mf); op = pop(); node_copy(&ip, op); - prec = operator_list[ip.node.operation].prec; + prec = operator_list[ip.operation].prec; while (!is_stack_empty()) { op = pop(); - if (prec <= operator_list[op->node.operation].prec) { - if (op->node.operation == RPN_OPERATOR_PARENT) continue; + if (prec <= operator_list[op->operation].prec) { + if (op->operation == RPN_OPERATOR_PARENT) continue; - rpn_copy(&calc.prev, &ip.node.number); - run_operator(&ip.node, &op->node, &ip.node, op->node.operation); + rpn_copy(&calc.prev, &ip.number); + run_operator(&ip, op, &ip, op->operation); if (calc.is_nan) { flush_postfix(); - mpfr_clear(ip.node.number.mf); + mpfr_clear(ip.number.mf); return; } } else { push(op); break; - } + } } - if(ip.node.operation != RPN_OPERATOR_EQUAL && ip.node.operation != RPN_OPERATOR_PERCENT) + if (ip.operation != RPN_OPERATOR_EQUAL && ip.operation != RPN_OPERATOR_PERCENT) push(&ip); - calc.prev_operator = op->node.operation; + calc.prev_operator = op->operation; - rpn_copy(number, &ip.node.number); - mpfr_clear(ip.node.number.mf); + rpn_copy(number, &ip.number); + mpfr_clear(ip.number.mf); } int exec_infix2postfix(calc_number_t *number, unsigned int func) { - stack_node_t tmp; + calc_node_t tmp; if (is_stack_empty() && func == RPN_OPERATOR_EQUAL) { /* if a number has been entered with exponential */ @@ -357,12 +377,12 @@ int exec_infix2postfix(calc_number_t *number, unsigned int func) if (func == RPN_OPERATOR_PERCENT) percent_mode = TRUE; - mpfr_init(tmp.node.number.mf); - rpn_copy(&tmp.node.number, number); - tmp.node.operation = func; + mpfr_init(tmp.number.mf); + rpn_copy(&tmp.number, number); + tmp.operation = func; push(&tmp); - mpfr_clear(tmp.node.number.mf); + mpfr_clear(tmp.number.mf); if (func == RPN_OPERATOR_NONE) return 0; @@ -390,24 +410,24 @@ void exec_change_infix(void) void exec_closeparent(calc_number_t *number) { - stack_node_t *op, ip; + calc_node_t *op, ip; - rpn_alloc(&ip.node.number); - rpn_copy(&ip.node.number, number); + rpn_alloc(&ip.number); + rpn_copy(&ip.number, number); while (!is_stack_empty()) { op = pop(); - if (op->node.operation == RPN_OPERATOR_PARENT) + if (op->operation == RPN_OPERATOR_PARENT) break; - run_operator(&ip.node, &op->node, &ip.node, op->node.operation); + run_operator(&ip, op, &ip, op->operation); if (calc.is_nan) { flush_postfix(); return; } } - rpn_copy(number, &ip.node.number); - rpn_free(&ip.node.number); + rpn_copy(number, &ip.number); + rpn_free(&ip.number); } int eval_parent_count(void) @@ -423,12 +443,12 @@ int eval_parent_count(void) return n; } -void flush_postfix() +void flush_postfix(void) { while (!is_stack_empty()) pop(); /* clear prev and last typed operators */ - calc.prev_operator = + calc.prev_operator = calc.last_operator = 0; } @@ -440,7 +460,7 @@ void start_rpn_engine(void) mpfr_init(calc.code.mf); mpfr_init(calc.prev.mf); mpfr_init(calc.memory.number.mf); - mpfr_init(temp.node.number.mf); + mpfr_init(temp.number.mf); rpn_zero(&calc.memory.number); } @@ -449,5 +469,5 @@ void stop_rpn_engine(void) mpfr_clear(calc.code.mf); mpfr_clear(calc.prev.mf); mpfr_clear(calc.memory.number.mf); - mpfr_clear(temp.node.number.mf); + mpfr_clear(temp.number.mf); } diff --git a/base/applications/calc/utl_ieee.c b/base/applications/calc/utl_ieee.c index c240bf2855..69be266f61 100644 --- a/base/applications/calc/utl_ieee.c +++ b/base/applications/calc/utl_ieee.c @@ -1,3 +1,23 @@ +/* + * ReactOS Calc (Utility functions for IEEE-754 engine) + * + * Copyright 2007-2017, Carlo Bramini + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + #include "calc.h" void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base) @@ -7,7 +27,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base) switch (base) { case IDC_RADIO_HEX: - _stprintf(buffer, TEXT("%I64X"), rpn->i); + _stprintf(buffer, _T("%I64X"), rpn->i); break; case IDC_RADIO_DEC: /* @@ -19,44 +39,44 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base) #define MAX_LD_WIDTH 16 /* calculate the width of integer number */ width = (rpn->f==0) ? 1 : (int)log10(fabs(rpn->f))+1; - if ((calc.sci_out != FALSE) || (width > MAX_LD_WIDTH) || (width < -MAX_LD_WIDTH)) - _stprintf(buffer, TEXT("%#e"), rpn->f); + if (calc.sci_out == TRUE || width > MAX_LD_WIDTH || width < -MAX_LD_WIDTH) + _stprintf(buffer, _T("%#.*e"), MAX_LD_WIDTH-1, rpn->f); else { TCHAR *ptr, *dst; - ptr = buffer + _stprintf(buffer, TEXT("%#*.*f"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f); + ptr = buffer + _stprintf(buffer, _T("%#*.*f"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f); /* format string ensures there is a '.': */ - dst = _tcschr(buffer, TEXT('.')); + dst = _tcschr(buffer, _T('.')); while (--ptr > dst) - if (*ptr != TEXT('0')) + if (*ptr != _T('0')) break; /* put the string terminator for removing the final '0' (if any) */ - ptr[1] = TEXT('\0'); + ptr[1] = _T('\0'); /* check if the number finishes with '.' */ if (ptr == dst) /* remove the dot (it will be re-added later) */ - ptr[0] = TEXT('\0'); + ptr[0] = _T('\0'); } #undef MAX_LD_WIDTH break; case IDC_RADIO_OCT: - _stprintf(buffer, TEXT("%I64o"), rpn->i); + _stprintf(buffer, _T("%I64o"), rpn->i); break; case IDC_RADIO_BIN: if (rpn->i == 0) { - buffer[0] = TEXT('0'); - buffer[1] = TEXT('\0'); + buffer[0] = _T('0'); + buffer[1] = _T('\0'); break; } tmp = *rpn; - buffer[0] = TEXT('\0'); + buffer[0] = _T('\0'); while (tmp.u) { memmove(buffer+1, buffer, (size-1)*sizeof(TCHAR)); if (tmp.u & 1) - calc.buffer[0] = TEXT('1'); + buffer[0] = _T('1'); else - calc.buffer[0] = TEXT('0'); + buffer[0] = _T('0'); tmp.u >>= 1; } break; @@ -69,20 +89,20 @@ void convert_text2number_2(calc_number_t *a) switch (calc.base) { case IDC_RADIO_HEX: - _stscanf(calc.buffer, TEXT("%I64X"), &(a->i)); + _stscanf(calc.buffer, _T("%I64X"), &(a->i)); break; case IDC_RADIO_DEC: - _stscanf(calc.buffer, TEXT("%lf"), &(a->f)); + _stscanf(calc.buffer, _T("%lf"), &(a->f)); break; case IDC_RADIO_OCT: - _stscanf(calc.buffer, TEXT("%I64o"), &(a->i)); + _stscanf(calc.buffer, _T("%I64o"), &(a->i)); break; case IDC_RADIO_BIN: ptr = calc.buffer; a->i = 0; - while (*ptr != TEXT('\0')) { + while (*ptr != _T('\0')) { a->i <<= 1; - if (*ptr++ == TEXT('1')) + if (*ptr++ == _T('1')) a->i |= 1; } break; diff --git a/base/applications/calc/utl_mpfr.c b/base/applications/calc/utl_mpfr.c index 048b3b92c6..5c2d797e80 100644 --- a/base/applications/calc/utl_mpfr.c +++ b/base/applications/calc/utl_mpfr.c @@ -1,3 +1,23 @@ +/* + * ReactOS Calc (Utility functions for GMP/MPFR engine) + * + * Copyright 2007-2017, Carlo Bramini + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + #include "calc.h" void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base) @@ -39,7 +59,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base) width = 1 + mpfr_get_si(t, MPFR_DEFAULT_RND); mpfr_clear(t); } - if ((calc.sci_out != FALSE) || (width > max_ld_width) || (width < -max_ld_width)) + if (calc.sci_out == TRUE || width > max_ld_width || width < -max_ld_width) ptr = temp + gmp_sprintf(temp, "%*.*#Fe", 1, max_ld_width, ff); else { ptr = temp + gmp_sprintf(temp, "%#*.*Ff", width, ((max_ld_width-width-1)>=0) ? max_ld_width-width-1 : 0, ff); @@ -62,8 +82,8 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base) case IDC_RADIO_BIN: /* if the number is zero, just write 0 ;) */ if (rpn_is_zero(rpn)) { - temp[0] = TEXT('0'); - temp[1] = TEXT('\0'); + temp[0] = _T('0'); + temp[1] = _T('\0'); break; } /* repeat until a bit set to '1' is found */ @@ -78,8 +98,8 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base) } while (1); /* now revert the string into TCHAR buffer */ for (q=0; q<n; q++) - buffer[n-q-1] = (temp[q] == '1') ? TEXT('1') : TEXT('0'); - buffer[n] = TEXT('\0'); + buffer[n-q-1] = (temp[q] == '1') ? _T('1') : _T('0'); + buffer[n] = _T('\0'); mpz_clear(zz); mpf_clear(ff); @@ -87,7 +107,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base) } mpz_clear(zz); mpf_clear(ff); - _sntprintf(buffer, SIZEOF(calc.buffer), TEXT("%s"), temp); + _sntprintf(buffer, SIZEOF(calc.buffer), _T("%hs"), temp); } void convert_text2number_2(calc_number_t *a) @@ -135,4 +155,3 @@ void convert_real_integer(unsigned int base) break; } } - diff --git a/base/applications/calc/winmain.c b/base/applications/calc/winmain.c index e976131996..c6723bac18 100644 --- a/base/applications/calc/winmain.c +++ b/base/applications/calc/winmain.c @@ -166,6 +166,8 @@ static const WORD operator_codes[] = { IDC_BUTTON_MULT, // RPN_OPERATOR_MULT IDC_BUTTON_DIV, // RPN_OPERATOR_DIV IDC_BUTTON_MOD, // RPN_OPERATOR_MOD + IDC_BUTTON_XeY, // RPN_OPERATOR_POW + IDC_BUTTON_XrY, // RPN_OPERATOR_SQR }; typedef void (*rpn_callback1)(calc_number_t *); @@ -180,8 +182,6 @@ typedef struct { rpn_callback1 inv_hyp; } function_table_t; -static void run_pow(calc_number_t *number); -static void run_sqr(calc_number_t *number); static void run_fe(calc_number_t *number); static void run_dat_sta(calc_number_t *number); static void run_mp(calc_number_t *c); @@ -205,10 +205,9 @@ static const function_table_t function_table[] = { { IDC_BUTTON_LN, MODIFIER_INV, 1, rpn_ln, rpn_exp, NULL, NULL }, { IDC_BUTTON_LOG, MODIFIER_INV, 1, rpn_log, rpn_exp10, NULL, NULL }, { IDC_BUTTON_NF, 0, 1, rpn_fact, NULL, NULL, NULL }, - { IDC_BUTTON_AVE, 0, 0, rpn_ave, NULL, NULL, NULL }, - { IDC_BUTTON_SUM, 0, 0, rpn_sum, NULL, NULL, NULL }, + { IDC_BUTTON_AVE, MODIFIER_INV, 0, rpn_ave, rpn_ave2, NULL, NULL }, + { IDC_BUTTON_SUM, MODIFIER_INV, 0, rpn_sum, rpn_sum2, NULL, NULL }, { IDC_BUTTON_S, MODIFIER_INV, 0, rpn_s_m1, rpn_s, NULL, NULL }, - { IDC_BUTTON_XeY, MODIFIER_INV, 1, run_pow, run_sqr, NULL, NULL }, { IDC_BUTTON_SQRT, MODIFIER_INV, 1, rpn_sqrt, NULL, NULL, NULL }, { IDC_BUTTON_DMS, MODIFIER_INV, 1, rpn_dec2dms, rpn_dms2dec, NULL, NULL }, { IDC_BUTTON_FE, 0, 1, run_fe, NULL, NULL, NULL }, @@ -1132,16 +1131,6 @@ static statistic_t *upload_stat_number(int n) return p; } -static void run_pow(calc_number_t *number) -{ - exec_infix2postfix(number, RPN_OPERATOR_POW); -} - -static void run_sqr(calc_number_t *number) -{ - exec_infix2postfix(number, RPN_OPERATOR_SQR); -} - static void run_fe(calc_number_t *number) { calc.sci_out = ((calc.sci_out != FALSE) ? FALSE : TRUE); @@ -1531,17 +1520,29 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) case IDC_BUTTON_LSH: case IDC_BUTTON_RSH: case IDC_BUTTON_EQU: + case IDC_BUTTON_XeY: + case IDC_BUTTON_XrY: if (calc.is_nan) break; /* - * LSH button holds the RSH function too with INV modifier, - * but since it's a two operand operator, it must be handled here. + * LSH and XeY buttons hold also the RSH and XrY functions with INV modifier, + * but since they are two operand operators, they must be handled here. */ - if (LOWORD(wp) == IDC_BUTTON_LSH && - (get_modifiers(hWnd) & MODIFIER_INV)) { - PostMessage(hWnd, WM_COMMAND, MAKEWPARAM(IDC_BUTTON_RSH, BN_CLICKED), 0); - SendDlgItemMessage(hWnd, IDC_CHECK_INV, BM_SETCHECK, 0, 0); - break; + if ((get_modifiers(hWnd) & MODIFIER_INV)) + { + WPARAM IdcSim = IDC_STATIC; + + switch (LOWORD(wp)) { + case IDC_BUTTON_LSH: IdcSim = MAKEWPARAM(IDC_BUTTON_RSH, BN_CLICKED); break; + case IDC_BUTTON_XeY: IdcSim = MAKEWPARAM(IDC_BUTTON_XrY, BN_CLICKED); break; + } + + if (IdcSim != IDC_STATIC) + { + PostMessage(hWnd, WM_COMMAND, IdcSim, 0); + CheckDlgButton(hWnd, IDC_CHECK_INV, BST_UNCHECKED); + } } + for (x=0; x<SIZEOF(operator_codes); x++) { if (LOWORD(wp) == operator_codes[x]) { convert_text2number(&calc.code); @@ -1668,7 +1669,6 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) case IDC_BUTTON_SIN: case IDC_BUTTON_COS: case IDC_BUTTON_TAN: - case IDC_BUTTON_XeY: case IDC_BUTTON_MS: for (x=0; x<SIZEOF(function_table); x++) { if (LOWORD(wp) == function_table[x].idc) { @@ -1697,8 +1697,8 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) convert_text2number(&calc.code); cb(&calc.code); display_rpn_result(hWnd, &calc.code); - if (!(function_table[x].range & NO_CHAIN)) - exec_infix2postfix(&calc.code, RPN_OPERATOR_NONE); +// if (!(function_table[x].range & NO_CHAIN)) +// exec_infix2postfix(&calc.code, RPN_OPERATOR_NONE); if (function_table[x].range & MODIFIER_INV) SendDlgItemMessage(hWnd, IDC_CHECK_INV, BM_SETCHECK, 0, 0); if (function_table[x].range & MODIFIER_HYP)

1 0

[reactos] 01/13: [CALC] Rename files only.
by Carlo-Bramini 18 Mar '19

18 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28f493624ab1d9da1935d… commit 28f493624ab1d9da1935df851228d7a4a6395488 Author: Carlo-Bramini <carlo_bramini(a)users.sourceforge.net> AuthorDate: Mon Aug 6 09:52:59 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 18 01:33:51 2019 +0100 [CALC] Rename files only. --- base/applications/calc/CMakeLists.txt | 6 +++--- base/applications/calc/{function.c => fun_ieee.c} | 0 base/applications/calc/{rpn.c => rpn_ieee.c} | 0 base/applications/calc/{utl.c => utl_ieee.c} | 0 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base/applications/calc/CMakeLists.txt b/base/applications/calc/CMakeLists.txt index 2d0d6055d8..a92c7c3911 100644 --- a/base/applications/calc/CMakeLists.txt +++ b/base/applications/calc/CMakeLists.txt @@ -3,9 +3,9 @@ add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1) list(APPEND SOURCE convert.c - function.c - rpn.c - utl.c + fun_ieee.c + rpn_ieee.c + utl_ieee.c winmain.c calc.h) diff --git a/base/applications/calc/function.c b/base/applications/calc/fun_ieee.c similarity index 100% rename from base/applications/calc/function.c rename to base/applications/calc/fun_ieee.c diff --git a/base/applications/calc/rpn.c b/base/applications/calc/rpn_ieee.c similarity index 100% rename from base/applications/calc/rpn.c rename to base/applications/calc/rpn_ieee.c diff --git a/base/applications/calc/utl.c b/base/applications/calc/utl_ieee.c similarity index 100% rename from base/applications/calc/utl.c rename to base/applications/calc/utl_ieee.c

1 0

[reactos] 01/01: [USERENV] Implement GetProfileType().
by Eric Kohl 17 Mar '19

17 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8d44606d61e3bbace306… commit c8d44606d61e3bbace3068a989249383fba3209d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 17 17:51:32 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 17 17:51:32 2019 +0100 [USERENV] Implement GetProfileType(). --- dll/win32/userenv/profile.c | 95 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 93 insertions(+), 2 deletions(-) diff --git a/dll/win32/userenv/profile.c b/dll/win32/userenv/profile.c index cf5424288a..6a079076bf 100644 --- a/dll/win32/userenv/profile.c +++ b/dll/win32/userenv/profile.c @@ -1566,8 +1566,99 @@ WINAPI GetProfileType( _Out_ PDWORD pdwFlags) { - DPRINT1("GetProfileType() not implemented!\n"); - return FALSE; + UNICODE_STRING SidString = {0, 0, NULL}; + HANDLE hToken; + HKEY hProfilesKey = NULL, hProfileKey = NULL; + DWORD dwType, dwLength, dwState = 0; + DWORD dwError; + BOOL bResult = FALSE; + + DPRINT("GetProfileType(%p)\n", pdwFlags); + + if (pdwFlags == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, TRUE, &hToken)) + { + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) + { + DPRINT1("Failed to open a token (Error %lu)\n", GetLastError()); + return FALSE; + } + } + + /* Get the user SID string */ + if (!GetUserSidStringFromToken(hToken, &SidString)) + { + DPRINT1("GetUserSidStringFromToken() failed\n"); + goto done; + } + + DPRINT("SID: %wZ\n", &SidString); + + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", + 0, + KEY_QUERY_VALUE, + &hProfilesKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", dwError); + SetLastError(dwError); + goto done; + } + + dwError = RegOpenKeyExW(hProfilesKey, + SidString.Buffer, + 0, + KEY_QUERY_VALUE | KEY_SET_VALUE, + &hProfileKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", dwError); + SetLastError(dwError); + goto done; + } + + /* Get the State value */ + dwLength = sizeof(dwState); + dwError = RegQueryValueExW(hProfileKey, + L"State", + NULL, + &dwType, + (PBYTE)&dwState, + &dwLength); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", dwError); + SetLastError(dwError); + goto done; + } + + *pdwFlags = 0; + + if (dwState & 0x80) /* PROFILE_GUEST_USER */ + *pdwFlags |= PT_TEMPORARY; + + /* FIXME: Add checks for PT_MANDATORY and PT_ROAMING */ + + bResult = TRUE; + +done: + if (hProfileKey != NULL) + RegCloseKey(hProfileKey); + + if (hProfilesKey != NULL) + RegCloseKey(hProfilesKey); + + RtlFreeUnicodeString(&SidString); + + CloseHandle(hToken); + + return bResult; }

1 0

[reactos] 01/01: [USERENV] LoadUserProfileW: Check the user for Administators and Guests group membership and set the State value accordingly.
by Eric Kohl 17 Mar '19

17 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f21a8a6e699d83168dbc… commit 0f21a8a6e699d83168dbcbe8438a53423773247f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 17 12:44:54 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 17 12:44:54 2019 +0100 [USERENV] LoadUserProfileW: Check the user for Administators and Guests group membership and set the State value accordingly. See https://www.pcreview.co.uk/threads/purpose-of-the-state-key-located-in-user… --- dll/win32/userenv/internal.h | 4 ++ dll/win32/userenv/misc.c | 4 +- dll/win32/userenv/profile.c | 115 +++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 117 insertions(+), 6 deletions(-) diff --git a/dll/win32/userenv/internal.h b/dll/win32/userenv/internal.h index f33725ffd7..2c1cfeb79b 100644 --- a/dll/win32/userenv/internal.h +++ b/dll/win32/userenv/internal.h @@ -40,6 +40,10 @@ BOOL RemoveDirectoryPath(LPCWSTR lpPathName); /* misc.c */ + +extern SID_IDENTIFIER_AUTHORITY LocalSystemAuthority; +extern SID_IDENTIFIER_AUTHORITY WorldAuthority; + typedef struct _DYN_FUNCS { HMODULE hModule; diff --git a/dll/win32/userenv/misc.c b/dll/win32/userenv/misc.c index 9014998e40..214d8f1f44 100644 --- a/dll/win32/userenv/misc.c +++ b/dll/win32/userenv/misc.c @@ -31,8 +31,8 @@ #define NDEBUG #include <debug.h> -static SID_IDENTIFIER_AUTHORITY LocalSystemAuthority = {SECURITY_NT_AUTHORITY}; -static SID_IDENTIFIER_AUTHORITY WorldAuthority = {SECURITY_WORLD_SID_AUTHORITY}; +SID_IDENTIFIER_AUTHORITY LocalSystemAuthority = {SECURITY_NT_AUTHORITY}; +SID_IDENTIFIER_AUTHORITY WorldAuthority = {SECURITY_WORLD_SID_AUTHORITY}; /* FUNCTIONS ***************************************************************/ diff --git a/dll/win32/userenv/profile.c b/dll/win32/userenv/profile.c index bd859cc21c..cf5424288a 100644 --- a/dll/win32/userenv/profile.c +++ b/dll/win32/userenv/profile.c @@ -348,6 +348,106 @@ done: } +static +DWORD +CheckForGuestsAndAdmins( + _In_ HANDLE hToken, + _Out_ PDWORD pdwState) +{ + PTOKEN_GROUPS pGroupInfo = NULL; + PSID pAdministratorsSID = NULL; + PSID pGuestsSID = NULL; + DWORD i, dwSize; + DWORD dwError = ERROR_SUCCESS; + + DPRINT("CheckForGuestsAndAdmins(%p %p)\n", hToken, pdwState); + + /* Get the buffer size */ + if (!GetTokenInformation(hToken, TokenGroups, NULL, dwSize, &dwSize)) + { + dwError = GetLastError(); + if (dwError != ERROR_INSUFFICIENT_BUFFER) + { + DPRINT1("GetTokenInformation() failed (Error %lu)\n", dwError); + return dwError; + } + + dwError = ERROR_SUCCESS; + } + + /* Allocate the buffer */ + pGroupInfo = (PTOKEN_GROUPS)HeapAlloc(GetProcessHeap(), 0, dwSize); + if (pGroupInfo == NULL) + { + dwError = ERROR_OUTOFMEMORY; + DPRINT1("HeapAlloc() failed (Error %lu)\n", dwError); + goto done; + } + + /* Get the token groups */ + if (!GetTokenInformation(hToken, TokenGroups, pGroupInfo, dwSize, &dwSize)) + { + dwError = GetLastError(); + DPRINT1("GetTokenInformation() failed (Error %lu)\n", dwError); + goto done; + } + + /* Build the Administrators Group SID */ + if(!AllocateAndInitializeSid(&LocalSystemAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, 0, 0, 0, 0, 0, + &pAdministratorsSID)) + { + dwError = GetLastError(); + DPRINT1("AllocateAndInitializeSid() failed (Error %lu)\n", dwError); + goto done; + } + + /* Build the Guests Group SID */ + if(!AllocateAndInitializeSid(&LocalSystemAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_GUESTS, + 0, 0, 0, 0, 0, 0, + &pGuestsSID)) + { + dwError = GetLastError(); + DPRINT1("AllocateAndInitializeSid() failed (Error %lu)\n", dwError); + goto done; + } + + /* Check for Administratos or Guests group memberships */ + for (i = 0; i < pGroupInfo->GroupCount; i++) + { + if (EqualSid(pAdministratorsSID, pGroupInfo->Groups[i].Sid)) + { + *pdwState |= 0x0100; // PROFILE_ADMIN_USER + } + + if (EqualSid(pGuestsSID, pGroupInfo->Groups[i].Sid)) + { + *pdwState |= 0x0080; // PROFILE_GUESTS_USER + } + } + + dwError = ERROR_SUCCESS; + +done: + if (pGuestsSID != NULL) + FreeSid(pGuestsSID); + + if (pAdministratorsSID != NULL) + FreeSid(pAdministratorsSID); + + if (pGroupInfo != NULL) + HeapFree(GetProcessHeap(), 0, pGroupInfo); + + return dwError; +} + + static DWORD SetProfileData( @@ -360,8 +460,7 @@ SetProfileData( DWORD dwLength, dwState = 0; DWORD dwError; - DPRINT("SetProfileData(%S %p)\n", - pszSidString, hToken); + DPRINT("SetProfileData(%S %p)\n", pszSidString, hToken); dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", @@ -427,6 +526,14 @@ SetProfileData( goto done; } + dwError = CheckForGuestsAndAdmins(hToken, + &dwState); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", dwError); + goto done; + } + dwLength = sizeof(dwState); dwError = RegSetValueExW(hProfileKey, L"State", @@ -1350,7 +1457,7 @@ GetProfilesDirectoryA( LPWSTR lpBuffer; BOOL bResult; - if (!lpcchSize) + if (!lpcchSize || !lpProfileDir) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1474,7 +1581,7 @@ GetUserProfileDirectoryA( LPWSTR lpBuffer; BOOL bResult; - if (!lpcchSize) + if (!lpcchSize || !lpProfileDir) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE;

1 0

[reactos] 01/01: [NETAPI32] NetUserEnum, NetUserGetInfo: Get the user privileges and auth flags for info levels 1, 2, 3, 4 and 11.
by Eric Kohl 17 Mar '19

17 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=646ab9286c35cabb5da85… commit 646ab9286c35cabb5da854a775ac227f103a2c6b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 17 12:34:49 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 17 12:34:49 2019 +0100 [NETAPI32] NetUserEnum, NetUserGetInfo: Get the user privileges and auth flags for info levels 1, 2, 3, 4 and 11. --- dll/win32/netapi32/user.c | 268 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 244 insertions(+), 24 deletions(-) diff --git a/dll/win32/netapi32/user.c b/dll/win32/netapi32/user.c index 1d2b8e299e..a867b786ec 100644 --- a/dll/win32/netapi32/user.c +++ b/dll/win32/netapi32/user.c @@ -39,6 +39,7 @@ typedef struct _ENUM_CONTEXT SAM_HANDLE ServerHandle; SAM_HANDLE BuiltinDomainHandle; SAM_HANDLE AccountDomainHandle; + PSID BuiltinDomainSid; PSID AccountDomainSid; SAM_ENUMERATE_HANDLE EnumerationContext; @@ -400,16 +401,159 @@ FreeUserInfo(PUSER_ALL_INFORMATION UserInfo) static NET_API_STATUS -BuildUserInfoBuffer(SAM_HANDLE UserHandle, - PSID AccountDomainSid, - DWORD level, - ULONG RelativeId, - LPVOID *Buffer) +GetUserPrivileges( + _In_ SAM_HANDLE BuiltinDomainHandle, + _In_ SAM_HANDLE UserHandle, + _In_ PSID AccountDomainSid, + _In_ ULONG RelativeId, + _Out_ PDWORD Priv, + _Out_ PDWORD AuthFlags) +{ + PGROUP_MEMBERSHIP GroupMembership = NULL; + ULONG GroupCount, SidCount, AliasCount, i; + PSID *SidArray = NULL; + PULONG AliasArray = NULL; + BOOL bAdmin = FALSE, bUser = FALSE; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status; + + FIXME("GetUserPrivileges(%p)\n", UserHandle); + + /* Get the users group memberships */ + Status = SamGetGroupsForUser(UserHandle, + &GroupMembership, + &GroupCount); + if (!NT_SUCCESS(Status)) + { + ERR("SamGetGroupsForUser() failed (Status 0x%08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Allocate the SID array */ + ApiStatus = NetApiBufferAllocate((GroupCount + 1) * sizeof(PSID), + (PVOID*)&SidArray); + if (ApiStatus != NERR_Success) + { + goto done; + } + + /* Add the user to the SID array */ + SidCount = 0; + ApiStatus = BuildSidFromSidAndRid(AccountDomainSid, + RelativeId, + &SidArray[0]); + if (ApiStatus != NERR_Success) + { + goto done; + } + + SidCount++; + + /* Add the groups to the SID array */ + for (i = 0; i < GroupCount; i++) + { + ApiStatus = BuildSidFromSidAndRid(AccountDomainSid, + GroupMembership[i].RelativeId, + &SidArray[i + 1]); + if (ApiStatus != NERR_Success) + { + goto done; + } + + SidCount++; + } + + /* Get aliases for the user and his groups */ + Status = SamGetAliasMembership(BuiltinDomainHandle, + SidCount, + SidArray, + &AliasCount, + &AliasArray); + if (!NT_SUCCESS(Status)) + { + ERR("SamGetAliasMembership() failed (Status 0x%08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + *AuthFlags = 0; + + /* Set the AuthFlags */ + for (i = 0; i < AliasCount; i++) + { + switch (AliasArray[i]) + { + case DOMAIN_ALIAS_RID_ADMINS: + bAdmin = TRUE; + break; + + case DOMAIN_ALIAS_RID_USERS: + bUser = TRUE; + break; + + case DOMAIN_ALIAS_RID_ACCOUNT_OPS: + *AuthFlags |= AF_OP_ACCOUNTS; + break; + + case DOMAIN_ALIAS_RID_SYSTEM_OPS: + *AuthFlags |= AF_OP_SERVER; + break; + + case DOMAIN_ALIAS_RID_PRINT_OPS: + *AuthFlags |= AF_OP_PRINT; + break; + } + } + + /* Set the prvileges */ + if (bAdmin) + { + *Priv = USER_PRIV_ADMIN; + } + else if (bUser) + { + *Priv = USER_PRIV_USER; + } + else + { + *Priv = USER_PRIV_GUEST; + } + +done: + if (AliasArray != NULL) + SamFreeMemory(AliasArray); + + if (SidArray != NULL) + { + for (i = 0; i < SidCount; i++) + NetApiBufferFree(SidArray[i]); + + NetApiBufferFree(SidArray); + } + + if (GroupMembership != NULL) + SamFreeMemory(GroupMembership); + + return ApiStatus; +} + + +static +NET_API_STATUS +BuildUserInfoBuffer( + _In_ SAM_HANDLE BuiltinDomainHandle, + _In_ SAM_HANDLE UserHandle, + _In_ PSID AccountDomainSid, + _In_ ULONG RelativeId, + _In_ DWORD level, + _Out_ LPVOID *Buffer) { UNICODE_STRING LogonServer = RTL_CONSTANT_STRING(L"\\\\*"); PUSER_ALL_INFORMATION UserInfo = NULL; LPVOID LocalBuffer = NULL; PACL Dacl = NULL; + DWORD Priv = 0, AuthFlags = 0; PUSER_INFO_0 UserInfo0; PUSER_INFO_1 UserInfo1; PUSER_INFO_2 UserInfo2; @@ -444,6 +588,19 @@ BuildUserInfoBuffer(SAM_HANDLE UserHandle, goto done; } + if ((level == 1) || (level == 2) || (level == 3) || + (level == 4) || (level == 11)) + { + ApiStatus = GetUserPrivileges(BuiltinDomainHandle, + UserHandle, + AccountDomainSid, + RelativeId, + &Priv, + &AuthFlags); + if (ApiStatus != NERR_Success) + goto done; + } + switch (level) { case 0: @@ -595,7 +752,7 @@ BuildUserInfoBuffer(SAM_HANDLE UserHandle, UserInfo1->usri1_password = NULL; UserInfo1->usri1_password_age = GetPasswordAge(&UserInfo->PasswordLastSet); - /* FIXME: usri1_priv */ + UserInfo1->usri1_priv = Priv; UserInfo1->usri1_home_dir = Ptr; memcpy(UserInfo1->usri1_home_dir, @@ -638,7 +795,7 @@ BuildUserInfoBuffer(SAM_HANDLE UserHandle, UserInfo2->usri2_password = NULL; UserInfo2->usri2_password_age = GetPasswordAge(&UserInfo->PasswordLastSet); - /* FIXME: usri2_priv */ + UserInfo2->usri2_priv = Priv; UserInfo2->usri2_home_dir = Ptr; memcpy(UserInfo2->usri2_home_dir, @@ -664,7 +821,7 @@ BuildUserInfoBuffer(SAM_HANDLE UserHandle, UserInfo2->usri2_script_path[UserInfo->ScriptPath.Length / sizeof(WCHAR)] = UNICODE_NULL; Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->ScriptPath.Length + sizeof(WCHAR)); - /* FIXME: usri2_auth_flags */ + UserInfo2->usri2_auth_flags = AuthFlags; UserInfo2->usri2_full_name = Ptr; memcpy(UserInfo2->usri2_full_name, @@ -757,7 +914,7 @@ BuildUserInfoBuffer(SAM_HANDLE UserHandle, UserInfo3->usri3_password = NULL; UserInfo3->usri3_password_age = GetPasswordAge(&UserInfo->PasswordLastSet); - /* FIXME: usri3_priv */ + UserInfo3->usri3_priv = Priv; UserInfo3->usri3_home_dir = Ptr; memcpy(UserInfo3->usri3_home_dir, @@ -783,7 +940,7 @@ BuildUserInfoBuffer(SAM_HANDLE UserHandle, UserInfo3->usri3_script_path[UserInfo->ScriptPath.Length / sizeof(WCHAR)] = UNICODE_NULL; Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->ScriptPath.Length + sizeof(WCHAR)); - /* FIXME: usri3_auth_flags */ + UserInfo3->usri3_auth_flags = AuthFlags; UserInfo3->usri3_full_name = Ptr; memcpy(UserInfo3->usri3_full_name, @@ -894,7 +1051,7 @@ BuildUserInfoBuffer(SAM_HANDLE UserHandle, UserInfo4->usri4_password = NULL; UserInfo4->usri4_password_age = GetPasswordAge(&UserInfo->PasswordLastSet); - /* FIXME: usri4_priv */ + UserInfo4->usri4_priv = Priv; UserInfo4->usri4_home_dir = Ptr; memcpy(UserInfo4->usri4_home_dir, @@ -920,7 +1077,7 @@ BuildUserInfoBuffer(SAM_HANDLE UserHandle, UserInfo4->usri4_script_path[UserInfo->ScriptPath.Length / sizeof(WCHAR)] = UNICODE_NULL; Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->ScriptPath.Length + sizeof(WCHAR)); - /* FIXME: usri4_auth_flags */ + UserInfo4->usri4_auth_flags = AuthFlags; UserInfo4->usri4_full_name = Ptr; memcpy(UserInfo4->usri4_full_name, @@ -1088,8 +1245,8 @@ BuildUserInfoBuffer(SAM_HANDLE UserHandle, UserInfo11->usri11_full_name[UserInfo->FullName.Length / sizeof(WCHAR)] = UNICODE_NULL; Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR)); - /* FIXME: usri11_priv */ - /* FIXME: usri11_auth_flags */ + UserInfo11->usri11_priv = Priv; + UserInfo11->usri11_auth_flags = AuthFlags; UserInfo11->usri11_password_age = GetPasswordAge(&UserInfo->PasswordLastSet); @@ -2526,6 +2683,7 @@ NetUserEnum(LPCWSTR servername, LPVOID Buffer = NULL; ULONG i; SAM_HANDLE UserHandle = NULL; + ACCESS_MASK DesiredAccess; NET_API_STATUS ApiStatus = NERR_Success; NTSTATUS Status = STATUS_SUCCESS; @@ -2588,12 +2746,27 @@ NetUserEnum(LPCWSTR servername, goto done; } - Status = OpenBuiltinDomain(EnumContext->ServerHandle, - DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, - &EnumContext->BuiltinDomainHandle); + /* Get the Builtin Domain SID */ + Status = GetBuiltinDomainSid(&EnumContext->BuiltinDomainSid); + if (!NT_SUCCESS(Status)) + { + ERR("GetBuiltinDomainSid failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + DesiredAccess = DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP; + if ((level == 1) || (level == 2) || (level == 3) || (level == 4) || (level == 11)) + DesiredAccess |= DOMAIN_GET_ALIAS_MEMBERSHIP; + + /* Open the Builtin Domain */ + Status = SamOpenDomain(EnumContext->ServerHandle, + DesiredAccess, + EnumContext->BuiltinDomainSid, + &EnumContext->BuiltinDomainHandle); if (!NT_SUCCESS(Status)) { - ERR("OpenBuiltinDomain failed (Status %08lx)\n", Status); + ERR("SamOpenDomain failed (Status %08lx)\n", Status); ApiStatus = NetpNtStatusToApiStatus(Status); goto done; } @@ -2648,8 +2821,12 @@ NetUserEnum(LPCWSTR servername, TRACE("RID: %lu\n", CurrentUser->RelativeId); + DesiredAccess = READ_CONTROL | USER_READ_GENERAL | USER_READ_PREFERENCES | USER_READ_LOGON | USER_READ_ACCOUNT; + if ((level == 1) || (level == 2) || (level == 3) || (level == 4) || (level == 11)) + DesiredAccess |= USER_LIST_GROUPS; + Status = SamOpenUser(EnumContext->AccountDomainHandle, //BuiltinDomainHandle, - READ_CONTROL | USER_READ_GENERAL | USER_READ_PREFERENCES | USER_READ_LOGON | USER_READ_ACCOUNT, + DesiredAccess, CurrentUser->RelativeId, &UserHandle); if (!NT_SUCCESS(Status)) @@ -2659,10 +2836,11 @@ NetUserEnum(LPCWSTR servername, goto done; } - ApiStatus = BuildUserInfoBuffer(UserHandle, + ApiStatus = BuildUserInfoBuffer(EnumContext->BuiltinDomainHandle, + UserHandle, EnumContext->AccountDomainSid, - level, CurrentUser->RelativeId, + level, &Buffer); if (ApiStatus != NERR_Success) { @@ -2695,6 +2873,9 @@ done: if (EnumContext->AccountDomainHandle != NULL) SamCloseHandle(EnumContext->AccountDomainHandle); + if (EnumContext->BuiltinDomainSid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, EnumContext->BuiltinDomainSid); + if (EnumContext->AccountDomainSid != NULL) RtlFreeHeap(RtlGetProcessHeap(), 0, EnumContext->AccountDomainSid); @@ -2909,11 +3090,14 @@ NetUserGetInfo(LPCWSTR servername, UNICODE_STRING UserName; SAM_HANDLE ServerHandle = NULL; SAM_HANDLE AccountDomainHandle = NULL; + SAM_HANDLE BuiltinDomainHandle = NULL; SAM_HANDLE UserHandle = NULL; PULONG RelativeIds = NULL; PSID_NAME_USE Use = NULL; LPVOID Buffer = NULL; PSID AccountDomainSid = NULL; + PSID BuiltinDomainSid = NULL; + ACCESS_MASK DesiredAccess; NET_API_STATUS ApiStatus = NERR_Success; NTSTATUS Status = STATUS_SUCCESS; @@ -2937,6 +3121,31 @@ NetUserGetInfo(LPCWSTR servername, goto done; } + /* Get the Builtin Domain SID */ + Status = GetBuiltinDomainSid(&BuiltinDomainSid); + if (!NT_SUCCESS(Status)) + { + ERR("GetBuiltinDomainSid failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + DesiredAccess = DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP; + if ((level == 1) || (level == 2) || (level == 3) || (level == 4) || (level == 11)) + DesiredAccess |= DOMAIN_GET_ALIAS_MEMBERSHIP; + + /* Open the Builtin Domain */ + Status = SamOpenDomain(ServerHandle, + DesiredAccess, + BuiltinDomainSid, + &BuiltinDomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + /* Get the Account Domain SID */ Status = GetAccountDomainSid((servername != NULL) ? &ServerName : NULL, &AccountDomainSid); @@ -2985,9 +3194,13 @@ NetUserGetInfo(LPCWSTR servername, TRACE("RID: %lu\n", RelativeIds[0]); + DesiredAccess = READ_CONTROL | USER_READ_GENERAL | USER_READ_PREFERENCES | USER_READ_LOGON | USER_READ_ACCOUNT; + if ((level == 1) || (level == 2) || (level == 3) || (level == 4) || (level == 11)) + DesiredAccess |= USER_LIST_GROUPS; + /* Open the user object */ Status = SamOpenUser(AccountDomainHandle, - READ_CONTROL | USER_READ_GENERAL | USER_READ_PREFERENCES | USER_READ_LOGON | USER_READ_ACCOUNT, + DesiredAccess, RelativeIds[0], &UserHandle); if (!NT_SUCCESS(Status)) @@ -2997,10 +3210,11 @@ NetUserGetInfo(LPCWSTR servername, goto done; } - ApiStatus = BuildUserInfoBuffer(UserHandle, + ApiStatus = BuildUserInfoBuffer(BuiltinDomainHandle, + UserHandle, AccountDomainSid, - level, RelativeIds[0], + level, &Buffer); if (ApiStatus != NERR_Success) { @@ -3024,6 +3238,12 @@ done: if (AccountDomainSid != NULL) RtlFreeHeap(RtlGetProcessHeap(), 0, AccountDomainSid); + if (BuiltinDomainHandle != NULL) + SamCloseHandle(BuiltinDomainHandle); + + if (BuiltinDomainSid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, BuiltinDomainSid); + if (ServerHandle != NULL) SamCloseHandle(ServerHandle);

1 0

[reactos] 01/01: [USERENV] Store the profiles load time, flags and state in the profile list.
by Eric Kohl 16 Mar '19

16 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf6a5d6e7c6a1b69f6554… commit cf6a5d6e7c6a1b69f6554d298a3e9848cccc603f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Mar 16 19:12:25 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Mar 16 19:13:15 2019 +0100 [USERENV] Store the profiles load time, flags and state in the profile list. --- dll/win32/userenv/profile.c | 107 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/dll/win32/userenv/profile.c b/dll/win32/userenv/profile.c index 1c18a67ab6..bd859cc21c 100644 --- a/dll/win32/userenv/profile.c +++ b/dll/win32/userenv/profile.c @@ -348,6 +348,109 @@ done: } +static +DWORD +SetProfileData( + _In_ PWSTR pszSidString, + _In_ DWORD dwFlags, + _In_ HANDLE hToken) +{ + HKEY hProfilesKey = NULL, hProfileKey = NULL; + FILETIME LoadTime; + DWORD dwLength, dwState = 0; + DWORD dwError; + + DPRINT("SetProfileData(%S %p)\n", + pszSidString, hToken); + + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", + 0, + KEY_QUERY_VALUE, + &hProfilesKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", dwError); + goto done; + } + + dwError = RegOpenKeyExW(hProfilesKey, + pszSidString, + 0, + KEY_QUERY_VALUE | KEY_SET_VALUE, + &hProfileKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", dwError); + goto done; + } + + /* Set the profile load time */ + GetSystemTimeAsFileTime(&LoadTime); + + dwLength = sizeof(LoadTime.dwLowDateTime); + dwError = RegSetValueExW(hProfileKey, + L"ProfileLoadTimeLow", + 0, + REG_DWORD, + (PBYTE)&LoadTime.dwLowDateTime, + dwLength); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", dwError); + goto done; + } + + dwLength = sizeof(LoadTime.dwHighDateTime); + dwError = RegSetValueExW(hProfileKey, + L"ProfileLoadTimeHigh", + 0, + REG_DWORD, + (PBYTE)&LoadTime.dwHighDateTime, + dwLength); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", dwError); + goto done; + } + + dwLength = sizeof(dwFlags); + dwError = RegSetValueExW(hProfileKey, + L"Flags", + 0, + REG_DWORD, + (PBYTE)&dwFlags, + dwLength); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", dwError); + goto done; + } + + dwLength = sizeof(dwState); + dwError = RegSetValueExW(hProfileKey, + L"State", + 0, + REG_DWORD, + (PBYTE)&dwState, + dwLength); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", dwError); + goto done; + } + +done: + if (hProfileKey != NULL) + RegCloseKey(hProfileKey); + + if (hProfilesKey != NULL) + RegCloseKey(hProfilesKey); + + return dwError; +} + + /* PUBLIC FUNCTIONS ********************************************************/ BOOL @@ -1749,6 +1852,10 @@ LoadUserProfileW( SetLastError((DWORD)Error); goto cleanup; } + + SetProfileData(SidString.Buffer, + lpProfileInfo->dwFlags, + hToken); } /* Open future HKEY_CURRENT_USER */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs