Ros-diffs May 2015

ros-diffs@reactos.org

15 participants
500 discussions

[cwittich] 67834: [WIN32SS] spelling fix
by cwittich＠svn.reactos.org 20 May '15

20 May '15

Author: cwittich Date: Wed May 20 06:51:57 2015 New Revision: 67834 URL: http://svn.reactos.org/svn/reactos?rev=67834&view=rev Log: [WIN32SS] spelling fix Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Wed May 20 06:51:57 2015 @@ -74,7 +74,7 @@ { PCLIP pElement = NULL; - /* Use exisiting entry with specified format */ + /* Use existing entry with specified format */ if (!bEnd) pElement = IntIsFormatAvailable(pWinStaObj, fmt);

1 0

[dreimer] 67833: [MAZESCR] INI files for setting parameters? Lets get to the past Win 3.11 standards and make a configure dialog for that which reads and writes the stuff to the registry.
by dreimer＠svn.reactos.org 20 May '15

20 May '15

Author: dreimer Date: Wed May 20 01:57:07 2015 New Revision: 67833 URL: http://svn.reactos.org/svn/reactos?rev=67833&view=rev Log: [MAZESCR] INI files for setting parameters? Lets get to the past Win 3.11 standards and make a configure dialog for that which reads and writes the stuff to the registry. Removed: trunk/rosapps/applications/screensavers/mazescr/lang/bg-BG.rc trunk/rosapps/applications/screensavers/mazescr/lang/es-ES.rc trunk/rosapps/applications/screensavers/mazescr/lang/fr-FR.rc trunk/rosapps/applications/screensavers/mazescr/lang/lt-LT.rc trunk/rosapps/applications/screensavers/mazescr/lang/no-NO.rc trunk/rosapps/applications/screensavers/mazescr/lang/pl-PL.rc trunk/rosapps/applications/screensavers/mazescr/lang/ro-RO.rc trunk/rosapps/applications/screensavers/mazescr/lang/sk-SK.rc trunk/rosapps/applications/screensavers/mazescr/lang/uk-UA.rc Modified: trunk/rosapps/applications/screensavers/mazescr/CMakeLists.txt trunk/rosapps/applications/screensavers/mazescr/lang/de-DE.rc trunk/rosapps/applications/screensavers/mazescr/lang/en-US.rc trunk/rosapps/applications/screensavers/mazescr/maze.c trunk/rosapps/applications/screensavers/mazescr/maze.rc trunk/rosapps/applications/screensavers/mazescr/resource.h Modified: trunk/rosapps/applications/screensavers/mazescr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/CMakeLists.txt [iso-8859-1] Wed May 20 01:57:07 2015 @@ -4,5 +4,5 @@ set_module_type(mazescr win32gui UNICODE) set_target_properties(mazescr PROPERTIES SUFFIX ".scr") target_link_libraries(mazescr scrnsave) -add_importlibs(mazescr user32 gdi32 msvcrt kernel32) +add_importlibs(mazescr user32 gdi32 advapi32 msvcrt kernel32) add_cd_file(TARGET mazescr DESTINATION reactos/system32 FOR all) Removed: trunk/rosapps/applications/screensavers/mazescr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/lang/bg-BG.rc (removed) @@ -1,8 +0,0 @@ -LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DESCRIPTION "ÐÐºÑÐ°Ð½ÐµÐ½ Ð¿ÑÐµÐ´Ð¿Ð°Ð·Ð¸ÑÐµÐ» âÐÐ°Ð±Ð¸ÑÐ¸Ð½Ñâ" - IDS_TITLE "ÐÐ°..." - IDS_TEXT "ÐÑÐ¼Ð° Ð½ÑÐ¶Ð´Ð° Ð¾Ñ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸." -END Modified: trunk/rosapps/applications/screensavers/mazescr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/lang/de-DE.rc [iso-8859-1] Wed May 20 01:57:07 2015 @@ -1,8 +1,45 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -STRINGTABLE DISCARDABLE +IDD_DLG_SCREEN DIALOGEX DISCARDABLE 0, 0, 276, 112 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Maze Bildschirmschoner Einstellungen" +FONT 8, "MS Shell Dlg" BEGIN - IDS_DESCRIPTION "Maze Bildschirmschoner" - IDS_TITLE "Ãber" - IDS_TEXT "Keinerlei Einstellungen notwendig." + LTEXT "LabyrinthgrÃ¶Ãe:",IDC_STATIC,7,7,90,12,SS_CENTERIMAGE + CONTROL "Slider1",IDC_SLIDER_SIZE,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,7,140,12 + CTEXT "Static",IDC_TEXT_SIZE,245,7,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE + LTEXT "Vor-LÃ¶sungsverzÃ¶gerung:",IDC_STATIC,7,28,90,12,SS_CENTERIMAGE + CONTROL "Slider2",IDC_SLIDER_PRESD,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,28,140,12 + CTEXT "Static",IDC_TEXT_PRESD,245,28,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE + LTEXT "Nach-LÃ¶sungsverzÃ¶gerung:",IDC_STATIC,7,49,90,12,SS_CENTERIMAGE + CONTROL "Slider3",IDC_SLIDER_POSTSD,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,49,140,12 + CTEXT "Static",IDC_TEXT_POSTSD,245,49,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE + LTEXT "LÃ¶sungsverzÃ¶gerung:",IDC_STATIC,7,70,90,12,SS_CENTERIMAGE + CONTROL "Slider4",IDC_SLIDER_SD,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,70,140,12 + CTEXT "Static",IDC_TEXT_SD,245,70,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK,59,91,50,14 + PUSHBUTTON "Abbrechen",IDCANCEL,113,91,50,14 + PUSHBUTTON "Ãber",IDABOUT,167,91,50,14 END + +IDD_DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 229, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ãber" +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Maze Bildschirmschoner 1.0",IDC_STATIC,7,7,215,9 + LTEXT "[06-21-85] Martin Weiss - Original Code",IDC_STATIC,7,20,215,8 + LTEXT "[01-29-88] Dave Lemke - Hacked fÃ¼r X11",IDC_STATIC,7,29,215,8 + LTEXT "[10-04-88] Richard Hess - UnHacked fÃ¼r X11",IDC_STATIC,7,38,215,8 + LTEXT "[03-03-93] Jim Randell - UnHacked fÃ¼r X11",IDC_STATIC,7,47,215,8 + LTEXT "[03-07-93] Jamie Zawinski - Bereinigung und Code Sauberkeit",IDC_STATIC,7,56,215,8 + LTEXT "[10-08-94] Ge van Geldorp - Portiert auf Windows",IDC_STATIC,7,65,215,8 + LTEXT "[08-15-03] Ge van Geldorp - Portiert auf ReactOS",IDC_STATIC,7,74,215,8 + CTEXT "R.I.P. Ge van Geldorp, wir vermissen dich!",IDC_STATIC,7,87,215,10,SS_SUNKEN + DEFPUSHBUTTON "OK",IDOK,87,100,56,14 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Maze Bildschirmschoner" +END Modified: trunk/rosapps/applications/screensavers/mazescr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/lang/en-US.rc [iso-8859-1] Wed May 20 01:57:07 2015 @@ -1,8 +1,45 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -STRINGTABLE DISCARDABLE +IDD_DLG_SCREEN DIALOGEX DISCARDABLE 0, 0, 276, 112 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Maze ScreenSaver Settings" +FONT 8, "MS Shell Dlg" BEGIN - IDS_DESCRIPTION "Maze ScreenSaver" - IDS_TITLE "About" - IDS_TEXT "No options need to be set." + LTEXT "Maze Size:",IDC_STATIC,7,7,90,12,SS_CENTERIMAGE + CONTROL "Slider1",IDC_SLIDER_SIZE,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,7,140,12 + CTEXT "Static",IDC_TEXT_SIZE,245,7,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE + LTEXT "Pre Solve Delay:",IDC_STATIC,7,28,90,12,SS_CENTERIMAGE + CONTROL "Slider2",IDC_SLIDER_PRESD,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,28,140,12 + CTEXT "Static",IDC_TEXT_PRESD,245,28,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE + LTEXT "Post Solve Delay:",IDC_STATIC,7,49,90,12,SS_CENTERIMAGE + CONTROL "Slider3",IDC_SLIDER_POSTSD,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,49,140,12 + CTEXT "Static",IDC_TEXT_POSTSD,245,49,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE + LTEXT "Solve Delay:",IDC_STATIC,7,70,90,12,SS_CENTERIMAGE + CONTROL "Slider4",IDC_SLIDER_SD,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,70,140,12 + CTEXT "Static",IDC_TEXT_SD,245,70,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK,59,91,50,14 + PUSHBUTTON "Cancel",IDCANCEL,113,91,50,14 + PUSHBUTTON "About",IDABOUT,167,91,50,14 END + +IDD_DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 229, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About" +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Maze ScreenSaver 1.0",IDC_STATIC,7,7,215,9 + LTEXT "[06-21-85] Martin Weiss - Original Code",IDC_STATIC,7,20,215,8 + LTEXT "[01-29-88] Dave Lemke - Hacked for X11",IDC_STATIC,7,29,215,8 + LTEXT "[10-04-88] Richard Hess - UnHacked for X11",IDC_STATIC,7,38,215,8 + LTEXT "[03-03-93] Jim Randell - UnHacked for X11",IDC_STATIC,7,47,215,8 + LTEXT "[03-07-93] Jamie Zawinski - Cleanup and Code tidiness",IDC_STATIC,7,56,215,8 + LTEXT "[10-08-94] Ge van Geldorp - Ported to Windows",IDC_STATIC,7,65,215,8 + LTEXT "[08-15-03] Ge van Geldorp - Ported to ReactOS",IDC_STATIC,7,74,215,8 + CTEXT "R.I.P. Ge van Geldorp, we miss you!",IDC_STATIC,7,87,215,10,SS_SUNKEN + DEFPUSHBUTTON "OK",IDOK,87,100,56,14 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Maze Screensaver" +END Removed: trunk/rosapps/applications/screensavers/mazescr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/lang/es-ES.rc (removed) @@ -1,8 +0,0 @@ -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DESCRIPTION "Laberinto" - IDS_TITLE "Acerca de" - IDS_TEXT "Ninguna opciÃ³n necesita ser configurada." -END Removed: trunk/rosapps/applications/screensavers/mazescr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/lang/fr-FR.rc (removed) @@ -1,8 +0,0 @@ -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DESCRIPTION "Ãcran de veille labyrinthe" - IDS_TITLE "Ã propos de" - IDS_TEXT "Il n'y a aucune option Ã dÃ©finir." -END Removed: trunk/rosapps/applications/screensavers/mazescr/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/lang/lt-LT.rc (removed) @@ -1,8 +0,0 @@ -LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DESCRIPTION "Labirintas" - IDS_TITLE "Apie" - IDS_TEXT "NÄra keiÄiamÅ³ parametrÅ³." -END Removed: trunk/rosapps/applications/screensavers/mazescr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/lang/no-NO.rc (removed) @@ -1,8 +0,0 @@ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DESCRIPTION "Maze Skjermsparer" - IDS_TITLE "Om" - IDS_TEXT "Ingen valg trengs Ã¥ settes." -END Removed: trunk/rosapps/applications/screensavers/mazescr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/lang/pl-PL.rc (removed) @@ -1,15 +0,0 @@ -/* - * translated by Caemyr - Olaf Siejka (Feb, 2008) - * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org - * IRC: irc.freenode.net #reactos-pl; - */ - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DESCRIPTION "Wygaszacz Labirynt" - IDS_TITLE "O programie" - IDS_TEXT "Brak opcji do ustawiania." -END Removed: trunk/rosapps/applications/screensavers/mazescr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/lang/ro-RO.rc (removed) @@ -1,18 +0,0 @@ -/* - * PROJECT: ReactOS Maze ScreenSaver - * LICENSE: GPL - See COPYING in the top level directory - * FILE: rosapps/applications/screensavers/mazescr/lang/ro-RO.rc - * PURPOSE: Romanian Language File for Maze ScreenSaver - * TRANSLATOR: Ètefan Fulea (stefan dot fulea at mail dot md) - */ - -LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -#pragma code_page(65001) - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DESCRIPTION "Labirint (animaÈie de inactivitate)" - IDS_TITLE "Despre" - IDS_TEXT "Nu este necesarÄ stabilirea de opÈiuni." -END Removed: trunk/rosapps/applications/screensavers/mazescr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/lang/sk-SK.rc (removed) @@ -1,12 +0,0 @@ -/* TRANSLATOR: MÃ¡rio KaÄmÃ¡r /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * DATE OF TR: 30-01-2008 - */ - -LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DESCRIPTION "Bludisko - Å¡etriÄ obrazovky" - IDS_TITLE "Äo je ..." - IDS_TEXT "Nie sÃº potrebnÃ© Å¾iadne nastavenia." -END Removed: trunk/rosapps/applications/screensavers/mazescr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/lang/uk-UA.rc (removed) @@ -1,16 +0,0 @@ -/* - * PROJECT: Maze ScreenSaver - * LICENSE: Public Domain - * FILE: rosapps/applications/screensavers/mazescr/lang/uk-UA.rc - * PURPOSE: Ukraianian Language File for Maze ScreenSaver - * TRANSLATOR: Artem Reznikov - */ - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DESCRIPTION "ÐÐ°ÑÑÐ°Ð²ÐºÐ° ""ÐÐ°Ð±ÑÑÐ¸Ð½Ñ""" - IDS_TITLE "ÐÑÐ¾" - IDS_TEXT "Ð¦Ñ Ð·Ð°ÑÑÐ°Ð²ÐºÐ° Ð½Ðµ Ð¼Ð°Ñ Ð½Ð°Ð»Ð°ÑÑÐ¾Ð²ÑÐ²Ð°Ð½Ð¸Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑÐ²." -END Modified: trunk/rosapps/applications/screensavers/mazescr/maze.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/maze.c [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/maze.c [iso-8859-1] Wed May 20 01:57:07 2015 @@ -49,16 +49,17 @@ #define STRICT +#include <windows.h> /* required for all Windows applications */ +#include <scrnsave.h> +#include <tchar.h> #include <stdlib.h> +#include <commctrl.h> #include <string.h> #include <time.h> -#include <windows.h> /* required for all Windows applications */ -#include <scrnsave.h> #include "resource.h" #define APPNAME _T("Maze") -//static BOOL InitInstance(HWND hParent); LRESULT CALLBACK ScreenSaverProc(HWND hWnd, UINT message, WPARAM uParam, LPARAM lParam); static int choose_door(); static long backup(); @@ -71,9 +72,8 @@ HBRUSH hBrushLiving; HPEN hPenWall; HDC hDC; -//static BOOL waiting; - -static int solve_delay, pre_solve_delay, post_solve_delay; + +static int solve_delay, pre_solve_delay, post_solve_delay, size; #define MAX_MAZE_SIZE_X ((unsigned long) 1000) // Dynamic detection? #define MAX_MAZE_SIZE_Y ((unsigned long) 1000) // Dynamic detection? @@ -119,6 +119,63 @@ static int grid_width, grid_height; static int bw; static int state = 1, pathi = 0; +static LPCWSTR registryPath = _T("Software\\Microsoft\\ScreenSavers\\mazescr"); + +static void SetDefaults() +{ + size = 10; + pre_solve_delay = 5000; + post_solve_delay = 5000; + solve_delay = 1; +} + +static void ReadRegistry() +{ + LONG result; + HKEY skey; + DWORD valuetype, valuesize, val_size, val_presd, val_postsd, val_sd; + + SetDefaults(); + + result = RegOpenKeyEx(HKEY_CURRENT_USER, registryPath, 0, KEY_READ, &skey); + if(result != ERROR_SUCCESS) + return; + + valuesize = sizeof(DWORD); + + result = RegQueryValueEx(skey, _T("size"), NULL, &valuetype, (LPBYTE)&val_size, &valuesize); + if(result == ERROR_SUCCESS) + size = val_size; + result = RegQueryValueEx(skey, _T("pre_solve_delay"), NULL, &valuetype, (LPBYTE)&val_presd, &valuesize); + if(result == ERROR_SUCCESS) + pre_solve_delay = val_presd; + result = RegQueryValueEx(skey, _T("post_solve_delay"), NULL, &valuetype, (LPBYTE)&val_postsd, &valuesize); + if(result == ERROR_SUCCESS) + post_solve_delay = val_postsd; + result = RegQueryValueEx(skey, _T("solve_delay"), NULL, &valuetype, (LPBYTE)&val_sd, &valuesize); + if(result == ERROR_SUCCESS) + solve_delay = val_sd; + + RegCloseKey(skey); +} + +static void WriteRegistry() +{ + LONG result; + HKEY skey; + DWORD disp; + + result = RegCreateKeyEx(HKEY_CURRENT_USER, registryPath, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &skey, &disp); + if(result != ERROR_SUCCESS) + return; + + RegSetValueEx(skey, _T("size"), 0, REG_DWORD, (LPBYTE)&size, sizeof(size)); + RegSetValueEx(skey, _T("pre_solve_delay"), 0, REG_DWORD, (LPBYTE)&pre_solve_delay, sizeof(pre_solve_delay)); + RegSetValueEx(skey, _T("post_solve_delay"), 0, REG_DWORD, (LPBYTE)&post_solve_delay, sizeof(post_solve_delay)); + RegSetValueEx(skey, _T("solve_delay"), 0, REG_DWORD, (LPBYTE)&solve_delay, sizeof(solve_delay)); + + RegCloseKey(skey); +} static void set_maze_sizes(width, height) int width, height; @@ -417,7 +474,7 @@ } } - hBrush = GetStockObject(WHITE_BRUSH); // FIXME: do not hardcode + hBrush = GetStockObject(WHITE_BRUSH); draw_solid_square(start_x, start_y, start_dir, hDC, hBrush); draw_solid_square(end_x, end_y, end_dir, hDC, hBrush); } @@ -520,14 +577,9 @@ static BOOL OnCreate(HWND hWnd, LPCREATESTRUCT lpCreateStruct) { - int size; - srand((unsigned) time(NULL)); - size = GetPrivateProfileIntW(L"maze", L"gridsize", 10, L"maze.ini"); - pre_solve_delay = GetPrivateProfileIntW(L"maze", L"predelay", 5000, L"maze.ini"); - post_solve_delay = GetPrivateProfileIntW(L"maze", L"postdelay", 5000, L"maze.ini"); - solve_delay = GetPrivateProfileIntW(L"maze", L"solvedelay", 1, L"maze.ini"); + ReadRegistry(); if (size < 2) { size = 7 + (rand() % 30); @@ -580,6 +632,34 @@ return TRUE; } +BOOL WINAPI AboutProc(HWND hWnd, UINT message, WPARAM wparam, LPARAM lparam) +{ + switch(message){ + case WM_COMMAND: + switch(LOWORD(wparam)){ + case IDOK: + EndDialog(hWnd, LOWORD(wparam)); + return TRUE; + } + } + return FALSE; +} + +static void ReadSettings(HWND hWnd) +{ + size = SendDlgItemMessage(hWnd, IDC_SLIDER_SIZE, TBM_GETPOS, 0, 0); + SetDlgItemInt(hWnd, IDC_TEXT_SIZE, size, FALSE); + + pre_solve_delay = SendDlgItemMessage(hWnd, IDC_SLIDER_PRESD, TBM_GETPOS, 0, 0); + SetDlgItemInt(hWnd, IDC_TEXT_PRESD, pre_solve_delay, FALSE); + + post_solve_delay = SendDlgItemMessage(hWnd, IDC_SLIDER_POSTSD, TBM_GETPOS, 0, 0); + SetDlgItemInt(hWnd, IDC_TEXT_POSTSD, post_solve_delay, FALSE); + + solve_delay = SendDlgItemMessage(hWnd, IDC_SLIDER_SD, TBM_GETPOS, 0, 0); + SetDlgItemInt(hWnd, IDC_TEXT_SD, solve_delay, FALSE); +} + LRESULT CALLBACK ScreenSaverProc( HWND hWnd, // window handle UINT message, // type of message @@ -646,18 +726,48 @@ BOOL WINAPI ScreenSaverConfigureDialog(HWND hWnd, UINT message, WPARAM wparam, LPARAM lparam) { + switch (message) + { + case WM_INITDIALOG: + ReadRegistry(); + //Set slider ranges + SendDlgItemMessage(hWnd, IDC_SLIDER_SIZE, TBM_SETRANGE, FALSE, MAKELPARAM(5, 64)); + SendDlgItemMessage(hWnd, IDC_SLIDER_PRESD, TBM_SETRANGE, FALSE, MAKELPARAM(1, 10000)); + SendDlgItemMessage(hWnd, IDC_SLIDER_POSTSD, TBM_SETRANGE, FALSE, MAKELPARAM(1, 10000)); + SendDlgItemMessage(hWnd, IDC_SLIDER_SD, TBM_SETRANGE, FALSE, MAKELPARAM(1, 10000)); + //Set current values to slider + SendDlgItemMessage(hWnd, IDC_SLIDER_SIZE, TBM_SETPOS, TRUE, size); + SendDlgItemMessage(hWnd, IDC_SLIDER_PRESD, TBM_SETPOS, TRUE, pre_solve_delay); + SendDlgItemMessage(hWnd, IDC_SLIDER_POSTSD, TBM_SETPOS, TRUE, post_solve_delay); + SendDlgItemMessage(hWnd, IDC_SLIDER_SD, TBM_SETPOS, TRUE, solve_delay); + //Set current values to texts + SetDlgItemInt(hWnd, IDC_TEXT_SIZE, size, FALSE); + SetDlgItemInt(hWnd, IDC_TEXT_PRESD, pre_solve_delay, FALSE); + SetDlgItemInt(hWnd, IDC_TEXT_POSTSD, post_solve_delay, FALSE); + SetDlgItemInt(hWnd, IDC_TEXT_SD, solve_delay, FALSE); + return TRUE; + case WM_COMMAND: + switch (LOWORD(wparam)) + { + case IDOK: + WriteRegistry(); + EndDialog(hWnd, TRUE); + return TRUE; + case IDCANCEL: + EndDialog(hWnd, TRUE); + break; + case IDABOUT: + DialogBox(hMainInstance, MAKEINTRESOURCE(IDD_DLG_ABOUT), hWnd, (DLGPROC)AboutProc); + break; + } + case WM_HSCROLL: + ReadSettings(hWnd); + return TRUE; + } + return FALSE; +} + +BOOL WINAPI RegisterDialogClasses(HANDLE hmodule) +{ return TRUE; } - -BOOL WINAPI RegisterDialogClasses(HANDLE hmodule) -{ - TCHAR szTitle[256]; - TCHAR szText[256]; - - LoadString(hmodule, IDS_TITLE, szTitle, 256); - - LoadString(hmodule, IDS_TEXT, szText, 256); - - MessageBox(0, szText, szTitle, MB_OK | MB_ICONWARNING); - return TRUE; -} Modified: trunk/rosapps/applications/screensavers/mazescr/maze.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/maze.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/maze.rc [iso-8859-1] Wed May 20 01:57:07 2015 @@ -1,5 +1,4 @@ #include <windows.h> -#include <scrnsave.h> #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL @@ -8,46 +7,23 @@ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Maze ScreenSaver\0" -#define REACTOS_STR_INTERNAL_NAME "maze\0" -#define REACTOS_STR_ORIGINAL_FILENAME "maze.scr\0" +#define REACTOS_STR_INTERNAL_NAME "Maze\0" +#define REACTOS_STR_ORIGINAL_FILENAME "mazescr.scr\0" #include <reactos/version.rc> #include <reactos/manifest_exe.rc> +#ifndef IDC_STATIC +#define IDC_STATIC -1 +#endif + /* UTF-8 */ #pragma code_page(65001) -#ifdef LANGUAGE_BG_BG - #include "lang/bg-BG.rc" -#endif #ifdef LANGUAGE_DE_DE #include "lang/de-DE.rc" #endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif -#ifdef LANGUAGE_ES_ES - #include "lang/es-ES.rc" -#endif -#ifdef LANGUAGE_FR_FR - #include "lang/fr-FR.rc" -#endif -#ifdef LANGUAGE_LT_LT - #include "lang/lt-LT.rc" -#endif -#ifdef LANGUAGE_NO_NO - #include "lang/no-NO.rc" -#endif -#ifdef LANGUAGE_PL_PL - #include "lang/pl-PL.rc" -#endif -#ifdef LANGUAGE_RO_RO - #include "lang/ro-RO.rc" -#endif -#ifdef LANGUAGE_SK_SK - #include "lang/sk-SK.rc" -#endif -#ifdef LANGUAGE_UK_UA - #include "lang/uk-UA.rc" -#endif Modified: trunk/rosapps/applications/screensavers/mazescr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/resource.h [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/resource.h [iso-8859-1] Wed May 20 01:57:07 2015 @@ -1,6 +1,15 @@ #pragma once -#define IDS_DESCRIPTION 1 -#define IDS_TITLE 2 -#define IDS_TEXT 3 -#define IDI_ICON 101 +#define IDS_DESCRIPTION 1 +#define IDABOUT 10 +#define IDI_ICON 101 +#define IDD_DLG_ABOUT 110 +#define IDC_SLIDER_SIZE 1000 +#define IDC_SLIDER_PRESD 1001 +#define IDC_SLIDER_POSTSD 1002 +#define IDC_SLIDER_SD 1003 +#define IDC_TEXT_SIZE 1004 +#define IDC_TEXT_PRESD 1005 +#define IDC_TEXT_POSTSD 1006 +#define IDC_TEXT_SD 1007 +#define IDD_DLG_SCREEN 2003

1 0

[aandrejevic] 67832: [FAST486] Fix Fast486FpuFromDoubleReal.
by aandrejevic＠svn.reactos.org 20 May '15

20 May '15

Author: aandrejevic Date: Wed May 20 01:04:21 2015 New Revision: 67832 URL: http://svn.reactos.org/svn/reactos?rev=67832&view=rev Log: [FAST486] Fix Fast486FpuFromDoubleReal. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6783… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Wed May 20 01:04:21 2015 @@ -457,7 +457,7 @@ /* If this is a zero, we're done */ if (Value == 0) return; - if (Result->Exponent == 0x3FF) Result->Exponent = FPU_MAX_EXPONENT + 1; + if (Result->Exponent == 0x7FF) Result->Exponent = FPU_MAX_EXPONENT + 1; else { /* Adjust the exponent bias */

1 0

[dquintana] 67831: [STOBJECT] Followup to r67830: When no one handles a message, properly return that it was not handled. This way all messages are handled correctly and not just NCCREATE. Also too...
by dquintana＠svn.reactos.org 19 May '15

19 May '15

Author: dquintana Date: Tue May 19 20:31:31 2015 New Revision: 67831 URL: http://svn.reactos.org/svn/reactos?rev=67831&view=rev Log: [STOBJECT] Followup to r67830: When no one handles a message, properly return that it was not handled. This way all messages are handled correctly and not just NCCREATE. Also took the chance to short-cut NCDESTROY, since the icon handlers have no need to receive this message. CORE-9592 #resolve Modified: trunk/reactos/dll/shellext/stobject/csystray.cpp Modified: trunk/reactos/dll/shellext/stobject/csystray.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/csys… ============================================================================== --- trunk/reactos/dll/shellext/stobject/csystray.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/csystray.cpp [iso-8859-1] Tue May 19 20:31:31 2015 @@ -87,11 +87,12 @@ if (FAILED(hr)) return hr; - if (hr != S_FALSE) - return hr; - } - - return S_OK; + if (hr == S_OK) + return hr; + } + + // Not handled by anyone, so return accordingly. + return S_FALSE; } HRESULT CSysTray::NotifyIcon(INT code, UINT uId, HICON hIcon, LPCWSTR szTip) @@ -207,6 +208,7 @@ switch (uMsg) { case WM_NCCREATE: + case WM_NCDESTROY: return FALSE; case WM_CREATE: InitIcons(); @@ -227,8 +229,5 @@ if (FAILED(hr)) return FALSE; - if (hr == S_FALSE) - return FALSE; - - return TRUE; -} + return (hr == S_OK); +}

1 0

[cwittich] 67830: [stobject] do not handle WM_NCCREATE in ProcessWindowMessage otherwise it get passed to ProcessIconMessage which will flag it as handled in case g_NumIcons is 0 which then will re...
by cwittich＠svn.reactos.org 19 May '15

19 May '15

Author: cwittich Date: Tue May 19 19:58:11 2015 New Revision: 67830 URL: http://svn.reactos.org/svn/reactos?rev=67830&view=rev Log: [stobject] do not handle WM_NCCREATE in ProcessWindowMessage otherwise it get passed to ProcessIconMessage which will flag it as handled in case g_NumIcons is 0 which then will result in ATL not calling DefWndProc anymore CORE-9592 Modified: trunk/reactos/dll/shellext/stobject/csystray.cpp Modified: trunk/reactos/dll/shellext/stobject/csystray.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/csys… ============================================================================== --- trunk/reactos/dll/shellext/stobject/csystray.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/csystray.cpp [iso-8859-1] Tue May 19 19:58:11 2015 @@ -206,6 +206,8 @@ switch (uMsg) { + case WM_NCCREATE: + return FALSE; case WM_CREATE: InitIcons(); SetTimer(1, 2000, NULL);

1 0

[akhaldi] 67829: [SHELL32] Fix a typo. Spotted by IRC nick premoboss. CORE-9704
by akhaldi＠svn.reactos.org 19 May '15

19 May '15

Author: akhaldi Date: Tue May 19 19:38:06 2015 New Revision: 67829 URL: http://svn.reactos.org/svn/reactos?rev=67829&view=rev Log: [SHELL32] Fix a typo. Spotted by IRC nick premoboss. CORE-9704 Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Tue May 19 19:38:06 2015 @@ -702,7 +702,7 @@ IDS_FILEOOP_DELETING "Cancellazione in corso..." IDS_FILEOOP_FROM_TO "Da %1 a %2" IDS_FILEOOP_FROM "Da %1" - IDS_FILEOOP_PREFLIGHT "Verifia preliminare" + IDS_FILEOOP_PREFLIGHT "Verifica preliminare" /* message box strings */ IDS_RESTART_TITLE "Riavvia"

1 0

[aandrejevic] 67828: [FAST486] Fix Fast486FpuArithmeticOperation. It doesn't really matter for the operation itself which operand is the source/destination, because the FPU actually always performs...
by aandrejevic＠svn.reactos.org 19 May '15

19 May '15

Author: aandrejevic Date: Tue May 19 16:57:46 2015 New Revision: 67828 URL: http://svn.reactos.org/svn/reactos?rev=67828&view=rev Log: [FAST486] Fix Fast486FpuArithmeticOperation. It doesn't really matter for the operation itself which operand is the source/destination, because the FPU actually always performs the operation on ST0 and something else. So, FDIV/FDIVR were never really reversed here, it's just that FDIV always divides ST0 by something and FDIVR always divides something by ST0. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6782… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Tue May 19 16:57:46 2015 @@ -1273,9 +1273,11 @@ static inline VOID FASTCALL Fast486FpuArithmeticOperation(PFAST486_STATE State, INT Operation, - PFAST486_FPU_DATA_REG SourceOperand, - PFAST486_FPU_DATA_REG DestOperand) + PFAST486_FPU_DATA_REG Operand, + BOOLEAN TopDestination) { + PFAST486_FPU_DATA_REG DestOperand = TopDestination ? &FPU_ST(0) : Operand; + ASSERT(!(Operation & ~7)); /* Check the operation */ @@ -1284,14 +1286,14 @@ /* FADD */ case 0: { - Fast486FpuAdd(State, DestOperand, SourceOperand, DestOperand); + Fast486FpuAdd(State, &FPU_ST(0), Operand, DestOperand); break; } /* FMUL */ case 1: { - Fast486FpuMultiply(State, DestOperand, SourceOperand, DestOperand); + Fast486FpuMultiply(State, &FPU_ST(0), Operand, DestOperand); break; } @@ -1300,7 +1302,7 @@ /* FCOMP */ case 3: { - Fast486FpuCompare(State, DestOperand, SourceOperand); + Fast486FpuCompare(State, &FPU_ST(0), Operand); if (Operation == 3) Fast486FpuPop(State); break; @@ -1309,28 +1311,28 @@ /* FSUB */ case 4: { - Fast486FpuSubtract(State, DestOperand, SourceOperand, DestOperand); + Fast486FpuSubtract(State, &FPU_ST(0), Operand, DestOperand); break; } /* FSUBR */ case 5: { - Fast486FpuSubtract(State, SourceOperand, DestOperand, DestOperand); + Fast486FpuSubtract(State, Operand, &FPU_ST(0), DestOperand); break; } /* FDIV */ case 6: { - Fast486FpuDivide(State, SourceOperand, DestOperand, DestOperand); + Fast486FpuDivide(State, &FPU_ST(0), Operand, DestOperand); break; } /* FDIVR */ case 7: { - Fast486FpuDivide(State, DestOperand, SourceOperand, DestOperand); + Fast486FpuDivide(State, Operand, &FPU_ST(0), DestOperand); break; } } @@ -1425,7 +1427,7 @@ FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; #ifndef FAST486_NO_FPU - PFAST486_FPU_DATA_REG SourceOperand, DestOperand; + PFAST486_FPU_DATA_REG Operand; FAST486_FPU_DATA_REG MemoryData; #endif @@ -1444,9 +1446,6 @@ FPU_SAVE_LAST_INST(); - /* The destination operand is ST0 */ - DestOperand = &FPU_ST(0); - if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { /* Raise the invalid operation exception */ @@ -1455,9 +1454,9 @@ if (State->FpuControl.Im) { /* Return the indefinite NaN */ - DestOperand->Sign = TRUE; - DestOperand->Exponent = FPU_MAX_EXPONENT + 1; - DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + FPU_ST(0).Sign = TRUE; + FPU_ST(0).Exponent = FPU_MAX_EXPONENT + 1; + FPU_ST(0).Mantissa = FPU_INDEFINITE_MANTISSA; FPU_SET_TAG(0, FPU_TAG_SPECIAL); } @@ -1478,7 +1477,7 @@ } Fast486FpuFromSingleReal(State, Value, &MemoryData); - SourceOperand = &MemoryData; + Operand = &MemoryData; FPU_SAVE_LAST_OPERAND(); } @@ -1492,9 +1491,9 @@ if (State->FpuControl.Im) { /* Return the indefinite NaN */ - DestOperand->Sign = TRUE; - DestOperand->Exponent = FPU_MAX_EXPONENT + 1; - DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + FPU_ST(0).Sign = TRUE; + FPU_ST(0).Exponent = FPU_MAX_EXPONENT + 1; + FPU_ST(0).Mantissa = FPU_INDEFINITE_MANTISSA; FPU_SET_TAG(0, FPU_TAG_SPECIAL); } @@ -1504,11 +1503,11 @@ } /* Load the source operand from an FPU register */ - SourceOperand = &FPU_ST(ModRegRm.SecondRegister); + Operand = &FPU_ST(ModRegRm.SecondRegister); } /* Perform the requested operation */ - Fast486FpuArithmeticOperation(State, ModRegRm.Register, SourceOperand, DestOperand); + Fast486FpuArithmeticOperation(State, ModRegRm.Register, Operand, TRUE); #endif } @@ -2291,7 +2290,6 @@ FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; #ifndef FAST486_NO_FPU - PFAST486_FPU_DATA_REG SourceOperand, DestOperand; LONG Value; FAST486_FPU_DATA_REG MemoryData; #endif @@ -2348,9 +2346,6 @@ return; } - /* The destination operand is always ST0 */ - DestOperand = &FPU_ST(0); - if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { /* Raise the invalid operation exception */ @@ -2359,9 +2354,9 @@ if (State->FpuControl.Im) { /* Return the indefinite NaN */ - DestOperand->Sign = TRUE; - DestOperand->Exponent = FPU_MAX_EXPONENT + 1; - DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + FPU_ST(0).Sign = TRUE; + FPU_ST(0).Exponent = FPU_MAX_EXPONENT + 1; + FPU_ST(0).Mantissa = FPU_INDEFINITE_MANTISSA; FPU_SET_TAG(0, FPU_TAG_SPECIAL); } @@ -2371,10 +2366,9 @@ } Fast486FpuFromInteger(State, (LONGLONG)Value, &MemoryData); - SourceOperand = &MemoryData; /* Perform the requested operation */ - Fast486FpuArithmeticOperation(State, ModRegRm.Register, SourceOperand, DestOperand); + Fast486FpuArithmeticOperation(State, ModRegRm.Register, &MemoryData, TRUE); #endif } @@ -2614,7 +2608,7 @@ FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; #ifndef FAST486_NO_FPU - PFAST486_FPU_DATA_REG SourceOperand, DestOperand; + PFAST486_FPU_DATA_REG Operand; FAST486_FPU_DATA_REG MemoryData; #endif @@ -2637,9 +2631,6 @@ { ULONGLONG Value; - /* The destination operand is ST0 */ - DestOperand = &FPU_ST(0); - if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { /* Raise the invalid operation exception */ @@ -2648,9 +2639,9 @@ if (State->FpuControl.Im) { /* Return the indefinite NaN */ - DestOperand->Sign = TRUE; - DestOperand->Exponent = FPU_MAX_EXPONENT + 1; - DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + FPU_ST(0).Sign = TRUE; + FPU_ST(0).Exponent = FPU_MAX_EXPONENT + 1; + FPU_ST(0).Mantissa = FPU_INDEFINITE_MANTISSA; FPU_SET_TAG(0, FPU_TAG_SPECIAL); } @@ -2673,17 +2664,14 @@ } Fast486FpuFromDoubleReal(State, Value, &MemoryData); - SourceOperand = &MemoryData; + Operand = &MemoryData; FPU_SAVE_LAST_OPERAND(); } else { - /* The source operand is ST0 */ - SourceOperand = &FPU_ST(0); - /* Load the destination operand from an FPU register */ - DestOperand = &FPU_ST(ModRegRm.SecondRegister); + Operand = &FPU_ST(ModRegRm.SecondRegister); if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY)) @@ -2694,9 +2682,9 @@ if (State->FpuControl.Im) { /* Return the indefinite NaN */ - DestOperand->Sign = TRUE; - DestOperand->Exponent = FPU_MAX_EXPONENT + 1; - DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + Operand->Sign = TRUE; + Operand->Exponent = FPU_MAX_EXPONENT + 1; + Operand->Mantissa = FPU_INDEFINITE_MANTISSA; FPU_SET_TAG(ModRegRm.SecondRegister, FPU_TAG_SPECIAL); } @@ -2707,7 +2695,7 @@ } /* Perform the requested operation */ - Fast486FpuArithmeticOperation(State, ModRegRm.Register, SourceOperand, DestOperand); + Fast486FpuArithmeticOperation(State, ModRegRm.Register, Operand, ModRegRm.Memory); #endif } @@ -2992,7 +2980,7 @@ FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; #ifndef FAST486_NO_FPU - PFAST486_FPU_DATA_REG SourceOperand, DestOperand; + PFAST486_FPU_DATA_REG Operand; FAST486_FPU_DATA_REG MemoryData; #endif @@ -3015,9 +3003,6 @@ { SHORT Value; - /* The destination operand is ST0 */ - DestOperand = &FPU_ST(0); - if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { /* Raise the invalid operation exception */ @@ -3026,9 +3011,9 @@ if (State->FpuControl.Im) { /* Return the indefinite NaN */ - DestOperand->Sign = TRUE; - DestOperand->Exponent = FPU_MAX_EXPONENT + 1; - DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + FPU_ST(0).Sign = TRUE; + FPU_ST(0).Exponent = FPU_MAX_EXPONENT + 1; + FPU_ST(0).Mantissa = FPU_INDEFINITE_MANTISSA; FPU_SET_TAG(0, FPU_TAG_SPECIAL); } @@ -3045,7 +3030,7 @@ } Fast486FpuFromInteger(State, (LONGLONG)Value, &MemoryData); - SourceOperand = &MemoryData; + Operand = &MemoryData; FPU_SAVE_LAST_OPERAND(); } @@ -3059,11 +3044,8 @@ return; } - /* The source operand is ST0 */ - SourceOperand = &FPU_ST(0); - /* Load the destination operand from a register */ - DestOperand = &FPU_ST(ModRegRm.SecondRegister); + Operand = &FPU_ST(ModRegRm.SecondRegister); if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY)) @@ -3077,7 +3059,7 @@ } /* Perform the requested operation */ - Fast486FpuArithmeticOperation(State, ModRegRm.Register, SourceOperand, DestOperand); + Fast486FpuArithmeticOperation(State, ModRegRm.Register, Operand, ModRegRm.Memory); if (!ModRegRm.Memory) Fast486FpuPop(State); #endif

1 0

[aandrejevic] 67827: [FAST486] Fix UnsignedDivMod128 (again). Fix Fast486FpuAdd to handle numbers whose difference of exponents is greater than the number of bits in the mantissa.
by aandrejevic＠svn.reactos.org 19 May '15

19 May '15

Author: aandrejevic Date: Tue May 19 02:37:17 2015 New Revision: 67827 URL: http://svn.reactos.org/svn/reactos?rev=67827&view=rev Log: [FAST486] Fix UnsignedDivMod128 (again). Fix Fast486FpuAdd to handle numbers whose difference of exponents is greater than the number of bits in the mantissa. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6782… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Tue May 19 02:37:17 2015 @@ -204,8 +204,15 @@ * divisor has more than the original divisor */ Bits = CountLeadingZeros64(Divisor); - if (CurrentHigh > 0ULL) Bits -= CountLeadingZeros64(CurrentHigh); + if (CurrentHigh > 0ULL) Bits += 64 - CountLeadingZeros64(CurrentHigh); else Bits -= CountLeadingZeros64(CurrentLow); + + if (Bits >= 64) + { + *QuotientHigh = *QuotientLow; + *QuotientLow = 0ULL; + Bits -= 64; + } if (Bits) { @@ -635,15 +642,33 @@ /* Adjust the first operand to it... */ if (FirstAdjusted.Exponent < TempResult.Exponent) { - FirstAdjusted.Mantissa >>= (TempResult.Exponent - FirstAdjusted.Exponent); - FirstAdjusted.Exponent = TempResult.Exponent; + if ((TempResult.Exponent - FirstAdjusted.Exponent) < 64) + { + FirstAdjusted.Mantissa >>= (TempResult.Exponent - FirstAdjusted.Exponent); + FirstAdjusted.Exponent = TempResult.Exponent; + } + else + { + /* The second operand is the result */ + *Result = *SecondOperand; + return TRUE; + } } /* ... and the second one too */ if (SecondAdjusted.Exponent < TempResult.Exponent) { - SecondAdjusted.Mantissa >>= (TempResult.Exponent - SecondAdjusted.Exponent); - SecondAdjusted.Exponent = TempResult.Exponent; + if ((TempResult.Exponent - FirstAdjusted.Exponent) < 64) + { + SecondAdjusted.Mantissa >>= (TempResult.Exponent - SecondAdjusted.Exponent); + SecondAdjusted.Exponent = TempResult.Exponent; + } + else + { + /* The first operand is the result */ + *Result = *FirstOperand; + return TRUE; + } } if (FirstAdjusted.Sign == SecondAdjusted.Sign)

1 0

[aandrejevic] 67826: [FAST486] Add checks for special numbers in Fast486FpuAdd. Don't use pointers to out-of-scope variables.
by aandrejevic＠svn.reactos.org 18 May '15

18 May '15

Author: aandrejevic Date: Mon May 18 23:33:25 2015 New Revision: 67826 URL: http://svn.reactos.org/svn/reactos?rev=67826&view=rev Log: [FAST486] Add checks for special numbers in Fast486FpuAdd. Don't use pointers to out-of-scope variables. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6782… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Mon May 18 23:33:25 2015 @@ -591,6 +591,18 @@ FAST486_FPU_DATA_REG SecondAdjusted = *SecondOperand; FAST486_FPU_DATA_REG TempResult; + if (FPU_IS_INDEFINITE(FirstOperand) + || FPU_IS_INDEFINITE(SecondOperand) + || (FPU_IS_POS_INF(FirstOperand) && FPU_IS_NEG_INF(SecondOperand)) + || (FPU_IS_NEG_INF(FirstOperand) && FPU_IS_POS_INF(SecondOperand))) + { + /* The result will be indefinite */ + Result->Sign = TRUE; + Result->Exponent = FPU_MAX_EXPONENT + 1; + Result->Mantissa = FPU_INDEFINITE_MANTISSA; + return TRUE; + } + if ((!FPU_IS_NORMALIZED(FirstOperand) || !FPU_IS_NORMALIZED(SecondOperand))) { /* Raise the denormalized exception */ @@ -601,6 +613,20 @@ Fast486FpuException(State); return FALSE; } + } + + if (FPU_IS_ZERO(FirstOperand) || FPU_IS_INFINITY(SecondOperand)) + { + /* The second operand is the result */ + *Result = *SecondOperand; + return TRUE; + } + + if (FPU_IS_ZERO(SecondOperand) || FPU_IS_INFINITY(FirstOperand)) + { + /* The first operand is the result */ + *Result = *FirstOperand; + return TRUE; } /* Find the largest exponent */ @@ -2942,6 +2968,7 @@ BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; #ifndef FAST486_NO_FPU PFAST486_FPU_DATA_REG SourceOperand, DestOperand; + FAST486_FPU_DATA_REG MemoryData; #endif TOGGLE_ADSIZE(AddressSize); @@ -2962,7 +2989,6 @@ if (ModRegRm.Memory) { SHORT Value; - FAST486_FPU_DATA_REG MemoryData; /* The destination operand is ST0 */ DestOperand = &FPU_ST(0);

1 0

[ekohl] 67825: [SYSDM] The maximum length of hardware profiles names is 79 characters. Use a matching string length and set the length of the edit control accordingly.
by ekohl＠svn.reactos.org 18 May '15

18 May '15

Author: ekohl Date: Mon May 18 20:29:14 2015 New Revision: 67825 URL: http://svn.reactos.org/svn/reactos?rev=67825&view=rev Log: [SYSDM] The maximum length of hardware profiles names is 79 characters. Use a matching string length and set the length of the edit control accordingly. Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hardprof.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] Mon May 18 20:29:14 2015 @@ -11,9 +11,11 @@ #include <debug.h> +#define PROFILE_NAME_LENGTH 80 + typedef struct _PROFILE { - WCHAR szFriendlyName[256]; + WCHAR szFriendlyName[PROFILE_NAME_LENGTH]; WCHAR szName[5]; DWORD dwProfileNumber; DWORD dwPreferenceOrder; @@ -37,11 +39,12 @@ UINT idFrom, UINT idTo) { - WCHAR szNewProfileName[256]; + WCHAR szNewProfileName[PROFILE_NAME_LENGTH]; SetDlgItemText(hwndDlg, idFrom, pProfileData->pProfiles[pProfileData->dwSelectedProfileIndex].szFriendlyName); swprintf(szNewProfileName, L"Profile %lu", pProfileData->dwProfileCount); + SendDlgItemMessageW(hwndDlg, idTo, EM_SETLIMITTEXT, PROFILE_NAME_LENGTH - 1, 0); SetDlgItemText(hwndDlg, idTo, szNewProfileName); } @@ -76,7 +79,7 @@ GetDlgItemText(hwndDlg, IDC_COPYPROFILETO, pDstProfile->szFriendlyName, - 256); + PROFILE_NAME_LENGTH); pDstProfile->dwProfileNumber = ++pProfileData->dwLastProfile; swprintf(pDstProfile->szName, L"%04lu", pDstProfile->dwProfileNumber); @@ -138,7 +141,7 @@ GetDlgItemText(hwndDlg, IDC_RENPROFEDITTO, pProfile->szFriendlyName, - 256); + PROFILE_NAME_LENGTH); /* Replace the listbox string */ SendDlgItemMessageW(pProfileData->hwndProfileDlg, IDC_HRDPROFLSTBOX, LB_DELETESTRING, pProfileData->dwSelectedProfileIndex, 0); @@ -288,7 +291,7 @@ if (lError != ERROR_SUCCESS) return; - dwSize = 256 * sizeof(WCHAR); + dwSize = PROFILE_NAME_LENGTH * sizeof(WCHAR); lError = RegQueryValueExW(hProfileKey, L"FriendlyName", NULL,

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2015